diff --git a/Makefile b/Makefile index 053f5b17..4402fada 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # also bump pve-kernel-meta if either of MAJ.MIN, PATCHLEVEL or KREL change KERNEL_MAJ=5 KERNEL_MIN=6 -KERNEL_PATCHLEVEL=8 +KERNEL_PATCHLEVEL=10 # increment KREL if the ABI changes (abicheck target in debian/rules) # rebuild packages with new KREL and run 'make abiupdate' KREL=1 diff --git a/debian/changelog b/debian/changelog index c3498954..2573cdbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +pve-edge-kernel (5.6.10-1) edge; urgency=medium + + * update to Linux 5.6.10-1 based on Ubuntu 5.6.0-7.7 + + -- Fabian Mastenbroek Sat, 2 May 2020 21:07:10 +0200 + pve-edge-kernel (5.6.8-1) edge; urgency=medium * update to Linux 5.6.8-1 based on Ubuntu 5.6.0-7.7 diff --git a/patches/pve/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/patches/pve/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index d04313f7..adbdafb8 100644 --- a/patches/pve/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/patches/pve/0003-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -183,11 +183,12 @@ index 320255e5e8f8..8d5808de9071 100644 /* * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset. * The device will throw a Link Down error on AER-capable systems and -@@ -4663,6 +4763,7 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs }, - /* Amazon Annapurna Labs */ - { PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs }, -+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, +@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled { + { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs }, + /* Zhaoxin Root/Downstream Ports */ + { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, ++ /* PCIe ACS overrides */ ++ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; diff --git a/submodules/linux-stable b/submodules/linux-stable index 63c3d497..c9feecbe 160000 --- a/submodules/linux-stable +++ b/submodules/linux-stable @@ -1 +1 @@ -Subproject commit 63c3d497410788af1804579f0cded007318c5991 +Subproject commit c9feecbe2f4a6b1ca993195f5ce7baf65cf0a310