upgpkg: libre/linux-libre 4.16.5_gnu-1

Signed-off-by: David P <megver83@parabola.nu>

9 files changed, 41 insertions, 141 deletions

diff --git a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
index 10d9a4bfd..156d03e21 100644
--- a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ b/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
@@ -1,8 +1,8 @@
-From ff9d06de19e83c0c5a00a4d46376b4d1032c4f99 Mon Sep 17 00:00:00 2001
-Message-Id: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
+From f7a249814be46cbcb7bad48e4b1910baaf7f8961 Mon Sep 17 00:00:00 2001
+Message-Id: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/6] add sysctl to disallow unprivileged CLONE_NEWUSER by
+Subject: [PATCH 1/5] add sysctl to disallow unprivileged CLONE_NEWUSER by
  default
 
 Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
diff --git a/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch b/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
index 32c398976..ad7ac0c34 100644
--- a/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ b/libre/linux-libre/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
@@ -1,10 +1,10 @@
-From 3dcbf4dd14d295c3a238d73e9f791a827b906058 Mon Sep 17 00:00:00 2001
-Message-Id: <3dcbf4dd14d295c3a238d73e9f791a827b906058.1524129246.git.jan.steffens@gmail.com>
-In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
+From 7f9a95491f506700d46db581ef3734ced7c9618b Mon Sep 17 00:00:00 2001
+Message-Id: <7f9a95491f506700d46db581ef3734ced7c9618b.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.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/6] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/5] 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/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch b/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch
index 5a5f9ce0d..4669b03bd 100644
--- a/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ b/libre/linux-libre/0003-Partially-revert-swiotlb-remove-various-exports.patch
@@ -1,10 +1,10 @@
-From 1b03bcc6faecde170f9bea83accdde7bbd36df96 Mon Sep 17 00:00:00 2001
-Message-Id: <1b03bcc6faecde170f9bea83accdde7bbd36df96.1524129246.git.jan.steffens@gmail.com>
-In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
+From be536681bd2439bf8e95df124fa282cf4a2e7846 Mon Sep 17 00:00:00 2001
+Message-Id: <be536681bd2439bf8e95df124fa282cf4a2e7846.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.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/6] Partially revert "swiotlb: remove various exports"
+Subject: [PATCH 3/5] Partially revert "swiotlb: remove various exports"
 
 This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
 The proprietary NVIDIA driver needs one of the exports.
@@ -13,7 +13,7 @@ The proprietary NVIDIA driver needs one of the exports.
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/swiotlb.c b/lib/swiotlb.c
-index c43ec2271469..77d699f14af7 100644
+index 44f7eb408fdb..0bb1bb65ad6b 100644
 --- a/lib/swiotlb.c
 +++ b/lib/swiotlb.c
 @@ -1016,6 +1016,7 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
diff --git a/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch b/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
index 05924c39c..ae5b8c9e4 100644
--- a/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
+++ b/libre/linux-libre/0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
@@ -1,10 +1,10 @@
-From b04d533fa7e16e58243296b5063a624e91d2048e Mon Sep 17 00:00:00 2001
-Message-Id: <b04d533fa7e16e58243296b5063a624e91d2048e.1524129246.git.jan.steffens@gmail.com>
-In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
+From a117a2995f291e765c5de06f42f02a1687ecb55e Mon Sep 17 00:00:00 2001
+Message-Id: <a117a2995f291e765c5de06f42f02a1687ecb55e.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.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/6] Fix vboxguest on guests with more than 4G RAM
+Subject: [PATCH 4/5] Fix vboxguest on guests with more than 4G RAM
 
 Squashed commit of the following:
 
