Update to 4.11.6-1

2024-12-27 09:54:10 +00:00 · 2017-06-22 23:51:45 -04:00 · 2017-06-22 23:51:45 -04:00 · aeed66594f
commit aeed66594f
parent bf2f23abe0
9 changed files with 1266 additions and 128 deletions
--- a/.SRCINFO
+++ b/.SRCINFO
@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Mon May  1 17:47:01 UTC 2017
+# Fri Jun 23 03:51:30 UTC 2017
 pkgbase = linux-vfio
-	pkgver = 4.10.13
+	pkgver = 4.11.6
 	pkgrel = 1
 	url = http://www.kernel.org/
 	arch = i686
@ -14,26 +14,32 @@ pkgbase = linux-vfio
 	makedepends = bc
 	makedepends = libelf
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.10.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.11.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.10.13.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.11.6.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.10.13.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.11.6.sign
 	source = config
 	source = config.x86_64
-	source = 99-linux.hook
+	source = 90-linux.hook
 	source = linux.preset
 	source = add-acs-overrides.patch
 	source = i915-vga-arbiter.patch
-	sha256sums = 3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b
+	source = CVE-2017-1000364.mm-larger-stack-guard-gap-between-vmas.patch
 	source = CVE-2017-1000364.mm-fix-new-crash-in-unmapped_area_topdown.patch
 	source = CVE-2017-1000364.fixup.allow-stack-to-grow-up-to-address-space-limit.patch
 	sha256sums = b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6
 	sha256sums = SKIP
-	sha256sums = b1a7a98aa97cc0917fcab0def68032d5bf61838c79177b2222cee2485015458f
+	sha256sums = 00c0b804ccda18d6ed4a32ba0be049a80363aa2bc084733a22da03f435d992a4
 	sha256sums = SKIP
-	sha256sums = 386051f19482672c871e7865fc62f5e2c8010d857729134ba13044734962e42c
+	sha256sums = f330007da72867bb86556d1f8b84b8a4c8148a5ed5195ae25570a5da61428733
-	sha256sums = 12a87284e2935cd17e2846a207cc76f1728531416523735d66ef8a0ae690884c
+	sha256sums = 9dd9aa4a8ec613cc8261e40db897685d75e3d426219ed8d21fa3a6bc72a27a32
 	sha256sums = 8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5
 	sha256sums = 99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9
 	sha256sums = 773b2a7db63dbc38336e04e25d5017a2a02c49e424cfa32beedb4e47a5027d2c
-	sha256sums = 0bef31f6d1415398cb2e78d58798aa49e146b27c87764da181b6d41bd4e577eb
+	sha256sums = e82ea0c7752b5845655043bb209e39ca3a9fe9c0841b100a5d182261c1ab7068
 	sha256sums = e1b6a237894fb9e7bf142eb97b5e53c2e46a15ff69ef11593007f254b9faa160
 	sha256sums = beede1721c92bae39049be5bcb30e4274406dc53c41436bf75bd44238ee8efe4
 	sha256sums = de9c4f81b51c497de930b365f63633a005e3b8bcfbb21be93fe0cbab84ed9f76
 pkgname = linux-vfio
 	pkgdesc = The Linux kernel and modules with patches to enable GPU passthrough with KVM
--- a/90-linux.hook
+++ b/90-linux.hook
--- a/CVE-2017-1000364.fixup.allow-stack-to-grow-up-to-address-space-limit.patch
+++ b/CVE-2017-1000364.fixup.allow-stack-to-grow-up-to-address-space-limit.patch
@ -0,0 +1,45 @@
 From bd726c90b6b8ce87602208701b208a208e6d5600 Mon Sep 17 00:00:00 2001
 From: Helge Deller <deller@gmx.de>
 Date: Mon, 19 Jun 2017 17:34:05 +0200
 Subject: [PATCH] Allow stack to grow up to address space limit
 Fix expand_upwards() on architectures with an upward-growing stack (parisc,
 metag and partly IA-64) to allow the stack to reliably grow exactly up to
 the address space limit given by TASK_SIZE.
 Signed-off-by: Helge Deller <deller@gmx.de>
 Acked-by: Hugh Dickins <hughd@google.com>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 mm/mmap.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
 diff --git a/mm/mmap.c b/mm/mmap.c
 index 290b77d9a01e0..a5e3dcd75e79f 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
