Skip to content

Commit

Permalink
kernel: Linux 6.12.2
Browse files Browse the repository at this point in the history 
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/log/?h=v6.12.2

Signed-off-by: Marty Jones <[email protected]>
  • Loading branch information
@mj22226
mj22226 committed Dec 5, 2024
1 parent 27dd8e3 commit f92fa9e
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.12
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.12 = .1
LINUX_KERNEL_HASH-6.12.1 = 0193b1d86dd372ec891bae799f6da20deef16fc199f30080a4ea9de8cef0c619
LINUX_VERSION-6.12 = .2
LINUX_KERNEL_HASH-6.12.2 = bb1e0710c73e877b1f3005be7301734903636be8ef1700d3b12106e8f3403d8b
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.12/253-ksmbd-config.patch
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.12/410-block-fit-partition-parser.patch
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.12/920-device_tree_cmdline.patch
View file
Original file line number Diff line number Diff line change
@@ -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));
Expand Down
22 changes: 11 additions & 11 deletions ...nux/generic/pending-6.12/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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:
Expand All @@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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;
Expand Down Expand Up @@ -138,15 +138,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
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,
+ [RTN_POLICY_FAILED] = -EACCES,
[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;
Expand Down Expand Up @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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);
Expand All @@ -194,15 +194,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
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);
+ in6_dev_put_clear(&net->ipv6.ip6_policy_failed_entry->rt6i_idev);
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;
Expand All @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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);

Expand All @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <[email protected]>
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
Expand All @@ -243,15 +243,15 @@ Signed-off-by: Jonas Gorski <[email protected]>
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);
+ kfree(net->ipv6.ip6_policy_failed_entry);
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);
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/pending-6.12/920-mangle_bootargs.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <[email protected]>

--- 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

Expand Down

0 comments on commit f92fa9e

Please sign in to comment.