From 02617e159d4eebf05638f1fb6eabe64e66c7cd20 Mon Sep 17 00:00:00 2001 From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com> Date: Tue, 1 Nov 2022 10:06:45 +0800 Subject: [PATCH] kernel: bump 5.10 to 5.10.152 (#10341) All patches automatically rebased. Signed-off-by: Liu Linhui --- include/kernel-5.10 | 4 ++-- .../ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch | 2 +- .../generic/backport-5.10/011-kbuild-export-SUBARCH.patch | 2 +- .../linux/generic/hack-5.10/660-fq_codel_defaults.patch | 2 +- .../generic/hack-5.10/661-use_fq_codel_by_default.patch | 6 +++--- ...53-net-patch-linux-kernel-to-support-shortcut-fe.patch | 4 ++-- .../generic/pending-5.10/201-extra_optimization.patch | 2 +- ...core-Flag-to-identify-ingress-shaping-done-for-e.patch | 2 +- .../604-net-core-Replace-nss-keyword-with-offload.patch | 2 +- .../mediatek/patches-5.10/410-bt-mtk-serial-fix.patch | 2 +- .../oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch | 2 +- .../002-net-usb-r8152-add-LED-configuration-from-OF.patch | 8 ++++---- ...rockchip-rk3399-add-support-for-Rongpin-King3399.patch | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) mode change 100755 => 100644 target/linux/rockchip/patches-5.10/206-rockchip-rk3399-add-support-for-Rongpin-King3399.patch diff --git a/include/kernel-5.10 b/include/kernel-5.10 index 517f79a61..f4cdfe5fa 100644 --- a/include/kernel-5.10 +++ b/include/kernel-5.10 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.10 = .150 -LINUX_KERNEL_HASH-5.10.150 = 5813bc3c5d70b0beb26de4b627baa33554d01bed8c842a2e46072cf03d74dee1 +LINUX_VERSION-5.10 = .152 +LINUX_KERNEL_HASH-5.10.152 = fa0b5c83a4ebfda9f0a52cc693646eb6c24dbade6c37ee2d18b66ee2df15d8a6 diff --git a/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch b/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch index 540e134ef..923589661 100644 --- a/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch +++ b/target/linux/ath79/patches-5.10/404-mtd-cybertan-trx-parser.patch @@ -7,7 +7,7 @@ +obj-$(CONFIG_MTD_PARSER_CYBERTAN) += parser_cybertan.o obj-$(CONFIG_MTD_PARSER_IMAGETAG) += parser_imagetag.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o - obj-$(CONFIG_MTD_PARSER_TPLINK_SAFELOADER) += tplink_safeloader.o + obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o --- a/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig @@ -102,6 +102,14 @@ config MTD_OF_PARTS_LINKSYS_NS diff --git a/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch b/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch index bb99e4ddb..c8c9b305a 100644 --- a/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch +++ b/target/linux/generic/backport-5.10/011-kbuild-export-SUBARCH.patch @@ -10,7 +10,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -507,7 +507,7 @@ KBUILD_LDFLAGS_MODULE := +@@ -509,7 +509,7 @@ KBUILD_LDFLAGS_MODULE := KBUILD_LDFLAGS := CLANG_FLAGS := diff --git a/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch b/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch index 5541c0bc8..a57a045f4 100644 --- a/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch +++ b/target/linux/generic/hack-5.10/660-fq_codel_defaults.patch @@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -469,7 +469,11 @@ static int fq_codel_init(struct Qdisc *s +@@ -467,7 +467,11 @@ static int fq_codel_init(struct Qdisc *s sch->limit = 10*1024; q->flows_cnt = 1024; diff --git a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch index 21e558702..b2f4c9eb5 100644 --- a/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-5.10/661-use_fq_codel_by_default.patch @@ -44,7 +44,7 @@ Signed-off-by: Felix Fietkau device, it has to decide which ones to send first, which ones to --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -2290,7 +2290,7 @@ static int __init pktsched_init(void) +@@ -2291,7 +2291,7 @@ static int __init pktsched_init(void) return err; } @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau register_qdisc(&pfifo_head_drop_qdisc_ops); --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -709,7 +709,7 @@ static const struct Qdisc_class_ops fq_c +@@ -707,7 +707,7 @@ static const struct Qdisc_class_ops fq_c .walk = fq_codel_walk, }; @@ -64,7 +64,7 @@ Signed-off-by: Felix Fietkau .cl_ops = &fq_codel_class_ops, .id = "fq_codel", .priv_size = sizeof(struct fq_codel_sched_data), -@@ -724,6 +724,7 @@ static struct Qdisc_ops fq_codel_qdisc_o +@@ -722,6 +722,7 @@ static struct Qdisc_ops fq_codel_qdisc_o .dump_stats = fq_codel_dump_stats, .owner = THIS_MODULE, }; diff --git a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch index 858bc0c78..954da5930 100644 --- a/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch +++ b/target/linux/generic/hack-5.10/953-net-patch-linux-kernel-to-support-shortcut-fe.patch @@ -12,8 +12,8 @@ struct list_head *br_ip_list); --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -860,6 +860,10 @@ struct sk_buff { - #endif +@@ -862,6 +862,10 @@ struct sk_buff { + __u8 scm_io_uring:1; __u8 gro_skip:1; +#ifdef CONFIG_SHORTCUT_FE diff --git a/target/linux/generic/pending-5.10/201-extra_optimization.patch b/target/linux/generic/pending-5.10/201-extra_optimization.patch index e7f46d244..6a8817ffa 100644 --- a/target/linux/generic/pending-5.10/201-extra_optimization.patch +++ b/target/linux/generic/pending-5.10/201-extra_optimization.patch @@ -14,7 +14,7 @@ Signed-off-by: Felix Fietkau --- a/Makefile +++ b/Makefile -@@ -744,11 +744,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni +@@ -747,11 +747,11 @@ KBUILD_CFLAGS += $(call cc-disable-warni KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) ifdef CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE diff --git a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch index 0abebbe5e..6bd9d476a 100644 --- a/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch +++ b/target/linux/ipq807x/patches-5.10/603-net-core-Flag-to-identify-ingress-shaping-done-for-e.patch @@ -21,7 +21,7 @@ Change-Id: Ib3cd341e5b2d4dcf552e02e38d3f34a4f00351cd * @tc_at_ingress: used within tc_classify to distinguish in/egress * @redirected: packet was redirected by packet classifier * @from_ingress: packet was redirected from the ingress path -@@ -850,6 +851,7 @@ struct sk_buff { +@@ -851,6 +852,7 @@ struct sk_buff { #ifdef CONFIG_NET_CLS_ACT __u8 tc_skip_classify:1; __u8 tc_at_ingress:1; diff --git a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch index 1bc1604d2..6f01b7dce 100644 --- a/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch +++ b/target/linux/ipq807x/patches-5.10/604-net-core-Replace-nss-keyword-with-offload.patch @@ -24,7 +24,7 @@ Change-Id: Iddb97d6ba0a443b830d1ac23728434a417bc8a92 * @tc_at_ingress: used within tc_classify to distinguish in/egress * @redirected: packet was redirected by packet classifier * @from_ingress: packet was redirected from the ingress path -@@ -851,7 +851,7 @@ struct sk_buff { +@@ -852,7 +852,7 @@ struct sk_buff { #ifdef CONFIG_NET_CLS_ACT __u8 tc_skip_classify:1; __u8 tc_at_ingress:1; diff --git a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch index 33d27a181..fc9f36950 100644 --- a/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.10/410-bt-mtk-serial-fix.patch @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2716,6 +2716,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2718,6 +2718,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; diff --git a/target/linux/oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch b/target/linux/oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch index 6c795c1d2..f609f1b12 100644 --- a/target/linux/oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch +++ b/target/linux/oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch @@ -179,7 +179,7 @@ static inline struct clk_oxnas_gate *to_clk_oxnas_gate(struct clk_hw *hw) { return container_of(hw, struct clk_oxnas_gate, hw); -@@ -249,3 +401,42 @@ static struct platform_driver oxnas_stdc +@@ -251,3 +403,42 @@ static struct platform_driver oxnas_stdc }, }; builtin_platform_driver(oxnas_stdclk_driver); diff --git a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch index 1e9d5a288..51b4d87e6 100644 --- a/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.10/002-net-usb-r8152-add-LED-configuration-from-OF.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer #include #include #include -@@ -6780,6 +6781,22 @@ static void rtl_tally_reset(struct r8152 +@@ -6782,6 +6783,22 @@ static void rtl_tally_reset(struct r8152 ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -45,7 +45,7 @@ Signed-off-by: David Bauer static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -6821,6 +6838,8 @@ static void r8152b_init(struct r8152 *tp +@@ -6823,6 +6840,8 @@ static void r8152b_init(struct r8152 *tp ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -54,7 +54,7 @@ Signed-off-by: David Bauer } static void r8153_init(struct r8152 *tp) -@@ -6961,6 +6980,8 @@ static void r8153_init(struct r8152 *tp) +@@ -6963,6 +6982,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -63,7 +63,7 @@ Signed-off-by: David Bauer } static void r8153b_init(struct r8152 *tp) -@@ -7043,6 +7064,8 @@ static void r8153b_init(struct r8152 *tp +@@ -7045,6 +7066,8 @@ static void r8153b_init(struct r8152 *tp rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/target/linux/rockchip/patches-5.10/206-rockchip-rk3399-add-support-for-Rongpin-King3399.patch b/target/linux/rockchip/patches-5.10/206-rockchip-rk3399-add-support-for-Rongpin-King3399.patch old mode 100755 new mode 100644 index c31149cd5..8f9bb89e5 --- a/target/linux/rockchip/patches-5.10/206-rockchip-rk3399-add-support-for-Rongpin-King3399.patch +++ b/target/linux/rockchip/patches-5.10/206-rockchip-rk3399-add-support-for-Rongpin-King3399.patch @@ -1,6 +1,6 @@ --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -51,3 +51,4 @@ +@@ -51,3 +51,4 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-ro dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-sapphire-excavator.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399pro-rock-pi-n10.dtb