@@ -2230,16 +2230,19 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 	if (!(vma->vm_flags & VM_GROWSUP))
 		return -EFAULT;
 -	/* Guard against wrapping around to address 0. */
 +	/* Guard against exceeding limits of the address space. */
 	address &= PAGE_MASK;
 -	address += PAGE_SIZE;
 -	if (!address)
 +	if (address >= TASK_SIZE)
 		return -ENOMEM;
 +	address += PAGE_SIZE;
 	/* Enforce stack_guard_gap */
 	gap_addr = address + stack_guard_gap;
 -	if (gap_addr < address)
 -		return -ENOMEM;
 +
 +	/* Guard against overflow */
 +	if (gap_addr < address || gap_addr > TASK_SIZE)
 +		gap_addr = TASK_SIZE;
 +
 	next = vma->vm_next;
 	if (next && next->vm_start < gap_addr) {
 		if (!(next->vm_flags & VM_GROWSUP))
--- a/CVE-2017-1000364.mm-fix-new-crash-in-unmapped_area_topdown.patch
+++ b/CVE-2017-1000364.mm-fix-new-crash-in-unmapped_area_topdown.patch
@ -0,0 +1,47 @@
 From f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89 Mon Sep 17 00:00:00 2001
 From: Hugh Dickins <hughd@google.com>
 Date: Tue, 20 Jun 2017 02:10:44 -0700
 Subject: [PATCH] mm: fix new crash in unmapped_area_topdown()
 Trinity gets kernel BUG at mm/mmap.c:1963! in about 3 minutes of
 mmap testing.  That's the VM_BUG_ON(gap_end < gap_start) at the
 end of unmapped_area_topdown().  Linus points out how MAP_FIXED
 (which does not have to respect our stack guard gap intentions)
 could result in gap_end below gap_start there.  Fix that, and
 the similar case in its alternative, unmapped_area().
 Cc: stable@vger.kernel.org
 Fixes: 1be7107fbe18 ("mm: larger stack guard gap, between vmas")
 Reported-by: Dave Jones <davej@codemonkey.org.uk>
 Debugged-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Hugh Dickins <hughd@google.com>
 Acked-by: Michal Hocko <mhocko@suse.com>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 ---
 mm/mmap.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 diff --git a/mm/mmap.c b/mm/mmap.c
 index 8e07976d5e477..290b77d9a01e0 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
@@ -1817,7 +1817,8 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
 		/* Check if current node has a suitable gap */
 		if (gap_start > high_limit)
 			return -ENOMEM;
 -		if (gap_end >= low_limit && gap_end - gap_start >= length)
 +		if (gap_end >= low_limit &&
 +		    gap_end > gap_start && gap_end - gap_start >= length)
 			goto found;
 		/* Visit right subtree if it looks promising */
@@ -1920,7 +1921,8 @@ unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
 		gap_end = vm_start_gap(vma);
 		if (gap_end < low_limit)
 			return -ENOMEM;
 -		if (gap_start <= high_limit && gap_end - gap_start >= length)
 +		if (gap_start <= high_limit &&
 +		    gap_end > gap_start && gap_end - gap_start >= length)
 			goto found;
 		/* Visit left subtree if it looks promising */
--- a/CVE-2017-1000364.mm-larger-stack-guard-gap-between-vmas.patch
+++ b/CVE-2017-1000364.mm-larger-stack-guard-gap-between-vmas.patch
@ -0,0 +1,883 @@
 From: Hugh Dickins <hughd@google.com>
 Date: Mon, 19 Jun 2017 04:03:24 -0700
 Subject: mm: larger stack guard gap, between vmas
 Origin: https://git.kernel.org/linus/1be7107fbe18eed3e319a6c3e83c78254b693acb
 Stack guard page is a useful feature to reduce a risk of stack smashing
 into a different mapping. We have been using a single page gap which
 is sufficient to prevent having stack adjacent to a different mapping.
 But this seems to be insufficient in the light of the stack usage in
 userspace. E.g. glibc uses as large as 64kB alloca() in many commonly
 used functions. Others use constructs liks gid_t buffer[NGROUPS_MAX]
 which is 256kB or stack strings with MAX_ARG_STRLEN.
 This will become especially dangerous for suid binaries and the default
 no limit for the stack size limit because those applications can be
 tricked to consume a large portion of the stack and a single glibc call
 could jump over the guard page. These attacks are not theoretical,
 unfortunatelly.
 Make those attacks less probable by increasing the stack guard gap
 to 1MB (on systems with 4k pages; but make it depend on the page size
 because systems with larger base pages might cap stack allocations in
 the PAGE_SIZE units) which should cover larger alloca() and VLA stack
 allocations. It is obviously not a full fix because the problem is
 somehow inherent, but it should reduce attack space a lot.
 One could argue that the gap size should be configurable from userspace,
 but that can be done later when somebody finds that the new 1MB is wrong
 for some special case applications.  For now, add a kernel command line
 option (stack_guard_gap) to specify the stack gap size (in page units).
 Implementation wise, first delete all the old code for stack guard page:
 because although we could get away with accounting one extra page in a
 stack vma, accounting a larger gap can break userspace - case in point,
 a program run with "ulimit -S -v 20000" failed when the 1MB gap was
 counted for RLIMIT_AS; similar problems could come with RLIMIT_MLOCK
 and strict non-overcommit mode.
 Instead of keeping gap inside the stack vma, maintain the stack guard
 gap as a gap between vmas: using vm_start_gap() in place of vm_start
 (or vm_end_gap() in place of vm_end if VM_GROWSUP) in just those few
 places which need to respect the gap - mainly arch_get_unmapped_area(),
 and and the vma tree's subtree_gap support for that.
 Original-patch-by: Oleg Nesterov <oleg@redhat.com>
 Original-patch-by: Michal Hocko <mhocko@suse.com>
 Signed-off-by: Hugh Dickins <hughd@google.com>
 Acked-by: Michal Hocko <mhocko@suse.com>
 Tested-by: Helge Deller <deller@gmx.de> # parisc
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 [bwh: Backported to 4.11: adjust context]
 ---
 Documentation/admin-guide/kernel-parameters.txt |   7 ++
 arch/arc/mm/mmap.c                              |   2 +-
 arch/arm/mm/mmap.c                              |   4 +-
 arch/frv/mm/elf-fdpic.c                         |   2 +-
 arch/mips/mm/mmap.c                             |   2 +-
 arch/parisc/kernel/sys_parisc.c                 |  15 ++-
 arch/powerpc/mm/hugetlbpage-radix.c             |   2 +-
 arch/powerpc/mm/mmap.c                          |   4 +-
 arch/powerpc/mm/slice.c                         |   2 +-
 arch/s390/mm/mmap.c                             |   4 +-
 arch/sh/mm/mmap.c                               |   4 +-
 arch/sparc/kernel/sys_sparc_64.c                |   4 +-
 arch/sparc/mm/hugetlbpage.c                     |   2 +-
 arch/tile/mm/hugetlbpage.c                      |   2 +-
 arch/x86/kernel/sys_x86_64.c                    |   4 +-
 arch/x86/mm/hugetlbpage.c                       |   2 +-
 arch/xtensa/kernel/syscall.c                    |   2 +-
 fs/hugetlbfs/inode.c                            |   2 +-
 fs/proc/task_mmu.c                              |   4 -
 include/linux/mm.h                              |  53 ++++-----
 mm/gup.c                                        |   5 -
 mm/memory.c                                     |  38 ------
 mm/mmap.c                                       | 149 ++++++++++++++----------
 23 files changed, 152 insertions(+), 163 deletions(-)
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3779,6 +3779,13 @@
 	spia_pedr=
 	spia_peddr=
 +	stack_guard_gap=	[MM]
 +			override the default stack gap protection. The value
 +			is in page units and it defines how many pages prior
 +			to (for stacks growing down) resp. after (for stacks
 +			growing up) the main stack are reserved for no other
 +			mapping. Default value is 256 pages.
 +
 	stacktrace	[FTRACE]
 			Enabled the stack tracer on boot up.
 --- a/arch/arc/mm/mmap.c
 +++ b/arch/arc/mm/mmap.c
@@ -65,7 +65,7 @@ arch_get_unmapped_area(struct file *filp
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/arm/mm/mmap.c
 +++ b/arch/arm/mm/mmap.c
@@ -90,7 +90,7 @@ arch_get_unmapped_area(struct file *filp
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -141,7 +141,7 @@ arch_get_unmapped_area_topdown(struct fi
 			addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -				(!vma || addr + len <= vma->vm_start))
 +				(!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/frv/mm/elf-fdpic.c
 +++ b/arch/frv/mm/elf-fdpic.c
@@ -75,7 +75,7 @@ unsigned long arch_get_unmapped_area(str
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(current->mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			goto success;
 	}
 --- a/arch/mips/mm/mmap.c
 +++ b/arch/mips/mm/mmap.c
@@ -93,7 +93,7 @@ static unsigned long arch_get_unmapped_a
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/parisc/kernel/sys_parisc.c
 +++ b/arch/parisc/kernel/sys_parisc.c
@@ -90,7 +90,7 @@ unsigned long arch_get_unmapped_area(str
 		unsigned long len, unsigned long pgoff, unsigned long flags)
 {
 	struct mm_struct *mm = current->mm;
 -	struct vm_area_struct *vma;
 +	struct vm_area_struct *vma, *prev;
 	unsigned long task_size = TASK_SIZE;
 	int do_color_align, last_mmap;
 	struct vm_unmapped_area_info info;
@@ -117,9 +117,10 @@ unsigned long arch_get_unmapped_area(str
 		else
 			addr = PAGE_ALIGN(addr);
 -		vma = find_vma(mm, addr);
 +		vma = find_vma_prev(mm, addr, &prev);
 		if (task_size - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)) &&
 +		    (!prev || addr >= vm_end_gap(prev)))
 			goto found_addr;
 	}
@@ -143,7 +144,7 @@ arch_get_unmapped_area_topdown(struct fi
 			  const unsigned long len, const unsigned long pgoff,
 			  const unsigned long flags)
 {
 -	struct vm_area_struct *vma;
 +	struct vm_area_struct *vma, *prev;
 	struct mm_struct *mm = current->mm;
 	unsigned long addr = addr0;
 	int do_color_align, last_mmap;
@@ -177,9 +178,11 @@ arch_get_unmapped_area_topdown(struct fi
 			addr = COLOR_ALIGN(addr, last_mmap, pgoff);
 		else
 			addr = PAGE_ALIGN(addr);
 -		vma = find_vma(mm, addr);
 +
 +		vma = find_vma_prev(mm, addr, &prev);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)) &&
 +		    (!prev || addr >= vm_end_gap(prev)))
 			goto found_addr;
 	}
 --- a/arch/powerpc/mm/hugetlbpage-radix.c
 +++ b/arch/powerpc/mm/hugetlbpage-radix.c
@@ -65,7 +65,7 @@ radix__hugetlb_get_unmapped_area(struct
 		addr = ALIGN(addr, huge_page_size(h));
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 	/*
 --- a/arch/powerpc/mm/mmap.c
 +++ b/arch/powerpc/mm/mmap.c
@@ -107,7 +107,7 @@ radix__arch_get_unmapped_area(struct fil
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -143,7 +143,7 @@ radix__arch_get_unmapped_area_topdown(st
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -				(!vma || addr + len <= vma->vm_start))
 +				(!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/powerpc/mm/slice.c
 +++ b/arch/powerpc/mm/slice.c
@@ -105,7 +105,7 @@ static int slice_area_is_free(struct mm_
 	if ((mm->task_size - len) < addr)
 		return 0;
 	vma = find_vma(mm, addr);
 -	return (!vma || (addr + len) <= vma->vm_start);
 +	return (!vma || (addr + len) <= vm_start_gap(vma));
 }
 static int slice_low_has_vma(struct mm_struct *mm, unsigned long slice)
 --- a/arch/s390/mm/mmap.c
 +++ b/arch/s390/mm/mmap.c
@@ -100,7 +100,7 @@ arch_get_unmapped_area(struct file *filp
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -138,7 +138,7 @@ arch_get_unmapped_area_topdown(struct fi
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -				(!vma || addr + len <= vma->vm_start))
 +				(!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/sh/mm/mmap.c
 +++ b/arch/sh/mm/mmap.c
@@ -64,7 +64,7 @@ unsigned long arch_get_unmapped_area(str
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -114,7 +114,7 @@ arch_get_unmapped_area_topdown(struct fi
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/sparc/kernel/sys_sparc_64.c
 +++ b/arch/sparc/kernel/sys_sparc_64.c
@@ -120,7 +120,7 @@ unsigned long arch_get_unmapped_area(str
 		vma = find_vma(mm, addr);
 		if (task_size - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -183,7 +183,7 @@ arch_get_unmapped_area_topdown(struct fi
 		vma = find_vma(mm, addr);
 		if (task_size - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/sparc/mm/hugetlbpage.c
 +++ b/arch/sparc/mm/hugetlbpage.c
@@ -120,7 +120,7 @@ hugetlb_get_unmapped_area(struct file *f
 		addr = ALIGN(addr, huge_page_size(h));
 		vma = find_vma(mm, addr);
 		if (task_size - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 	if (mm->get_unmapped_area == arch_get_unmapped_area)
 --- a/arch/tile/mm/hugetlbpage.c
 +++ b/arch/tile/mm/hugetlbpage.c
@@ -233,7 +233,7 @@ unsigned long hugetlb_get_unmapped_area(
 		addr = ALIGN(addr, huge_page_size(h));
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 	if (current->mm->get_unmapped_area == arch_get_unmapped_area)
 --- a/arch/x86/kernel/sys_x86_64.c
 +++ b/arch/x86/kernel/sys_x86_64.c
@@ -141,7 +141,7 @@ arch_get_unmapped_area(struct file *filp
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (end - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
@@ -184,7 +184,7 @@ arch_get_unmapped_area_topdown(struct fi
 		addr = PAGE_ALIGN(addr);
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -				(!vma || addr + len <= vma->vm_start))
 +				(!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/arch/x86/mm/hugetlbpage.c
 +++ b/arch/x86/mm/hugetlbpage.c
@@ -145,7 +145,7 @@ hugetlb_get_unmapped_area(struct file *f
 		addr = ALIGN(addr, huge_page_size(h));
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 	if (mm->get_unmapped_area == arch_get_unmapped_area)
 --- a/arch/xtensa/kernel/syscall.c
 +++ b/arch/xtensa/kernel/syscall.c
@@ -88,7 +88,7 @@ unsigned long arch_get_unmapped_area(str
 		/* At this point:  (!vmm || addr < vmm->vm_end). */
 		if (TASK_SIZE - len < addr)
 			return -ENOMEM;
 -		if (!vmm || addr + len <= vmm->vm_start)
 +		if (!vmm || addr + len <= vm_start_gap(vmm))
 			return addr;
 		addr = vmm->vm_end;
 		if (flags & MAP_SHARED)
 --- a/fs/hugetlbfs/inode.c
 +++ b/fs/hugetlbfs/inode.c
@@ -200,7 +200,7 @@ hugetlb_get_unmapped_area(struct file *f
 		addr = ALIGN(addr, huge_page_size(h));
 		vma = find_vma(mm, addr);
 		if (TASK_SIZE - len >= addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)))
 			return addr;
 	}
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
@@ -303,11 +303,7 @@ show_map_vma(struct seq_file *m, struct
 	/* We don't show the stack guard page in /proc/maps */
 	start = vma->vm_start;
 -	if (stack_guard_page_start(vma, start))
 -		start += PAGE_SIZE;
 	end = vma->vm_end;
 -	if (stack_guard_page_end(vma, end))
 -		end -= PAGE_SIZE;
 	seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
 	seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
@@ -1403,12 +1403,6 @@ int clear_page_dirty_for_io(struct page
 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
 -/* Is the vma a continuation of the stack vma above it? */
 -static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
 -{
 -	return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
 -}
 -
 static inline bool vma_is_anonymous(struct vm_area_struct *vma)
 {
 	return !vma->vm_ops;
@@ -1424,28 +1418,6 @@ bool vma_is_shmem(struct vm_area_struct
 static inline bool vma_is_shmem(struct vm_area_struct *vma) { return false; }
 #endif
 -static inline int stack_guard_page_start(struct vm_area_struct *vma,
 -					     unsigned long addr)
 -{
 -	return (vma->vm_flags & VM_GROWSDOWN) &&
 -		(vma->vm_start == addr) &&
 -		!vma_growsdown(vma->vm_prev, addr);
 -}
 -
 -/* Is the vma a continuation of the stack vma below it? */
 -static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
 -{
 -	return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
 -}
 -
 -static inline int stack_guard_page_end(struct vm_area_struct *vma,
 -					   unsigned long addr)
 -{
 -	return (vma->vm_flags & VM_GROWSUP) &&
 -		(vma->vm_end == addr) &&
 -		!vma_growsup(vma->vm_next, addr);
 -}
 -
 int vma_is_stack_for_current(struct vm_area_struct *vma);
 extern unsigned long move_page_tables(struct vm_area_struct *vma,
@@ -2232,6 +2204,7 @@ void page_cache_async_readahead(struct a
 				pgoff_t offset,
 				unsigned long size);
 +extern unsigned long stack_guard_gap;
 /* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */
 extern int expand_stack(struct vm_area_struct *vma, unsigned long address);
@@ -2260,6 +2233,30 @@ static inline struct vm_area_struct * fi
 	return vma;
 }
 +static inline unsigned long vm_start_gap(struct vm_area_struct *vma)
 +{
 +	unsigned long vm_start = vma->vm_start;
 +
 +	if (vma->vm_flags & VM_GROWSDOWN) {
 +		vm_start -= stack_guard_gap;
 +		if (vm_start > vma->vm_start)
 +			vm_start = 0;
 +	}
 +	return vm_start;
 +}
 +
 +static inline unsigned long vm_end_gap(struct vm_area_struct *vma)
 +{
 +	unsigned long vm_end = vma->vm_end;
 +
 +	if (vma->vm_flags & VM_GROWSUP) {
 +		vm_end += stack_guard_gap;
 +		if (vm_end < vma->vm_end)
 +			vm_end = -PAGE_SIZE;
 +	}
 +	return vm_end;
 +}
 +
 static inline unsigned long vma_pages(struct vm_area_struct *vma)
 {
 	return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 --- a/mm/gup.c
 +++ b/mm/gup.c
@@ -387,11 +387,6 @@ static int faultin_page(struct task_stru
 	/* mlock all present pages, but do not fault in new pages */
 	if ((*flags & (FOLL_POPULATE | FOLL_MLOCK)) == FOLL_MLOCK)
 		return -ENOENT;
 -	/* For mm_populate(), just skip the stack guard page. */
 -	if ((*flags & FOLL_POPULATE) &&
 -			(stack_guard_page_start(vma, address) ||
 -			 stack_guard_page_end(vma, address + PAGE_SIZE)))
 -		return -ENOENT;
 	if (*flags & FOLL_WRITE)
 		fault_flags |= FAULT_FLAG_WRITE;
 	if (*flags & FOLL_REMOTE)
 --- a/mm/memory.c
 +++ b/mm/memory.c
@@ -2855,40 +2855,6 @@ out_release:
 }
 /*
 - * This is like a special single-page "expand_{down|up}wards()",
 - * except we must first make sure that 'address{-|+}PAGE_SIZE'
 - * doesn't hit another vma.
 - */
 -static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
 -{
 -	address &= PAGE_MASK;
 -	if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
 -		struct vm_area_struct *prev = vma->vm_prev;
 -
 -		/*
 -		 * Is there a mapping abutting this one below?
 -		 *
 -		 * That's only ok if it's the same stack mapping
 -		 * that has gotten split..
 -		 */
 -		if (prev && prev->vm_end == address)
 -			return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
 -
 -		return expand_downwards(vma, address - PAGE_SIZE);
 -	}
 -	if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
 -		struct vm_area_struct *next = vma->vm_next;
 -
 -		/* As VM_GROWSDOWN but s/below/above/ */
 -		if (next && next->vm_start == address + PAGE_SIZE)
 -			return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
 -
 -		return expand_upwards(vma, address + PAGE_SIZE);
 -	}
 -	return 0;
 -}
 -
 -/*
  * We enter with non-exclusive mmap_sem (to exclude vma changes,
  * but allow concurrent faults), and pte mapped but not yet locked.
  * We return with mmap_sem still held, but pte unmapped and unlocked.
@@ -2904,10 +2870,6 @@ static int do_anonymous_page(struct vm_f
 	if (vma->vm_flags & VM_SHARED)
 		return VM_FAULT_SIGBUS;
 -	/* Check if we need to add a guard page to the stack */
 -	if (check_stack_guard_page(vma, vmf->address) < 0)
 -		return VM_FAULT_SIGSEGV;
 -
 	/*
 	 * Use pte_alloc() instead of pte_alloc_map().  We can't run
 	 * pte_offset_map() on pmds where a huge pmd might be created
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
@@ -183,6 +183,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 	unsigned long retval;
 	unsigned long newbrk, oldbrk;
 	struct mm_struct *mm = current->mm;
 +	struct vm_area_struct *next;
 	unsigned long min_brk;
 	bool populate;
 	LIST_HEAD(uf);
@@ -229,7 +230,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
 	}
 	/* Check against existing mmap mappings. */
 -	if (find_vma_intersection(mm, oldbrk, newbrk+PAGE_SIZE))
 +	next = find_vma(mm, oldbrk);
 +	if (next && newbrk + PAGE_SIZE > vm_start_gap(next))
 		goto out;
 	/* Ok, looks good - let it rip. */
@@ -253,10 +255,22 @@ out:
 static long vma_compute_subtree_gap(struct vm_area_struct *vma)
 {
 -	unsigned long max, subtree_gap;
 -	max = vma->vm_start;
 -	if (vma->vm_prev)
 -		max -= vma->vm_prev->vm_end;
 +	unsigned long max, prev_end, subtree_gap;
 +
 +	/*
 +	 * Note: in the rare case of a VM_GROWSDOWN above a VM_GROWSUP, we
 +	 * allow two stack_guard_gaps between them here, and when choosing
 +	 * an unmapped area; whereas when expanding we only require one.
 +	 * That's a little inconsistent, but keeps the code here simpler.
 +	 */
 +	max = vm_start_gap(vma);
 +	if (vma->vm_prev) {
 +		prev_end = vm_end_gap(vma->vm_prev);
 +		if (max > prev_end)
 +			max -= prev_end;
 +		else
 +			max = 0;
 +	}
 	if (vma->vm_rb.rb_left) {
 		subtree_gap = rb_entry(vma->vm_rb.rb_left,
 				struct vm_area_struct, vm_rb)->rb_subtree_gap;
@@ -352,7 +366,7 @@ static void validate_mm(struct mm_struct
 			anon_vma_unlock_read(anon_vma);
 		}
 -		highest_address = vma->vm_end;
 +		highest_address = vm_end_gap(vma);
 		vma = vma->vm_next;
 		i++;
 	}
@@ -541,7 +555,7 @@ void __vma_link_rb(struct mm_struct *mm,
 	if (vma->vm_next)
 		vma_gap_update(vma->vm_next);
 	else
 -		mm->highest_vm_end = vma->vm_end;
 +		mm->highest_vm_end = vm_end_gap(vma);
 	/*
 	 * vma->vm_prev wasn't known when we followed the rbtree to find the
@@ -856,7 +870,7 @@ again:
 			vma_gap_update(vma);
 		if (end_changed) {
 			if (!next)
 -				mm->highest_vm_end = end;
 +				mm->highest_vm_end = vm_end_gap(vma);
 			else if (!adjust_next)
 				vma_gap_update(next);
 		}
@@ -941,7 +955,7 @@ again:
 			 * mm->highest_vm_end doesn't need any update
 			 * in remove_next == 1 case.
 			 */
 -			VM_WARN_ON(mm->highest_vm_end != end);
 +			VM_WARN_ON(mm->highest_vm_end != vm_end_gap(vma));
 		}
 	}
 	if (insert && file)
@@ -1787,7 +1801,7 @@ unsigned long unmapped_area(struct vm_un
 	while (true) {
 		/* Visit left subtree if it looks promising */
 -		gap_end = vma->vm_start;
 +		gap_end = vm_start_gap(vma);
 		if (gap_end >= low_limit && vma->vm_rb.rb_left) {
 			struct vm_area_struct *left =
 				rb_entry(vma->vm_rb.rb_left,
@@ -1798,7 +1812,7 @@ unsigned long unmapped_area(struct vm_un
 			}
 		}
 -		gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
 +		gap_start = vma->vm_prev ? vm_end_gap(vma->vm_prev) : 0;
 check_current:
 		/* Check if current node has a suitable gap */
 		if (gap_start > high_limit)
@@ -1825,8 +1839,8 @@ check_current:
 			vma = rb_entry(rb_parent(prev),
 				       struct vm_area_struct, vm_rb);
 			if (prev == vma->vm_rb.rb_left) {
 -				gap_start = vma->vm_prev->vm_end;
 -				gap_end = vma->vm_start;
 +				gap_start = vm_end_gap(vma->vm_prev);
 +				gap_end = vm_start_gap(vma);
 				goto check_current;
 			}
 		}
@@ -1890,7 +1904,7 @@ unsigned long unmapped_area_topdown(stru
 	while (true) {
 		/* Visit right subtree if it looks promising */
 -		gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
 +		gap_start = vma->vm_prev ? vm_end_gap(vma->vm_prev) : 0;
 		if (gap_start <= high_limit && vma->vm_rb.rb_right) {
 			struct vm_area_struct *right =
 				rb_entry(vma->vm_rb.rb_right,
@@ -1903,7 +1917,7 @@ unsigned long unmapped_area_topdown(stru
 check_current:
 		/* Check if current node has a suitable gap */
 -		gap_end = vma->vm_start;
 +		gap_end = vm_start_gap(vma);
 		if (gap_end < low_limit)
 			return -ENOMEM;
 		if (gap_start <= high_limit && gap_end - gap_start >= length)
@@ -1929,7 +1943,7 @@ check_current:
 				       struct vm_area_struct, vm_rb);
 			if (prev == vma->vm_rb.rb_right) {
 				gap_start = vma->vm_prev ?
 -					vma->vm_prev->vm_end : 0;
 +					vm_end_gap(vma->vm_prev) : 0;
 				goto check_current;
 			}
 		}
@@ -1967,7 +1981,7 @@ arch_get_unmapped_area(struct file *filp
 		unsigned long len, unsigned long pgoff, unsigned long flags)
 {
 	struct mm_struct *mm = current->mm;
 -	struct vm_area_struct *vma;
 +	struct vm_area_struct *vma, *prev;
 	struct vm_unmapped_area_info info;
 	if (len > TASK_SIZE - mmap_min_addr)
@@ -1978,9 +1992,10 @@ arch_get_unmapped_area(struct file *filp
 	if (addr) {
 		addr = PAGE_ALIGN(addr);
 -		vma = find_vma(mm, addr);
 +		vma = find_vma_prev(mm, addr, &prev);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -		    (!vma || addr + len <= vma->vm_start))
 +		    (!vma || addr + len <= vm_start_gap(vma)) &&
 +		    (!prev || addr >= vm_end_gap(prev)))
 			return addr;
 	}
@@ -2003,7 +2018,7 @@ arch_get_unmapped_area_topdown(struct fi
 			  const unsigned long len, const unsigned long pgoff,
 			  const unsigned long flags)
 {
 -	struct vm_area_struct *vma;
 +	struct vm_area_struct *vma, *prev;
 	struct mm_struct *mm = current->mm;
 	unsigned long addr = addr0;
 	struct vm_unmapped_area_info info;
@@ -2018,9 +2033,10 @@ arch_get_unmapped_area_topdown(struct fi
 	/* requesting a specific address */
 	if (addr) {
 		addr = PAGE_ALIGN(addr);
 -		vma = find_vma(mm, addr);
 +		vma = find_vma_prev(mm, addr, &prev);
 		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
 -				(!vma || addr + len <= vma->vm_start))
 +				(!vma || addr + len <= vm_start_gap(vma)) &&
 +				(!prev || addr >= vm_end_gap(prev)))
 			return addr;
 	}
@@ -2155,21 +2171,19 @@ find_vma_prev(struct mm_struct *mm, unsi
  * update accounting. This is shared with both the
  * grow-up and grow-down cases.
  */
 -static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, unsigned long grow)
 +static int acct_stack_growth(struct vm_area_struct *vma,
 +			     unsigned long size, unsigned long grow)
 {
 	struct mm_struct *mm = vma->vm_mm;
 	struct rlimit *rlim = current->signal->rlim;
 -	unsigned long new_start, actual_size;
 +	unsigned long new_start;
 	/* address space limit tests */
 	if (!may_expand_vm(mm, vma->vm_flags, grow))
 		return -ENOMEM;
 	/* Stack limit test */
 -	actual_size = size;
 -	if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
 -		actual_size -= PAGE_SIZE;
 -	if (actual_size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
 +	if (size > READ_ONCE(rlim[RLIMIT_STACK].rlim_cur))
 		return -ENOMEM;
 	/* mlock limit tests */
@@ -2207,17 +2221,30 @@ static int acct_stack_growth(struct vm_a
 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
 {
 	struct mm_struct *mm = vma->vm_mm;
 +	struct vm_area_struct *next;
 +	unsigned long gap_addr;
 	int error = 0;
 	if (!(vma->vm_flags & VM_GROWSUP))
 		return -EFAULT;
 	/* Guard against wrapping around to address 0. */
 -	if (address < PAGE_ALIGN(address+4))
 -		address = PAGE_ALIGN(address+4);
 -	else
 +	address &= PAGE_MASK;
 +	address += PAGE_SIZE;
 +	if (!address)
 		return -ENOMEM;
 +	/* Enforce stack_guard_gap */
 +	gap_addr = address + stack_guard_gap;
 +	if (gap_addr < address)
 +		return -ENOMEM;
 +	next = vma->vm_next;
 +	if (next && next->vm_start < gap_addr) {
 +		if (!(next->vm_flags & VM_GROWSUP))
 +			return -ENOMEM;
 +		/* Check that both stack segments have the same anon_vma? */
 +	}
 +
 	/* We must make sure the anon_vma is allocated. */
 	if (unlikely(anon_vma_prepare(vma)))
 		return -ENOMEM;
@@ -2261,7 +2288,7 @@ int expand_upwards(struct vm_area_struct
 				if (vma->vm_next)
 					vma_gap_update(vma->vm_next);
 				else
 -					mm->highest_vm_end = address;
 +					mm->highest_vm_end = vm_end_gap(vma);
 				spin_unlock(&mm->page_table_lock);
 				perf_event_mmap(vma);
@@ -2282,6 +2309,8 @@ int expand_downwards(struct vm_area_stru
 				   unsigned long address)
 {
 	struct mm_struct *mm = vma->vm_mm;
 +	struct vm_area_struct *prev;
 +	unsigned long gap_addr;
 	int error;
 	address &= PAGE_MASK;
@@ -2289,6 +2318,17 @@ int expand_downwards(struct vm_area_stru
 	if (error)
 		return error;
 +	/* Enforce stack_guard_gap */
 +	gap_addr = address - stack_guard_gap;
 +	if (gap_addr > address)
 +		return -ENOMEM;
 +	prev = vma->vm_prev;
 +	if (prev && prev->vm_end > gap_addr) {
 +		if (!(prev->vm_flags & VM_GROWSDOWN))
 +			return -ENOMEM;
 +		/* Check that both stack segments have the same anon_vma? */
 +	}
 +
 	/* We must make sure the anon_vma is allocated. */
 	if (unlikely(anon_vma_prepare(vma)))
 		return -ENOMEM;
@@ -2343,28 +2383,25 @@ int expand_downwards(struct vm_area_stru
 	return error;
 }
 -/*
 - * Note how expand_stack() refuses to expand the stack all the way to
 - * abut the next virtual mapping, *unless* that mapping itself is also
 - * a stack mapping. We want to leave room for a guard page, after all
 - * (the guard page itself is not added here, that is done by the
 - * actual page faulting logic)
 - *
 - * This matches the behavior of the guard page logic (see mm/memory.c:
 - * check_stack_guard_page()), which only allows the guard page to be
 - * removed under these circumstances.
 - */
 +/* enforced gap between the expanding stack and other mappings. */
 +unsigned long stack_guard_gap = 256UL<<PAGE_SHIFT;
 +
 +static int __init cmdline_parse_stack_guard_gap(char *p)
 +{
 +	unsigned long val;
 +	char *endptr;
 +
 +	val = simple_strtoul(p, &endptr, 10);
 +	if (!*endptr)
 +		stack_guard_gap = val << PAGE_SHIFT;
 +
 +	return 0;
 +}
 +__setup("stack_guard_gap=", cmdline_parse_stack_guard_gap);
 +
 #ifdef CONFIG_STACK_GROWSUP
 int expand_stack(struct vm_area_struct *vma, unsigned long address)
 {
 -	struct vm_area_struct *next;
 -
 -	address &= PAGE_MASK;
 -	next = vma->vm_next;
 -	if (next && next->vm_start == address + PAGE_SIZE) {
 -		if (!(next->vm_flags & VM_GROWSUP))
 -			return -ENOMEM;
 -	}
 	return expand_upwards(vma, address);
 }
@@ -2386,14 +2423,6 @@ find_extend_vma(struct mm_struct *mm, un
 #else
 int expand_stack(struct vm_area_struct *vma, unsigned long address)
 {
 -	struct vm_area_struct *prev;
 -
 -	address &= PAGE_MASK;
 -	prev = vma->vm_prev;
 -	if (prev && prev->vm_end == address) {
 -		if (!(prev->vm_flags & VM_GROWSDOWN))
 -			return -ENOMEM;
 -	}
 	return expand_downwards(vma, address);
 }
@@ -2491,7 +2520,7 @@ detach_vmas_to_be_unmapped(struct mm_str
 		vma->vm_prev = prev;
 		vma_gap_update(vma);
 	} else
 -		mm->highest_vm_end = prev ? prev->vm_end : 0;
 +		mm->highest_vm_end = prev ? vm_end_gap(prev) : 0;
 	tail_vma->vm_next = NULL;
 	/* Kill the cache */
--- a/28
+++ b/28
@ -2,8 +2,8 @@
 # Maintainer: Mark Weiman <markzz@archlinux.net>
 pkgbase=linux-vfio
-_srcname=linux-4.10
+_srcname=linux-4.11
-pkgver=4.10.13
+pkgver=4.11.6
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
@ -17,23 +17,28 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
        # the main kernel config files
        'config' 'config.x86_64'
        # pacman hook for initramfs regeneration
-        '99-linux.hook'
+        '90-linux.hook'
        # standard config files for mkinitcpio ramdisk
        'linux.preset'
        # patches for pci passthrough
        'add-acs-overrides.patch'
        'i915-vga-arbiter.patch'
-        )
+        CVE-2017-1000364.mm-larger-stack-guard-gap-between-vmas.patch
-sha256sums=('3c95d9f049bd085e5c346d2c77f063b8425f191460fcd3ae9fe7e94e0477dc4b'
+        CVE-2017-1000364.mm-fix-new-crash-in-unmapped_area_topdown.patch
        CVE-2017-1000364.fixup.allow-stack-to-grow-up-to-address-space-limit.patch)
 sha256sums=('b67ecafd0a42b3383bf4d82f0850cbff92a7e72a215a6d02f42ddbafcf42a7d6'
            'SKIP'
-            'b1a7a98aa97cc0917fcab0def68032d5bf61838c79177b2222cee2485015458f'
+            '00c0b804ccda18d6ed4a32ba0be049a80363aa2bc084733a22da03f435d992a4'
            'SKIP'
-            '386051f19482672c871e7865fc62f5e2c8010d857729134ba13044734962e42c'
+            'f330007da72867bb86556d1f8b84b8a4c8148a5ed5195ae25570a5da61428733'
-            '12a87284e2935cd17e2846a207cc76f1728531416523735d66ef8a0ae690884c'
+            '9dd9aa4a8ec613cc8261e40db897685d75e3d426219ed8d21fa3a6bc72a27a32'
            '8f407ad5ff6eff106562ba001c36a281134ac9aa468a596aea660a4fe1fd60b5'
            '99d0102c8065793096b8ea2ccc01c41fa3dcb96855f9f6f2c583b2372208c6f9'
            '773b2a7db63dbc38336e04e25d5017a2a02c49e424cfa32beedb4e47a5027d2c'
-            '0bef31f6d1415398cb2e78d58798aa49e146b27c87764da181b6d41bd4e577eb')
+            'e82ea0c7752b5845655043bb209e39ca3a9fe9c0841b100a5d182261c1ab7068'
            'e1b6a237894fb9e7bf142eb97b5e53c2e46a15ff69ef11593007f254b9faa160'
            'beede1721c92bae39049be5bcb30e4274406dc53c41436bf75bd44238ee8efe4'
            'de9c4f81b51c497de930b365f63633a005e3b8bcfbb21be93fe0cbab84ed9f76')
 validpgpkeys=(
              'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
              '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@ -47,6 +52,11 @@ prepare() {
  # add upstream patch
  patch -p1 -i "${srcdir}/patch-${pkgver}"
  # security patches
  patch -p1 < "${srcdir}/CVE-2017-1000364.mm-larger-stack-guard-gap-between-vmas.patch"
  patch -p1 < "${srcdir}/CVE-2017-1000364.mm-fix-new-crash-in-unmapped_area_topdown.patch"
  patch -p1 < "${srcdir}/CVE-2017-1000364.fixup.allow-stack-to-grow-up-to-address-space-limit.patch"
  # add latest fixes from stable queue, if needed
  # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
--- a/165
+++ b/165
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.10.0-1 Kernel Configuration
+# Linux/x86 4.11.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@ -38,7 +38,6 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_32_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_DEBUG_RODATA=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@ -130,13 +129,12 @@ CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
 CONFIG_CGROUPS=y
@ -152,6 +150,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
 # CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CPUSETS=y
@ -220,6 +219,7 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
 #
 # Kernel Performance Events And Counters
@ -228,6 +228,7 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
@ -260,6 +261,7 @@ CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
@ -301,6 +303,12 @@ CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
 # CONFIG_HAVE_ARCH_VMAP_STACK is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 #
 # GCOV-based kernel profiling
@ -324,6 +332,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_LBDAF=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
@ -333,6 +342,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_SQ=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_SED_OPAL=y
 #
 # Partition Types
@ -359,6 +370,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_SYSV68_PARTITION is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 #
 # IO Schedulers
@ -371,6 +383,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=m
@ -620,7 +633,7 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@ -680,7 +693,6 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@ -755,6 +767,7 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
@ -782,9 +795,13 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 #
-# PCI host controller drivers
+# DesignWare PCI Core Support
 #
 # CONFIG_PCIE_DW_PLAT is not set
 #
 # PCI host controller drivers
 #
 CONFIG_ISA_DMA_API=y
 CONFIG_ISA=y
 # CONFIG_EISA is not set
@ -834,7 +851,6 @@ CONFIG_BINFMT_MISC=y
 CONFIG_COREDUMP=y
 CONFIG_COMPAT_32=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
 CONFIG_PMC_ATOM=y
 CONFIG_NET=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
@ -847,6 +863,7 @@ CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@ -855,6 +872,7 @@ CONFIG_XFRM_USER=m
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 # CONFIG_SMC is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@ -880,6 +898,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
@ -918,6 +937,7 @@ CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
@ -1012,6 +1032,7 @@ CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_SET_RBTREE=m
 CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@ -1335,7 +1356,6 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_HWMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
@ -1436,6 +1456,7 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
@ -1483,7 +1504,7 @@ CONFIG_NET_NCSI=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
+CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
@ -1770,9 +1791,12 @@ CONFIG_NFC_ST_NCI_I2C=m
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 # CONFIG_NFC_ST95HF is not set
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
@ -1876,6 +1900,7 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_PHYSMAP is not set
 CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_PHYSMAP_OF_VERSATILE is not set
 # CONFIG_MTD_PHYSMAP_OF_GEMINI is not set
 # CONFIG_MTD_SBC_GXX is not set
 # CONFIG_MTD_AMD76XROM is not set
 # CONFIG_MTD_ICHXROM is not set
@ -1964,7 +1989,7 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@ -1984,6 +2009,7 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
 # CONFIG_CDROM_PKTCDVD_WCACHE is not set
 CONFIG_ATA_OVER_ETH=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_RSXX=m
@ -2045,6 +2071,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@ -2236,6 +2263,7 @@ CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_QEDI=m
 CONFIG_QEDF=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_SYM53C416=m
@ -2457,6 +2485,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
 CONFIG_GTP=m
@ -2466,6 +2495,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
@ -2555,6 +2585,7 @@ CONFIG_PCMCIA_NMCLAN=m
 CONFIG_NI65=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_HAVE_ECC=y
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@ -2683,8 +2714,8 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP_NETVF=m
+CONFIG_NFP=m
-# CONFIG_NFP_NET_DEBUG is not set
+# CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2000=m
@ -2712,6 +2743,7 @@ CONFIG_QED_LL2=y
 CONFIG_QED_SRIOV=y
 CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCOM_EMAC=m
@ -2761,8 +2793,6 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_SYNOPSYS_DWC_ETH_QOS=m
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@ -2909,6 +2939,7 @@ CONFIG_ATH5K=m
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
@ -3020,7 +3051,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
 # CONFIG_IWLWIFI_PCIE_RTPM is not set
 #
 # Debugging Options
@ -3357,6 +3387,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_OMAP4 is not set
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CROS_EC is not set
 # CONFIG_KEYBOARD_CAP11XX is not set
@ -3519,6 +3550,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
@ -3532,7 +3564,6 @@ CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 CONFIG_INPUT_GPIO_BEEPER=m
@ -3645,6 +3676,7 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@ -3694,6 +3726,8 @@ CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@ -3915,6 +3949,7 @@ CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 #
@ -3931,6 +3966,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=y
 CONFIG_PINCTRL_BROXTON=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=y
 CONFIG_GPIOLIB=y
 CONFIG_OF_GPIO=y
@ -3946,6 +3982,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
 CONFIG_GPIO_ICH=m
@ -3997,6 +4034,7 @@ CONFIG_GPIO_WHISKEY_COVE=y
 CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_PCH is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_RDC321X is not set
 # CONFIG_GPIO_SODAVILLE is not set
@ -4038,6 +4076,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_OLPC=m
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@ -4046,6 +4085,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_MAX8903 is not set
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_DETECTOR_MAX14656 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@ -4189,6 +4229,7 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_STTS751=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS1015=m
@ -4266,6 +4307,7 @@ CONFIG_WATCHDOG_SYSFS=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SOFT_WATCHDOG_PRETIMEOUT is not set
 CONFIG_GPIO_WATCHDOG=m
 CONFIG_WDAT_WDT=m
 CONFIG_XILINX_WATCHDOG=m
@ -4313,6 +4355,7 @@ CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_INTEL_MEI_WDT=m
 CONFIG_NI903X_WDT=m
 CONFIG_NIC7018_WDT=m
 CONFIG_MEN_A21_WDT=m
 #
@ -4430,6 +4473,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_MT6397 is not set
 # CONFIG_MFD_MENF21BMC is not set
 # CONFIG_EZX_PCAP is not set
 CONFIG_MFD_CPCAP=m
 CONFIG_MFD_VIPERBOARD=m
 CONFIG_MFD_RETU=m
 CONFIG_MFD_PCF50633=m
@ -4561,6 +4605,7 @@ CONFIG_IR_ITE_CIR=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGORPLUGUSB=m
@ -4646,7 +4691,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
@ -4711,6 +4755,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
 CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@ -4761,6 +4806,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 # Media capture/analog TV support
 #
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
@ -5085,6 +5131,7 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
 #
@ -5179,6 +5226,7 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
@ -5186,6 +5234,7 @@ CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_VM=y
 #
 # I2C encoder or helper chips
@ -5260,7 +5309,9 @@ CONFIG_DRM_I2C_ADV7511_AUDIO=y
 CONFIG_DRM_HISI_HIBMC=m
 CONFIG_DRM_MXS=y
 CONFIG_DRM_MXSFB=m
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
 # CONFIG_DRM_LIB_RANDOM is not set
 #
 # Frame buffer Devices
@ -5278,6 +5329,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
@ -5386,6 +5438,7 @@ CONFIG_HDMI=y
 CONFIG_VGA_CONSOLE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
@ -5644,7 +5697,7 @@ CONFIG_SND_DESIGNWARE_PCM=m
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SST_MFLD_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
@ -5700,7 +5753,9 @@ CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES8328 is not set
+CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDMI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -5769,12 +5824,15 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 # CONFIG_SND_SIMPLE_SCU_CARD is not set
 CONFIG_SND_X86=y
 CONFIG_HDMI_LPE_AUDIO=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
@ -6066,6 +6124,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 #
@ -6093,6 +6152,7 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HUB_USB251XB=m
 CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
@ -6123,6 +6183,7 @@ CONFIG_UWB_I1480U=m
 CONFIG_MMC=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_PWRSEQ_EMMC=m
 # CONFIG_PWRSEQ_SD8787 is not set
 CONFIG_PWRSEQ_SIMPLE=m
 CONFIG_MMC_BLOCK=m
 CONFIG_MMC_BLOCK_MINORS=8
@ -6175,6 +6236,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 #
 # LED drivers
@ -6752,9 +6814,6 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 CONFIG_DVB_CXD2099=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
@ -6780,13 +6839,6 @@ CONFIG_COMMON_CLK_XLNX_CLKWZRD=m
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 #
 # Old ISDN4Linux (deprecated)
 #
 CONFIG_ISDN_DRV_ICN=m
 CONFIG_ISDN_DRV_PCBIT=m
 CONFIG_ISDN_DRV_ACT2000=m
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
@ -6858,6 +6910,8 @@ CONFIG_SURFACE_PRO3_BUTTON=m
 CONFIG_SURFACE_3_BUTTON=m
 CONFIG_INTEL_PUNIT_IPC=m
 # CONFIG_MLX_CPLD_PLATFORM is not set
 # CONFIG_SILEAD_DMI is not set
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
@ -6883,13 +6937,7 @@ CONFIG_COMMON_CLK_RK808=m
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
-# CONFIG_COMMON_CLK_MT2701 is not set
+# CONFIG_COMMON_CLK_VC5 is not set
 # CONFIG_COMMON_CLK_MT2701_MMSYS is not set
 # CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
 # CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
 # CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
 # CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
 #
 # Hardware Spinlock drivers
@ -6944,6 +6992,7 @@ CONFIG_REMOTEPROC=m
 #
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_PM_DEVFREQ=y
 #
@ -6967,6 +7016,7 @@ CONFIG_EXTCON=m
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_ARIZONA is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
@ -7029,9 +7079,11 @@ CONFIG_MMA7660=m
 # CONFIG_AD799X is not set
 # CONFIG_ENVELOPE_DETECTOR is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
@ -7045,8 +7097,10 @@ CONFIG_MMA7660=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_ADS8688 is not set
 # CONFIG_TI_AM335X_ADC is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_VF610_ADC is not set
 # CONFIG_VIPERBOARD_ADC is not set
@ -7141,6 +7195,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@ -7179,6 +7234,7 @@ CONFIG_MAX30100=m
 CONFIG_INV_MPU6050_IIO=m
 # CONFIG_INV_MPU6050_I2C is not set
 CONFIG_INV_MPU6050_SPI=m
 # CONFIG_IIO_ST_LSM6DSX is not set
 #
 # Light sensors
@ -7193,6 +7249,7 @@ CONFIG_BH1780=m
 # CONFIG_CM32181 is not set
 # CONFIG_CM3232 is not set
 # CONFIG_CM3323 is not set
 # CONFIG_CM3605 is not set
 # CONFIG_CM36651 is not set
 # CONFIG_GP2AP020A00F is not set
 # CONFIG_SENSORS_ISL29018 is not set
@ -7253,6 +7310,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # Digital potentiometers
 #
 # CONFIG_DS1803 is not set
 # CONFIG_MAX5481 is not set
 # CONFIG_MAX5487 is not set
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
@ -7268,6 +7326,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
 # CONFIG_IIO_CROS_EC_BARO is not set
 # CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@ -7286,10 +7345,11 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # CONFIG_AS3935 is not set
 #
-# Proximity sensors
+# Proximity and distance sensors
 #
 # CONFIG_LIDAR_LITE_V2 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 #
 # Temperature sensors
@ -7297,6 +7357,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_NTB is not set
@ -7377,10 +7438,14 @@ CONFIG_INTEL_TH_PTI=m
 #
 # CONFIG_FPGA is not set
 #
 # FSI support
 #
 CONFIG_FSI=m
 #
 # Firmware Drivers
 #
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
@ -7776,6 +7841,7 @@ CONFIG_FRAME_POINTER=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
 #
@ -7785,6 +7851,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
@ -7792,6 +7859,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
@ -7823,7 +7891,6 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 #
@ -7839,6 +7906,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@ -7898,8 +7966,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENT=y
+CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENT=y
+CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
@ -7921,6 +7989,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 #
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
@ -7936,6 +8005,7 @@ CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_PARMAN is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
@ -7962,10 +8032,7 @@ CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP_CORE is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
@ -8005,6 +8072,7 @@ CONFIG_SECURITY_PATH=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@ -8062,6 +8130,7 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_ENGINE=m
 #
 # Authenticated Encryption with Associated Data
@ -8120,6 +8189,7 @@ CONFIG_CRYPTO_WP512=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_586=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
@ -8296,6 +8366,8 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 # CONFIG_DMA_NOOP_OPS is not set
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@ -8320,12 +8392,13 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_6x10 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_AUTOSELECT=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
 CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
--- a/config.x86_64
+++ b/config.x86_64
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.10.0-1 Kernel Configuration
+# Linux/x86 4.11.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@ -41,7 +41,6 @@ CONFIG_HAVE_INTEL_TXT=y
 CONFIG_X86_64_SMP=y
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_DEBUG_RODATA=y
 CONFIG_PGTABLE_LEVELS=4
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@ -135,13 +134,12 @@ CONFIG_SRCU=y
 # CONFIG_TASKS_RCU is not set
 CONFIG_RCU_STALL_COMMON=y
 # CONFIG_TREE_RCU_TRACE is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
-CONFIG_NMI_LOG_BUF_SHIFT=13
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=12
 CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
 CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
 CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
@ -161,6 +159,7 @@ CONFIG_FAIR_GROUP_SCHED=y
 CONFIG_CFS_BANDWIDTH=y
 # CONFIG_RT_GROUP_SCHED is not set
 CONFIG_CGROUP_PIDS=y
 # CONFIG_CGROUP_RDMA is not set
 CONFIG_CGROUP_FREEZER=y
 # CONFIG_CGROUP_HUGETLB is not set
 CONFIG_CPUSETS=y
@ -229,6 +228,7 @@ CONFIG_PCI_QUIRKS=y
 CONFIG_MEMBARRIER=y
 # CONFIG_EMBEDDED is not set
 CONFIG_HAVE_PERF_EVENTS=y
 # CONFIG_PC104 is not set
 #
 # Kernel Performance Events And Counters
@ -237,6 +237,7 @@ CONFIG_PERF_EVENTS=y
 # CONFIG_DEBUG_PERF_USE_VMALLOC is not set
 CONFIG_VM_EVENT_COUNTERS=y
 CONFIG_SLUB_DEBUG=y
 # CONFIG_SLUB_MEMCG_SYSFS_ON is not set
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
@ -269,6 +270,7 @@ CONFIG_HAVE_NMI=y
 CONFIG_HAVE_ARCH_TRACEHOOK=y
 CONFIG_HAVE_DMA_CONTIGUOUS=y
 CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_CLK=y
@ -300,6 +302,7 @@ CONFIG_HAVE_CONTEXT_TRACKING=y
 CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_SOFT_DIRTY=y
 CONFIG_MODULES_USE_ELF_RELA=y
@ -319,6 +322,12 @@ CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_CPU_NO_EFFICIENT_FFS is not set
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX is not set
 # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 CONFIG_STRICT_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
 CONFIG_STRICT_MODULE_RWX=y
 #
 # GCOV-based kernel profiling
@ -341,6 +350,7 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 # CONFIG_MODULE_COMPRESS_XZ is not set
 CONFIG_MODULES_TREE_LOOKUP=y
 CONFIG_BLOCK=y
 CONFIG_BLK_SCSI_REQUEST=y
 CONFIG_BLK_DEV_BSG=y
 CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
@ -350,6 +360,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_SQ=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_DEBUG_FS=y
 CONFIG_BLK_SED_OPAL=y
 #
 # Partition Types
@ -377,6 +389,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 #
 # IO Schedulers
@ -389,6 +402,7 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_CFQ=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="cfq"
 CONFIG_MQ_IOSCHED_DEADLINE=y
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PADATA=y
 CONFIG_ASN1=m
@ -651,7 +665,7 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
 # CONFIG_ACPI_DEBUGGER is not set
 CONFIG_ACPI_SLEEP=y
 # CONFIG_ACPI_PROCFS_POWER is not set
-# CONFIG_ACPI_REV_OVERRIDE_POSSIBLE is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
 CONFIG_ACPI_EC_DEBUGFS=m
 CONFIG_ACPI_AC=m
 CONFIG_ACPI_BATTERY=m
@ -709,7 +723,6 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_STAT_DETAILS=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
 # CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
@ -766,6 +779,7 @@ CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
 CONFIG_PCIEASPM_DEFAULT=y
 # CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_PCIE_DPC=y
@ -793,9 +807,13 @@ CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
 CONFIG_HOTPLUG_PCI_SHPC=m
 #
-# PCI host controller drivers
+# DesignWare PCI Core Support
 #
 # CONFIG_PCIE_DW_PLAT is not set
 #
 # PCI host controller drivers
 #
 CONFIG_VMD=m
 CONFIG_ISA_DMA_API=y
 CONFIG_AMD_NB=y
@ -839,7 +857,6 @@ CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
 CONFIG_SYSVIPC_COMPAT=y
 CONFIG_KEYS_COMPAT=y
 CONFIG_X86_DEV_DMA_OPS=y
 CONFIG_PMC_ATOM=y
 CONFIG_NET=y
 CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
@ -853,6 +870,7 @@ CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 # CONFIG_XFRM_SUB_POLICY is not set
@ -861,6 +879,7 @@ CONFIG_XFRM_USER=m
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 # CONFIG_SMC is not set
 CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
@ -886,6 +905,7 @@ CONFIG_NET_FOU=m
 CONFIG_NET_FOU_IP_TUNNELS=y
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 CONFIG_INET_XFRM_TUNNEL=m
 CONFIG_INET_TUNNEL=m
@ -924,6 +944,7 @@ CONFIG_IPV6_ROUTE_INFO=y
 CONFIG_IPV6_OPTIMISTIC_DAD=y
 CONFIG_INET6_AH=m
 CONFIG_INET6_ESP=m
 CONFIG_INET6_ESP_OFFLOAD=m
 CONFIG_INET6_IPCOMP=m
 CONFIG_IPV6_MIP6=m
 CONFIG_IPV6_ILA=m
@ -1018,6 +1039,7 @@ CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
 CONFIG_NFT_SET_RBTREE=m
 CONFIG_NFT_SET_HASH=m
 CONFIG_NFT_SET_BITMAP=m
 CONFIG_NFT_COUNTER=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@ -1341,7 +1363,6 @@ CONFIG_BRIDGE_IGMP_SNOOPING=y
 CONFIG_BRIDGE_VLAN_FILTERING=y
 CONFIG_HAVE_NET_DSA=y
 CONFIG_NET_DSA=m
 CONFIG_NET_DSA_HWMON=y
 CONFIG_NET_DSA_TAG_BRCM=y
 CONFIG_NET_DSA_TAG_DSA=y
 CONFIG_NET_DSA_TAG_EDSA=y
@ -1442,6 +1463,7 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_SAMPLE=m
 CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
@ -1489,7 +1511,7 @@ CONFIG_NET_NCSI=y
 CONFIG_RPS=y
 CONFIG_RFS_ACCEL=y
 CONFIG_XPS=y
-# CONFIG_CGROUP_NET_PRIO is not set
+CONFIG_CGROUP_NET_PRIO=y
 CONFIG_CGROUP_NET_CLASSID=y
 CONFIG_NET_RX_BUSY_POLL=y
 CONFIG_BQL=y
@ -1769,9 +1791,12 @@ CONFIG_NFC_ST_NCI_I2C=m
 # CONFIG_NFC_NXP_NCI is not set
 # CONFIG_NFC_S3FWRN5_I2C is not set
 # CONFIG_NFC_ST95HF is not set
 CONFIG_PSAMPLE=m
 CONFIG_NET_IFE=m
 CONFIG_LWTUNNEL=y
 CONFIG_LWTUNNEL_BPF=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 CONFIG_NET_DEVLINK=m
 CONFIG_MAY_USE_DEVLINK=m
 CONFIG_HAVE_EBPF_JIT=y
@ -1948,7 +1973,7 @@ CONFIG_BLK_DEV_FD=m
 CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_ZRAM=m
 CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
+CONFIG_CISS_SCSI_TAPE=y
 CONFIG_BLK_DEV_DAC960=m
 # CONFIG_BLK_DEV_UMEM is not set
 # CONFIG_BLK_DEV_COW_COMMON is not set
@ -1971,6 +1996,7 @@ CONFIG_ATA_OVER_ETH=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
 CONFIG_VIRTIO_BLK=m
 # CONFIG_VIRTIO_BLK_SCSI is not set
 # CONFIG_BLK_DEV_HD is not set
 CONFIG_BLK_DEV_RBD=m
 CONFIG_BLK_DEV_RSXX=m
@ -2028,6 +2054,7 @@ CONFIG_EEPROM_LEGACY=m
 CONFIG_EEPROM_MAX6875=m
 CONFIG_EEPROM_93CX6=m
 # CONFIG_EEPROM_93XX46 is not set
 CONFIG_EEPROM_IDT_89HPESX=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
@ -2225,6 +2252,7 @@ CONFIG_TCM_QLA2XXX=m
 # CONFIG_TCM_QLA2XXX_DEBUG is not set
 CONFIG_SCSI_QLA_ISCSI=m
 CONFIG_QEDI=m
 CONFIG_QEDF=m
 CONFIG_SCSI_LPFC=m
 # CONFIG_SCSI_LPFC_DEBUG_FS is not set
 CONFIG_SCSI_DC395x=m
@ -2433,6 +2461,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
 CONFIG_MACVTAP=m
 CONFIG_IPVLAN=m
 CONFIG_IPVTAP=m
 CONFIG_VXLAN=m
 CONFIG_GENEVE=m
 CONFIG_GTP=m
@ -2442,6 +2471,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
 CONFIG_NETPOLL=y
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_TUN=m
 CONFIG_TAP=m
 # CONFIG_TUN_VNET_CROSS_LE is not set
 CONFIG_VETH=m
 CONFIG_VIRTIO_NET=m
@ -2527,6 +2557,7 @@ CONFIG_PCNET32=m
 CONFIG_PCMCIA_NMCLAN=m
 CONFIG_AMD_XGBE=m
 CONFIG_AMD_XGBE_HAVE_ECC=y
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=m
@ -2653,8 +2684,8 @@ CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
 CONFIG_NET_VENDOR_NETRONOME=y
-CONFIG_NFP_NETVF=m
+CONFIG_NFP=m
-# CONFIG_NFP_NET_DEBUG is not set
+# CONFIG_NFP_DEBUG is not set
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@ -2678,6 +2709,7 @@ CONFIG_QED_LL2=y
 CONFIG_QED_SRIOV=y
 CONFIG_QEDE=m
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCOM_EMAC=m
 CONFIG_NET_VENDOR_REALTEK=y
@ -2725,7 +2757,6 @@ CONFIG_HAPPYMEAL=m
 CONFIG_SUNGEM=m
 CONFIG_CASSINI=m
 CONFIG_NIU=m
 CONFIG_NET_VENDOR_SYNOPSYS=y
 CONFIG_NET_VENDOR_TEHUTI=y
 CONFIG_TEHUTI=m
 CONFIG_NET_VENDOR_TI=y
@ -2871,6 +2902,7 @@ CONFIG_ATH5K=m
 CONFIG_ATH5K_PCI=y
 CONFIG_ATH9K_HW=m
 CONFIG_ATH9K_COMMON=m
 CONFIG_ATH9K_COMMON_DEBUG=y
 CONFIG_ATH9K_BTCOEX_SUPPORT=y
 CONFIG_ATH9K=m
 CONFIG_ATH9K_PCI=y
@ -2981,7 +3013,6 @@ CONFIG_IWLDVM=m
 CONFIG_IWLMVM=m
 CONFIG_IWLWIFI_OPMODE_MODULAR=y
 # CONFIG_IWLWIFI_BCAST_FILTERING is not set
 # CONFIG_IWLWIFI_PCIE_RTPM is not set
 #
 # Debugging Options
@ -3306,6 +3337,7 @@ CONFIG_KEYBOARD_MPR121=m
 # CONFIG_KEYBOARD_SAMSUNG is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_SUNKBD is not set
 CONFIG_KEYBOARD_TM2_TOUCHKEY=m
 # CONFIG_KEYBOARD_XTKBD is not set
 # CONFIG_KEYBOARD_CROS_EC is not set
 CONFIG_INPUT_MOUSE=y
@ -3456,6 +3488,7 @@ CONFIG_TOUCHSCREEN_SUR40=m
 CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
 # CONFIG_TOUCHSCREEN_SX8654 is not set
 CONFIG_TOUCHSCREEN_TPS6507X=m
 CONFIG_TOUCHSCREEN_ZET6223=m
 CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TOUCHSCREEN_ROHM_BU21023=m
 CONFIG_INPUT_MISC=y
@ -3468,7 +3501,6 @@ CONFIG_INPUT_E3X0_BUTTON=m
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_MC13783_PWRBUTTON=m
 CONFIG_INPUT_MMA8450=m
 CONFIG_INPUT_MPU3050=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_GP2A=m
 # CONFIG_INPUT_GPIO_BEEPER is not set
@ -3578,6 +3610,7 @@ CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_DMA=y
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_EXAR=m
 CONFIG_SERIAL_8250_CS=m
 CONFIG_SERIAL_8250_NR_UARTS=32
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
@ -3617,6 +3650,8 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
 CONFIG_SERIAL_RP2=m
 CONFIG_SERIAL_RP2_NR_UARTS=32
 CONFIG_SERIAL_FSL_LPUART=m
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 CONFIG_PPDEV=m
@ -3828,6 +3863,7 @@ CONFIG_PPS_CLIENT_GPIO=m
 #
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PINCTRL=y
 #
@ -3843,6 +3879,7 @@ CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_CHERRYVIEW=y
 CONFIG_PINCTRL_INTEL=y
 CONFIG_PINCTRL_BROXTON=y
 # CONFIG_PINCTRL_GEMINILAKE is not set
 CONFIG_PINCTRL_SUNRISEPOINT=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
@ -3855,6 +3892,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # CONFIG_GPIO_AMDPT is not set
 # CONFIG_GPIO_DWAPB is not set
 CONFIG_GPIO_EXAR=m
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_ICH=m
 CONFIG_GPIO_LYNXPOINT=y
@ -3895,6 +3933,7 @@ CONFIG_GPIO_WHISKEY_COVE=y
 #
 CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_ML_IOH is not set
 CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_RDC321X is not set
 #
@ -3925,6 +3964,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
@ -4075,6 +4115,7 @@ CONFIG_SENSORS_SMSC47B397=m
 CONFIG_SENSORS_SCH56XX_COMMON=m
 CONFIG_SENSORS_SCH5627=m
 CONFIG_SENSORS_SCH5636=m
 CONFIG_SENSORS_STTS751=m
 CONFIG_SENSORS_SMM665=m
 CONFIG_SENSORS_ADC128D818=m
 CONFIG_SENSORS_ADS1015=m
@ -4148,6 +4189,7 @@ CONFIG_WATCHDOG_SYSFS=y
 # Watchdog Device Drivers
 #
 CONFIG_SOFT_WATCHDOG=m
 # CONFIG_SOFT_WATCHDOG_PRETIMEOUT is not set
 CONFIG_WDAT_WDT=m
 CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
@ -4189,6 +4231,7 @@ CONFIG_MACHZ_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_INTEL_MEI_WDT=m
 CONFIG_NI903X_WDT=m
 CONFIG_NIC7018_WDT=m
 CONFIG_MEN_A21_WDT=m
 CONFIG_XEN_WDT=m
@ -4418,6 +4461,7 @@ CONFIG_IR_ITE_CIR=m
 CONFIG_IR_FINTEK=m
 CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_SPI=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGORPLUGUSB=m
@ -4503,7 +4547,6 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 CONFIG_VIDEO_HDPVR=m
 CONFIG_VIDEO_USBVISION=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160_AC97=y
 CONFIG_VIDEO_STK1160=m
 CONFIG_VIDEO_GO7007=m
 CONFIG_VIDEO_GO7007_USB=m
@ -4568,6 +4611,7 @@ CONFIG_DVB_USB_LME2510=m
 CONFIG_DVB_USB_MXL111SF=m
 CONFIG_DVB_USB_RTL28XXU=m
 CONFIG_DVB_USB_DVBSKY=m
 CONFIG_DVB_USB_ZD1301=m
 CONFIG_DVB_TTUSB_BUDGET=m
 CONFIG_DVB_TTUSB_DEC=m
 CONFIG_SMS_USB_DRV=m
@ -4618,6 +4662,7 @@ CONFIG_VIDEO_ZORAN_AVS6EYES=m
 # Media capture/analog TV support
 #
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
 CONFIG_VIDEO_IVTV_ALSA=m
 CONFIG_VIDEO_FB_IVTV=m
 CONFIG_VIDEO_HEXIUM_GEMINI=m
@ -4941,6 +4986,7 @@ CONFIG_DVB_RTL2832=m
 CONFIG_DVB_RTL2832_SDR=m
 CONFIG_DVB_SI2168=m
 CONFIG_DVB_AS102_FE=m
 CONFIG_DVB_ZD1301_DEMOD=m
 CONFIG_DVB_GP8PSK_FE=m
 #
@ -5029,11 +5075,13 @@ CONFIG_VGA_SWITCHEROO=y
 CONFIG_DRM=m
 CONFIG_DRM_MIPI_DSI=y
 CONFIG_DRM_DP_AUX_CHARDEV=y
 # CONFIG_DRM_DEBUG_MM_SELFTEST is not set
 CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM_TTM=m
 CONFIG_DRM_VM=y
 #
 # I2C encoder or helper chips
@ -5090,7 +5138,9 @@ CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_ANALOGIX_ANX78XX=m
 CONFIG_HSA_AMD=m
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
 # CONFIG_DRM_LIB_RANDOM is not set
 #
 # Frame buffer Devices
@ -5108,6 +5158,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 CONFIG_FB_SYS_FILLRECT=m
 CONFIG_FB_SYS_COPYAREA=m
 CONFIG_FB_SYS_IMAGEBLIT=m
 # CONFIG_FB_PROVIDE_GET_FB_UNMAPPED_AREA is not set
 # CONFIG_FB_FOREIGN_ENDIAN is not set
 CONFIG_FB_SYS_FOPS=m
 CONFIG_FB_DEFERRED_IO=y
@ -5208,6 +5259,7 @@ CONFIG_HDMI=y
 CONFIG_VGA_CONSOLE=y
 CONFIG_VGACON_SOFT_SCROLLBACK=y
 CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
 # CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
 CONFIG_DUMMY_CONSOLE=y
 CONFIG_DUMMY_CONSOLE_COLUMNS=80
 CONFIG_DUMMY_CONSOLE_ROWS=25
@ -5424,7 +5476,7 @@ CONFIG_SND_DESIGNWARE_PCM=m
 # CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMG is not set
-CONFIG_SND_SST_MFLD_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
 CONFIG_SND_SST_IPC=m
 CONFIG_SND_SST_IPC_ACPI=m
 CONFIG_SND_SOC_INTEL_SST=m
@ -5480,7 +5532,9 @@ CONFIG_SND_SOC_AC97_CODEC=m
 CONFIG_SND_SOC_DA7219=m
 CONFIG_SND_SOC_DMIC=m
 CONFIG_SND_SOC_HDMI_CODEC=m
-# CONFIG_SND_SOC_ES8328 is not set
+CONFIG_SND_SOC_ES8328=m
 CONFIG_SND_SOC_ES8328_I2C=m
 CONFIG_SND_SOC_ES8328_SPI=m
 # CONFIG_SND_SOC_GTM601 is not set
 CONFIG_SND_SOC_HDAC_HDMI=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -5549,11 +5603,14 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8974 is not set
 # CONFIG_SND_SOC_WM8978 is not set
 # CONFIG_SND_SOC_WM8985 is not set
 CONFIG_SND_SOC_NAU8540=m
 # CONFIG_SND_SOC_NAU8810 is not set
 CONFIG_SND_SOC_NAU8825=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_X86=y
 CONFIG_HDMI_LPE_AUDIO=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_AC97_BUS=m
@ -5850,6 +5907,7 @@ CONFIG_USB_SERIAL_XSENS_MT=m
 CONFIG_USB_SERIAL_WISHBONE=m
 CONFIG_USB_SERIAL_SSU100=m
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_UPD78F0730=m
 # CONFIG_USB_SERIAL_DEBUG is not set
 #
@ -5877,6 +5935,7 @@ CONFIG_USB_TEST=m
 CONFIG_USB_ISIGHTFW=m
 CONFIG_USB_YUREX=m
 CONFIG_USB_EZUSB_FX2=m
 CONFIG_USB_HUB_USB251XB=m
 CONFIG_USB_HSIC_USB3503=m
 CONFIG_USB_HSIC_USB4604=m
 CONFIG_USB_LINK_LAYER_TEST=m
@ -5954,6 +6013,7 @@ CONFIG_MEMSTICK_REALTEK_USB=m
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=m
 CONFIG_LEDS_CLASS_FLASH=m
 CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 #
 # LED drivers
@ -6073,6 +6133,7 @@ CONFIG_EDAC_I5100=m
 CONFIG_EDAC_I7300=m
 CONFIG_EDAC_SBRIDGE=m
 CONFIG_EDAC_SKX=m
 # CONFIG_EDAC_PND2 is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_MC146818_LIB=y
 CONFIG_RTC_CLASS=y
@ -6499,9 +6560,6 @@ CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 CONFIG_DVB_CXD2099=m
 CONFIG_LIRC_STAGING=y
 CONFIG_LIRC_BT829=m
 CONFIG_LIRC_IMON=m
 CONFIG_LIRC_PARALLEL=m
 CONFIG_LIRC_SASEM=m
 CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
@ -6527,10 +6585,6 @@ CONFIG_GS_FPGABOOT=m
 # CONFIG_WILC1000_SDIO is not set
 # CONFIG_WILC1000_SPI is not set
 # CONFIG_MOST is not set
 #
 # Old ISDN4Linux (deprecated)
 #
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 CONFIG_X86_PLATFORM_DEVICES=y
@ -6601,6 +6655,9 @@ CONFIG_INTEL_PUNIT_IPC=m
 CONFIG_INTEL_TELEMETRY=m
 # CONFIG_MLX_PLATFORM is not set
 # CONFIG_MLX_CPLD_PLATFORM is not set
 CONFIG_INTEL_TURBO_MAX_3=y
 # CONFIG_SILEAD_DMI is not set
 CONFIG_PMC_ATOM=y
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
@ -6621,13 +6678,6 @@ CONFIG_COMMON_CLK=y
 # CONFIG_COMMON_CLK_NXP is not set
 # CONFIG_COMMON_CLK_PXA is not set
 # CONFIG_COMMON_CLK_PIC32 is not set
 # CONFIG_COMMON_CLK_MT2701 is not set
 # CONFIG_COMMON_CLK_MT2701_MMSYS is not set
 # CONFIG_COMMON_CLK_MT2701_IMGSYS is not set
 # CONFIG_COMMON_CLK_MT2701_VDECSYS is not set
 # CONFIG_COMMON_CLK_MT2701_HIFSYS is not set
 # CONFIG_COMMON_CLK_MT2701_ETHSYS is not set
 # CONFIG_COMMON_CLK_MT2701_BDPSYS is not set
 #
 # Hardware Spinlock drivers
@ -6681,6 +6731,7 @@ CONFIG_REMOTEPROC=m
 #
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
 CONFIG_PM_DEVFREQ=y
 #
@ -6704,6 +6755,7 @@ CONFIG_EXTCON=m
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_ARIZONA is not set
 CONFIG_EXTCON_GPIO=m
 CONFIG_EXTCON_INTEL_INT3496=m
 # CONFIG_EXTCON_MAX3355 is not set
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
@ -6764,9 +6816,11 @@ CONFIG_MMA7660=m
 # CONFIG_AD7923 is not set
 # CONFIG_AD799X is not set
 # CONFIG_HI8435 is not set
 # CONFIG_HX711 is not set
 # CONFIG_INA2XX_ADC is not set
 # CONFIG_LTC2485 is not set
 # CONFIG_MAX1027 is not set
 # CONFIG_MAX11100 is not set
 # CONFIG_MAX1363 is not set
 # CONFIG_MCP320X is not set
 # CONFIG_MCP3422 is not set
@ -6779,7 +6833,9 @@ CONFIG_MMA7660=m
 # CONFIG_TI_ADC128S052 is not set
 # CONFIG_TI_ADC161S626 is not set
 # CONFIG_TI_ADS1015 is not set
 # CONFIG_TI_ADS7950 is not set
 # CONFIG_TI_AM335X_ADC is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_VIPERBOARD_ADC is not set
 #
@ -6868,6 +6924,7 @@ CONFIG_IIO_ST_SENSORS_CORE=m
 # CONFIG_ADXRS450 is not set
 # CONFIG_BMG160 is not set
 CONFIG_HID_SENSOR_GYRO_3D=m
 # CONFIG_MPU3050_I2C is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
 CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
@ -6905,6 +6962,7 @@ CONFIG_MAX30100=m
 # CONFIG_KMX61 is not set
 # CONFIG_INV_MPU6050_I2C is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IIO_ST_LSM6DSX is not set
 #
 # Light sensors
@ -6978,6 +7036,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # Digital potentiometers
 #
 # CONFIG_DS1803 is not set
 # CONFIG_MAX5481 is not set
 # CONFIG_MAX5487 is not set
 # CONFIG_MCP4131 is not set
 # CONFIG_MCP4531 is not set
@ -6993,6 +7052,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 #
 # CONFIG_ABP060MG is not set
 # CONFIG_BMP280 is not set
 # CONFIG_IIO_CROS_EC_BARO is not set
 # CONFIG_HID_SENSOR_PRESS is not set
 # CONFIG_HP03 is not set
 # CONFIG_MPL115_I2C is not set
@ -7011,10 +7071,11 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # CONFIG_AS3935 is not set
 #
-# Proximity sensors
+# Proximity and distance sensors
 #
 # CONFIG_LIDAR_LITE_V2 is not set
 # CONFIG_SX9500 is not set
 # CONFIG_SRF08 is not set
 #
 # Temperature sensors
@ -7022,6 +7083,7 @@ CONFIG_IIO_TIGHTLOOP_TRIGGER=m
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 # CONFIG_MLX90614 is not set
 # CONFIG_TMP006 is not set
 # CONFIG_TMP007 is not set
 # CONFIG_TSYS01 is not set
 # CONFIG_TSYS02D is not set
 # CONFIG_NTB is not set
@ -7102,10 +7164,14 @@ CONFIG_INTEL_TH_PTI=m
 #
 # CONFIG_FPGA is not set
 #
 # FSI support
 #
 CONFIG_FSI=m
 #
 # Firmware Drivers
 #
 # CONFIG_ARM_SCPI_PROTOCOL is not set
 CONFIG_EDD=m
 # CONFIG_EDD_OFF is not set
 CONFIG_FIRMWARE_MEMMAP=y
@ -7504,6 +7570,7 @@ CONFIG_STACK_VALIDATION=y
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x0
 CONFIG_MAGIC_SYSRQ_SERIAL=y
 CONFIG_DEBUG_KERNEL=y
 #
@ -7513,6 +7580,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PAGEALLOC is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
 # CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
@ -7520,6 +7588,7 @@ CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
 # CONFIG_DEBUG_STACK_USAGE is not set
 # CONFIG_DEBUG_VM is not set
 CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_DEBUG_MEMORY_INIT=y
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
@ -7554,7 +7623,6 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 # CONFIG_SCHED_STACK_END_CHECK is not set
 # CONFIG_DEBUG_TIMEKEEPING is not set
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_PREEMPT is not set
 #
@ -7570,6 +7638,7 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_ATOMIC_SLEEP is not set
 # CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
 # CONFIG_LOCK_TORTURE_TEST is not set
 # CONFIG_WW_MUTEX_SELFTEST is not set
 CONFIG_STACKTRACE=y
 # CONFIG_DEBUG_KOBJECT is not set
 CONFIG_DEBUG_BUGVERBOSE=y
@ -7630,8 +7699,8 @@ CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_KPROBE_EVENT=y
+CONFIG_KPROBE_EVENTS=y
-CONFIG_UPROBE_EVENT=y
+CONFIG_UPROBE_EVENTS=y
 CONFIG_BPF_EVENTS=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_DYNAMIC_FTRACE=y
@ -7653,6 +7722,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 #
 CONFIG_LKDTM=m
 # CONFIG_TEST_LIST_SORT is not set
 # CONFIG_TEST_SORT is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
 # CONFIG_BACKTRACE_SELF_TEST is not set
 # CONFIG_RBTREE_TEST is not set
@ -7668,6 +7738,7 @@ CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_UUID is not set
 # CONFIG_TEST_RHASHTABLE is not set
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_PARMAN is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
 # CONFIG_DMA_API_DEBUG is not set
 # CONFIG_TEST_LKM is not set
@ -7694,10 +7765,7 @@ CONFIG_EARLY_PRINTK_EFI=y
 # CONFIG_X86_PTDUMP_CORE is not set
 # CONFIG_X86_PTDUMP is not set
 # CONFIG_EFI_PGT_DUMP is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_WX is not set
 CONFIG_DEBUG_SET_MODULE_RONX=y
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
 # CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
@ -7738,6 +7806,7 @@ CONFIG_SECURITY_PATH=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set
 # CONFIG_SECURITY_APPARMOR is not set
@ -7795,6 +7864,7 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ABLK_HELPER=m
 CONFIG_CRYPTO_SIMD=m
 CONFIG_CRYPTO_GLUE_HELPER_X86=m
 CONFIG_CRYPTO_ENGINE=m
 #
 # Authenticated Encryption with Associated Data
@ -7862,6 +7932,7 @@ CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
 # Ciphers
 #
 CONFIG_CRYPTO_AES=y
 CONFIG_CRYPTO_AES_TI=m
 CONFIG_CRYPTO_AES_X86_64=m
 CONFIG_CRYPTO_AES_NI_INTEL=m
 CONFIG_CRYPTO_ANUBIS=m
@ -8048,6 +8119,8 @@ CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 # CONFIG_DMA_NOOP_OPS is not set
 CONFIG_DMA_VIRT_OPS=y
 CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@ -8072,9 +8145,9 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_ACORN_8x8 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_6x10 is not set
 # CONFIG_FONT_10x18 is not set
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
 CONFIG_FONT_AUTOSELECT=y
 # CONFIG_SG_SPLIT is not set
 CONFIG_SG_POOL=y
@ -8082,3 +8155,4 @@ CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_ARCH_HAS_PMEM_API=y
 CONFIG_ARCH_HAS_MMIO_FLUSH=y
 CONFIG_SBITMAP=y
 CONFIG_PARMAN=m
--- a/i915-vga-arbiter.patch
+++ b/i915-vga-arbiter.patch
@ -1,6 +1,6 @@
-From ff4ebf882ce844b78d61ff350fe16aef09eb9e33 Mon Sep 17 00:00:00 2001
+From c3466f73ee88a129b5955d4f2049e79688183e96 Mon Sep 17 00:00:00 2001
 From: Mark Weiman <mark.weiman@markzz.com>
-Date: Sun, 5 Mar 2017 14:50:17 -0500
+Date: Thu, 22 Jun 2017 21:27:07 -0400
 Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices
 ---
@ -12,22 +12,22 @@ Subject: [PATCH] i915: Add module option to support VGA arbiter on HD devices
 5 files changed, 60 insertions(+), 3 deletions(-)
 diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
-index 728ca3ea74d2..41f971599688 100644
+index edacd31ae1a1..c45b8c6e5883 100644
 --- a/drivers/gpu/drm/i915/i915_drv.c
 +++ b/drivers/gpu/drm/i915/i915_drv.c
-@@ -574,10 +574,20 @@ static int i915_load_modeset_init(struct drm_device *dev)
+@@ -573,10 +573,20 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	 * If we are a secondary display controller (!PCI_DISPLAY_CLASS_VGA),
 	 * then we do not take part in VGA arbitration and the
 	 * vga_client_register() fails with -ENODEV.
-+	 *
+ 	 *
-+	 * NB. The set_decode callback here actually works on GMCH
+ 	 * NB. The set_decode callback here actually works on GMCH
 +	 * devices, on newer HD devices we can only disable VGA MMIO space.
 +	 * Disabling VGA I/O space requires disabling I/O in the PCI command
 +	 * register.  Nonetheless, we like to pretend that we participate in
 +	 * VGA arbitration and can dynamically disable VGA I/O space because
 +	 * this makes X happy, even though it's a complete lie.
 	 */
-	ret = vga_client_register(pdev, dev, NULL, i915_vga_set_decode);
+-	ret = vga_client_register(pdev, dev_priv, NULL, i915_vga_set_decode);
 -	if (ret && ret != -ENODEV)
 -		goto out;
 +	if (!i915.enable_hd_vgaarb || !HAS_PCH_SPLIT(dev_priv)) {
@ -53,20 +53,20 @@ index 728ca3ea74d2..41f971599688 100644
 	intel_hpd_init(dev_priv);
 diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
-index d46ffe7086bc..6967d6d356c8 100644
+index 0e280fbd52f1..f47675d24bf8 100644
 --- a/drivers/gpu/drm/i915/i915_params.c
 +++ b/drivers/gpu/drm/i915/i915_params.c
@@ -51,6 +51,7 @@ struct i915_params i915 __read_mostly = {
 	.invert_brightness = 0,
 	.disable_display = 0,
- 	.enable_cmd_parser = 1,
+ 	.enable_cmd_parser = true,
 +	.enable_hd_vgaarb = false,
 	.use_mmio_flip = 0,
 	.mmio_debug = 0,
 	.verbose_state_checks = 1,
-@@ -192,6 +193,10 @@ module_param_named_unsafe(enable_cmd_parser, i915.enable_cmd_parser, int, 0600);
+@@ -192,6 +193,10 @@ module_param_named_unsafe(enable_cmd_parser, i915.enable_cmd_parser, bool, 0400)
 MODULE_PARM_DESC(enable_cmd_parser,
- 		 "Enable command parsing (1=enabled [default], 0=disabled)");
+ 		 "Enable command parsing (true=enabled [default], false=disabled)");
 +module_param_named(enable_hd_vgaarb, i915.enable_hd_vgaarb, bool, 0444);
 +MODULE_PARM_DESC(enable_hd_vgaarb,
@ -76,7 +76,7 @@ index d46ffe7086bc..6967d6d356c8 100644
 MODULE_PARM_DESC(use_mmio_flip,
 		 "use MMIO flips (-1=never, 0=driver discretion [default], 1=always)");
 diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h
-index 817ad959941e..6375f768f16e 100644
+index 8e433de04679..e3c294cdfebf 100644
 --- a/drivers/gpu/drm/i915/i915_params.h
 +++ b/drivers/gpu/drm/i915/i915_params.h
@@ -61,6 +61,7 @@ struct i915_params {
@ -88,10 +88,10 @@ index 817ad959941e..6375f768f16e 100644
 	bool nuclear_pageflip;
 	bool enable_dp_mst;
 diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
-index 891c86aef99d..e0574960aa0d 100644
+index 5370dbec7a7d..f25eb8eea591 100644
 --- a/drivers/gpu/drm/i915/intel_display.c
 +++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -16305,6 +16305,37 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv)
+@@ -16525,6 +16525,37 @@ static void i915_disable_vga(struct drm_i915_private *dev_priv)
 	POSTING_READ(vga_reg);
 }
@ -129,7 +129,7 @@ index 891c86aef99d..e0574960aa0d 100644
 void intel_modeset_init_hw(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
-@@ -16760,6 +16791,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
+@@ -16967,6 +16998,7 @@ void i915_redisable_vga_power_on(struct drm_i915_private *dev_priv)
 	if (!(I915_READ(vga_reg) & VGA_DISP_DISABLE)) {
 		DRM_DEBUG_KMS("Something enabled VGA plane, disabling it\n");
 		i915_disable_vga(dev_priv);
@ -137,7 +137,7 @@ index 891c86aef99d..e0574960aa0d 100644
 	}
 }
-@@ -17089,6 +17121,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
+@@ -17296,6 +17328,8 @@ void intel_modeset_cleanup(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = to_i915(dev);
@ -147,10 +147,10 @@ index 891c86aef99d..e0574960aa0d 100644
 	WARN_ON(!llist_empty(&dev_priv->atomic_helper.free_list));
 diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
-index 03a2112004f9..4db71cbe62ca 100644
+index 344f238b283f..f70cab001517 100644
 --- a/drivers/gpu/drm/i915/intel_drv.h
 +++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -1206,6 +1206,7 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
+@@ -1240,6 +1240,7 @@ int vlv_get_cck_clock(struct drm_i915_private *dev_priv,
 void lpt_disable_pch_transcoder(struct drm_i915_private *dev_priv);
 void lpt_disable_iclkip(struct drm_i915_private *dev_priv);
 extern const struct drm_plane_funcs intel_plane_funcs;
@ -159,5 +159,5 @@ index 03a2112004f9..4db71cbe62ca 100644
 unsigned int intel_fb_xy_to_linear(int x, int y,
 				   const struct intel_plane_state *state,
 -- 
-2.12.0
+2.13.1