Merge pull request #2192 from shenki/kernel-4.17.1
kernel: Move to Linux 4.17.1-openpower1
diff --git a/openpower/configs/zaius_defconfig b/openpower/configs/zaius_defconfig
index cc38009..3561155 100644
--- a/openpower/configs/zaius_defconfig
+++ b/openpower/configs/zaius_defconfig
@@ -41,7 +41,7 @@
BR2_OPENPOWER_POWER9=y
BR2_HOSTBOOT_CONFIG_FILE="zaius.config"
BR2_OPENPOWER_MACHINE_XML_GITHUB_PROJECT_VALUE="zaius-xml"
-BR2_OPENPOWER_MACHINE_XML_VERSION="a941f8b75cdcd46caa6a7d82155078cb4a176c55"
+BR2_OPENPOWER_MACHINE_XML_VERSION="f9eeb28409477a8e3c2e46f35ba2784a67d63e5c"
BR2_OPENPOWER_MACHINE_XML_FILENAME="zaius.xml"
BR2_OPENPOWER_SYSTEM_XML_FILENAME="ZAIUS_hb.system.xml"
BR2_OPENPOWER_MRW_XML_FILENAME="ZAIUS_hb.mrw.xml"
diff --git a/openpower/package/skiboot/Config.in b/openpower/package/skiboot/Config.in
index 891f082..16a7ce8 100644
--- a/openpower/package/skiboot/Config.in
+++ b/openpower/package/skiboot/Config.in
@@ -31,7 +31,7 @@
config BR2_SKIBOOT_VERSION
string
- default "v6.0.1-61-g1b86a92b6cb6" if BR2_SKIBOOT_LATEST_VERSION
+ default "v6.1-rc1" if BR2_SKIBOOT_LATEST_VERSION
default BR2_SKIBOOT_CUSTOM_VERSION_VALUE \
if BR2_SKIBOOT_CUSTOM_VERSION