diff --git a/ci/Dockerfile/fedora25 b/ci/Dockerfile/fedora25
index 9414efc..433f948 100644
--- a/ci/Dockerfile/fedora25
+++ b/ci/Dockerfile/fedora25
@@ -3,4 +3,4 @@
 RUN dnf -y install gcc-c++ flex bison git ctags cscope expat-devel patch zlib-devel zlib-static texinfo perl-bignum "perl(XML::Simple)" "perl(YAML)" "perl(XML::SAX)" "perl(Fatal)" "perl(Thread::Queue)" "perl(Env)" "perl(XML::LibXML)" "perl(Digest::SHA1)" libxml2-devel libxslt "perl(ExtUtils::MakeMaker)"
 RUN dnf -y install which wget unzip tar cpio python bzip2 bc vim redhat-lsb-core
 RUN dnf -y install findutils
-RUN dnf -y install ncurses-devel
+RUN dnf -y install ncurses-devel openssl-devel
diff --git a/ci/Dockerfile/ubuntu1404 b/ci/Dockerfile/ubuntu1404
index 8acb932..b3833c9 100644
--- a/ci/Dockerfile/ubuntu1404
+++ b/ci/Dockerfile/ubuntu1404
@@ -7,4 +7,4 @@
   python language-pack-en texinfo \
   build-essential g++ git bison flex unzip \
   libxml-simple-perl libxml-sax-perl libxml2-dev libxml2-utils xsltproc
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy wget bc
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -yy wget bc libssl-dev
diff --git a/openpower/configs/barreleye_defconfig b/openpower/configs/barreleye_defconfig
index d92535f..9867974 100644
--- a/openpower/configs/barreleye_defconfig
+++ b/openpower/configs/barreleye_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firenze_defconfig b/openpower/configs/firenze_defconfig
index 40fb32e..a08bf93 100644
--- a/openpower/configs/firenze_defconfig
+++ b/openpower/configs/firenze_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/firestone_defconfig b/openpower/configs/firestone_defconfig
index 64e40a9..0180ad0 100644
--- a/openpower/configs/firestone_defconfig
+++ b/openpower/configs/firestone_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/garrison_defconfig b/openpower/configs/garrison_defconfig
index e0ae1d3..1a23a6f 100644
--- a/openpower/configs/garrison_defconfig
+++ b/openpower/configs/garrison_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/habanero_defconfig b/openpower/configs/habanero_defconfig
index 5a1289c..bef261b 100644
--- a/openpower/configs/habanero_defconfig
+++ b/openpower/configs/habanero_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/linux/skiroot_defconfig b/openpower/configs/linux/skiroot_defconfig
index e72fc34..d8b8b1b 100644
--- a/openpower/configs/linux/skiroot_defconfig
+++ b/openpower/configs/linux/skiroot_defconfig
@@ -43,6 +43,7 @@
 CONFIG_HZ_100=y
 CONFIG_KEXEC=y
 CONFIG_IRQ_ALL_CPUS=y
+CONFIG_NUMA=y
 # CONFIG_COMPACTION is not set
 # CONFIG_MIGRATION is not set
 # CONFIG_BOUNCE is not set
@@ -239,12 +240,3 @@
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_HW is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_NUMA=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
diff --git a/openpower/configs/linux/skiroot_p9_defconfig b/openpower/configs/linux/skiroot_p9_defconfig
index 7163df1..a6f9452 100644
--- a/openpower/configs/linux/skiroot_p9_defconfig
+++ b/openpower/configs/linux/skiroot_p9_defconfig
@@ -43,6 +43,7 @@
 CONFIG_HZ_100=y
 CONFIG_KEXEC=y
 CONFIG_IRQ_ALL_CPUS=y
+CONFIG_NUMA=y
 # CONFIG_COMPACTION is not set
 # CONFIG_MIGRATION is not set
 # CONFIG_BOUNCE is not set
@@ -73,7 +74,6 @@
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
-CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 CONFIG_BLK_DEV_NVME=m
 CONFIG_EEPROM_AT24=y
@@ -147,14 +147,13 @@
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_MISC=y
 # CONFIG_SERIO_SERPORT is not set
+# CONFIG_DEVMEM is not set
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_IPMI_HANDLER=y
 CONFIG_IPMI_DEVICE_INTERFACE=y
 CONFIG_IPMI_POWERNV=y
 CONFIG_HW_RANDOM=y
-CONFIG_RAW_DRIVER=y
-CONFIG_MAX_RAW_DEVS=1024
 CONFIG_TCG_TIS_I2C_NUVOTON=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
@@ -199,11 +198,7 @@
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=m
-CONFIG_CIFS=m
-# CONFIG_CIFS_DEBUG is not set
+# CONFIG_MISC_FILESYSTEMS is not set
 CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ASCII=y
