mirror of
https://git.proxmox.com/git/pve-kernel
synced 2025-04-28 15:20:02 +00:00
rebase patches on top of Ubuntu-6.11.0-13.14
(generated with debian/scripts/import-upstream-tag) Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
parent
b50ca75ce2
commit
a872f278b9
@ -33,7 +33,7 @@ Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
|
|||||||
1 file changed, 9 insertions(+), 5 deletions(-)
|
1 file changed, 9 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
|
||||||
index ffaaca0978cbc..a89436d481f07 100644
|
index ffaaca0978cb..a89436d481f0 100644
|
||||||
--- a/drivers/pci/pci.c
|
--- a/drivers/pci/pci.c
|
||||||
+++ b/drivers/pci/pci.c
|
+++ b/drivers/pci/pci.c
|
||||||
@@ -1067,8 +1067,15 @@ static void pci_std_enable_acs(struct pci_dev *dev, struct pci_acs *caps)
|
@@ -1067,8 +1067,15 @@ static void pci_std_enable_acs(struct pci_dev *dev, struct pci_acs *caps)
|
||||||
|
@ -14,7 +14,7 @@ This reverts commit b310f5f58c83756fc164f7d391d76f0df9cc65c3.
|
|||||||
1 file changed, 27 deletions(-)
|
1 file changed, 27 deletions(-)
|
||||||
|
|
||||||
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
|
||||||
index 34c8b02ca7878..a27cbc22148fa 100644
|
index 34c8b02ca787..a27cbc22148f 100644
|
||||||
--- a/drivers/iommu/intel/iommu.c
|
--- a/drivers/iommu/intel/iommu.c
|
||||||
+++ b/drivers/iommu/intel/iommu.c
|
+++ b/drivers/iommu/intel/iommu.c
|
||||||
@@ -4766,33 +4766,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
@@ -4766,33 +4766,6 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1632, quirk_iommu_igfx);
|
||||||
|
Loading…
Reference in New Issue
Block a user