From b9aab0288c238883f5e5b24d9b6544b6058fa61a Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 2 Mar 2021 13:34:58 +0100 Subject: [PATCH] ubdate sources and patches to Ubuntu-5.11.0-11.12 Signed-off-by: Thomas Lamprecht --- ...-mkcompile_h-accept-an-alternate-timestamp-strin.patch | 4 ++-- .../0002-bridge-keep-MAC-of-first-assigned-port.patch | 4 ++-- ...Enable-overrides-for-missing-ACS-capabilities-4..patch | 8 ++++---- ...-kvm-disable-default-dynamic-halt-polling-growth.patch | 4 ++-- ...ore-downgrade-unregister_netdevice-refcount-lea.patch} | 4 ++-- submodules/ubuntu-hirsute | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename patches/kernel/{0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch => 0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch} (87%) diff --git a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch index d5fc7ec..b625b1f 100644 --- a/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch +++ b/patches/kernel/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch @@ -21,10 +21,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h -index d1d757c6edf4..7b57571cf574 100755 +index 4ae735039daf..5a1abe7b4169 100755 --- a/scripts/mkcompile_h +++ b/scripts/mkcompile_h -@@ -34,10 +34,14 @@ else +@@ -24,10 +24,14 @@ else VERSION=$KBUILD_BUILD_VERSION fi diff --git a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch index a684a53..714c0e2 100644 --- a/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch +++ b/patches/kernel/0002-bridge-keep-MAC-of-first-assigned-port.patch @@ -19,10 +19,10 @@ Signed-off-by: Thomas Lamprecht 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/bridge/br_stp_if.c b/net/bridge/br_stp_if.c -index d174d3a566aa..885e18c72c87 100644 +index ba55851fe132..82675e1ecfb8 100644 --- a/net/bridge/br_stp_if.c +++ b/net/bridge/br_stp_if.c -@@ -256,10 +256,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) +@@ -265,10 +265,7 @@ bool br_stp_recalculate_bridge_id(struct net_bridge *br) return false; list_for_each_entry(p, &br->port_list, list) { 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 1433ef8..921a691 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 6351dd00e363..7e8ea458052b 100644 +index a74453c464b0..dca92e06e431 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -3441,6 +3441,15 @@ +@@ -3646,6 +3646,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 6351dd00e363..7e8ea458052b 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 6c2c8dafccfd..220a848de745 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 { +@@ -4770,6 +4870,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 dc398c8..dba712d 100644 --- 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,10 +13,10 @@ Signed-off-by: Thomas Lamprecht 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 2caba2828982..2080de085df5 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c -@@ -76,7 +76,7 @@ module_param(halt_poll_ns, uint, 0644); +@@ -77,7 +77,7 @@ module_param(halt_poll_ns, uint, 0644); EXPORT_SYMBOL_GPL(halt_poll_ns); /* Default doubles per-vcpu halt_poll_ns. */ diff --git a/patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch b/patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch similarity index 87% rename from patches/kernel/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch rename to patches/kernel/0005-net-core-downgrade-unregister_netdevice-refcount-lea.patch index adbc801..29b5539 100644 --- a/patches/kernel/0006-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 134add2cc8da..5be8d3b4cf68 100644 +index 449b45b843d4..9e247c1a065f 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -9279,7 +9279,7 @@ static void netdev_wait_allrefs(struct net_device *dev) +@@ -10258,7 +10258,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/submodules/ubuntu-hirsute b/submodules/ubuntu-hirsute index 01f2ad6..f488090 160000 --- a/submodules/ubuntu-hirsute +++ b/submodules/ubuntu-hirsute @@ -1 +1 @@ -Subproject commit 01f2ad60c19fc07666c3cad5e6f527bc46af6303 +Subproject commit f48809012350997899c3ce1afc47eb77f116fcf4