From f1c01b38bdd98b06ae5c07ec9b63981adff52e5f Mon Sep 17 00:00:00 2001 From: DHDAXCW Date: Mon, 5 Aug 2024 15:06:08 +0800 Subject: [PATCH] kernel: bump 6.6 to 6.6.42 --- include/kernel-6.6 | 4 ++-- ...he-incorrect-ifdeffery-and-dependenc.patch | 20 +++++++++---------- ...x-rename-mv88e6xxx_g2_scratch_gpio_s.patch | 2 +- ...x-add-Amethyst-specific-SMI-GPIO-fun.patch | 2 +- .../hack-6.6/230-openwrt_lzma_options.patch | 2 +- .../generic/hack-6.6/902-debloat_proc.patch | 6 +++--- .../hack-6.6/904-debloat_dma_buf.patch | 2 +- .../911-kobject_add_broadcast_uevent.patch | 2 +- ...k-events-support-multiple-registrant.patch | 4 ++-- .../pending-6.6/630-packet_socket_type.patch | 16 +++++++-------- ...ng-with-source-address-failed-policy.patch | 2 +- ...equest-assisted-learning-on-CPU-port.patch | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 212c6263d..477ed1109 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .42 -LINUX_KERNEL_HASH-6.6.42 = 8801c8c297d774e76044977ec3d0684399dc4e7cce347d730874ec78b774e683 +LINUX_VERSION-6.6 = .44 +LINUX_KERNEL_HASH-6.6.44 = 93218296934915636fe6ba08e125948424cc270fd8948502c0ab91087a9fccd8 diff --git a/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch b/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch index 99a6bfe63..6d3c7d04f 100644 --- a/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch +++ b/target/linux/generic/backport-6.6/310-v6.7-mips-kexec-fix-the-incorrect-ifdeffery-and-dependenc.patch @@ -134,7 +134,7 @@ Signed-off-by: Andrew Morton }; --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c -@@ -392,7 +392,7 @@ static void cps_smp_finish(void) +@@ -395,7 +395,7 @@ static void cps_smp_finish(void) local_irq_enable(); } @@ -143,7 +143,7 @@ Signed-off-by: Andrew Morton enum cpu_death { CPU_DEATH_HALT, -@@ -429,7 +429,7 @@ static void cps_shutdown_this_cpu(enum c +@@ -432,7 +432,7 @@ static void cps_shutdown_this_cpu(enum c } } @@ -152,7 +152,7 @@ Signed-off-by: Andrew Morton static void cps_kexec_nonboot_cpu(void) { -@@ -439,9 +439,9 @@ static void cps_kexec_nonboot_cpu(void) +@@ -442,9 +442,9 @@ static void cps_kexec_nonboot_cpu(void) cps_shutdown_this_cpu(CPU_DEATH_POWER); } @@ -164,7 +164,7 @@ Signed-off-by: Andrew Morton #ifdef CONFIG_HOTPLUG_CPU -@@ -610,7 +610,7 @@ static const struct plat_smp_ops cps_smp +@@ -613,7 +613,7 @@ static const struct plat_smp_ops cps_smp .cpu_die = cps_cpu_die, .cleanup_dead_cpu = cps_cleanup_dead_cpu, #endif @@ -175,8 +175,8 @@ Signed-off-by: Andrew Morton }; --- a/arch/mips/loongson64/reset.c +++ b/arch/mips/loongson64/reset.c -@@ -53,7 +53,7 @@ static void loongson_halt(void) - } +@@ -39,7 +39,7 @@ static int firmware_poweroff(struct sys_ + return NOTIFY_DONE; } -#ifdef CONFIG_KEXEC @@ -184,9 +184,9 @@ Signed-off-by: Andrew Morton /* 0X80000000~0X80200000 is safe */ #define MAX_ARGS 64 -@@ -158,7 +158,7 @@ static int __init mips_reboot_setup(void - _machine_halt = loongson_halt; - pm_power_off = loongson_poweroff; +@@ -152,7 +152,7 @@ static int __init mips_reboot_setup(void + firmware_poweroff, NULL); + } -#ifdef CONFIG_KEXEC +#ifdef CONFIG_KEXEC_CORE @@ -195,7 +195,7 @@ Signed-off-by: Andrew Morton return -ENOMEM; --- a/arch/mips/loongson64/smp.c +++ b/arch/mips/loongson64/smp.c -@@ -864,7 +864,7 @@ const struct plat_smp_ops loongson3_smp_ +@@ -883,7 +883,7 @@ const struct plat_smp_ops loongson3_smp_ .cpu_disable = loongson3_cpu_disable, .cpu_die = loongson3_cpu_die, #endif diff --git a/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch b/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch index d9265cad1..48dd6ffb6 100644 --- a/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch +++ b/target/linux/generic/backport-6.6/896-01-v6.9-net-dsa-mv88e6xxx-rename-mv88e6xxx_g2_scratch_gpio_s.patch @@ -19,7 +19,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3668,7 +3668,7 @@ static int mv88e6xxx_mdio_register(struc +@@ -3669,7 +3669,7 @@ static int mv88e6xxx_mdio_register(struc if (external) { mv88e6xxx_reg_lock(chip); diff --git a/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch b/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch index 5661d50ad..e5931573f 100644 --- a/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch +++ b/target/linux/generic/backport-6.6/896-02-v6.9-net-dsa-mv88e6xxx-add-Amethyst-specific-SMI-GPIO-fun.patch @@ -27,7 +27,7 @@ Signed-off-by: Paolo Abeni --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c -@@ -3668,7 +3668,10 @@ static int mv88e6xxx_mdio_register(struc +@@ -3669,7 +3669,10 @@ static int mv88e6xxx_mdio_register(struc if (external) { mv88e6xxx_reg_lock(chip); diff --git a/target/linux/generic/hack-6.6/230-openwrt_lzma_options.patch b/target/linux/generic/hack-6.6/230-openwrt_lzma_options.patch index a22acafea..ca70da7e3 100644 --- a/target/linux/generic/hack-6.6/230-openwrt_lzma_options.patch +++ b/target/linux/generic/hack-6.6/230-openwrt_lzma_options.patch @@ -23,7 +23,7 @@ Signed-off-by: Imre Kaloz { {0x02, 0x21}, "lz4", unlz4 }, --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -456,10 +456,10 @@ quiet_cmd_bzip2_with_size = BZIP2 $@ +@@ -460,10 +460,10 @@ quiet_cmd_bzip2_with_size = BZIP2 $@ # --------------------------------------------------------------------------- quiet_cmd_lzma = LZMA $@ diff --git a/target/linux/generic/hack-6.6/902-debloat_proc.patch b/target/linux/generic/hack-6.6/902-debloat_proc.patch index 7b05e55f5..8b774863a 100644 --- a/target/linux/generic/hack-6.6/902-debloat_proc.patch +++ b/target/linux/generic/hack-6.6/902-debloat_proc.patch @@ -29,7 +29,7 @@ Signed-off-by: Felix Fietkau --- a/fs/locks.c +++ b/fs/locks.c -@@ -2896,6 +2896,8 @@ static const struct seq_operations locks +@@ -2895,6 +2895,8 @@ static const struct seq_operations locks static int __init proc_locks_init(void) { @@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -3036,11 +3036,13 @@ static const struct seq_operations fib_r +@@ -3037,11 +3037,13 @@ static const struct seq_operations fib_r int __net_init fib_proc_init(struct net *net) { @@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau fib_triestat_seq_show, NULL)) goto out2; -@@ -3051,17 +3053,21 @@ int __net_init fib_proc_init(struct net +@@ -3052,17 +3054,21 @@ int __net_init fib_proc_init(struct net return 0; out3: diff --git a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch index 4d2ea4621..355bd0d70 100644 --- a/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-6.6/904-debloat_dma_buf.patch @@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4486,6 +4486,7 @@ int wake_up_state(struct task_struct *p, +@@ -4483,6 +4483,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/hack-6.6/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-6.6/911-kobject_add_broadcast_uevent.patch index 7a21e73da..56cd696e1 100644 --- a/target/linux/generic/hack-6.6/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/hack-6.6/911-kobject_add_broadcast_uevent.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #endif /* _KOBJECT_H_ */ --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -691,6 +691,43 @@ int add_uevent_var(struct kobj_uevent_en +@@ -706,6 +706,43 @@ int add_uevent_var(struct kobj_uevent_en EXPORT_SYMBOL_GPL(add_uevent_var); #if defined(CONFIG_NET) diff --git a/target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch b/target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch index ddfdf1eaa..d9eb2fb1e 100644 --- a/target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch +++ b/target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch @@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen struct nf_conn *ct = item->ct; struct sk_buff *skb; unsigned int type; -@@ -3750,11 +3757,17 @@ static int ctnetlink_stat_exp_cpu(struct +@@ -3751,11 +3758,17 @@ static int ctnetlink_stat_exp_cpu(struct } #ifdef CONFIG_NF_CONNTRACK_EVENTS @@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = { [IPCTNL_MSG_CT_NEW] = { -@@ -3853,8 +3866,12 @@ static int __net_init ctnetlink_net_init +@@ -3854,8 +3867,12 @@ static int __net_init ctnetlink_net_init static void ctnetlink_net_pre_exit(struct net *net) { #ifdef CONFIG_NF_CONNTRACK_EVENTS diff --git a/target/linux/generic/pending-6.6/630-packet_socket_type.patch b/target/linux/generic/pending-6.6/630-packet_socket_type.patch index fd00e1e05..2b753efa6 100644 --- a/target/linux/generic/pending-6.6/630-packet_socket_type.patch +++ b/target/linux/generic/pending-6.6/630-packet_socket_type.patch @@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1864,6 +1864,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1925,6 +1925,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1871,6 +1872,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1932,6 +1933,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1883,7 +1885,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1944,7 +1946,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -2129,12 +2131,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -2190,12 +2192,12 @@ static int packet_rcv(struct sk_buff *sk unsigned int snaplen, res; bool is_drop_n_account = false; @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2261,12 +2263,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -2322,12 +2324,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -3385,6 +3387,7 @@ static int packet_create(struct net *net +@@ -3451,6 +3453,7 @@ static int packet_create(struct net *net mutex_init(&po->pg_vec_lock); po->rollover = NULL; po->prot_hook.func = packet_rcv; @@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -4036,6 +4039,16 @@ packet_setsockopt(struct socket *sock, i +@@ -4118,6 +4121,16 @@ packet_setsockopt(struct socket *sock, i packet_sock_flag_set(po, PACKET_SOCK_QDISC_BYPASS, val); return 0; } @@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -4095,6 +4108,13 @@ static int packet_getsockopt(struct sock +@@ -4177,6 +4190,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR_SZ: val = READ_ONCE(po->vnet_hdr_sz); break; diff --git a/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index cc92e20f6..f754705dc 100644 --- a/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/pending-6.6/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski static void rt_fibinfo_free(struct rtable __rcu **rtp) --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c -@@ -2783,6 +2783,7 @@ static const char *const rtn_type_names[ +@@ -2784,6 +2784,7 @@ static const char *const rtn_type_names[ [RTN_THROW] = "THROW", [RTN_NAT] = "NAT", [RTN_XRESOLVE] = "XRESOLVE", diff --git a/target/linux/generic/pending-6.6/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch b/target/linux/generic/pending-6.6/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch index 15d385c5f..3f3d7572e 100644 --- a/target/linux/generic/pending-6.6/768-net-dsa-mv88e6xxx-Request-assisted-learning-on-CPU-port.patch +++ b/target/linux/generic/pending-6.6/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 -@@ -6992,6 +6992,7 @@ static int mv88e6xxx_register_switch(str +@@ -6993,6 +6993,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;