diff --git a/config-6.12 b/config-6.12 index 6c4d16f..c6ed65f 100644 --- a/config-6.12 +++ b/config-6.12 @@ -2683,6 +2683,7 @@ CONFIG_HIGH_RES_TIMERS=y # CONFIG_HISI_HIKEY_USB is not set # CONFIG_HISILICON_ERRATUM_161010101 is not set # CONFIG_HISILICON_ERRATUM_161600802 is not set +# CONFIG_HISILICON_ERRATUM_162100801 is not set # CONFIG_HISI_PCIE_PMU is not set # CONFIG_HISI_PTT is not set # CONFIG_HIST_TRIGGERS_DEBUG is not set diff --git a/hack-6.12/253-ksmbd-config.patch b/hack-6.12/253-ksmbd-config.patch index f67c5ef..540a459 100644 --- a/hack-6.12/253-ksmbd-config.patch +++ b/hack-6.12/253-ksmbd-config.patch @@ -1,6 +1,6 @@ --- a/init/Kconfig +++ b/init/Kconfig -@@ -2034,7 +2034,7 @@ config PADATA +@@ -2043,7 +2043,7 @@ config PADATA bool config ASN1 diff --git a/hack-6.12/259-regmap_dynamic.patch b/hack-6.12/259-regmap_dynamic.patch index bb60726..eec0786 100644 --- a/hack-6.12/259-regmap_dynamic.patch +++ b/hack-6.12/259-regmap_dynamic.patch @@ -140,7 +140,7 @@ Signed-off-by: Felix Fietkau #include #include #include -@@ -3506,3 +3507,5 @@ static int __init regmap_initcall(void) +@@ -3519,3 +3520,5 @@ static int __init regmap_initcall(void) return 0; } postcore_initcall(regmap_initcall); diff --git a/hack-6.12/410-block-fit-partition-parser.patch b/hack-6.12/410-block-fit-partition-parser.patch index baf50b5..1869258 100644 --- a/hack-6.12/410-block-fit-partition-parser.patch +++ b/hack-6.12/410-block-fit-partition-parser.patch @@ -1,6 +1,6 @@ --- a/block/blk.h +++ b/block/blk.h -@@ -558,6 +558,8 @@ void blk_free_ext_minor(unsigned int min +@@ -564,6 +564,8 @@ void blk_free_ext_minor(unsigned int min #define ADDPART_FLAG_NONE 0 #define ADDPART_FLAG_RAID 1 #define ADDPART_FLAG_WHOLEDISK 2 diff --git a/hack-6.12/902-debloat_proc.patch b/hack-6.12/902-debloat_proc.patch index 230285c..a8beee4 100644 --- a/hack-6.12/902-debloat_proc.patch +++ b/hack-6.12/902-debloat_proc.patch @@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau if (!pe) --- a/mm/vmstat.c +++ b/mm/vmstat.c -@@ -2194,10 +2194,12 @@ void __init init_mm_internals(void) +@@ -2195,10 +2195,12 @@ void __init init_mm_internals(void) start_shepherd_timer(); #endif #ifdef CONFIG_PROC_FS diff --git a/hack-6.12/920-device_tree_cmdline.patch b/hack-6.12/920-device_tree_cmdline.patch index d8ab4dc..78e5dcb 100644 --- a/hack-6.12/920-device_tree_cmdline.patch +++ b/hack-6.12/920-device_tree_cmdline.patch @@ -1,6 +1,6 @@ --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -1051,6 +1051,9 @@ int __init early_init_dt_scan_chosen(cha +@@ -1052,6 +1052,9 @@ int __init early_init_dt_scan_chosen(cha p = of_get_flat_dt_prop(node, "bootargs", &l); if (p != NULL && l > 0) strscpy(cmdline, p, min(l, COMMAND_LINE_SIZE)); diff --git a/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index a114698..52c3f5c 100644 --- a/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -76,7 +76,7 @@ Signed-off-by: Jonas Gorski static inline const char *rtn_type(char *buf, size_t len, unsigned int t) --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c -@@ -181,6 +181,7 @@ static int ipmr_rule_action(struct fib_r +@@ -191,6 +191,7 @@ static int ipmr_rule_action(struct fib_r case FR_ACT_UNREACHABLE: return -ENETUNREACH; case FR_ACT_PROHIBIT: @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski tb_id = fib_rule_get_table(rule, arg); --- a/net/ipv6/ip6mr.c +++ b/net/ipv6/ip6mr.c -@@ -170,6 +170,8 @@ static int ip6mr_rule_action(struct fib_ +@@ -180,6 +180,8 @@ static int ip6mr_rule_action(struct fib_ return -ENETUNREACH; case FR_ACT_PROHIBIT: return -EACCES; @@ -138,7 +138,7 @@ Signed-off-by: Jonas Gorski static const struct rt6_info ip6_blk_hole_entry_template = { .dst = { .__rcuref = RCUREF_INIT(1), -@@ -1048,6 +1062,7 @@ static const int fib6_prop[RTN_MAX + 1] +@@ -1051,6 +1065,7 @@ static const int fib6_prop[RTN_MAX + 1] [RTN_BLACKHOLE] = -EINVAL, [RTN_UNREACHABLE] = -EHOSTUNREACH, [RTN_PROHIBIT] = -EACCES, @@ -146,7 +146,7 @@ Signed-off-by: Jonas Gorski [RTN_THROW] = -EAGAIN, [RTN_NAT] = -EINVAL, [RTN_XRESOLVE] = -EINVAL, -@@ -1083,6 +1098,10 @@ static void ip6_rt_init_dst_reject(struc +@@ -1086,6 +1101,10 @@ static void ip6_rt_init_dst_reject(struc rt->dst.output = ip6_pkt_prohibit_out; rt->dst.input = ip6_pkt_prohibit; break; @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -6291,6 +6322,8 @@ static int ip6_route_dev_notify(struct n +@@ -6306,6 +6337,8 @@ static int ip6_route_dev_notify(struct n #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.ip6_prohibit_entry->dst.dev = dev; net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.dev = dev; net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); #endif -@@ -6302,6 +6335,7 @@ static int ip6_route_dev_notify(struct n +@@ -6317,6 +6350,7 @@ static int ip6_route_dev_notify(struct n in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); #ifdef CONFIG_IPV6_MULTIPLE_TABLES in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); #endif } -@@ -6497,6 +6531,8 @@ static int __net_init ip6_route_net_init +@@ -6512,6 +6546,8 @@ static int __net_init ip6_route_net_init #ifdef CONFIG_IPV6_MULTIPLE_TABLES net->ipv6.fib6_has_custom_rules = false; @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, sizeof(*net->ipv6.ip6_prohibit_entry), GFP_KERNEL); -@@ -6507,11 +6543,21 @@ static int __net_init ip6_route_net_init +@@ -6522,11 +6558,21 @@ static int __net_init ip6_route_net_init ip6_template_metrics, true); INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->dst.rt_uncached); @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, ip6_template_metrics, true); -@@ -6538,6 +6584,8 @@ out: +@@ -6553,6 +6599,8 @@ out: return ret; #ifdef CONFIG_IPV6_MULTIPLE_TABLES @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski out_ip6_prohibit_entry: kfree(net->ipv6.ip6_prohibit_entry); out_ip6_null_entry: -@@ -6557,6 +6605,7 @@ static void __net_exit ip6_route_net_exi +@@ -6572,6 +6620,7 @@ static void __net_exit ip6_route_net_exi kfree(net->ipv6.ip6_null_entry); #ifdef CONFIG_IPV6_MULTIPLE_TABLES kfree(net->ipv6.ip6_prohibit_entry); @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski kfree(net->ipv6.ip6_blk_hole_entry); #endif dst_entries_destroy(&net->ipv6.ip6_dst_ops); -@@ -6640,6 +6689,9 @@ void __init ip6_route_init_special_entri +@@ -6655,6 +6704,9 @@ void __init ip6_route_init_special_entri init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); diff --git a/pending-6.12/920-mangle_bootargs.patch b/pending-6.12/920-mangle_bootargs.patch index 336dc4f..a42aba0 100644 --- a/pending-6.12/920-mangle_bootargs.patch +++ b/pending-6.12/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1859,6 +1859,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS +@@ -1868,6 +1868,15 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS config ARCH_HAS_MEMBARRIER_SYNC_CORE bool