aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-02-14 20:17:31 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-02-17 13:48:43 +0000
commit5bb9954826229782d4d285d65dfcca8a1c9e20d9 (patch)
treebe5beceb5fdbfb3498ea12bffc7a503fa97a8af2
parent5ea33837f863d6843b4cb0a8f173f1f6e0aeac2b (diff)
downloadupstream-5bb9954826229782d4d285d65dfcca8a1c9e20d9.tar.gz
upstream-5bb9954826229782d4d285d65dfcca8a1c9e20d9.tar.bz2
upstream-5bb9954826229782d4d285d65dfcca8a1c9e20d9.zip
kernel: update kernel 5.10 to 5.10.16
Compile and runtime-tested on mediatek/mt7622 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
-rw-r--r--include/kernel-version.mk4
-rw-r--r--target/linux/generic/pending-5.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch2
-rw-r--r--target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 41059e7caa..98c7f469d0 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif
LINUX_VERSION-5.4 = .98
-LINUX_VERSION-5.10 = .14
+LINUX_VERSION-5.10 = .16
LINUX_KERNEL_HASH-5.4.98 = 83a248d6fbe388f133769d736f36b754767abc9d66f1c034b537ad778fbd46b1
-LINUX_KERNEL_HASH-5.10.14 = fa27b79f198b5be969e497ed5461860df48e0591c85e60699fc8be26837a1d2a
+LINUX_KERNEL_HASH-5.10.16 = 536fe3ea273bfcc72b3571d3b3a7ff0a5bcdc16068efd22e42c4f9d03c200a37
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/generic/pending-5.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch b/target/linux/generic/pending-5.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
index 61fcbac92e..e5ee2c8656 100644
--- a/target/linux/generic/pending-5.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
+++ b/target/linux/generic/pending-5.10/491-ubi-auto-create-ubiblock-device-for-rootfs.patch
@@ -53,7 +53,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
static void ubiblock_remove_all(void)
{
struct ubiblock *next;
-@@ -684,6 +722,10 @@ int __init ubiblock_init(void)
+@@ -684,6 +725,10 @@ int __init ubiblock_init(void)
*/
ubiblock_create_from_param();
diff --git a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
index e6a3d15b79..42b91fe4c3 100644
--- a/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
+++ b/target/linux/generic/pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch
@@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com>
--- a/drivers/net/dsa/mv88e6xxx/chip.c
+++ b/drivers/net/dsa/mv88e6xxx/chip.c
-@@ -2853,6 +2853,7 @@ static int mv88e6xxx_setup(struct dsa_sw
+@@ -2857,6 +2857,7 @@ static int mv88e6xxx_setup(struct dsa_sw
chip->ds = ds;
ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip);