Skip to content

Commit 8632106

Browse files
author
Ilya Smirnov
authored
Merge pull request #5631 from runlevel5/kernel-5-10-191
linux: Bump to 5.10.194
2 parents 0c37a5f + 234b339 commit 8632106

13 files changed

+15
-16
lines changed

‎openpower/configs/blackbird_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1717
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1818
BR2_LINUX_KERNEL=y
1919
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
20-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2121
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2222
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2323
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/mihawk_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1717
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1818
BR2_LINUX_KERNEL=y
1919
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
20-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
20+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2121
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2222
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2323
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/mowgli_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/nicole_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1515
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1616
BR2_LINUX_KERNEL=y
1717
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
18-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
18+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
1919
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2020
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2121
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/opal_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1212
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1313
BR2_LINUX_KERNEL=y
1414
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
15-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
15+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
1616
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
1717
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
1818
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/p9dsu_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/romulus_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/swift_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/witherspoon_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/zaius_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1616
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1717
BR2_LINUX_KERNEL=y
1818
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
19-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
19+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
2020
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
2121
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2222
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/configs/zz_defconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ BR2_ROOTFS_OVERLAY="../openpower/overlay"
1414
BR2_ROOTFS_POST_BUILD_SCRIPT="../openpower/scripts/fixup-target-var ../openpower/scripts/firmware-whitelist"
1515
BR2_LINUX_KERNEL=y
1616
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
17-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.108"
17+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.194"
1818
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_OP_BUILD_PATH)/linux"
1919
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
2020
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_OP_BUILD_PATH)/configs/linux/skiroot_defconfig"

‎openpower/linux/0001-xhci-Reset-controller-on-xhci-shutdown.patch

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Joel Stanley <[email protected]>
1414
1 file changed, 3 insertions(+)
1515

1616
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
17-
index a8d97e23f601..308ab396bd88 100644
17+
index 473b0b64dd57..ca0c642ce935 100644
1818
--- a/drivers/usb/host/xhci.c
1919
+++ b/drivers/usb/host/xhci.c
20-
@@ -793,6 +793,9 @@ void xhci_shutdown(struct usb_hcd *hcd)
20+
@@ -812,6 +812,9 @@ void xhci_shutdown(struct usb_hcd *hcd)
2121
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
2222
"xhci_shutdown completed - status = %x",
2323
readl(&xhci->op_regs->status));
@@ -26,4 +26,3 @@ index a8d97e23f601..308ab396bd88 100644
2626
+ pci_reset_function_locked(to_pci_dev(hcd->self.sysdev));
2727
}
2828
EXPORT_SYMBOL_GPL(xhci_shutdown);
29-

‎openpower/linux/0002-Release-OpenPower-kernel.patch

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ Signed-off-by: Joel Stanley <[email protected]>
99
1 file changed, 1 insertion(+), 1 deletion(-)
1010

1111
diff --git a/Makefile b/Makefile
12-
index 695f8e739a91..f2280292b96e 100644
12+
index 92accf2ddc08..18dcc81a67e4 100644
1313
--- a/Makefile
1414
+++ b/Makefile
1515
@@ -2,7 +2,7 @@
1616
VERSION = 5
1717
PATCHLEVEL = 10
18-
SUBLEVEL = 108
18+
SUBLEVEL = 194
1919
-EXTRAVERSION =
2020
+EXTRAVERSION = -openpower1
2121
NAME = Dare mighty things

0 commit comments

Comments
 (0)