summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-6.1
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-07-27 05:25:12 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-07-30 18:53:00 +0200
commitc4a5fe6cee52e9d9735f3e1c0eb0c06661579f3e (patch)
tree2aaf33c2e52425fb4c0666276b3f08cb677a6bfc /target/linux/generic/hack-6.1
parent8fba9afda5f514afa48a216514b3f0b0fb22afac (diff)
downloadopenwrt-c4a5fe6cee52e9d9735f3e1c0eb0c06661579f3e.tar.gz
openwrt-c4a5fe6cee52e9d9735f3e1c0eb0c06661579f3e.tar.bz2
openwrt-c4a5fe6cee52e9d9735f3e1c0eb0c06661579f3e.zip
kernel: bump 6.1 to 6.1.42
Manually rebased: generic/pending-6.1/203-kallsyms_uncompressed.patch All other patches automatically rebased. Changelog: https://lore.kernel.org/stable/2023072749-gumming-selector-a081@gregkh/ Build system: x86/64 Build-tested: x86/64/AMD Cezanne Run-tested: x86/64/AMD Cezanne Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/hack-6.1')
-rw-r--r--target/linux/generic/hack-6.1/259-regmap_dynamic.patch2
-rw-r--r--target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-6.1/259-regmap_dynamic.patch b/target/linux/generic/hack-6.1/259-regmap_dynamic.patch
index 8d25f59ce2..407bc72ac8 100644
--- a/target/linux/generic/hack-6.1/259-regmap_dynamic.patch
+++ b/target/linux/generic/hack-6.1/259-regmap_dynamic.patch
@@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
-@@ -3513,3 +3514,5 @@ static int __init regmap_initcall(void)
+@@ -3511,3 +3512,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);
diff --git a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
index 25a3f83b24..59235ea00a 100644
--- a/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
+++ b/target/linux/generic/hack-6.1/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] net/dsa/mv88e6xxx: disable ATU violation
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -3465,6 +3465,9 @@ static int mv88e6xxx_setup_port(struct m
+@@ -3472,6 +3472,9 @@ static int mv88e6xxx_setup_port(struct m
else
reg = 1 << port;