Bump to 4.16.6-1

Signed-off-by: Piotr Gorski <lucjan.lucjanov@gmail.com>

7 files changed, 19 insertions, 99 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8b1fe369ec4..810cb7cc36c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-uksm
-	pkgver = 4.16.5
+	pkgver = 4.16.6
 	pkgrel = 1
 	url = https://github.com/dolohow/uksm
 	arch = x86_64
@@ -7,8 +7,8 @@ pkgbase = linux-uksm
 	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.5.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.5.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.6.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.6.sign
 	source = kernel_gcc_patch-20180310.tar.gz::https://github.com/graysky2/kernel_gcc_patch/archive/20180310.tar.gz
 	source = https://raw.githubusercontent.com/dolohow/uksm/master/uksm-4.16.patch
 	source = config
@@ -20,12 +20,11 @@ pkgbase = linux-uksm
 	source = 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
 	source = 0003-Partially-revert-swiotlb-remove-various-exports.patch
 	source = 0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
-	source = 0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha512sums = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 	sha512sums = SKIP
-	sha512sums = 15c0f85c5f35c2d87a0b63767e18c52a469a81154d915c50b7c7b1c0aed81229e86b3e1cf6e021539c100b29766c47c459adb7d2fcce0da165090206832f62f9
+	sha512sums = 151f3fedfb025f090e0f3d747890366933236b11d1f2bf8794c7d0309f9bb577c01fbfcd6ac073b3c49657543961592c643e896c6a57fe8df6ecde89270d0b36
 	sha512sums = SKIP
 	sha512sums = 079e34ec7bf3ef36438c648116e24c51e00ea8608a1d8b5776164478522d6a96dcab5fe0431e8e9a6282c11a1edd177e1b68fc971a81717b297e199efc101963
 	sha512sums = ab962157c2c20faf0bd164a82c2e28ce35fd581d640409ae6419dc2a64c82b7f49e7215149de0bc028dd3d517434160d68127b05137f6b6611641cc871f6c76e
@@ -34,11 +33,10 @@ pkgbase = linux-uksm
 	sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44
 	sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74
 	sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
-	sha512sums = cfcf6cb510b145039075442f397b9526c103334f8728cae1fb70395dabed3ff0105ce9da7412f98a744e62ec2cae8aa8406b39d9f9ea6d8c0a04bd6c78605885
-	sha512sums = ca10d5457633a5504b09007a299114b32fd2f84aeb2381138ea5ecaf9c3da76b84efce63f9e23ea7b9b70ae7c05c7c29756c5a95abf599155fff73b24926d5ed
-	sha512sums = b12a068e3158b5281ea6f471a4065fb9fb1e51d4b8c17d0bbf6556c2afcf257d0905948b336f72752717c136aa26ca88e3a81abd318b5e48a085bd050ea89ba3
-	sha512sums = 7a1c931269f3e801496dd8dad049b65fb28212d90179640b8ac0d7f380e0f1378dc8f43624893f200e99678793300d331701fad3826b059c9336f7b16ef8a521
-	sha512sums = 23ea6d086bc0a483c08b28d8a64a47636024322d38a17bb5994df4cd25cbd1d29be39a7ed0d8c2305409efdb455c5b5f3fd9d72ca10d3c13df66185a5d089a8c
+	sha512sums = 23edb1f606212bef6e9f8c395858f46108019d9a0fb9e604b06c0c186927325e182c2b09b5336ef01e68b80c374f751de1ca3edb8ecde7ab4e0e71669cfe4b35
+	sha512sums = 0ff56daee47c0557bbce45952c85e8a72ef1c58ff66b75f232d6a4823dc1a0de9e52880396e72b4769ea4fa780478249f44f08e038d05a2a9e374f0486661c49
+	sha512sums = 15efd1a371b6d501b9e1ce813cef477835e20a74b5ee02fe8879bb3155ba072855cc3b22a16ea7f39dc023335c07e60476bb189ec929a3f3430fc35885701b2c
+	sha512sums = 48b12084b00dd475e876c03e1242a5d06701e94579abf2c318d810bf55c45d54413ec338eca01f42f2e2688f78e5cdfcc2994c55da011d2d64b02df829a5979f
 
 pkgname = linux-uksm
 	pkgdesc = Linux Kernel and modules with the UKSM.
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 b2f326324412..bb734e91965e 100644
--- a/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -2,7 +2,7 @@ From 3a7745f6fdd71aa34dae33c3edc586363d9ece9e Mon Sep 17 00:00:00 2001
 Message-Id: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/4] 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 b97ed8832f60..fa5e4f91106e 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
