upgpkg: linux-gc 4.16.11-1

upstream release

5 files changed, 21 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33994b4b3cd2..307d7edd660c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-gc
-	pkgver = 4.16.10
+	pkgver = 4.16.11
 	pkgrel = 1
 	url = http://cchalpha.blogspot.co.uk/
 	arch = x86_64
@@ -11,8 +11,8 @@ pkgbase = linux-gc
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.16.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.10.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.11.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.11.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
@@ -21,12 +21,11 @@ pkgbase = linux-gc
 	source = v4.16_pds098p.patch::https://bitbucket.org/alfredchen/linux-gc/downloads/v4.16_pds098p.patch
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
 	source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
-	source = 0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = 63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9
 	sha256sums = SKIP
-	sha256sums = 9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6
+	sha256sums = d0d998f193c3feeab95f1378dea15aa6ba145f591661547cc00ef16d161651fe
 	sha256sums = SKIP
 	sha256sums = 5ea627c419baef8aa6c0024a0f352716f6655283402e3f3318a188fea984971d
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -34,9 +33,8 @@ pkgbase = linux-gc
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
 	sha256sums = 226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d
 	sha256sums = 5e421e0c3fc60706640c202612c9d6b2de0f04499c90798e5e3b153fc356e6ef
-	sha256sums = 286ea6a6f19148ec09d7c07bd80cd08f44a9b8f5821b0732fdbb1dc14ceb539b
-	sha256sums = ca6590d1368788dff5dd41f2a643ee1dcce4ec9e5ead5caa6e673f68c44851cb
-	sha256sums = ffa7f3305bade3ed258a93919c28fb0c810953d3e44ae4c9608512991f7eb703
+	sha256sums = b01e9bd4e0f3cc2b91db1d8c043b2d85329bd0c9a9441a91d337c3c33661b658
+	sha256sums = 09170daf49fe4cb720f331cd2da1c75771eb4f9f124353bf035218b1f8ca57d1
 
 pkgname = linux-gc
 	pkgdesc = The Linux-gc kernel and modules with the PDS-mq CPU scheduler
@@ -46,12 +44,12 @@ pkgname = linux-gc
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-gc=4.16.10
+	provides = linux-gc=4.16.11
 	backup = etc/mkinitcpio.d/linux-gc.preset
 
 pkgname = linux-gc-headers
 	pkgdesc = Header files and scripts for building modules for Linux-gc kernel
 	depends = linux-gc
-	provides = linux-gc-headers=4.16.10
-	provides = linux-headers=4.16.10
+	provides = linux-gc-headers=4.16.11
+	provides = linux-headers=4.16.11
 
diff --git a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 6748fd65e79c..f669b43a7b4a 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,8 @@
-From 1d8e17daf031e219d904ef93718081534c9e8cea Mon Sep 17 00:00:00 2001
-Message-Id: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
+From 05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8 Mon Sep 17 00:00:00 2001
+Message-Id: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com>
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/3] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/2] add sysctl to disallow unprivileged CLONE_NEWUSER by
  default
 
 Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 26953df1687d..0fb23b73b2ab 100644
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
-From 97ed8f58f1e019eca30233ffc6a14e6eddac1a36 Mon Sep 17 00:00:00 2001
-Message-Id: <97ed8f58f1e019eca30233ffc6a14e6eddac1a36.1526520264.git.jan.steffens@gmail.com>
-In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
+From b5f4a5ba26b365471531e328b237887bab4ab89b Mon Sep 17 00:00:00 2001
+Message-Id: <b5f4a5ba26b365471531e328b237887bab4ab89b.1527025123.git.jan.steffens@gmail.com>
+In-Reply-To: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com>
+References: <05e9de6f123ae14e08a0b3c0e028f7e3a129d0e8.1527025123.git.jan.steffens@gmail.com>
 From: Jim Bride <jim.bride@linux.intel.com>
 Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/3] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/2] drm/i915/edp: Only use the alternate fixed mode if it's
  asked for
 
 In commit dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for
