From 781ce8d148116c8411fd4ed82f74715878304538 Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Fri, 26 Jan 2024 12:42:34 +0800 Subject: [PATCH] kernel: bump 6.6 to 6.6.14 (#11827) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-6.6 | 4 ++-- ...-conntrack-events-support-multiple-registrant.patch | 2 +- .../hack-6.6/999-revert-6.5-deprecated-API.patch | 2 +- .../613-netfilter_optional_tcp_window_check.patch | 10 +++++----- ...er-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch | 2 +- .../linux/x86/patches-6.6/992-enable-intel-guc.patch | 2 +- .../993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch | 6 +++--- .../996-intel-igc-i225-i226-disable-eee.patch | 2 +- .../999-Add-xtsproxy-Crypto-API-module.patch | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/kernel-6.6 b/include/kernel-6.6 index 0924e4f37..3036dc4b3 100644 --- a/include/kernel-6.6 +++ b/include/kernel-6.6 @@ -1,2 +1,2 @@ -LINUX_VERSION-6.6 = .13 -LINUX_KERNEL_HASH-6.6.13 = 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc +LINUX_VERSION-6.6 = .14 +LINUX_KERNEL_HASH-6.6.14 = fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584 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 6a8de09bb..b9fbe6877 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/999-revert-6.5-deprecated-API.patch b/target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch index abde48818..25a6f742c 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 @@ -53,7 +53,7 @@ return ERR_PTR(-EINVAL); if (!thermal_class) -@@ -1393,6 +1393,17 @@ free_tz: +@@ -1392,6 +1392,17 @@ free_tz: } EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips); 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 46f8adf14..e6c3b2a02 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 @@ -25,7 +25,7 @@ Signed-off-by: Christian 'Ansuel' Marangi /* * Get the required data from the packet. */ -@@ -1257,7 +1261,7 @@ int nf_conntrack_tcp_packet(struct nf_co +@@ -1283,7 +1287,7 @@ int nf_conntrack_tcp_packet(struct nf_co IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeout = timeouts[TCP_CONNTRACK_UNACK]; @@ -34,7 +34,7 @@ Signed-off-by: Christian 'Ansuel' Marangi timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeout = timeouts[TCP_CONNTRACK_RETRANS]; else -@@ -1573,6 +1577,9 @@ void nf_conntrack_tcp_init_net(struct ne +@@ -1599,6 +1603,9 @@ void nf_conntrack_tcp_init_net(struct ne */ tn->tcp_be_liberal = 0; @@ -46,7 +46,7 @@ Signed-off-by: Christian 'Ansuel' Marangi --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -637,6 +637,7 @@ enum nf_ct_sysctl_index { +@@ -631,6 +631,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, -@@ -844,6 +845,14 @@ static struct ctl_table nf_ct_sysctl_tab +@@ -838,6 +839,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), -@@ -1054,6 +1063,7 @@ static void nf_conntrack_standalone_init +@@ -1048,6 +1057,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/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch index a8139dc2e..1cfc4b7ca 100644 --- a/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch +++ b/target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c -@@ -8177,7 +8177,7 @@ static int nft_register_flowtable_net_ho +@@ -8202,7 +8202,7 @@ static int nft_register_flowtable_net_ho err = flowtable->data.type->setup(&flowtable->data, hook->ops.dev, FLOW_BLOCK_BIND); diff --git a/target/linux/x86/patches-6.6/992-enable-intel-guc.patch b/target/linux/x86/patches-6.6/992-enable-intel-guc.patch index 5ee66b5e8..f7e3bfd8f 100644 --- a/target/linux/x86/patches-6.6/992-enable-intel-guc.patch +++ b/target/linux/x86/patches-6.6/992-enable-intel-guc.patch @@ -1,6 +1,6 @@ --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c -@@ -26,10 +26,14 @@ static void uc_expand_default_options(st +@@ -31,10 +31,14 @@ static void uc_expand_default_options(st return; /* Don't enable GuC/HuC on pre-Gen12 */ diff --git a/target/linux/x86/patches-6.6/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch b/target/linux/x86/patches-6.6/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch index a41f45a52..96f6b11f9 100644 --- a/target/linux/x86/patches-6.6/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch +++ b/target/linux/x86/patches-6.6/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h -@@ -1592,6 +1592,7 @@ struct bnx2x { +@@ -1593,6 +1593,7 @@ struct bnx2x { uint num_ethernet_queues; uint num_cnic_queues; int disable_tpa; @@ -182,7 +182,7 @@ /* Clean trail, interrupt corrects the leds */ --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c -@@ -113,6 +113,10 @@ static int disable_tpa; +@@ -112,6 +112,10 @@ static int disable_tpa; module_param(disable_tpa, int, 0444); MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature"); @@ -193,7 +193,7 @@ static int int_mode; module_param(int_mode, int, 0444); MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X " -@@ -12342,6 +12346,8 @@ static int bnx2x_init_bp(struct bnx2x *b +@@ -12344,6 +12348,8 @@ static int bnx2x_init_bp(struct bnx2x *b if (BP_NOMCP(bp) && (func == 0)) dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n"); diff --git a/target/linux/x86/patches-6.6/996-intel-igc-i225-i226-disable-eee.patch b/target/linux/x86/patches-6.6/996-intel-igc-i225-i226-disable-eee.patch index 29d171d01..3f95aee0f 100644 --- a/target/linux/x86/patches-6.6/996-intel-igc-i225-i226-disable-eee.patch +++ b/target/linux/x86/patches-6.6/996-intel-igc-i225-i226-disable-eee.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c -@@ -109,7 +109,7 @@ void igc_reset(struct igc_adapter *adapt +@@ -108,7 +108,7 @@ void igc_reset(struct igc_adapter *adapt netdev_err(dev, "Error on hardware initialization\n"); /* Re-establish EEE setting */ diff --git a/target/linux/x86/patches-6.6/999-Add-xtsproxy-Crypto-API-module.patch b/target/linux/x86/patches-6.6/999-Add-xtsproxy-Crypto-API-module.patch index 53b555f3a..d75818164 100644 --- a/target/linux/x86/patches-6.6/999-Add-xtsproxy-Crypto-API-module.patch +++ b/target/linux/x86/patches-6.6/999-Add-xtsproxy-Crypto-API-module.patch @@ -15,7 +15,7 @@ when FPU is not usable. --- a/crypto/Kconfig +++ b/crypto/Kconfig -@@ -704,6 +704,16 @@ config CRYPTO_HCTR2 +@@ -709,6 +709,16 @@ config CRYPTO_HCTR2 See https://eprint.iacr.org/2021/1441