aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-09-07 06:07:43 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-09-09 02:15:15 +0200
commit5294b358aa1ab2015e151f4caabdb4dcccf62190 (patch)
treebc7e632b11b1c6688d45956cb055a890d6495eab
parenteac192843030d16046a0d603284c2b4c89822431 (diff)
downloadupstream-5294b358aa1ab2015e151f4caabdb4dcccf62190.tar.gz
upstream-5294b358aa1ab2015e151f4caabdb4dcccf62190.tar.bz2
upstream-5294b358aa1ab2015e151f4caabdb4dcccf62190.zip
kernel: bump 6.1 to 6.1.52
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.52 All patches automatically rebased. Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
-rw-r--r--include/kernel-6.14
-rw-r--r--target/linux/generic/hack-6.1/204-module_strip.patch4
-rw-r--r--target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/kernel-6.1 b/include/kernel-6.1
index 16e40238b58..cc106e2572f 100644
--- a/include/kernel-6.1
+++ b/include/kernel-6.1
@@ -1,2 +1,2 @@
-LINUX_VERSION-6.1 = .51
-LINUX_KERNEL_HASH-6.1.51 = 58b0446d8ea4bc0b26a35e2e3509bd53efcdeb295c9e4f48d33a23b1cdaa103b
+LINUX_VERSION-6.1 = .52
+LINUX_KERNEL_HASH-6.1.52 = 567737990dbc9265966a0786392821a9fa559fd346494fd1eff050dbeb383a52
diff --git a/target/linux/generic/hack-6.1/204-module_strip.patch b/target/linux/generic/hack-6.1/204-module_strip.patch
index 71ee62ece8d..bd168649f2e 100644
--- a/target/linux/generic/hack-6.1/204-module_strip.patch
+++ b/target/linux/generic/hack-6.1/204-module_strip.patch
@@ -118,7 +118,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static char *get_modinfo(const struct load_info *info, const char *tag);
static char *get_next_modinfo(const struct load_info *info, const char *tag,
-@@ -1950,9 +1952,11 @@ static int setup_load_info(struct load_i
+@@ -1958,9 +1960,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -131,7 +131,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;
-@@ -1973,6 +1977,7 @@ static int check_modinfo(struct module *
+@@ -1981,6 +1985,7 @@ static int check_modinfo(struct module *
mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
}
diff --git a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
index 9ec5b539d39..a68562d0958 100644
--- a/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-6.1/780-usb-net-MeigLink_modem_support.patch
@@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
-@@ -1179,6 +1181,11 @@ static const struct usb_device_id option
+@@ -1180,6 +1182,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },