From b6af182b857da245c1e7bffded0e5b6e573fcd84 Mon Sep 17 00:00:00 2001
From: Katelyn Schiesser <katelyn.schiesser@gmail.com>
Date: Wed, 26 Feb 2020 14:05:24 -0800
Subject: [PATCH] Update to 5.5.6.arch1

---
 .SRCINFO                | 14 +++++++-------
 PKGBUILD                | 13 +++++++------
 add-acs-overrides.patch |  5 ++---
 config                  |  9 +++++----
 i915-vga-arbiter.patch  |  3 +--
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 1af1513..911ef3d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-vfio
 	pkgdesc = Linux
-	pkgver = 5.5.5.arch1
-	pkgrel = 2
-	url = https://git.archlinux.org/linux.git/log/?h=v5.5.5-arch1
+	pkgver = 5.5.6.arch1
+	pkgrel = 1
+	url = https://git.archlinux.org/linux.git/log/?h=v5.5.6-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-vfio
 	makedepends = imagemagick
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.5.5-arch1
+	source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.5.6-arch1
 	source = config
 	source = add-acs-overrides.patch
 	source = i915-vga-arbiter.patch
@@ -23,9 +23,9 @@ pkgbase = linux-vfio
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	sha256sums = SKIP
-	sha256sums = d8ec5445fe03cd5e0cb95a8bcbdf4887a1649825b0a68b8ffd62dabe300ecb8f
-	sha256sums = 31ae60837b90feba277b182a9015e4df6e74fd660aba1a2841f49ecd57617559
-	sha256sums = 334f3472adc0280614b278ead7375d3a982dc1b9310c1fc62bc8b8e96eb2b6d4
+	sha256sums = a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868
+	sha256sums = 14a660a9d445ed3d1abde0338e92d7f23d94d850c3fc21634c45147d00e1ca61
+	sha256sums = fb0d88c416328639db0a870d31c0e2c6cb7b5428f3f3fe89be37d09d13f685c0
 
 pkgname = linux-vfio
 	pkgdesc = The Linux kernel and modules
diff --git a/PKGBUILD b/PKGBUILD
index 2236532..ed27273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 # Upstream: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=linux-vfio
-pkgver=5.5.5.arch1
-pkgrel=2
+pkgver=5.5.6.arch1
+pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
 url="https://git.archlinux.org/linux.git/log/?h=$_srctag"
@@ -29,9 +29,9 @@ validpgpkeys=(
   '8218F88849AAC522E94CF470A5E9288C4FA415FA'  # Jan Alexander Steffens (heftig)
 )
 sha256sums=('SKIP'
-            'd8ec5445fe03cd5e0cb95a8bcbdf4887a1649825b0a68b8ffd62dabe300ecb8f'
-            '31ae60837b90feba277b182a9015e4df6e74fd660aba1a2841f49ecd57617559'
-            '334f3472adc0280614b278ead7375d3a982dc1b9310c1fc62bc8b8e96eb2b6d4'
+            'a841aa011edf6bae0ffbe8ead8177e5056de5a6d7333bb96e16917903de4d868'
+            '14a660a9d445ed3d1abde0338e92d7f23d94d850c3fc21634c45147d00e1ca61'
+            'fb0d88c416328639db0a870d31c0e2c6cb7b5428f3f3fe89be37d09d13f685c0'
 )
 
 
@@ -66,7 +66,8 @@ prepare() {
 
 build() {
   cd $_srcname
-  make bzImage modules htmldocs
+  make all
+  make htmldocs
 }
 
 _package() {
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index 45e0701..5db0b6c 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -179,7 +179,7 @@ index fbeb9f73ef28..3bf409c65609 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
-@@ -4711,6 +4811,8 @@ static const struct pci_dev_acs_enabled {
+@@ -4701,6 +4801,8 @@ 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 },
@@ -189,5 +189,4 @@ index fbeb9f73ef28..3bf409c65609 100644
  };
  
 --
-2.21.0
-
+5.5.6
diff --git a/config b/config
index 02abb3a..d21a045 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.5.4-arch1 Kernel Configuration
+# Linux/x86 5.5.5-arch1 Kernel Configuration
 #
 
 #
@@ -10350,8 +10350,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_TER16x32 is not set
-CONFIG_FONT_AUTOSELECT=y
+CONFIG_FONT_TER16x32=y
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_MEMREGION=y
@@ -10421,7 +10420,9 @@ CONFIG_DEBUG_MISC=y
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_OWNER is not set
-# CONFIG_PAGE_POISONING is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+CONFIG_PAGE_POISONING_ZERO=y
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
diff --git a/i915-vga-arbiter.patch b/i915-vga-arbiter.patch
index 69134af..a0338c6 100644
--- a/i915-vga-arbiter.patch
+++ b/i915-vga-arbiter.patch
@@ -182,5 +182,4 @@ index f417e0948001..6e865b86db09 100644
  unsigned int intel_fb_xy_to_linear(int x, int y,
  				   const struct intel_plane_state *state,
 --
-2.24.0
-
+5.5.5