aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.15
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-04-14 09:28:11 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-16 14:02:13 +0200
commitde7535a6ac4467dbc2981fbd5b0aa785d286c9a0 (patch)
treee445551904ef73d74f66d689d0ea896bfe06e451 /target/linux/generic/hack-5.15
parent0085dd6cb5e3c57dd22994c22ce893575711b6f7 (diff)
downloadupstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.tar.gz
upstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.tar.bz2
upstream-de7535a6ac4467dbc2981fbd5b0aa785d286c9a0.zip
kernel: bump 5.15 to 5.15.34
Deleted (upstreamed): generic/pending-5.15/850-0003-PCI-aardvark-Fix-support-for-MSI-interrupts.patch [1] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.34&id=60eabd66d17fa2cbc31f670b2f201f0bc54090a2 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-5.15')
-rw-r--r--target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch b/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
index a003fc2944..134e2100c8 100644
--- a/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
+++ b/target/linux/generic/hack-5.15/661-kernel-ct-size-the-hashtable-more-adequately.patch
@@ -14,7 +14,7 @@ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
-@@ -2676,7 +2676,7 @@ int nf_conntrack_init_start(void)
+@@ -2727,7 +2727,7 @@ int nf_conntrack_init_start(void)
if (!nf_conntrack_htable_size) {
nf_conntrack_htable_size