@@ -232,12 +227,3 @@
 CONFIG_CRYPTO_ARC4=y
 CONFIG_CRYPTO_DES=y
 # CONFIG_CRYPTO_HW is not set
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_SPARSEMEM_MANUAL=y
-CONFIG_SPARSEMEM=y
-CONFIG_SPARSEMEM_EXTREME=y
-CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
-CONFIG_SPARSEMEM_VMEMMAP=y
-CONFIG_NUMA=y
-CONFIG_NEED_MULTIPLE_NODES=y
-CONFIG_HAVE_MEMORY_PRESENT=y
diff --git a/openpower/configs/openpower_mambo_defconfig b/openpower/configs/openpower_mambo_defconfig
index 4ae4d34..ff43283 100644
--- a/openpower/configs/openpower_mambo_defconfig
+++ b/openpower/configs/openpower_mambo_defconfig
@@ -14,7 +14,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/openpower_p9_mambo_defconfig b/openpower/configs/openpower_p9_mambo_defconfig
index d3ee2a3..86de291 100644
--- a/openpower/configs/openpower_p9_mambo_defconfig
+++ b/openpower/configs/openpower_p9_mambo_defconfig
@@ -14,7 +14,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/palmetto_defconfig b/openpower/configs/palmetto_defconfig
index 4fda411..10b8c80 100644
--- a/openpower/configs/palmetto_defconfig
+++ b/openpower/configs/palmetto_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"
diff --git a/openpower/configs/romulus_defconfig b/openpower/configs/romulus_defconfig
index ee1f6da..a7c72f5 100644
--- a/openpower/configs/romulus_defconfig
+++ b/openpower/configs/romulus_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -59,7 +59,7 @@
 BR2_OCC_BIN_FILENAME="occ.bin"
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="461d410dee0dc5e5deac948ebdcc4ec75eefe682"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
 BR2_PACKAGE_LOADKEYS=y
 BR2_ROMULUS_SYSTEM_XML_FILENAME="ROMULUS_hb.system.xml"
 BR2_ROMULUS_MRW_XML_FILENAME="ROMULUS_hb.mrw.xml"
diff --git a/openpower/configs/witherspoon_defconfig b/openpower/configs/witherspoon_defconfig
index 6d01263..74fcca3 100644
--- a/openpower/configs/witherspoon_defconfig
+++ b/openpower/configs/witherspoon_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -57,7 +57,7 @@
 BR2_OCC_BIN_FILENAME="occ.bin"
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="461d410dee0dc5e5deac948ebdcc4ec75eefe682"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
 BR2_PACKAGE_LOADKEYS=y
 BR2_WITHERSPOON_SYSTEM_XML_FILENAME="WITHERSPOON_hb.system.xml"
 BR2_WITHERSPOON_MRW_XML_FILENAME="WITHERSPOON_hb.mrw.xml"
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index d7fcf0e..b1c2916 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -16,7 +16,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -56,7 +56,7 @@
 BR2_OCC_BIN_FILENAME="occ.bin"
 BR2_CAPP_UCODE_BIN_FILENAME="cappucode.bin"
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="461d410dee0dc5e5deac948ebdcc4ec75eefe682"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
 BR2_PACKAGE_LOADKEYS=y
 BR2_ZAIUS_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
 BR2_ZAIUS_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/configs/zz_defconfig b/openpower/configs/zz_defconfig
index e84630a..bcbe33a 100644
--- a/openpower/configs/zz_defconfig
+++ b/openpower/configs/zz_defconfig
@@ -15,7 +15,7 @@
 BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.5"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.10.6"
 BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_p9_defconfig"
@@ -51,7 +51,7 @@
 # BR2_PACKAGE_OCC is not set
 # BR2_PACKAGE_CAPP_UCODE is not set
 BR2_SKIBOOT_CUSTOM_VERSION=y
-BR2_SKIBOOT_CUSTOM_VERSION_VALUE="461d410dee0dc5e5deac948ebdcc4ec75eefe682"
+BR2_SKIBOOT_CUSTOM_VERSION_VALUE="6a3a09c27315d858647a1c978fa7032591a8e6c5"
 BR2_PACKAGE_LOADKEYS=y
 # BR2_PACKAGE_HOST_PPE42_BINUTILS is not set
 # BR2_PACKAGE_HOST_PPE42_GCC is not set
