diff --git a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index cf367c1..bd2e87c 100644 --- a/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -55,10 +55,10 @@ Signed-off-by: Thomas Lamprecht 2 files changed, 111 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 0a6c12e3fd4a..51e9b9efdd34 100644 +index 21575acb6a20..fad011895cde 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3906,6 +3906,15 @@ +@@ -3908,6 +3908,15 @@ Also, it enforces the PCI Local Bus spec rule that those bits should be 0 in system reset events (useful for kexec/kdump cases). @@ -75,7 +75,7 @@ index 0a6c12e3fd4a..51e9b9efdd34 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 993eff5d2e39..e76bfd054dba 100644 +index 8e352736734f..0d5b4fd01aae 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -193,6 +193,106 @@ static int __init pci_apply_final_quirks(void) @@ -185,7 +185,7 @@ index 993eff5d2e39..e76bfd054dba 100644 /* * Decoding should be disabled for a PCI device during BAR sizing to avoid * conflict. But doing so may cause problems on host bridge and perhaps other -@@ -4912,6 +5012,8 @@ static const struct pci_dev_acs_enabled { +@@ -4915,6 +5015,8 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_CAVIUM, 0xA060, pci_quirk_mf_endpoint_acs }, /* APM X-Gene */ { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs }, diff --git a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index d821b32..6ef040e 100644 --- a/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 91f53eeb0e79..c0b35ed33b30 100644 +index 33dc2a3ff7d7..b797bc32a088 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10518,7 +10518,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10524,7 +10524,7 @@ static void netdev_wait_allrefs(struct net_device *dev) if (refcnt != 1 && time_after(jiffies, warning_time + netdev_unregister_timeout_secs * HZ)) { diff --git a/patches/kernel/0009-do-not-generate-split-BTF-type-info-per-default.patch b/patches/kernel/0008-do-not-generate-split-BTF-type-info-per-default.patch similarity index 100% rename from patches/kernel/0009-do-not-generate-split-BTF-type-info-per-default.patch rename to patches/kernel/0008-do-not-generate-split-BTF-type-info-per-default.patch diff --git a/patches/kernel/0010-blk-cgroup-always-terminate-io.stat-lines.patch b/patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch similarity index 100% rename from patches/kernel/0010-blk-cgroup-always-terminate-io.stat-lines.patch rename to patches/kernel/0009-blk-cgroup-always-terminate-io.stat-lines.patch diff --git a/patches/kernel/0011-vfs-fix.patch b/patches/kernel/0011-vfs-fix.patch deleted file mode 100644 index dc95794..0000000 --- a/patches/kernel/0011-vfs-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jamie Hill-Daniel -Date: Tue, 18 Jan 2022 08:06:04 +0100 -Subject: vfs: fs_context: fix up param length parsing in legacy_parse_param - -commit 722d94847de29310e8aa03fcbdb41fc92c521756 upstream. - -The "PAGE_SIZE - 2 - size" calculation in legacy_parse_param() is an -unsigned type so a large value of "size" results in a high positive -value instead of a negative value as expected. Fix this by getting rid -of the subtraction. - -Signed-off-by: Jamie Hill-Daniel -Signed-off-by: William Liu -Tested-by: Salvatore Bonaccorso -Tested-by: Thadeu Lima de Souza Cascardo -Acked-by: Dan Carpenter -Acked-by: Al Viro -Signed-off-by: Linus Torvalds -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Thomas Lamprecht ---- - fs/fs_context.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/fs_context.c b/fs/fs_context.c -index b7e43a780a625..24ce12f0db32e 100644 ---- a/fs/fs_context.c -+++ b/fs/fs_context.c -@@ -548,7 +548,7 @@ static int legacy_parse_param(struct fs_context *fc, struct fs_parameter *param) - param->key); - } - -- if (len > PAGE_SIZE - 2 - size) -+ if (size + len + 2 > PAGE_SIZE) - return invalf(fc, "VFS: Legacy: Cumulative options too large"); - if (strchr(param->key, ',') || - (param->type == fs_value_is_string &&