aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-09-07 06:55:41 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-09-25 23:04:37 +0200
commit442f7406a98073cba140a5dedbd09135527f3daa (patch)
tree2fd26c17d99f6c595482112d73991fab8622444f /target/linux
parent39320d4b58b80dea7bef7137d869d79466b25abe (diff)
downloadupstream-442f7406a98073cba140a5dedbd09135527f3daa.tar.gz
upstream-442f7406a98073cba140a5dedbd09135527f3daa.tar.bz2
upstream-442f7406a98073cba140a5dedbd09135527f3daa.zip
kernel: bump 5.15 to 5.15.131
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.131 All patches automatically rebased. Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 58bb5e147ae50391c29c53890f47e3a5420bbfad) [Refresh on top of OpenWrt 23.05] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ath25/patches-5.15/700-swconfig_mvswitch.patch2
-rw-r--r--target/linux/generic/hack-5.15/204-module_strip.patch4
-rw-r--r--target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch2
-rw-r--r--target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch2
4 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/ath25/patches-5.15/700-swconfig_mvswitch.patch b/target/linux/ath25/patches-5.15/700-swconfig_mvswitch.patch
index 79a4d1c1a0..dcfc019f12 100644
--- a/target/linux/ath25/patches-5.15/700-swconfig_mvswitch.patch
+++ b/target/linux/ath25/patches-5.15/700-swconfig_mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -95,6 +95,10 @@ config IP17XX_PHY
+@@ -96,6 +96,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git a/target/linux/generic/hack-5.15/204-module_strip.patch b/target/linux/generic/hack-5.15/204-module_strip.patch
index 31bfe07c78..e650c1b184 100644
--- a/target/linux/generic/hack-5.15/204-module_strip.patch
+++ b/target/linux/generic/hack-5.15/204-module_strip.patch
@@ -120,7 +120,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#ifdef CONFIG_MODVERSIONS
-@@ -3266,9 +3268,11 @@ static int setup_load_info(struct load_i
+@@ -3274,9 +3276,11 @@ static int setup_load_info(struct load_i
static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
@@ -133,7 +133,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;
-@@ -3289,6 +3293,7 @@ static int check_modinfo(struct module *
+@@ -3297,6 +3301,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-5.15/780-usb-net-MeigLink_modem_support.patch b/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
index 4f1966db16..5c1dbd69d3 100644
--- a/target/linux/generic/hack-5.15/780-usb-net-MeigLink_modem_support.patch
+++ b/target/linux/generic/hack-5.15/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) },
diff --git a/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch b/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
index 21538859a5..2896002ed1 100644
--- a/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
+++ b/target/linux/ramips/patches-5.15/830-mmc-MIPS-ralink-add-sdhci-for-mt7620a-SoC.patch
@@ -25,7 +25,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
-@@ -1092,3 +1092,5 @@ config MMC_OWL
+@@ -1093,3 +1093,5 @@ config MMC_OWL
config MMC_SDHCI_EXTERNAL_DMA
bool