diff --git a/openpower/linux/0011-powerpc-powernv-cpuidle-Pass-correct-drv-cpumask-for.patch b/openpower/linux/0011-powerpc-powernv-cpuidle-Pass-correct-drv-cpumask-for.patch
new file mode 100644
index 0000000..25937aa
--- /dev/null
+++ b/openpower/linux/0011-powerpc-powernv-cpuidle-Pass-correct-drv-cpumask-for.patch
@@ -0,0 +1,93 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
+Date: Thu, 23 Mar 2017 20:52:46 +0530
+Subject: [PATCH 11/12] powerpc/powernv/cpuidle: Pass correct drv->cpumask for
+ registration
+
+drv->cpumask defaults to cpu_possible_mask in __cpuidle_driver_init().
+On PowerNV platform cpu_present could be less than cpu_possible in cases
+where firmware detects the cpu, but it is not available to the OS.  When
+CONFIG_HOTPLUG_CPU=n, such cpus are not hotplugable at runtime and hence
+we skip creating cpu_device.
+
+This breaks cpuidle on powernv where register_cpu() is not called for
+cpus in cpu_possible_mask that cannot be hot-added at runtime.
+
+Trying cpuidle_register_device() on cpu without cpu_device will cause
+crash like this:
+
+cpu 0xf: Vector: 380 (Data SLB Access) at [c000000ff1503490]
+    pc: c00000000022c8bc: string+0x34/0x60
+    lr: c00000000022ed78: vsnprintf+0x284/0x42c
+    sp: c000000ff1503710
+   msr: 9000000000009033
+   dar: 6000000060000000
+  current = 0xc000000ff1480000
+  paca    = 0xc00000000fe82d00   softe: 0        irq_happened: 0x01
+    pid   = 1, comm = swapper/8
+Linux version 4.11.0-rc2 (sv@sagarika) (gcc version 4.9.4
+(Buildroot 2017.02-00004-gc28573e) ) #15 SMP Fri Mar 17 19:32:02 IST 2017
+enter ? for help
+[link register   ] c00000000022ed78 vsnprintf+0x284/0x42c
+[c000000ff1503710] c00000000022ebb8 vsnprintf+0xc4/0x42c (unreliable)
+[c000000ff1503800] c00000000022ef40 vscnprintf+0x20/0x44
+[c000000ff1503830] c0000000000ab61c vprintk_emit+0x94/0x2cc
+[c000000ff15038a0] c0000000000acc9c vprintk_func+0x60/0x74
+[c000000ff15038c0] c000000000619694 printk+0x38/0x4c
+[c000000ff15038e0] c000000000224950 kobject_get+0x40/0x60
+[c000000ff1503950] c00000000022507c kobject_add_internal+0x60/0x2c4
+[c000000ff15039e0] c000000000225350 kobject_init_and_add+0x70/0x78
+[c000000ff1503a60] c00000000053c288 cpuidle_add_sysfs+0x9c/0xe0
+[c000000ff1503ae0] c00000000053aeac cpuidle_register_device+0xd4/0x12c
+[c000000ff1503b30] c00000000053b108 cpuidle_register+0x98/0xcc
+[c000000ff1503bc0] c00000000085eaf0 powernv_processor_idle_init+0x140/0x1e0
+[c000000ff1503c60] c00000000000cd60 do_one_initcall+0xc0/0x15c
+[c000000ff1503d20] c000000000833e84 kernel_init_freeable+0x1a0/0x25c
+[c000000ff1503dc0] c00000000000d478 kernel_init+0x24/0x12c
+[c000000ff1503e30] c00000000000b564 ret_from_kernel_thread+0x5c/0x78
+
+This patch fixes the bug by passing correct cpumask from
+powernv-cpuidle driver.
+
+Signed-off-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com>
+Reviewed-by: Gautham R. Shenoy <ego@linux.vnet.ibm.com>
+[From http://patchwork.ozlabs.org/patch/742706/]
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+---
+ drivers/cpuidle/cpuidle-powernv.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/drivers/cpuidle/cpuidle-powernv.c b/drivers/cpuidle/cpuidle-powernv.c
+index 0835a37a5f3a..5e06d7b6b508 100644
+--- a/drivers/cpuidle/cpuidle-powernv.c
++++ b/drivers/cpuidle/cpuidle-powernv.c
+@@ -164,6 +164,24 @@ static int powernv_cpuidle_driver_init(void)
+ 		drv->state_count += 1;
+ 	}
+ 
++	/*
++	 * On PowerNV platform cpu_present may be less that cpu_possible in
++	 * cases where firmware detects the cpu, but it is not available to the
++	 * OS.  If CONFIG_HOTPLUG_CPU=n then such CPUs are not hotplugable at
++	 * runtime and hence cpu_devices are not created for those cpus by
++	 * generic topology_init().
++	 *
++	 * drv->cpumask defaults to cpu_possible_mask in
++	 * __cpuidle_driver_init().  This breaks cpuidle on powernv where
++	 * cpu_devices are not created for cpus in cpu_possible_mask that
++	 * cannot be hot-added later at runtime.
++	 *
++	 * Trying cpuidle_register_device() on a cpu without cpu_devices is
++	 * incorrect. Hence pass correct cpu mask to generic cpuidle driver.
++	 */
++
++	drv->cpumask = (struct cpumask *)cpu_present_mask;
++
+ 	return 0;
+ }
+ 
+-- 
+2.11.0
+
diff --git a/openpower/linux/0011-scsi-lpfc-Add-shutdown-method-for-kexec.patch b/openpower/linux/0011-scsi-lpfc-Add-shutdown-method-for-kexec.patch
deleted file mode 100644
index f4600c2..0000000
--- a/openpower/linux/0011-scsi-lpfc-Add-shutdown-method-for-kexec.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Anton Blanchard <anton@samba.org>
-Date: Thu, 2 Mar 2017 10:20:30 -0300
-Subject: [PATCH 11/12] scsi: lpfc: Add shutdown method for kexec
-
-We see lpfc devices regularly fail during kexec. Fix this by adding
-a shutdown method which mirrors the remove method.
-
-( mfoliveira: this patch has been submitted upstream at: )
-( http://www.spinics.net/lists/linux-scsi/msg105102.html )
-
-Signed-off-by: Anton Blanchard <anton@samba.org>
-Signed-off-by: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
-Signed-off-by: Joel Stanley <joel@jms.id.au>
----
- drivers/scsi/lpfc/lpfc_init.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
-index 4776fd85514f..10f75ad2b9e8 100644
---- a/drivers/scsi/lpfc/lpfc_init.c
-+++ b/drivers/scsi/lpfc/lpfc_init.c
-@@ -11447,6 +11447,7 @@ static struct pci_driver lpfc_driver = {
- 	.id_table	= lpfc_id_table,
- 	.probe		= lpfc_pci_probe_one,
- 	.remove		= lpfc_pci_remove_one,
-+	.shutdown	= lpfc_pci_remove_one,
- 	.suspend        = lpfc_pci_suspend_one,
- 	.resume		= lpfc_pci_resume_one,
- 	.err_handler    = &lpfc_err_handler,
--- 
-2.11.0
-
diff --git a/openpower/linux/0012-Release-OpenPower-kernel.patch b/openpower/linux/0012-Release-OpenPower-kernel.patch
index 1a569c7..943a0dc 100644
--- a/openpower/linux/0012-Release-OpenPower-kernel.patch
+++ b/openpower/linux/0012-Release-OpenPower-kernel.patch
@@ -9,13 +9,13 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 48e18096913f..644a4ae29ff1 100644
+index 23b6d29cb6da..4d4df2db5b8e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 10
- SUBLEVEL = 5
+ SUBLEVEL = 6
 -EXTRAVERSION =
 +EXTRAVERSION = -openpower1
  NAME = Fearless Coyote
diff --git a/openpower/package/garrison-xml/garrison.mk b/openpower/package/garrison-xml/garrison.mk
index 51e43e2..1e152ce 100644
--- a/openpower/package/garrison-xml/garrison.mk
+++ b/openpower/package/garrison-xml/garrison.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GARRISON_XML_VERSION ?= 3cd6e7ea9287a8c96f9ba710c67baff92e97af2c
+GARRISON_XML_VERSION ?= 19a516499e1090c20c5a3303db256529ef22c1c9
 GARRISON_XML_SITE ?= $(call github,open-power,garrison-xml,$(GARRISON_XML_VERSION))
 
 GARRISON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/hostboot/hostboot.mk b/openpower/package/hostboot/hostboot.mk
index 71cc3d7..c9d9374 100644
--- a/openpower/package/hostboot/hostboot.mk
+++ b/openpower/package/hostboot/hostboot.mk
@@ -3,8 +3,8 @@
 # hostboot
 #
 ################################################################################
-HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= a4b7bb77b3c152af89a57f904f323228ad24373d
-HOSTBOOT_VERSION_BRANCH_MASTER ?= a89ef1040290c7f25fa17f393acdba9a73b67e0a
+HOSTBOOT_VERSION_BRANCH_MASTER_P8 ?= 695bd891343faf1f0ef85fe53148590e58239efd
+HOSTBOOT_VERSION_BRANCH_MASTER ?= a0157757a0e3c229e81f5b1dc779e3c911c70161
 
 HOSTBOOT_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(HOSTBOOT_VERSION_BRANCH_MASTER),$(HOSTBOOT_VERSION_BRANCH_MASTER_P8))
 HOSTBOOT_SITE ?= $(call github,open-power,hostboot,$(HOSTBOOT_VERSION))
diff --git a/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch b/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch
new file mode 100644
index 0000000..114d484
--- /dev/null
+++ b/openpower/package/hostboot/p9Patches/hostboot-0010-Revert-Enablement-of-additional-eq_ana_bndy-rings-fo.patch
@@ -0,0 +1,318 @@
+From d03736195bb489ec8cee484d4c91b6e7348d4dc9 Mon Sep 17 00:00:00 2001
+From: Bill Hoffa <wghoffa@us.ibm.com>
+Date: Tue, 28 Mar 2017 08:17:31 -0500
+Subject: [PATCH] Revert "Enablement of additional eq_ana_bndy rings for Nimbus
+ DD2"
+
+This reverts commit b4b696de54dedb5e835a0f8abca5731b1f1bdeea.
+---
+ .../p9/procedures/hwp/lib/p9_hcode_image_defines.H | 20 +------
+ .../chips/p9/procedures/hwp/pm/p9_scan_ring_util.C | 40 ++-----------
+ src/import/chips/p9/utils/imageProcs/p9_ringId.C   | 30 +++-------
+ src/import/chips/p9/utils/imageProcs/p9_ringId.H   | 67 ++++------------------
+ src/import/chips/p9/utils/imageProcs/p9_ring_id.h  | 24 ++------
+ 5 files changed, 32 insertions(+), 149 deletions(-)
+
+diff --git a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
+index f6b9eea..6df1dbf 100644
+--- a/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
++++ b/src/import/chips/p9/procedures/hwp/lib/p9_hcode_image_defines.H
+@@ -488,24 +488,10 @@ typedef struct
+     uint16_t    eqAnaBndyRingBucket23;
+     uint16_t    eqAnaBndyRingBucket24;
+     uint16_t    eqAnaBndyRingBucket25;
+-    uint16_t    eqAnaBndyRingl3dccBucket;
++    uint16_t    eqAnaBndyRingl3dccBucket26;
+     uint16_t    eqAnaModeRing;
+-    uint16_t    eqAnaBndyRingBucket26;
+-    uint16_t    eqAnaBndyRingBucket27;
+-    uint16_t    eqAnaBndyRingBucket28;
+-    uint16_t    eqAnaBndyRingBucket29;
+-    uint16_t    eqAnaBndyRingBucket30;
+-    uint16_t    eqAnaBndyRingBucket31;
+-    uint16_t    eqAnaBndyRingBucket32;
+-    uint16_t    eqAnaBndyRingBucket33;
+-    uint16_t    eqAnaBndyRingBucket34;
+-    uint16_t    eqAnaBndyRingBucket35;
+-    uint16_t    eqAnaBndyRingBucket36;
+-    uint16_t    eqAnaBndyRingBucket37;
+-    uint16_t    eqAnaBndyRingBucket38;
+-    uint16_t    eqAnaBndyRingBucket39;
+-    uint16_t    eqAnaBndyRingBucket40;
+-    uint16_t    eqAnaBndyRingBucket41;
++    uint16_t    ex_l2_fure_1;
++    uint16_t    ex_l3_fure_1;
+ } QuadCmnRingsList_t;
+ 
+ typedef struct
+diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
+index 63e07e0..3df8232 100644
+--- a/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
++++ b/src/import/chips/p9/procedures/hwp/pm/p9_scan_ring_util.C
+@@ -182,24 +182,10 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
+             { eq_ana_bndy_bucket_23,    0,  0 },
+             { eq_ana_bndy_bucket_24,    0,  0 },
+             { eq_ana_bndy_bucket_25,    0,  0 },
+-            { eq_ana_bndy_bucket_l3dcc, 0,  0 },
++            { eq_ana_bndy_l3dcc_bucket_26, 0, 0 },
+             { eq_ana_mode,              0,  0 },
+-            { eq_ana_bndy_bucket_26,    0,  0 },
+-            { eq_ana_bndy_bucket_27,    0,  0 },
+-            { eq_ana_bndy_bucket_28,    0,  0 },
+-            { eq_ana_bndy_bucket_29,    0,  0 },
+-            { eq_ana_bndy_bucket_30,    0,  0 },
+-            { eq_ana_bndy_bucket_31,    0,  0 },
+-            { eq_ana_bndy_bucket_32,    0,  0 },
+-            { eq_ana_bndy_bucket_33,    0,  0 },
+-            { eq_ana_bndy_bucket_34,    0,  0 },
+-            { eq_ana_bndy_bucket_35,    0,  0 },
+-            { eq_ana_bndy_bucket_36,    0,  0 },
+-            { eq_ana_bndy_bucket_37,    0,  0 },
+-            { eq_ana_bndy_bucket_38,    0,  0 },
+-            { eq_ana_bndy_bucket_39,    0,  0 },
+-            { eq_ana_bndy_bucket_40,    0,  0 },
+-            { eq_ana_bndy_bucket_41,    0,  0 },
++            { ex_l2_fure_1,             0,  0 },
++            { ex_l3_fure_1,             0,  0 },
+         };
+ 
+         RingProfile l_quadSpecRings[TEMP_MAX_QUAD_SPEC_RINGS * MAX_QUADS_PER_CHIP] =
+@@ -321,24 +307,10 @@ RingBucket::RingBucket( PlatId i_plat, uint8_t* i_pRingStart, RingDebugMode_t i_
+         iv_ringName[ eq_ana_bndy_bucket_23 ]    =   (char*)"eq_ana_bndy_bucket_23";
+         iv_ringName[ eq_ana_bndy_bucket_24 ]    =   (char*)"eq_ana_bndy_bucket_24";
+         iv_ringName[ eq_ana_bndy_bucket_25 ]    =   (char*)"eq_ana_bndy_bucket_25";
+-        iv_ringName[ eq_ana_bndy_bucket_l3dcc ] =   (char*)"eq_ana_bndy_bucket_l3dcc";
++        iv_ringName[ eq_ana_bndy_l3dcc_bucket_26 ]      =   (char*)"eq_ana_bndy_l3dcc_bucket_26";
+         iv_ringName[ eq_ana_mode ]              =   (char*)"eq_ana_mode          ";
+-        iv_ringName[ eq_ana_bndy_bucket_26 ]    =   (char*)"eq_ana_bndy_bucket_26";
+-        iv_ringName[ eq_ana_bndy_bucket_27 ]    =   (char*)"eq_ana_bndy_bucket_27";
+-        iv_ringName[ eq_ana_bndy_bucket_28 ]    =   (char*)"eq_ana_bndy_bucket_28";
+-        iv_ringName[ eq_ana_bndy_bucket_29 ]    =   (char*)"eq_ana_bndy_bucket_29";
+-        iv_ringName[ eq_ana_bndy_bucket_30 ]    =   (char*)"eq_ana_bndy_bucket_30";
+-        iv_ringName[ eq_ana_bndy_bucket_31 ]    =   (char*)"eq_ana_bndy_bucket_31";
+-        iv_ringName[ eq_ana_bndy_bucket_32 ]    =   (char*)"eq_ana_bndy_bucket_32";
+-        iv_ringName[ eq_ana_bndy_bucket_33 ]    =   (char*)"eq_ana_bndy_bucket_33";
+-        iv_ringName[ eq_ana_bndy_bucket_34 ]    =   (char*)"eq_ana_bndy_bucket_34";
+-        iv_ringName[ eq_ana_bndy_bucket_35 ]    =   (char*)"eq_ana_bndy_bucket_35";
+-        iv_ringName[ eq_ana_bndy_bucket_36 ]    =   (char*)"eq_ana_bndy_bucket_36";
+-        iv_ringName[ eq_ana_bndy_bucket_37 ]    =   (char*)"eq_ana_bndy_bucket_37";
+-        iv_ringName[ eq_ana_bndy_bucket_38 ]    =   (char*)"eq_ana_bndy_bucket_38";
+-        iv_ringName[ eq_ana_bndy_bucket_39 ]    =   (char*)"eq_ana_bndy_bucket_39";
+-        iv_ringName[ eq_ana_bndy_bucket_40 ]    =   (char*)"eq_ana_bndy_bucket_40";
+-        iv_ringName[ eq_ana_bndy_bucket_41 ]    =   (char*)"eq_ana_bndy_bucket_41";
++        iv_ringName[ ex_l2_fure_1 ]             =   (char*)"ex_l2_fure_1         ";
++        iv_ringName[ ex_l3_fure_1 ]             =   (char*)"ex_l3_fure_1         ";
+         iv_ringName[ eq_repr ]                  =   (char*)"eq_repr              ";
+         iv_ringName[ ex_l3_repr ]               =   (char*)"ex_l3_repr           ";
+         iv_ringName[ ex_l2_repr ]               =   (char*)"ex_l2_repr           ";
+diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.C b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+index 1d21023..3bd7d2a 100644
+--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.C
++++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.C
+@@ -395,32 +395,18 @@ const GenRingIdList RING_ID_LIST_COMMON[] =
+     {"eq_ana_bndy_bucket_23"      , 0x29, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+     {"eq_ana_bndy_bucket_24"      , 0x2a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+     {"eq_ana_bndy_bucket_25"      , 0x2b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_l3dcc"   , 0x2c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
++    {"eq_ana_bndy_l3dcc_bucket_26", 0x2c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+     {"eq_ana_mode"                , 0x2d, 0x10, 0x10, EKB_RING    , 0x10030101},
+-    {"eq_ana_bndy_bucket_26"      , 0x2e, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_27"      , 0x2f, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_28"      , 0x30, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_29"      , 0x31, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_30"      , 0x32, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_31"      , 0x33, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_32"      , 0x34, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_33"      , 0x35, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_34"      , 0x36, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_35"      , 0x37, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_36"      , 0x38, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_37"      , 0x39, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_38"      , 0x3a, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_39"      , 0x3b, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_40"      , 0x3c, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
+-    {"eq_ana_bndy_bucket_41"      , 0x3d, 0x10, 0x10, EKB_FSM_RING, 0x10030108},
++    {"ex_l2_fure_1"               , 0x2e, 0x10, 0x10, EKB_RING    , 0x1003040F},
++    {"ex_l3_fure_1"               , 0x2f, 0x10, 0x10, EKB_RING    , 0x1003100F},
+ };
+ const GenRingIdList RING_ID_LIST_INSTANCE[] =
+ {
+-    {"eq_repr"                    , 0x3e, 0x10, 0x1b, VPD_RING    , 0x10036086},
+-    {"ex_l3_repr"                 , 0x3f, 0x10, 0x1b, VPD_RING    , 0x10031006},
+-    {"ex_l2_repr"                 , 0x40, 0x10, 0x1b, VPD_RING    , 0x10030406},
+-    {"ex_l3_refr_repr"            , 0x41, 0x10, 0x1b, VPD_RING    , 0x10030046},
+-    {"ex_l3_refr_time"            , 0x42, 0x10, 0x1b, VPD_RING    , 0x10030047},
++    {"eq_repr"                    , 0x30, 0x10, 0x1b, VPD_RING    , 0x10036086},
++    {"ex_l3_repr"                 , 0x31, 0x10, 0x1b, VPD_RING    , 0x10031006},
++    {"ex_l2_repr"                 , 0x32, 0x10, 0x1b, VPD_RING    , 0x10030406},
++    {"ex_l3_refr_repr"            , 0x33, 0x10, 0x1b, VPD_RING    , 0x10030046},
++    {"ex_l3_refr_time"            , 0x34, 0x10, 0x1b, VPD_RING    , 0x10030047},
+ };
+ const RingVariantOrder RING_VARIANT_ORDER[] = { BASE, CC, RL };
+ };
+diff --git a/src/import/chips/p9/utils/imageProcs/p9_ringId.H b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
+index a0e8261..b49ad89 100644
+--- a/src/import/chips/p9/utils/imageProcs/p9_ringId.H
++++ b/src/import/chips/p9/utils/imageProcs/p9_ringId.H
+@@ -778,24 +778,10 @@ enum RingOffset
+     eq_ana_bndy_bucket_23  = 41,
+     eq_ana_bndy_bucket_24  = 42,
+     eq_ana_bndy_bucket_25  = 43,
+-    eq_ana_bndy_bucket_l3dcc  = 44,
++    eq_ana_bndy_l3dcc_bucket_26  = 44,
+     eq_ana_mode     = 45,
+-    eq_ana_bndy_bucket_26 = 46,
+-    eq_ana_bndy_bucket_27 = 47,
+-    eq_ana_bndy_bucket_28 = 48,
+-    eq_ana_bndy_bucket_29 = 49,
+-    eq_ana_bndy_bucket_30 = 50,
+-    eq_ana_bndy_bucket_31 = 51,
+-    eq_ana_bndy_bucket_32 = 52,
+-    eq_ana_bndy_bucket_33 = 53,
+-    eq_ana_bndy_bucket_34 = 54,
+-    eq_ana_bndy_bucket_35 = 55,
+-    eq_ana_bndy_bucket_36 = 56,
+-    eq_ana_bndy_bucket_37 = 57,
+-    eq_ana_bndy_bucket_38 = 58,
+-    eq_ana_bndy_bucket_39 = 59,
+-    eq_ana_bndy_bucket_40 = 60,
+-    eq_ana_bndy_bucket_41 = 61,
++    ex_l2_fure_1    = 46,
++    ex_l3_fure_1    = 47,
+ 
+     // Instance Rings
+     eq_repr         = (0 | INSTANCE_RING_MARK),
+@@ -808,7 +794,7 @@ enum RingOffset
+ static const CHIPLET_DATA g_eqData =
+ {
+     16, // Quad Chiplet ID range is 16 - 21. The base ID is 16.
+-    62, // 62 common rings for Quad chiplet.
++    48, // 48 common rings for Quad chiplet.
+     5,  // 5 instance specific rings for each EQ chiplet
+     9   // 9 different rings since 2 per EX ring and 1 per EQ
+ };
+@@ -1085,7 +1071,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
+     { EQ::eq_ana_bndy_bucket_23          , "eq_ana_bndy_bucket_23"       , EQ_TYPE    }, // 215
+     { EQ::eq_ana_bndy_bucket_24          , "eq_ana_bndy_bucket_24"       , EQ_TYPE    }, // 216
+     { EQ::eq_ana_bndy_bucket_25          , "eq_ana_bndy_bucket_25"       , EQ_TYPE    }, // 217
+-    { EQ::eq_ana_bndy_bucket_l3dcc       , "eq_ana_bndy_bucket_l3dcc"    , EQ_TYPE    }, // 218
++    { EQ::eq_ana_bndy_l3dcc_bucket_26    , "eq_ana_bndy_l3dcc_bucket_26" , EQ_TYPE    }, // 218
+     { EQ::eq_ana_mode                    , "eq_ana_mode"                 , EQ_TYPE    }, // 219
+     { EQ::eq_repr                        , "eq_repr"                     , EQ_TYPE    }, // 220
+     { EQ::ex_l3_repr                     , "ex_l3_repr"                  , EQ_TYPE    }, // 221
+@@ -1096,25 +1082,10 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
+     { EC::ec_time                        , "ec_time"                     , EC_TYPE    }, // 226
+     { EC::ec_mode                        , "ec_mode"                     , EC_TYPE    }, // 227
+     { EC::ec_repr                        , "ec_repr"                     , EC_TYPE    }, // 228
+-    { INVALID_RING                       , "invalid"                     , EQ_TYPE    }, // 229
+-    { INVALID_RING                       , "invalid"                     , EQ_TYPE    }, // 230
++    { EQ::ex_l2_fure_1                   , "ex_l2_fure_1"                , EQ_TYPE    }, // 229
++    { EQ::ex_l3_fure_1                   , "ex_l3_fure_1"                , EQ_TYPE    }, // 230
+     { EC::ec_abst                        , "ec_abst"                     , EC_TYPE    }, // 231
+-    { EQ::eq_ana_bndy_bucket_26          , "eq_ana_bndy_bucket_26"       , EQ_TYPE    }, // 232
+-    { EQ::eq_ana_bndy_bucket_27          , "eq_ana_bndy_bucket_27"       , EQ_TYPE    }, // 233
+-    { EQ::eq_ana_bndy_bucket_28          , "eq_ana_bndy_bucket_28"       , EQ_TYPE    }, // 234
+-    { EQ::eq_ana_bndy_bucket_29          , "eq_ana_bndy_bucket_29"       , EQ_TYPE    }, // 235
+-    { EQ::eq_ana_bndy_bucket_30          , "eq_ana_bndy_bucket_30"       , EQ_TYPE    }, // 236
+-    { EQ::eq_ana_bndy_bucket_31          , "eq_ana_bndy_bucket_31"       , EQ_TYPE    }, // 237
+-    { EQ::eq_ana_bndy_bucket_32          , "eq_ana_bndy_bucket_32"       , EQ_TYPE    }, // 238
+-    { EQ::eq_ana_bndy_bucket_33          , "eq_ana_bndy_bucket_33"       , EQ_TYPE    }, // 239
+-    { EQ::eq_ana_bndy_bucket_34          , "eq_ana_bndy_bucket_34"       , EQ_TYPE    }, // 240
+-    { EQ::eq_ana_bndy_bucket_35          , "eq_ana_bndy_bucket_35"       , EQ_TYPE    }, // 241
+-    { EQ::eq_ana_bndy_bucket_36          , "eq_ana_bndy_bucket_36"       , EQ_TYPE    }, // 242
+-    { EQ::eq_ana_bndy_bucket_37          , "eq_ana_bndy_bucket_37"       , EQ_TYPE    }, // 243
+-    { EQ::eq_ana_bndy_bucket_38          , "eq_ana_bndy_bucket_38"       , EQ_TYPE    }, // 244
+-    { EQ::eq_ana_bndy_bucket_39          , "eq_ana_bndy_bucket_39"       , EQ_TYPE    }, // 245
+-    { EQ::eq_ana_bndy_bucket_40          , "eq_ana_bndy_bucket_40"       , EQ_TYPE    }, // 246
+-    { EQ::eq_ana_bndy_bucket_41          , "eq_ana_bndy_bucket_41"       , EQ_TYPE    }, // 247
++
+ };
+ #endif
+ #ifdef __PPE__
+@@ -1338,7 +1309,7 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
+     { EQ::eq_ana_bndy_bucket_23          , EQ_TYPE    }, // 215
+     { EQ::eq_ana_bndy_bucket_24          , EQ_TYPE    }, // 216
+     { EQ::eq_ana_bndy_bucket_25          , EQ_TYPE    }, // 217
+-    { EQ::eq_ana_bndy_bucket_l3dcc       , EQ_TYPE    }, // 218
++    { EQ::eq_ana_bndy_l3dcc_bucket_26    , EQ_TYPE    }, // 218
+     { EQ::eq_ana_mode                    , EQ_TYPE    }, // 219
+     { EQ::eq_repr                        , EQ_TYPE    }, // 220
+     { EQ::ex_l3_repr                     , EQ_TYPE    }, // 221
+@@ -1349,25 +1320,9 @@ static const ringProperties_t RING_PROPERTIES[NUM_RING_IDS] =
+     { EC::ec_time                        , EC_TYPE    }, // 226
+     { EC::ec_mode                        , EC_TYPE    }, // 227
+     { EC::ec_repr                        , EC_TYPE    }, // 228
+-    { INVALID_RING                       , EQ_TYPE    }, // 229
+-    { INVALID_RING                       , EQ_TYPE    }, // 230
++    { EQ::ex_l2_fure_1                   , EQ_TYPE    }, // 229
++    { EQ::ex_l3_fure_1                   , EQ_TYPE    }, // 230
+     { EC::ec_abst                        , EC_TYPE    }, // 231
+-    { EQ::eq_ana_bndy_bucket_26          , EQ_TYPE    }, // 232
+-    { EQ::eq_ana_bndy_bucket_27          , EQ_TYPE    }, // 233
+-    { EQ::eq_ana_bndy_bucket_28          , EQ_TYPE    }, // 234
+-    { EQ::eq_ana_bndy_bucket_29          , EQ_TYPE    }, // 235
+-    { EQ::eq_ana_bndy_bucket_30          , EQ_TYPE    }, // 236
+-    { EQ::eq_ana_bndy_bucket_31          , EQ_TYPE    }, // 237
+-    { EQ::eq_ana_bndy_bucket_32          , EQ_TYPE    }, // 238
+-    { EQ::eq_ana_bndy_bucket_33          , EQ_TYPE    }, // 239
+-    { EQ::eq_ana_bndy_bucket_34          , EQ_TYPE    }, // 240
+-    { EQ::eq_ana_bndy_bucket_35          , EQ_TYPE    }, // 241
+-    { EQ::eq_ana_bndy_bucket_36          , EQ_TYPE    }, // 242
+-    { EQ::eq_ana_bndy_bucket_37          , EQ_TYPE    }, // 243
+-    { EQ::eq_ana_bndy_bucket_38          , EQ_TYPE    }, // 244
+-    { EQ::eq_ana_bndy_bucket_39          , EQ_TYPE    }, // 245
+-    { EQ::eq_ana_bndy_bucket_40          , EQ_TYPE    }, // 246
+-    { EQ::eq_ana_bndy_bucket_41          , EQ_TYPE    }, // 247
+ };
+ #endif
+ 
+diff --git a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
+index 1b4860d..71634a8 100644
+--- a/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
++++ b/src/import/chips/p9/utils/imageProcs/p9_ring_id.h
+@@ -299,7 +299,7 @@ enum RingID
+     eq_ana_bndy_bucket_23 = 215,
+     eq_ana_bndy_bucket_24 = 216,
+     eq_ana_bndy_bucket_25 = 217,
+-    eq_ana_bndy_bucket_l3dcc = 218,
++    eq_ana_bndy_l3dcc_bucket_26 = 218,
+     eq_ana_mode = 219,
+ 
+     // Quad Chiplet Rings
+@@ -320,30 +320,14 @@ enum RingID
+     // EC0 - EC23 instance specific Ring
+     ec_repr = 228,
+ 
+-    // Values 229-230 unused
++    // Additional rings
++    ex_l2_fure_1 = 229,
++    ex_l3_fure_1 = 230,
+ 
+     // Core Chiplet Rings
+     // ABIST engine mode
+     ec_abst = 231,
+ 
+-    // Additional rings for Nimbus DD2
+-    eq_ana_bndy_bucket_26 = 232,
+-    eq_ana_bndy_bucket_27 = 233,
+-    eq_ana_bndy_bucket_28 = 234,
+-    eq_ana_bndy_bucket_29 = 235,
+-    eq_ana_bndy_bucket_30 = 236,
+-    eq_ana_bndy_bucket_31 = 237,
+-    eq_ana_bndy_bucket_32 = 238,
+-    eq_ana_bndy_bucket_33 = 239,
+-    eq_ana_bndy_bucket_34 = 240,
+-    eq_ana_bndy_bucket_35 = 241,
+-    eq_ana_bndy_bucket_36 = 242,
+-    eq_ana_bndy_bucket_37 = 243,
+-    eq_ana_bndy_bucket_38 = 244,
+-    eq_ana_bndy_bucket_39 = 245,
+-    eq_ana_bndy_bucket_40 = 246,
+-    eq_ana_bndy_bucket_41 = 247,
+-
+     //***************************
+     // Rings needed for SBE - End
+     //***************************
+-- 
+1.8.2.2
+
diff --git a/openpower/package/occ/occ.mk b/openpower/package/occ/occ.mk
index 300d16f..d3530b8 100644
--- a/openpower/package/occ/occ.mk
+++ b/openpower/package/occ/occ.mk
@@ -10,7 +10,10 @@
 OCC_VERSION ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_VERSION_BRANCH_MASTER),$(OCC_VERSION_BRANCH_MASTER_P8))
 OCC_SITE ?= $(call github,open-power,occ,$(OCC_VERSION))
 OCC_LICENSE = Apache-2.0