diff --git a/0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch b/0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
deleted file mode 100644
index 55968d7f0f11..000000000000
--- a/0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 005c2f4576d9bab5ff97dac4b3d27aafa2f1f153 Mon Sep 17 00:00:00 2001
-Message-Id: <005c2f4576d9bab5ff97dac4b3d27aafa2f1f153.1526520264.git.jan.steffens@gmail.com>
-In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffens@gmail.com>
-From: Mathias Nyman <mathias.nyman@linux.intel.com>
-Date: Mon, 14 May 2018 11:57:23 +0300
-Subject: [PATCH 3/3] xhci: Fix USB3 NULL pointer dereference at logical
- disconnect.
-
-Hub driver will try to disable a USB3 device twice at logical disconnect,
-racing with xhci_free_dev() callback from the first port disable.
-
-This can be triggered with "udisksctl power-off --block-device <disk>"
-or by writing "1" to the "remove" sysfs file for a USB3 device
-in 4.17-rc4.
-
-USB3 devices don't have a similar disabled link state as USB2 devices,
-and use a U3 suspended link state instead. In this state the port
-is still enabled and connected.
-
-hub_port_connect() first disconnects the device, then later it notices
-that device is still enabled (due to U3 states) it will try to disable
-the port again (set to U3).
-
-The xhci_free_dev() called during device disable is async, so checking
-for existing xhci->devs[i] when setting link state to U3 the second time
-was successful, even if device was being freed.
-
-The regression was caused by, and whole thing revealed by,
-Commit 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device")
-which sets xhci->devs[i]->udev to NULL before xhci_virt_dev() returned.
-and causes a NULL pointer dereference the second time we try to set U3.
-
-Fix this by checking xhci->devs[i]->udev exists before setting link state.
-
-The original patch went to stable so this fix needs to be applied there as
-well.
-
-Fixes: 44a182b9d177 ("xhci: Fix use-after-free in xhci_free_virt_device")
-Cc: <stable@vger.kernel.org>
-Reported-by: Jordan Glover <Golden_Miller83@protonmail.ch>
-Tested-by: Jordan Glover <Golden_Miller83@protonmail.ch>
-Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
----
- drivers/usb/host/xhci-hub.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 72ebbc908e19..32cd52ca8318 100644
---- a/drivers/usb/host/xhci-hub.c
-+++ b/drivers/usb/host/xhci-hub.c
-@@ -354,7 +354,7 @@ int xhci_find_slot_id_by_port(struct usb_hcd *hcd, struct xhci_hcd *xhci,
- 
- 	slot_id = 0;
- 	for (i = 0; i < MAX_HC_SLOTS; i++) {
--		if (!xhci->devs[i])
-+		if (!xhci->devs[i] || !xhci->devs[i]->udev)
- 			continue;
- 		speed = xhci->devs[i]->udev->speed;
- 		if (((speed >= USB_SPEED_SUPER) == (hcd->speed >= HCD_USB3))
--- 
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 7405eab605a5..9cd934ef482a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ _localmodcfg=
 
 pkgbase=linux-gc             # Build kernel with a different name
 _srcname=linux-4.16
-pkgver=4.16.10
+pkgver=4.16.11
 pkgrel=1
 _pdsversion=098p
 arch=('x86_64')
@@ -53,7 +53,6 @@ source=(
   "$_psd_patch::https://bitbucket.org/alfredchen/linux-gc/downloads/${_psd_patch}"
   0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
   0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
-  0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -61,7 +60,7 @@ validpgpkeys=(
 )
 sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
             'SKIP'
-            '9fe6093be401fe0ff3f6cb3d428f137119a7befaf86d70f18c7e88871c1852d6'
+            'd0d998f193c3feeab95f1378dea15aa6ba145f591661547cc00ef16d161651fe'
             'SKIP'
             '5ea627c419baef8aa6c0024a0f352716f6655283402e3f3318a188fea984971d'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -69,9 +68,8 @@ sha256sums=('63f6dc8e3c9f3a0273d5d6f4dca38a2413ca3a5f689329d05b750e4c87bb21b9'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
             '226e30068ea0fecdb22f337391385701996bfbdba37cdcf0f1dbf55f1080542d'
             '5e421e0c3fc60706640c202612c9d6b2de0f04499c90798e5e3b153fc356e6ef'
-            '286ea6a6f19148ec09d7c07bd80cd08f44a9b8f5821b0732fdbb1dc14ceb539b'
-            'ca6590d1368788dff5dd41f2a643ee1dcce4ec9e5ead5caa6e673f68c44851cb'
-            'ffa7f3305bade3ed258a93919c28fb0c810953d3e44ae4c9608512991f7eb703')
+            'b01e9bd4e0f3cc2b91db1d8c043b2d85329bd0c9a9441a91d337c3c33661b658'
+            '09170daf49fe4cb720f331cd2da1c75771eb4f9f124353bf035218b1f8ca57d1')
 
 _kernelname=${pkgbase#linux}
 
@@ -90,9 +88,6 @@ prepare() {
   # https://bugs.archlinux.org/task/56711
   patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 
-  # https://bugs.archlinux.org/task/58237
-  patch -Np1 -i ../0003-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
-
   # Patch source with PDS scheduler
   patch -Np1 -i "../${_psd_patch}"