@@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe
 References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.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/5] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/4] 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-Partially-revert-swiotlb-remove-various-exports.patch b/0003-Partially-revert-swiotlb-remove-various-exports.patch
index 69e45899cc67..fdedd7ee8b17 100644
--- a/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ b/0003-Partially-revert-swiotlb-remove-various-exports.patch
@@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe
 References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Fri, 6 Apr 2018 16:19:38 +0200
-Subject: [PATCH 3/5] Partially revert "swiotlb: remove various exports"
+Subject: [PATCH 3/4] Partially revert "swiotlb: remove various exports"
 
 This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
 The proprietary NVIDIA driver needs one of the exports.
diff --git a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
index c192a360d57b..a1d531150e11 100644
--- a/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+++ b/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
@@ -4,7 +4,7 @@ In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffe
 References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
 Date: Wed, 11 Apr 2018 21:27:44 +0200
-Subject: [PATCH 4/5] Fix vboxguest on guests with more than 4G RAM
+Subject: [PATCH 4/4] Fix vboxguest on guests with more than 4G RAM
 
 Squashed commit of the following:
 
diff --git a/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
deleted file mode 100644
index 7ab8e37cb78b..000000000000
--- a/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 33feec41e6d35bbc679befe5ec0fb12acef18c95 Mon Sep 17 00:00:00 2001
-Message-Id: <33feec41e6d35bbc679befe5ec0fb12acef18c95.1523790169.git.jan.steffens@gmail.com>
-In-Reply-To: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-References: <3a7745f6fdd71aa34dae33c3edc586363d9ece9e.1523790169.git.jan.steffens@gmail.com>
-From: Igor Russkikh <igor.russkikh@aquantia.com>
-Date: Wed, 11 Apr 2018 15:23:24 +0300
-Subject: [PATCH 5/5] net: aquantia: Regression on reset with 1.x firmware
-
-On ASUS XG-C100C with 1.5.44 firmware a special mode called "dirty wake"
-is active. With this mode when motherboard gets powered (but no poweron
-happens yet), NIC automatically enables powersave link and watches
-for WOL packet.
-This normally allows to powerup the PC after AC power failures.
-
-Not all motherboards or bios settings gives power to PCI slots,
-so this mode is not enabled on all the hardware.
-
-4.16 linux driver introduced full hardware reset sequence
-This is required since before that we had no NIC hardware
-reset implemented and there were side effects of "not clean start".
-
-But this full reset is incompatible with "dirty wake" WOL feature
-it keeps the PHY link in a special mode forever. As a consequence,
-driver sees no link and no traffic.
-
-To fix this we forcibly change FW state to idle state before doing
-the full reset. This makes FW to restore link state.
-
-Fixes: c8c82eb net: aquantia: Introduce global AQC hardware reset sequence
-Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- .../aquantia/atlantic/hw_atl/hw_atl_utils.c      | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
-index d3b847ec7465..c58b2c227260 100644
---- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
-+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.c
-@@ -48,6 +48,8 @@
- #define FORCE_FLASHLESS 0
- 
- static int hw_atl_utils_ver_match(u32 ver_expected, u32 ver_actual);
-+static int hw_atl_utils_mpi_set_state(struct aq_hw_s *self,
-+				      enum hal_atl_utils_fw_state_e state);
- 
- int hw_atl_utils_initfw(struct aq_hw_s *self, const struct aq_fw_ops **fw_ops)
- {
-@@ -247,6 +249,20 @@ int hw_atl_utils_soft_reset(struct aq_hw_s *self)
- 
- 	self->rbl_enabled = (boot_exit_code != 0);
- 
-+	/* FW 1.x may bootup in an invalid POWER state (WOL feature).
-+	 * We should work around this by forcing its state back to DEINIT
-+	 */
-+	if (!hw_atl_utils_ver_match(HW_ATL_FW_VER_1X,
-+				    aq_hw_read_reg(self,
-+						   HW_ATL_MPI_FW_VERSION))) {
-+		int err = 0;
-+
-+		hw_atl_utils_mpi_set_state(self, MPI_DEINIT);
-+		AQ_HW_WAIT_FOR((aq_hw_read_reg(self, HW_ATL_MPI_STATE_ADR) &
-+			       HW_ATL_MPI_STATE_MSK) == MPI_DEINIT,
-+			       10, 1000U);
-+	}
-+
- 	if (self->rbl_enabled)
- 		return hw_atl_utils_soft_reset_rbl(self);
- 	else
--- 
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 8cc8e1ffc7bc..025600f4b1ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -51,7 +51,7 @@ _1k_HZ_ticks=
 pkgbase=linux-uksm
 # pkgname=('linux-uksm' 'linux-uksm-headers' 'linux-uksm-docs')
 _srcname=linux-4.16
-pkgver=4.16.5
+pkgver=4.16.6
 pkgrel=1
 arch=('x86_64')
 url="https://github.com/dolohow/uksm"
@@ -84,8 +84,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
         '0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch'
         '0003-Partially-revert-swiotlb-remove-various-exports.patch'
-        '0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch'
-        '0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch')
+        '0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch')
 
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-uksm} 
@@ -112,10 +111,6 @@ prepare() {
     ### Fix https://bugs.archlinux.org/task/58153
         msg "Fix #58153"
         patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
-
-    ### Fix https://bugs.archlinux.org/task/58174
-        msg "Fix #58174"
-        patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
     
     ### Patch source with UKSM
         msg "Patching source with UKSM"
@@ -380,7 +375,7 @@ done
 
 sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662'
             'SKIP'
-            '15c0f85c5f35c2d87a0b63767e18c52a469a81154d915c50b7c7b1c0aed81229e86b3e1cf6e021539c100b29766c47c459adb7d2fcce0da165090206832f62f9'
+            '151f3fedfb025f090e0f3d747890366933236b11d1f2bf8794c7d0309f9bb577c01fbfcd6ac073b3c49657543961592c643e896c6a57fe8df6ecde89270d0b36'
             'SKIP'
             '079e34ec7bf3ef36438c648116e24c51e00ea8608a1d8b5776164478522d6a96dcab5fe0431e8e9a6282c11a1edd177e1b68fc971a81717b297e199efc101963'
             'ab962157c2c20faf0bd164a82c2e28ce35fd581d640409ae6419dc2a64c82b7f49e7215149de0bc028dd3d517434160d68127b05137f6b6611641cc871f6c76e'
@@ -389,11 +384,10 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            'cfcf6cb510b145039075442f397b9526c103334f8728cae1fb70395dabed3ff0105ce9da7412f98a744e62ec2cae8aa8406b39d9f9ea6d8c0a04bd6c78605885'
-            'ca10d5457633a5504b09007a299114b32fd2f84aeb2381138ea5ecaf9c3da76b84efce63f9e23ea7b9b70ae7c05c7c29756c5a95abf599155fff73b24926d5ed'
-            'b12a068e3158b5281ea6f471a4065fb9fb1e51d4b8c17d0bbf6556c2afcf257d0905948b336f72752717c136aa26ca88e3a81abd318b5e48a085bd050ea89ba3'
-            '7a1c931269f3e801496dd8dad049b65fb28212d90179640b8ac0d7f380e0f1378dc8f43624893f200e99678793300d331701fad3826b059c9336f7b16ef8a521'
-            '23ea6d086bc0a483c08b28d8a64a47636024322d38a17bb5994df4cd25cbd1d29be39a7ed0d8c2305409efdb455c5b5f3fd9d72ca10d3c13df66185a5d089a8c')
+            '23edb1f606212bef6e9f8c395858f46108019d9a0fb9e604b06c0c186927325e182c2b09b5336ef01e68b80c374f751de1ca3edb8ecde7ab4e0e71669cfe4b35'
+            '0ff56daee47c0557bbce45952c85e8a72ef1c58ff66b75f232d6a4823dc1a0de9e52880396e72b4769ea4fa780478249f44f08e038d05a2a9e374f0486661c49'
+            '15efd1a371b6d501b9e1ce813cef477835e20a74b5ee02fe8879bb3155ba072855cc3b22a16ea7f39dc023335c07e60476bb189ec929a3f3430fc35885701b2c'
+            '48b12084b00dd475e876c03e1242a5d06701e94579abf2c318d810bf55c45d54413ec338eca01f42f2e2688f78e5cdfcc2994c55da011d2d64b02df829a5979f')
             
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds