From a30f30033358dd4e3281bc888635eff2bfb7d1e7 Mon Sep 17 00:00:00 2001 From: Beginner <70857188+Beginner-Go@users.noreply.github.com> Date: Sun, 17 Mar 2024 18:20:51 +0800 Subject: [PATCH] kernel: bump 6.6 to 6.6.22 (#12003) --- include/kernel-6.6 | 4 ++-- ...k-events-support-multiple-registrant.patch | 2 +- ...-remove-userhdr-from-struct-genl_inf.patch | 8 +++---- .../999-revert-6.5-deprecated-API.patch | 24 +++++++++---------- ...-netfilter_optional_tcp_window_check.patch | 6 ++--- ...ng-with-source-address-failed-policy.patch | 14 +++++------ target/linux/x86/config-6.6 | 1 + 7 files changed, 30 insertions(+), 29 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index f4fb9269c..b30a51434 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .21 -LINUX_KERNEL_HASH-6.6.21 = ee0b430148da94d2b13608b8d80b007b7d281dc90e3f19b63cf9a9943810e457 +LINUX_VERSION-6.6 = .22 +LINUX_KERNEL_HASH-6.6.22 = 23e3e7b56407250f5411bdab95763d0bc4e3a19dfa431d951df7eacabd61a2f4 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 fe32c1293..ddfdf1eaa 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 @@ -94,7 +94,7 @@ Signed-off-by: Zhi Chen #ifdef CONFIG_NF_CONNTRACK_EVENTS --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h -@@ -104,6 +104,9 @@ struct netns_ct { +@@ -105,6 +105,9 @@ struct netns_ct { u8 sysctl_checksum; struct ip_conntrack_stat __percpu *stat; diff --git a/target/linux/generic/hack-6.6/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch b/target/linux/generic/hack-6.6/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch index 6d4190c88..2815ba78f 100644 --- a/target/linux/generic/hack-6.6/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch +++ b/target/linux/generic/hack-6.6/998-revert-genetlink-remove-userhdr-from-struct-genl_inf.patch @@ -48,7 +48,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e. retcode = drbd_adm_prepare(&adm_ctx, skb, info, DRBD_ADM_NEED_RESOURCE); --- a/include/net/genetlink.h +++ b/include/net/genetlink.h -@@ -96,6 +96,7 @@ struct genl_family { +@@ -98,6 +98,7 @@ struct genl_family { * @family: generic netlink family * @nlhdr: netlink message header * @genlhdr: generic netlink message header @@ -56,7 +56,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e. * @attrs: netlink attributes * @_net: network namespace * @user_ptr: user pointers -@@ -107,6 +108,7 @@ struct genl_info { +@@ -109,6 +110,7 @@ struct genl_info { const struct genl_family *family; const struct nlmsghdr * nlhdr; struct genlmsghdr * genlhdr; @@ -64,7 +64,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e. struct nlattr ** attrs; possible_net_t _net; void * user_ptr[2]; -@@ -123,11 +125,6 @@ static inline void genl_info_net_set(str +@@ -125,11 +127,6 @@ static inline void genl_info_net_set(str write_pnet(&info->_net, net); } @@ -268,7 +268,7 @@ This reverts commit bffcc6882a1bb2be8c9420184966f4c2c822078e. struct dp_meter *old_meter; --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c -@@ -1294,7 +1294,7 @@ static int tipc_nl_compat_recv(struct sk +@@ -1295,7 +1295,7 @@ static int tipc_nl_compat_recv(struct sk struct tipc_nl_compat_msg msg; struct nlmsghdr *req_nlh; struct nlmsghdr *rep_nlh; diff --git a/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch b/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch index 921275e55..30f9dd753 100644 --- a/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch +++ b/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch @@ -1,6 +1,6 @@ --- a/include/linux/device/class.h +++ b/include/linux/device/class.h -@@ -51,6 +51,7 @@ +@@ -51,6 +51,7 @@ struct fwnode_handle; */ struct class { const char *name; @@ -10,7 +10,7 @@ const struct attribute_group **dev_groups; --- a/include/linux/prandom.h +++ b/include/linux/prandom.h -@@ -24,6 +24,12 @@ +@@ -24,6 +24,12 @@ void prandom_seed_full_state(struct rnd_ #define prandom_init_once(pcpu_state) \ DO_ONCE(prandom_seed_full_state, (pcpu_state)) @@ -25,7 +25,7 @@ */ --- a/include/linux/u64_stats_sync.h +++ b/include/linux/u64_stats_sync.h -@@ -213,4 +213,16 @@ +@@ -213,4 +213,16 @@ static inline bool u64_stats_fetch_retry return __u64_stats_fetch_retry(syncp, start); } @@ -44,7 +44,7 @@ #endif /* _LINUX_U64_STATS_SYNC_H */ --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c -@@ -1270,7 +1270,7 @@ +@@ -1273,7 +1273,7 @@ thermal_zone_device_register_with_trips( return ERR_PTR(-EINVAL); } @@ -53,11 +53,10 @@ return ERR_PTR(-EINVAL); if (!thermal_class) -@@ -1392,6 +1392,17 @@ - return ERR_PTR(result); +@@ -1395,6 +1395,17 @@ free_tz: } EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips); -+ + +struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask, + void *devdata, struct thermal_zone_device_ops *ops, + const struct thermal_zone_params *tzp, int passive_delay, @@ -68,12 +67,13 @@ + passive_delay, polling_delay); +} +EXPORT_SYMBOL_GPL(thermal_zone_device_register); - ++ struct thermal_zone_device *thermal_tripless_zone_device_register( const char *type, + void *devdata, --- a/drivers/thermal/thermal_trip.c +++ b/drivers/thermal/thermal_trip.c -@@ -116,11 +116,29 @@ +@@ -113,11 +113,29 @@ void __thermal_zone_set_trips(struct the int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id, struct thermal_trip *trip) { @@ -108,7 +108,7 @@ --- a/include/linux/thermal.h +++ b/include/linux/thermal.h -@@ -76,7 +76,11 @@ +@@ -76,7 +76,11 @@ struct thermal_zone_device_ops { int (*set_trips) (struct thermal_zone_device *, int, int); int (*change_mode) (struct thermal_zone_device *, enum thermal_device_mode); @@ -120,7 +120,7 @@ int (*set_trip_hyst) (struct thermal_zone_device *, int, int); int (*get_crit_temp) (struct thermal_zone_device *, int *); int (*set_emul_temp) (struct thermal_zone_device *, int); -@@ -300,6 +304,14 @@ +@@ -302,6 +306,14 @@ int thermal_acpi_critical_trip_temp(stru #endif #ifdef CONFIG_THERMAL @@ -135,7 +135,7 @@ struct thermal_zone_device *thermal_zone_device_register_with_trips( const char *type, struct thermal_trip *trips, -@@ -356,6 +368,15 @@ +@@ -358,6 +370,15 @@ int thermal_zone_device_enable(struct th int thermal_zone_device_disable(struct thermal_zone_device *tz); void thermal_zone_device_critical(struct thermal_zone_device *tz); #else diff --git a/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch b/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch index c28fe934f..da74ac68b 100644 --- a/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch +++ b/target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch @@ -46,7 +46,7 @@ Signed-off-by: Christian 'Ansuel' Marangi --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -631,6 +631,7 @@ enum nf_ct_sysctl_index { +@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index { #endif NF_SYSCTL_CT_PROTO_TCP_LOOSE, NF_SYSCTL_CT_PROTO_TCP_LIBERAL, @@ -54,7 +54,7 @@ Signed-off-by: Christian 'Ansuel' Marangi NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST, NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS, NF_SYSCTL_CT_PROTO_TIMEOUT_UDP, -@@ -838,6 +839,14 @@ static struct ctl_table nf_ct_sysctl_tab +@@ -840,6 +841,14 @@ static struct ctl_table nf_ct_sysctl_tab .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, @@ -69,7 +69,7 @@ Signed-off-by: Christian 'Ansuel' Marangi [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = { .procname = "nf_conntrack_tcp_ignore_invalid_rst", .maxlen = sizeof(u8), -@@ -1048,6 +1057,7 @@ static void nf_conntrack_standalone_init +@@ -1050,6 +1059,7 @@ static void nf_conntrack_standalone_init XASSIGN(LOOSE, &tn->tcp_loose); XASSIGN(LIBERAL, &tn->tcp_be_liberal); 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 e09decca5..f3b5ccf2c 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 @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski cfg->fc_flags |= RTF_REJECT; if (rtm->rtm_type == RTN_LOCAL) -@@ -6284,6 +6315,8 @@ static int ip6_route_dev_notify(struct n +@@ -6277,6 +6308,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 -@@ -6295,6 +6328,7 @@ static int ip6_route_dev_notify(struct n +@@ -6288,6 +6321,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 } -@@ -6495,6 +6529,8 @@ static int __net_init ip6_route_net_init +@@ -6488,6 +6522,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); -@@ -6505,11 +6541,21 @@ static int __net_init ip6_route_net_init +@@ -6498,11 +6534,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); -@@ -6536,6 +6582,8 @@ out: +@@ -6529,6 +6575,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: -@@ -6555,6 +6603,7 @@ static void __net_exit ip6_route_net_exi +@@ -6548,6 +6596,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); -@@ -6638,6 +6687,9 @@ void __init ip6_route_init_special_entri +@@ -6631,6 +6680,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/target/linux/x86/config-6.6 b/target/linux/x86/config-6.6 index b52a35aca..89852a8d4 100644 --- a/target/linux/x86/config-6.6 +++ b/target/linux/x86/config-6.6 @@ -295,6 +295,7 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_INTEL=y # CONFIG_MICROCODE_LATE_LOADING is not set CONFIG_MIGRATION=y +CONFIG_MITIGATION_RFDS=y # CONFIG_MK6 is not set # CONFIG_MK7 is not set # CONFIG_MK8 is not set