commit 41fa5b6bbfb1852c1bd8824c217e19dc483a3567
author Stewart Smith <stewart@linux.vnet.ibm.com> Wed May 24 14:53:13 2017 +1000
committer GitHub <noreply@github.com> Wed May 24 14:53:13 2017 +1000
tree faf2d547ec66e0bcdb679e834b8ba6897711fc0a
parent c2d42caf85a223fb23a77f76407fa5afc6930109
parent a7cdb0451242ff19f28d9526c8071d5e7a9f0af8

Merge pull request #1102 from shenki/kernel-4.11.2

Release Linux 4.11.2-openpower1

openpower/configs/witherspoon_defconfig

diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 02c0014..d8308d6 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -58,7 +58,7 @@
 BR2_PACKAGE_LOADKEYS=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT=y
 BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="witherspoon-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="e536539f7c769944d2ce8318a2d96f6c159668c8"
+BR2_OPENPOWER_MACHINE_XML_VERSION="d389352298566dfaec3d7cfc28778eba012c9256"
 BR2_OPENPOWER_MACHINE_XML_FILENAME="witherspoon.xml"
 BR2_OPENPOWER_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_OPENPOWER_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"

openpower/package/occ/occ.mk

diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 666d6e1..14a4d12 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 OCC_VERSION_BRANCH_MASTER_P8 ?= 28f2cec690b7f19548ce860a8820f519e6c39a6a
-OCC_VERSION_BRANCH_MASTER ?= 8a7df03ba3d475d51f8507a0424b63868cca7e8a
+OCC_VERSION_BRANCH_MASTER ?= bc34ad5806549a7a20079745b2b1f8ef439ade0c
 
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
 OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))