From 49ce0d9356cd09ce049fa818cd31122a7f87c272 Mon Sep 17 00:00:00 2001 From: Mark Weiman Date: Sun, 26 Nov 2017 21:49:17 -0500 Subject: [PATCH] Update to 4.13.12-2 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- add-acs-overrides.patch | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 34eeac6..be86a5f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Nov 22 16:22:58 UTC 2017 +# Mon Nov 27 02:49:05 UTC 2017 pkgbase = linux-vfio pkgver = 4.13.12 - pkgrel = 1 + pkgrel = 2 url = http://www.kernel.org/ arch = i686 arch = x86_64 @@ -32,7 +32,7 @@ pkgbase = linux-vfio sha256sums = 9c6c4d27d59638d0569ea09a97138bfcfb219f17cdf1138be141380e6654f302 sha256sums = 8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5 sha256sums = 99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9 - sha256sums = 05467ff4108e13c8a1fed9e2cc5b4e7b50c83e97e39b82d5478ea89b4af475ea + sha256sums = d08e95336be54792b3ded0a5c9b0aeddd47a38d61752af2cbaf38bb6d158d521 sha256sums = 19fd3b81b4b081ceb100c89fb6bab012a8d708da6ca8cee53d771abca4770236 pkgname = linux-vfio diff --git a/PKGBUILD b/PKGBUILD index f393536..78cbcdb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=linux-vfio _srcname=linux-4.13 pkgver=4.13.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.kernel.org/" license=('GPL2') @@ -31,7 +31,7 @@ sha256sums=('2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c' '9c6c4d27d59638d0569ea09a97138bfcfb219f17cdf1138be141380e6654f302' '8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5' '99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9' - '05467ff4108e13c8a1fed9e2cc5b4e7b50c83e97e39b82d5478ea89b4af475ea' + 'd08e95336be54792b3ded0a5c9b0aeddd47a38d61752af2cbaf38bb6d158d521' '19fd3b81b4b081ceb100c89fb6bab012a8d708da6ca8cee53d771abca4770236') validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch index 2b821fb..8508d5e 100644 --- a/add-acs-overrides.patch +++ b/add-acs-overrides.patch @@ -1,7 +1,7 @@ -From 9c86ad69c5c974e229de02c8cdf32120e302269d Mon Sep 17 00:00:00 2001 +From 2c6fca56ec527524700a1d2f26ea77ae2d5e561f Mon Sep 17 00:00:00 2001 From: Mark Weiman -Date: Fri, 29 Sep 2017 17:20:25 -0400 -Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.13+) +Date: Sun, 26 Nov 2017 21:47:18 -0500 +Subject: [PATCH] pci: Enable overrides for missing ACS capabilities (4.13) This an updated version of Alex Williamson's patch from: https://lkml.org/lkml/2013/5/30/513 @@ -70,7 +70,7 @@ index d9c171ce4190..e1d4b9cdfc8d 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 140760403f36..01398d2d0e47 100644 +index 140760403f36..a7a58d814a17 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3671,6 +3671,106 @@ static int __init pci_apply_final_quirks(void) @@ -118,7 +118,7 @@ index 140760403f36..01398d2d0e47 100644 + } + acs_on_ids[max_acs_id].vendor = val; + p += strcspn(p, ":"); -+ if (*p != ';') { ++ if (*p != ':') { + pr_warn("PCIe ACS invalid ID\n"); + goto next; + } @@ -189,5 +189,5 @@ index 140760403f36..01398d2d0e47 100644 }; -- -2.14.2 +2.15.0