diff --git a/libre/linux-libre/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch b/libre/linux-libre/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
deleted file mode 100644
index 8fc4edeaf..000000000
--- a/libre/linux-libre/0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 23675bf063a1b39fccd29e7f573ec6729a11b3fa Mon Sep 17 00:00:00 2001
-Message-Id: <23675bf063a1b39fccd29e7f573ec6729a11b3fa.1524129246.git.jan.steffens@gmail.com>
-In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-From: Harry Wentland <harry.wentland@amd.com>
-Date: Thu, 12 Apr 2018 10:51:52 -0400
-Subject: [PATCH 5/6] Revert "drm/amd/display: disable CRTCs with NULL FB on
- their primary plane (V2)"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This seems to cause flickering and lock-ups for a wide range of users.
-Revert until we've found a proper fix for the flickering and lock-ups.
-
-This reverts commit 36cc549d59864b7161f0e23d710c1c4d1b9cf022.
-
-Cc: Shirish S <shirish.s@amd.com>
-Cc: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
-Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
-Signed-off-by: Harry Wentland <harry.wentland@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
----
- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 31 -------------------
- 1 file changed, 31 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-index 63c67346d316..8a6e6fbc78cd 100644
---- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -4776,60 +4776,29 @@ static int dm_update_planes_state(struct dc *dc,
- 	return ret;
- }
- 
--static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state,
--					  struct drm_crtc *crtc)
--{
--	struct drm_plane *plane;
--	struct drm_crtc_state *crtc_state;
--
--	WARN_ON(!drm_atomic_get_new_crtc_state(state, crtc));
--
--	drm_for_each_plane_mask(plane, state->dev, crtc->state->plane_mask) {
--		struct drm_plane_state *plane_state =
--			drm_atomic_get_plane_state(state, plane);
--
--		if (IS_ERR(plane_state))
--			return -EDEADLK;
--
--		crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);
--		if (IS_ERR(crtc_state))
--			return PTR_ERR(crtc_state);
--
--		if (crtc->primary == plane && crtc_state->active) {
--			if (!plane_state->fb)
--				return -EINVAL;
--		}
--	}
--	return 0;
--}
--
- static int amdgpu_dm_atomic_check(struct drm_device *dev,
- 				  struct drm_atomic_state *state)
- {
- 	struct amdgpu_device *adev = dev->dev_private;
- 	struct dc *dc = adev->dm.dc;
- 	struct dm_atomic_state *dm_state = to_dm_atomic_state(state);
- 	struct drm_connector *connector;
- 	struct drm_connector_state *old_con_state, *new_con_state;
- 	struct drm_crtc *crtc;
- 	struct drm_crtc_state *old_crtc_state, *new_crtc_state;
- 	int ret, i;
- 
- 	/*
- 	 * This bool will be set for true for any modeset/reset
- 	 * or plane update which implies non fast surface update.
- 	 */
- 	bool lock_and_validation_needed = false;
- 
- 	ret = drm_atomic_helper_check_modeset(dev, state);
- 	if (ret)
- 		goto fail;
- 
- 	for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
--		ret = dm_atomic_check_plane_state_fb(state, crtc);
--		if (ret)
--			goto fail;
--
- 		if (!drm_atomic_crtc_needs_modeset(new_crtc_state) &&
- 		    !new_crtc_state->color_mgmt_changed)
- 			continue;
--- 
-2.17.0
-
diff --git a/libre/linux-libre/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch b/libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
index d32cfc408..d02da63cb 100644
--- a/libre/linux-libre/0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+++ b/libre/linux-libre/0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
@@ -1,10 +1,10 @@
-From fb08717dc5ecf3ada73f93663b528d9d4ce4380b Mon Sep 17 00:00:00 2001
-Message-Id: <fb08717dc5ecf3ada73f93663b528d9d4ce4380b.1524129246.git.jan.steffens@gmail.com>
-In-Reply-To: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
-References: <ff9d06de19e83c0c5a00a4d46376b4d1032c4f99.1524129246.git.jan.steffens@gmail.com>
+From 415d0ca52b88f7cf3300a54c337ca80ebeccce5c Mon Sep 17 00:00:00 2001
+Message-Id: <415d0ca52b88f7cf3300a54c337ca80ebeccce5c.1524575789.git.jan.steffens@gmail.com>
+In-Reply-To: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
+References: <f7a249814be46cbcb7bad48e4b1910baaf7f8961.1524575789.git.jan.steffens@gmail.com>
 From: Igor Russkikh <igor.russkikh@aquantia.com>
 Date: Wed, 11 Apr 2018 15:23:24 +0300
-Subject: [PATCH 6/6] net: aquantia: Regression on reset with 1.x firmware
+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
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index f8c16b521..5acb1dc03 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -13,7 +13,7 @@
 pkgbase=linux-libre         # Build stock kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _pkgbasever=4.16-gnu
-_pkgver=4.16.3-gnu
+_pkgver=4.16.5-gnu
 
 _replacesarchkernel=('linux%') # '%' gets replaced with _kernelname
 _replacesoldkernels=() # '%' gets replaced with _kernelname
@@ -22,7 +22,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1.1
+pkgrel=1
 rcnrel=armv7-x0
 arch=('i686' 'x86_64' 'armv7h')
 url="https://linux-libre.fsfla.org/"
@@ -65,8 +65,7 @@ source=(
   '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-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch'
-  '0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch'
+  '0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch'
 )
 validpgpkeys=(
   '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
@@ -74,7 +73,7 @@ validpgpkeys=(
 )
 sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7610e7d4ae8a2230fa7483466636465ed9744444464a078de37b41c3db23e0'
             'SKIP'
-            'aaac5e639b353effec1f451f191e1f02d3ed593893cd814c0fd1bb6ce1705ac0806919fe2cd155ff3840a5ecd510b16c314f55ff55be6cc608817182177c2a52'
+            '0696f81eccf4c47acd4074f50a6f7dcae38171bbe91d3df14ddaa9692192dfcd9bfa715dfea714460ed3dc59683c7a1fbf9eca0982fffc23537942ad76f0bf72'
             'SKIP'
             '13cb5bc42542e7b8bb104d5f68253f6609e463b6799800418af33eb0272cc269aaa36163c3e6f0aacbdaaa1d05e2827a4a7c4a08a029238439ed08b89c564bb3'
             'SKIP'
@@ -82,13 +81,13 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7
             'SKIP'
             '7a3716bfe3b9f546da309c7492f3e08f8f506813afeb1c737a474c83313d5c313cf4582b65215c2cfce3b74d9d1021c96e8badafe8f6e5b01fe28d2b5c61ae78'
             'SKIP'
-            '43169d2a6429c2272b4fe9e21cc76a7992453810856967f8c51da58eff2ec3662d223d22f57303a5e8ff6caeb067aa5988d9dacc37f1d1086132a1cbcb688614'
-            '15463921e7783632632dfe1290c6e8a7af69a25182cdd7e8a5f67e9c4a835adcfe2feb93e58b5854c5319c60943964bae64d14b075e542e8df44658ee3830cbb'
+            '09b1d390e8e3603adf76018364ad645292ae8d51628a5e6e807cdace51519addf3f544b2dd71c67847464544fcb1728914f0b8b4addcfac1bafd0191729e8268'
+            '7d87ecaf0a37218be2cd5a67c353dafa5995935f7a8e805200156850c3a103d9f954b975aa768fed51114b21b06427556b78e71055b90578f62c2d08117a1539'
             '5ca4e5aa875c516bd53238a5b839889607d712921c661bb3b391f8e46b91717effff2825f498e6c9c3c49171974102039c016a96670b99f71d7ddeec20b4135d'
             '7ad5be75ee422dda3b80edd2eb614d8a9181e2c8228cd68b3881e2fb95953bf2dea6cbe7900ce1013c9de89b2802574b7b24869fc5d7a95d3cc3112c4d27063a'
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            'cb2744bc0d0ce866b9e67b4aec0c386fa8b8b04265b45ef4d6e41651f7ff45c81df9388da24f8e801a66d5093c06468807bf2b518faa60abebf5610c5aaf4587'
+            'b7305cdb520d562f4ad3489bdd4cb2acdc035bc3fbdc3bf56d78dec416122c8ff0a0971055c4a07f268455b20e57a2f9c774ac11f68fe03ea3d40b1e9fcd23e4'
             'SKIP'
             'e331035c3b6687ab8f8ddc35b77470b0abc58457790b78ce50ccf2c246ec16a05815a3f4a0107c0a1a7ee68317b984e51df66b22d76236f6d104eb7eb02db7c8'
             '04ffbd0e17a5d09ef7c02042b600b4903be5355e443ea168a6760a910eca0d4a11ef679fe9203cd2e59b0741e9405de7105d51e6e3c0713ecc0c08b212e7b39b'
@@ -106,12 +105,11 @@ sha512sums=('c6805b3649cd71cfef272384958b33da23a00908e795592470bf711dd67886ab7d7
             '0a1a18aa8a6cbf1bab406d356786d2c35fe52608c25bef8beefe440b8a015ba59375106f8b04051ae2225e158420875a82ee07d5b88a2f2087afeb102e8966c0'
             '02af4dd2a007e41db0c63822c8ab3b80b5d25646af1906dc85d0ad9bb8bbf5236f8e381d7f91cf99ed4b0978c50aee37cb9567cdeef65b7ec3d91b882852b1af'
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
-            'ac301d5bd282e1d336bf71ad9d1085f79f1e89cdd7daf4d9862d11bb82b3fc8eabf07fdff4603dae7f1ef99c0d8f0b93ef276bef794428d69e971335bc783b57'
-            'cea45ccde152a3f125a21352db3ffa2ecb058e56a637be86c4a02ae4759f359068c929bbe9ac604087feb7ab83b45c0458cf2aef712b784c32b892e57e21a441'
-            '8e97dc385260d2fba5d102746f9c763cb2fc77ec34ebb9963f49f389959d77cc9fdac6e2463b373c45ceb5f65da22aaaf7aaf16bea6fdc0760d2e08371f36d3f'
-            '22e7066a8068065e931e3e97e13b984e71c74b81370e57d7d0ff0c74c1d6aca05b8da214b270a9e94c0b2df9c107fdd07fc50cfb77e01687533fc2d6e3d26c3e'
-            '84e8321d9953eb59dd3af1a5f5c9fd74aabe25ba4ef3f1baef280bf2758d7aa3189f3d86140f8daf915bffbdfb81d39b3697bccf6b681d99f7e888d5a5b7dbfa'
-            'a55d10c4c2dd2ef86cf55e081b8c37825db851995072965b969b591d7ef306f0e84c7521c9c71d6812c740c5d21e9f9b618d74145f9d7cefdbd7b1d149b07f01')
+            'aa59b7f4fce14c95719a969af12c570acfd5fb8c624787bd8c75ba40ae1cc7e87126daaf22c9de2b7869c438fc5b1f56282b68ba0541aad058ec42631b8fe38b'
+            '7c9dec73129161edf1d72fd3867dc03a1a2a3df37e99b65135171154fed340a06c55986bbff694b0fa912d1f1d4eee6e5beec9393866812c849ef429934b1600'
+            'f96404228e5f541decd4962aae1c8b61192ef5a0349ab96fc370b71ac09b2c403cdcf2bbef8a4512db5458b575e4856d2e83f373c4a087c5895adeed5f9362c9'
+            '0e88c4d5552566938750234228683e64cf736a43bc210db0aa2e47ae145d78c2417e04c615dbd3571b6fd6739d283d7e67a03ac04e1e898bd5f2812257c800ac'
+            '0507e1b8c246e6b1c0be32f8d9c93e888c163b3f546d097bcd7596d0357994642b9eadc1c409c935854b91eabe7bb8b195fba1fa87fe09da347e152b999b17bc')
 
 _kernelname=${pkgbase#linux-libre}
 _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
@@ -173,11 +171,8 @@ prepare() {
   # https://bugs.archlinux.org/task/58153
   patch -Np1 -i ../0004-Fix-vboxguest-on-guests-with-more-than-4G-RAM.patch
 
-  # https://bugs.archlinux.org/task/58158
-  patch -Np1 -i ../0005-Revert-drm-amd-display-disable-CRTCs-with-NULL-FB-on.patch
-
   # https://bugs.archlinux.org/task/58174
-  patch -Np1 -i ../0006-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
+  patch -Np1 -i ../0005-net-aquantia-Regression-on-reset-with-1.x-firmware.patch
 
   # maintain the TTY over USB disconnects
   # http://www.coreboot.org/EHCI_Gadget_Debug
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 5b1cc304c..857b72846 100644
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.16.3-gnu-1 Kernel Configuration
+# Linux/x86 4.16.4-gnu-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2208,7 +2208,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
+# CONFIG_INTEL_MEI_TXE is not set
 CONFIG_VMWARE_VMCI=m
 
 #
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 751681ab4..d94a36f82 100644
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.16.3-gnu-1 Kernel Configuration
+# Linux/x86 4.16.4-gnu-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -2231,7 +2231,7 @@ CONFIG_SENSORS_LIS3_I2C=m
 CONFIG_ALTERA_STAPL=m
 CONFIG_INTEL_MEI=m
 CONFIG_INTEL_MEI_ME=m
-CONFIG_INTEL_MEI_TXE=m
+# CONFIG_INTEL_MEI_TXE is not set
 CONFIG_VMWARE_VMCI=m
 
 #