-OCC_LICENSE_FILES = src/LICENSE
+
+OCC_LICENSE_FILES_P8 = src/LICENSE
+OCC_LICENSE_FILES_P9 = LICENSE
+OCC_LICENSE_FILES ?= $(if $(BR2_OPENPOWER_POWER9),$(OCC_LICENSE_FILES_P9),$(OCC_LICENSE_FILES_P8))
 
 OCC_INSTALL_IMAGES = YES
 OCC_INSTALL_TARGET = NO
diff --git a/openpower/package/ppe42-binutils/ppe42-binutils.mk b/openpower/package/ppe42-binutils/ppe42-binutils.mk
index 68579d8..b63e2a1 100644
--- a/openpower/package/ppe42-binutils/ppe42-binutils.mk
+++ b/openpower/package/ppe42-binutils/ppe42-binutils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PPE42_BINUTILS_VERSION ?= 5b161fc30519a965f16e7e73c3410a388140cba1
+PPE42_BINUTILS_VERSION ?= ded0eff199fa1d9bd8be5a78935e8f023a2c5fad
 PPE42_BINUTILS_SITE ?= $(call github,open-power,ppe42-binutils,$(PPE42_BINUTILS_VERSION))
 PPE42_BINUTILS_LICENSE = GPLv3+
 
