rebase patches on top of Ubuntu-5.4.0-78.87

(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 536bb31aa969f7c54929854b448b334e4ca934aa..a6eb9f37d54d48ced51f3163facf360a58f93063 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 9d66e884ebf5..37040e842a24 100644
+index 359b54d2da21..00c9ace3711b 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
 @@ -3441,6 +3441,15 @@
@@ -75,7 +75,7 @@ index 9d66e884ebf5..37040e842a24 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 706f27a86a8e..c3eac7a5426e 100644
+index 862038155fdf..78fb4b34c12d 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
 @@ -192,6 +192,106 @@ static int __init pci_apply_final_quirks(void)
@@ -185,7 +185,7 @@ index 706f27a86a8e..c3eac7a5426e 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
-@@ -4825,6 +4925,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4828,6 +4928,8 @@ static const struct pci_dev_acs_enabled {
        { PCI_VENDOR_ID_CAVIUM, PCI_ANY_ID, pci_quirk_cavium_acs },
        /* APM X-Gene */
        { PCI_VENDOR_ID_AMCC, 0xE004, pci_quirk_xgene_acs },

diff --git a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
index dc398c841f099d6b60904ed93f6e95585abf1e1b..d3696345a89f0e2033bdb585108c5e550259f84b 100644 (file)
--- a/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
+++ b/patches/kernel/0004-kvm-disable-default-dynamic-halt-polling-growth.patch
@@ -13,7 +13,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 8769538a3d1d..d540a7d7f85c 100644
+index 26cb1630b86d..85bedd6ebbac 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
 @@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644);

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 a6e7508f8e37e22044ca574854ee3d6d7154808d..9319a8bbaa9a0dd332ab0d19aa0708368efa631c 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 2a1ed3aae100..c5dd076e8e61 100644
+index e177848a3631..8bc03eb967ff 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 db1f7638a92c85a64407e317e38dd038b9c44126..15688fdd8c0bb5ef21d5a20bc218fae260973bbf 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 6dbffd07edc4..fc1ee6073285 100644
+index e393a51b3973..8bbc10603f1f 100644
 --- a/net/core/dev.c
 +++ b/net/core/dev.c
-@@ -9281,7 +9281,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
+@@ -9349,7 +9349,7 @@ static void netdev_wait_allrefs(struct net_device *dev)
                refcnt = netdev_refcnt_read(dev);
  
                if (refcnt && time_after(jiffies, warning_time + 10 * HZ)) {

diff --git a/patches/kernel/0007-vfs-allow-unprivileged-whiteout-creation.patch b/patches/kernel/0007-vfs-allow-unprivileged-whiteout-creation.patch
index 0cb12baa0eaf84778e8dcb988c1a633788577048..72c43b8a7927f190ac1debdb12a0b2f01c7130dc 100644 (file)
--- a/patches/kernel/0007-vfs-allow-unprivileged-whiteout-creation.patch
+++ b/patches/kernel/0007-vfs-allow-unprivileged-whiteout-creation.patch
@@ -104,7 +104,7 @@ index 8557efe096dc..fc989487c273 100644
                type = DEVCG_DEV_BLOCK;
        else
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 21f93dfaf9d0..ae31b55fb69c 100644
+index 2bd06577c02a..fc22bade5b21 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1719,7 +1719,11 @@ extern int vfs_link(struct dentry *, struct inode *, struct dentry *, struct ino