From f92cfbbd3ea395d3a832a13afa37a54710394e57 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Thu, 17 Mar 2022 16:02:27 +0800 Subject: [PATCH] kernel: bump 5.15 to 5.15.29 (#9078) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-5.15 | 4 ++-- .../005-add-tty-driver-missing-function.patch | 11 ++--------- .../linux/generic/hack-5.15/220-arm-gc_sections.patch | 4 ++-- .../hack-5.15/410-block-fit-partition-parser.patch | 6 +++--- .../710-net-dsa-mv88e6xxx-default-VID-1.patch | 4 ++-- .../711-net-dsa-mv88e6xxx-disable-ATU-violation.patch | 2 +- .../760-net-dsa-mv88e6xxx-fix-vlan-setup.patch | 2 +- ...8e6xxx-Request-assisted-learning-on-CPU-port.patch | 2 +- ...-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch | 2 +- ...kchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch | 2 +- 10 files changed, 16 insertions(+), 23 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 7bce42703..7105dc171 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .28 -LINUX_KERNEL_HASH-5.15.28 = d8a2bbf3b971db9fd9a17b7768559f0a830b167d03c986fab636a57394b010e6 +LINUX_VERSION-5.15 = .29 +LINUX_KERNEL_HASH-5.15.29 = 5905e684602c47ae95746d4003cb834335e5451aca4ac7c3013f15dd49ed876e diff --git a/target/linux/generic/backport-5.15/005-add-tty-driver-missing-function.patch b/target/linux/generic/backport-5.15/005-add-tty-driver-missing-function.patch index 7c2e439fe..fc5ad0d2b 100644 --- a/target/linux/generic/backport-5.15/005-add-tty-driver-missing-function.patch +++ b/target/linux/generic/backport-5.15/005-add-tty-driver-missing-function.patch @@ -8,11 +8,9 @@ Subject: [PATCH] add tty driver missing function include/linux/tty_driver.h | 15 +++++++++++++++ 2 files changed, 28 insertions(+) -diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index 6616d4a0d..79c6cc39e 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c -@@ -3438,6 +3438,12 @@ void tty_driver_kref_put(struct tty_driver *driver) +@@ -3438,6 +3438,12 @@ void tty_driver_kref_put(struct tty_driv } EXPORT_SYMBOL(tty_driver_kref_put); @@ -25,8 +23,6 @@ index 6616d4a0d..79c6cc39e 100644 /* * Called by a tty driver to register itself. */ -diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h -index c20431d8d..cc404cfdc 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h @@ -329,6 +329,7 @@ extern struct list_head tty_drivers; @@ -37,7 +33,7 @@ index c20431d8d..cc404cfdc 100644 extern struct tty_driver *tty_find_polling_driver(char *name, int *line); extern void tty_driver_kref_put(struct tty_driver *driver); -@@ -337,6 +340,18 @@ extern void tty_driver_kref_put(struct tty_driver *driver); +@@ -337,6 +338,18 @@ extern void tty_driver_kref_put(struct t #define tty_alloc_driver(lines, flags) \ __tty_alloc_driver(lines, THIS_MODULE, flags) @@ -56,6 +52,3 @@ index c20431d8d..cc404cfdc 100644 static inline struct tty_driver *tty_driver_kref_get(struct tty_driver *d) { kref_get(&d->kref); --- -2.17.1 - diff --git a/target/linux/generic/hack-5.15/220-arm-gc_sections.patch b/target/linux/generic/hack-5.15/220-arm-gc_sections.patch index 081f948f6..907a152e8 100644 --- a/target/linux/generic/hack-5.15/220-arm-gc_sections.patch +++ b/target/linux/generic/hack-5.15/220-arm-gc_sections.patch @@ -72,7 +72,7 @@ Signed-off-by: Gabor Juhos --- a/arch/arm/include/asm/vmlinux.lds.h +++ b/arch/arm/include/asm/vmlinux.lds.h -@@ -29,13 +29,13 @@ +@@ -42,13 +42,13 @@ #define PROC_INFO \ . = ALIGN(4); \ __proc_info_begin = .; \ @@ -88,7 +88,7 @@ Signed-off-by: Gabor Juhos __idmap_text_end = .; \ #define ARM_DISCARD \ -@@ -96,12 +96,12 @@ +@@ -109,12 +109,12 @@ . = ALIGN(8); \ .ARM.unwind_idx : { \ __start_unwind_idx = .; \ diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch index 2ac6cb038..03cf36426 100644 --- a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch +++ b/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch @@ -52,7 +52,7 @@ +int parse_fit_partitions(struct parsed_partitions *state, u64 start_sector, u64 nr_sectors, int *slot, int add_remain); --- a/block/partitions/core.c +++ b/block/partitions/core.c -@@ -11,6 +11,10 @@ +@@ -12,6 +12,10 @@ #include #include #include @@ -63,7 +63,7 @@ #include "check.h" static int (*check_part[])(struct parsed_partitions *) = { -@@ -47,6 +51,9 @@ static int (*check_part[])(struct parsed +@@ -48,6 +52,9 @@ static int (*check_part[])(struct parsed #ifdef CONFIG_EFI_PARTITION efi_partition, /* this must come before msdos */ #endif @@ -73,7 +73,7 @@ #ifdef CONFIG_SGI_PARTITION sgi_partition, #endif -@@ -597,6 +604,11 @@ static bool blk_add_partition(struct gen +@@ -598,6 +605,11 @@ static bool blk_add_partition(struct gen (state->parts[p].flags & ADDPART_FLAG_RAID)) md_autodetect_dev(part->bd_dev); diff --git a/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch b/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch index fd6731ad1..f85b558fe 100644 --- a/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch +++ b/target/linux/generic/hack-5.15/710-net-dsa-mv88e6xxx-default-VID-1.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2328,6 +2328,7 @@ static int mv88e6xxx_port_fdb_add(struct +@@ -2321,6 +2321,7 @@ static int mv88e6xxx_port_fdb_add(struct struct mv88e6xxx_chip *chip = ds->priv; int err; @@ -8,7 +8,7 @@ mv88e6xxx_reg_lock(chip); err = mv88e6xxx_port_db_load_purge(chip, port, addr, vid, MV88E6XXX_G1_ATU_DATA_STATE_UC_STATIC); -@@ -2342,6 +2343,7 @@ static int mv88e6xxx_port_fdb_del(struct +@@ -2335,6 +2336,7 @@ static int mv88e6xxx_port_fdb_del(struct struct mv88e6xxx_chip *chip = ds->priv; int err; diff --git a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch index 422c3d6fd..4e0654f8f 100644 --- a/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch +++ b/target/linux/generic/hack-5.15/711-net-dsa-mv88e6xxx-disable-ATU-violation.patch @@ -1,6 +1,6 @@ --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -2990,6 +2990,9 @@ static int mv88e6xxx_setup_port(struct m +@@ -2983,6 +2983,9 @@ static int mv88e6xxx_setup_port(struct m else reg = 1 << port; diff --git a/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch b/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch index b0aeae708..0c9604e5a 100644 --- a/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch +++ b/target/linux/generic/pending-5.15/760-net-dsa-mv88e6xxx-fix-vlan-setup.patch @@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3200,6 +3200,7 @@ static int mv88e6xxx_setup(struct dsa_sw +@@ -3193,6 +3193,7 @@ static int mv88e6xxx_setup(struct dsa_sw chip->ds = ds; ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); diff --git a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 3a264e3dc..8a718a02f 100644 --- a/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-5.15/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -6326,6 +6326,7 @@ static int mv88e6xxx_register_switch(str +@@ -6319,6 +6319,7 @@ static int mv88e6xxx_register_switch(str ds->ops = &mv88e6xxx_switch_ops; ds->ageing_time_min = chip->info->age_time_coeff; ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; diff --git a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch index a5631b632..74e3f17f3 100644 --- a/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.15/007-arm64-dts-rockchip-add-EEPROM-node-for-NanoPi-R4S.patch @@ -13,7 +13,7 @@ Signed-off-by: Tianling Shen --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -75,6 +75,19 @@ &emmc_phy { +@@ -68,6 +68,19 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.15/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch b/target/linux/rockchip/patches-5.15/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch index 563a7f6df..624b993de 100644 --- a/target/linux/rockchip/patches-5.15/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch +++ b/target/linux/rockchip/patches-5.15/106-arm64-rockchip-add-OF-node-for-pcie-eth-on-NanoPi-R4S.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -101,6 +101,19 @@ +@@ -96,6 +96,19 @@ max-link-speed = <1>; num-lanes = <1>; vpcie3v3-supply = <&vcc3v3_sys>;