diff --git a/openpower/package/witherspoon-xml/witherspoon.mk b/openpower/package/witherspoon-xml/witherspoon.mk
index c7d0dd7..67a3a08 100644
--- a/openpower/package/witherspoon-xml/witherspoon.mk
+++ b/openpower/package/witherspoon-xml/witherspoon.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WITHERSPOON_XML_VERSION ?= 8b0fd4410c247b03fa0f8e049dd1e7c6c6a4cf1f
+WITHERSPOON_XML_VERSION ?= b208e4f2c91a653e20cc2ed79b02140bcbaf039e
 WITHERSPOON_XML_SITE ?= $(call github,open-power,witherspoon-xml,$(WITHERSPOON_XML_VERSION))
 
 WITHERSPOON_XML_LICENSE = Apache-2.0
diff --git a/openpower/package/zaius-xml/zaius.mk b/openpower/package/zaius-xml/zaius.mk
index 83096ed..3d3380a 100644
--- a/openpower/package/zaius-xml/zaius.mk
+++ b/openpower/package/zaius-xml/zaius.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ZAIUS_XML_VERSION ?= a035e04dba4d63c829226b7805951921881eecc1
+ZAIUS_XML_VERSION ?= b907705f75e5d462b9f23b894ea781ae5ab5c2bf
 ZAIUS_XML_SITE ?= $(call github,open-power,zaius-xml,$(ZAIUS_XML_VERSION))
 
 ZAIUS_XML_LICENSE = Apache-2.0