mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-10-29 01:22:25 +00:00
61 lines
2.7 KiB
Diff
61 lines
2.7 KiB
Diff
From c0484713ff059736b169496d396f722af5db31c0 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Sun, 14 Feb 2021 20:17:31 +0000
|
|
Subject: [PATCH 10/22] kernel: update kernel 5.10 to 5.10.16
|
|
|
|
Compile and runtime-tested on mediatek/mt7622
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
include/kernel-version.mk | 4 ++--
|
|
.../491-ubi-auto-create-ubiblock-device-for-rootfs.patch | 2 +-
|
|
.../pending-5.10/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch | 2 +-
|
|
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/kernel-version.mk b/include/kernel-version.mk
|
|
index 035692f3e3..26f24bae42 100644
|
|
--- a/include/kernel-version.mk
|
|
+++ b/include/kernel-version.mk
|
|
@@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
|
|
endif
|
|
|
|
LINUX_VERSION-5.4 = .105
|
|
-LINUX_VERSION-5.10 = .14
|
|
+LINUX_VERSION-5.10 = .16
|
|
|
|
LINUX_KERNEL_HASH-5.4.105 = 244e4cd16184285df55ec5a9501daba011aa8b85c5527ee05eab4592e70fb8b6
|
|
-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);
|
|
--
|
|
2.25.1
|
|
|