298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 6.6 to 6.6.14 (#11827)

Browse Source 
Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com>
This commit is contained in:
aakkll 2024-01-26 12:42:34 +08:00 committed by GitHub
parent 14e928eeaf
commit 781ce8d148
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.6
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.6 = .13 LINUX_VERSION-6.6 = .14
LINUX_KERNEL_HASH-6.6.13 = 88b89e7dd41ead4e3ab1e411c8bb8d592575acf815cf1df3c0dc57e2e882c0bc LINUX_KERNEL_HASH-6.6.14 = fbe96b2db3f962cd2a96a849d554300e7a4555995160082d4f323c2a1dfa1584

2
target/linux/generic/hack-6.6/952-add-net-conntrack-events-support-multiple-registrant.patch
View File

@ -94,7 +94,7 @@ Signed-off-by: Zhi Chen <zhichen@codeaurora.org>
#ifdef CONFIG_NF_CONNTRACK_EVENTS #ifdef CONFIG_NF_CONNTRACK_EVENTS
--- a/include/net/netns/conntrack.h --- a/include/net/netns/conntrack.h
+++ b/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; u8 sysctl_checksum;
struct ip_conntrack_stat __percpu *stat; struct ip_conntrack_stat __percpu *stat;

2
target/linux/generic/hack-6.6/999-revert-6.5-deprecated-API.patch
View File

@ -53,7 +53,7 @@
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
if (!thermal_class) if (!thermal_class)
@@ -1393,6 +1393,17 @@ free_tz: @@ -1392,6 +1392,17 @@ free_tz:
} }
EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips); EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);

10
target/linux/generic/pending-6.6/613-netfilter_optional_tcp_window_check.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
/* /*
* Get the required data from the packet. * 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 && IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED &&
timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK])
timeout = timeouts[TCP_CONNTRACK_UNACK]; timeout = timeouts[TCP_CONNTRACK_UNACK];
@ -34,7 +34,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS])
timeout = timeouts[TCP_CONNTRACK_RETRANS]; timeout = timeouts[TCP_CONNTRACK_RETRANS];
else 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; tn->tcp_be_liberal = 0;
@ -46,7 +46,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
--- a/net/netfilter/nf_conntrack_standalone.c --- a/net/netfilter/nf_conntrack_standalone.c
+++ b/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 #endif
NF_SYSCTL_CT_PROTO_TCP_LOOSE, NF_SYSCTL_CT_PROTO_TCP_LOOSE,
NF_SYSCTL_CT_PROTO_TCP_LIBERAL, NF_SYSCTL_CT_PROTO_TCP_LIBERAL,
@ -54,7 +54,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST, NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST,
NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS, NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS,
NF_SYSCTL_CT_PROTO_TIMEOUT_UDP, 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, .extra1 = SYSCTL_ZERO,
.extra2 = SYSCTL_ONE, .extra2 = SYSCTL_ONE,
}, },
@ -69,7 +69,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com>
[NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = { [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = {
.procname = "nf_conntrack_tcp_ignore_invalid_rst", .procname = "nf_conntrack_tcp_ignore_invalid_rst",
.maxlen = sizeof(u8), .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(LOOSE, &tn->tcp_loose);
XASSIGN(LIBERAL, &tn->tcp_be_liberal); XASSIGN(LIBERAL, &tn->tcp_be_liberal);

2
target/linux/generic/pending-6.6/701-netfilter-nf_tables-ignore-EOPNOTSUPP-on-flowtable-d.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/netfilter/nf_tables_api.c --- a/net/netfilter/nf_tables_api.c
+++ b/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, err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev, hook->ops.dev,
FLOW_BLOCK_BIND); FLOW_BLOCK_BIND);

2
target/linux/x86/patches-6.6/992-enable-intel-guc.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c
+++ b/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; return;
/* Don't enable GuC/HuC on pre-Gen12 */ /* Don't enable GuC/HuC on pre-Gen12 */

6
target/linux/x86/patches-6.6/993-bnx2x_warpcore_8727_2_5g_sgmii_txfault.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/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_ethernet_queues;
uint num_cnic_queues; uint num_cnic_queues;
int disable_tpa; int disable_tpa;
@ -182,7 +182,7 @@
/* Clean trail, interrupt corrects the leds */ /* Clean trail, interrupt corrects the leds */
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/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_param(disable_tpa, int, 0444);
MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature"); MODULE_PARM_DESC(disable_tpa, " Disable the TPA (LRO) feature");
@ -193,7 +193,7 @@
static int int_mode; static int int_mode;
module_param(int_mode, int, 0444); module_param(int_mode, int, 0444);
MODULE_PARM_DESC(int_mode, " Force interrupt mode other than MSI-X " 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)) if (BP_NOMCP(bp) && (func == 0))
dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n"); dev_err(&bp->pdev->dev, "MCP disabled, must load devices in order!\n");

2
target/linux/x86/patches-6.6/996-intel-igc-i225-i226-disable-eee.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/intel/igc/igc_main.c --- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/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"); netdev_err(dev, "Error on hardware initialization\n");
/* Re-establish EEE setting */ /* Re-establish EEE setting */

2
target/linux/x86/patches-6.6/999-Add-xtsproxy-Crypto-API-module.patch
View File

@ -15,7 +15,7 @@ when FPU is not usable.
--- a/crypto/Kconfig --- a/crypto/Kconfig
+++ b/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 See https://eprint.iacr.org/2021/1441