From 684791b47cef13c1209a64767bcda24283e00f58 Mon Sep 17 00:00:00 2001 From: Jiang Cuo Date: Sat, 22 Apr 2023 16:43:43 +0800 Subject: [PATCH] * Switch ubuntu kernel --- .gitmodules | 2 +- ...ides-for-missing-ACS-capabilities-4..patch | 20 ------------------- debian/patches/series.linux | 2 +- linux | 2 +- 4 files changed, 3 insertions(+), 23 deletions(-) diff --git a/.gitmodules b/.gitmodules index d50c64e..a425c34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,4 +3,4 @@ url = https://github.com/openzfs/zfs.git [submodule "linux"] path = linux - url = https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git + url = https://git.proxmox.com/git/mirror_ubuntu-kernels.git diff --git a/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch b/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch index 87cd3f1..f279b37 100644 --- a/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +++ b/debian/patches/pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch @@ -54,26 +54,6 @@ Signed-off-by: Thomas Lamprecht drivers/pci/quirks.c | 102 ++++++++++++++++++ 2 files changed, 111 insertions(+) -diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 2e77ecc12692..eae6fdc4c683 100644 ---- a/Documentation/admin-guide/kernel-parameters.txt -+++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4188,6 +4188,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). -+ pci_acs_override = -+ [PCIE] Override missing PCIe ACS support for: -+ downstream -+ All downstream ports - full ACS capabilities -+ multifunction -+ Add multifunction devices - multifunction ACS subset -+ id:nnnn:nnnn -+ Specific device - full ACS capabilities -+ Specified as vid:did (vendor/device ID) in hex - noioapicquirk [APIC] Disable all boot interrupt quirks. - 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 267e6002e29f..fac76ca1d16a 100644 --- a/drivers/pci/quirks.c diff --git a/debian/patches/series.linux b/debian/patches/series.linux index 190e29f..31149a1 100644 --- a/debian/patches/series.linux +++ b/debian/patches/series.linux @@ -1,7 +1,7 @@ pve/0001-Make-mkcompile_h-accept-an-alternate-timestamp-strin.patch pve/0002-wireless-Add-Debian-wireless-regdb-certificates.patch pve/0003-bridge-keep-MAC-of-first-assigned-port.patch -pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch +#pve/0004-pci-Enable-overrides-for-missing-ACS-capabilities-4..patch pve/0005-kvm-disable-default-dynamic-halt-polling-growth.patch pve/0006-net-core-downgrade-unregister_netdevice-refcount-lea.patch pve/0007-Revert-fortify-Do-not-cast-to-unsigned-char.patch diff --git a/linux b/linux index cdc7aff..d3bf8f1 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit cdc7aff9ed012801e62eedd99e4a5573eccac4db +Subproject commit d3bf8f1da09634a8b4e661d022702ead6c0dadfb