From 880344a2e20011c93f3dd30bba1203882d0f5886 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Mon, 8 Apr 2024 17:47:21 +0200 Subject: [PATCH] rebase patches on top of Ubuntu-6.8.0-23.23 (generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht --- ...Enable-overrides-for-missing-ACS-capabilities-4..patch | 6 +++--- ...core-downgrade-unregister_netdevice-refcount-lea.patch | 4 ++-- ...w-opt-in-to-allow-pass-through-on-broken-hardwar.patch | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index a099423..fbff6bb 100644 --- a/patches/kernel/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/kernel/0004-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 a413dd5cf488..89d1b030e1d5 100644 +index cfff5d4df6a0..21b6d7871493 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4401,6 +4401,15 @@ +@@ -4399,6 +4399,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 a413dd5cf488..89d1b030e1d5 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 17e43aa28774..1f4202c091bb 100644 +index ce469d84ebae..4f163ef55e7b 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -287,6 +287,106 @@ static int __init pci_apply_final_quirks(void) diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch index 50a1bbe..1d440bf 100644 --- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch +++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch @@ -14,10 +14,10 @@ Signed-off-by: Fabian Grünbichler 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/dev.c b/net/core/dev.c -index 76e6438f4858..3686fc45c557 100644 +index c9b8412f1c9d..67a9b4c1a511 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -10461,7 +10461,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) +@@ -10464,7 +10464,7 @@ static struct net_device *netdev_wait_allrefs_any(struct list_head *list) if (time_after(jiffies, warning_time + READ_ONCE(netdev_unregister_timeout_secs) * HZ)) { list_for_each_entry(dev, list, todo_list) { diff --git a/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch b/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch index e73292f..9fee46b 100644 --- a/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch +++ b/patches/kernel/0009-allow-opt-in-to-allow-pass-through-on-broken-hardwar.patch @@ -11,10 +11,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c -index a788062820df..4020c5336369 100644 +index 8a1471f794cb..fa9c6e056f1b 100644 --- a/drivers/iommu/intel/iommu.c +++ b/drivers/iommu/intel/iommu.c -@@ -159,6 +159,7 @@ static int dmar_map_gfx = 1; +@@ -234,6 +234,7 @@ static int dmar_map_gfx = 1; static int dmar_map_ipu = 1; static int intel_iommu_superpage = 1; static int iommu_identity_mapping; @@ -22,7 +22,7 @@ index a788062820df..4020c5336369 100644 static int iommu_skip_te_disable; #define IDENTMAP_GFX 2 -@@ -221,6 +222,9 @@ static int __init intel_iommu_setup(char *str) +@@ -296,6 +297,9 @@ static int __init intel_iommu_setup(char *str) } else if (!strncmp(str, "tboot_noforce", 13)) { pr_info("Intel-IOMMU: not forcing on after tboot. This could expose security risk for tboot\n"); intel_iommu_tboot_noforce = 1; @@ -32,7 +32,7 @@ index a788062820df..4020c5336369 100644 } else { pr_notice("Unknown option - '%s'\n", str); } -@@ -2395,7 +2399,7 @@ static bool device_rmrr_is_relaxable(struct device *dev) +@@ -2470,7 +2474,7 @@ static bool device_rmrr_is_relaxable(struct device *dev) return false; pdev = to_pci_dev(dev);