From f8e8aa2e8dc9a1d79b5b022e4f35f8cff53df8aa Mon Sep 17 00:00:00 2001 From: Marty Jones Date: Sun, 3 Nov 2024 20:00:27 -0500 Subject: [PATCH] kernel: Linux 6.12-rc6 https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/?h=v6.12-rc6 Signed-off-by: Marty Jones --- include/kernel-6.12 | 4 ++-- target/linux/generic/hack-6.12/253-ksmbd-config.patch | 2 +- .../hack-6.12/780-usb-net-MeigLink_modem_support.patch | 4 ++-- target/linux/generic/pending-6.12/920-mangle_bootargs.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-6.12 b/include/kernel-6.12 index 0cde4d60651f16..dbc9b8f15a6f8c 100644 --- a/include/kernel-6.12 +++ b/include/kernel-6.12 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.12 = -rc3 -LINUX_KERNEL_HASH-6.12-rc3 = c9b271cc559588796a80f06f4198a4de2823bc28cb5cd2632f3b80401035b91d +LINUX_VERSION-6.12 = -rc6 +LINUX_KERNEL_HASH-6.12-rc6 = 7932703bbf3859932f615c21de4c5ae56d99dc85525bc2361d543216cff7e4ca diff --git a/target/linux/generic/hack-6.12/253-ksmbd-config.patch b/target/linux/generic/hack-6.12/253-ksmbd-config.patch index 71f1e8941b3585..f67c5ef7f6b1db 100644 --- a/target/linux/generic/hack-6.12/253-ksmbd-config.patch +++ b/target/linux/generic/hack-6.12/253-ksmbd-config.patch @@ -1,6 +1,6 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -2030,7 +2030,7 @@ config PADATA +@@ -2034,7 +2034,7 @@ config PADATA bool config ASN1 diff --git a/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch index d62ad4afe9f3de..6f9d6f044aa1fa 100644 --- a/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch +++ b/target/linux/generic/hack-6.12/780-usb-net-MeigLink_modem_support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c -@@ -1082,6 +1082,7 @@ static const struct usb_device_id produc +@@ -1083,6 +1083,7 @@ static const struct usb_device_id produc {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */ @@ -19,7 +19,7 @@ #define QUECTEL_VENDOR_ID 0x2c7c /* These Quectel products use Quectel's vendor ID */ -@@ -1199,6 +1201,11 @@ static const struct usb_device_id option +@@ -1200,6 +1202,11 @@ static const struct usb_device_id option .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, diff --git a/target/linux/generic/pending-6.12/920-mangle_bootargs.patch b/target/linux/generic/pending-6.12/920-mangle_bootargs.patch index f4173cf58812ca..336dc4ff8976fd 100644 --- a/target/linux/generic/pending-6.12/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-6.12/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1855,6 +1855,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS +@@ -1859,6 +1859,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS config ARCH_HAS_MEMBARRIER_SYNC_CORE bool