rebase patches on top of Ubuntu-5.4.0-95.107

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

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 3d49e41c9379e57ab9e70666c56a1595e24d0c02..6c776276d9c57f53283eb9feb6b86a95f652a93b 100644 (file)
--- 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,7 +55,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 111 insertions(+)
 
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index 623eed9d3009..cc43987a3238 100644
+index 66d570dde754..c2c522ac579a 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -3447,6 +3447,15 @@
@@ -75,7 +75,7 @@ index 623eed9d3009..cc43987a3238 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 76f8ecd4e3f0..de76601eb079 100644
+index 4bb0cae64a35..5f16701fb23d 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 76f8ecd4e3f0..de76601eb079 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
-@@ -4944,6 +5044,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4945,6 +5045,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-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
index a8b5f35d671c252a2c0a1637e1f7b1cfd2244383..4937ebc1a17a5baf417eaf266c9a019d2b708d0b 100644 (file)
--- a/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
+++ b/patches/kernel/0005-Revert-KVM-VMX-enable-nested-virtualization-by-defau.patch
@@ -18,7 +18,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
-index f5b7aae369e1..ba290767701e 100644
+index dd48f73fd9f1..bdec72312f5e 100644
 --- a/arch/x86/kvm/vmx/vmx.c
 +++ b/arch/x86/kvm/vmx/vmx.c
 @@ -103,7 +103,7 @@ module_param(enable_apicv, bool, S_IRUGO);

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 193fe36e1092367d25699135801887765078cdc8..191f8a0a8cbb8a86a2b1e77afd80479b9c841c2b 100644 (file)
--- a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch
+++ b/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch
@@ -10,10 +10,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/net/core/dev.c b/net/core/dev.c
-index 1565f9e259f8..abba17336587 100644
+index 8a90dd55e844..3794b7c3a96f 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -9362,7 +9362,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
+@@ -9365,7 +9365,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
                refcnt = netdev_refcnt_read(dev);
  
                if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {