Bump to 4.16.18-rt9

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

3 files changed, 13 insertions, 146 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5187e0bfa24e..9f535218f56b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-rt-bfq
-	pkgver = 4.16.15.7
-	pkgrel = 3
+	pkgver = 4.16.18.9
+	pkgrel = 1
 	url = https://github.com/Algodev-github/bfq-mq/
 	arch = x86_64
 	license = GPL2
@@ -11,10 +11,10 @@ pkgbase = linux-rt-bfq
 	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.15.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.15.sign
-	source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.15-rt7.patch.xz
-	source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.15-rt7.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.18.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.16.18.sign
+	source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.18-rt9.patch.xz
+	source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.16/patch-4.16.18-rt9.patch.sign
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/bfq-sq-mq/4.16-bfq-sq-mq-v8r12-2K180625.patch
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0006-include-linux-add-gcc8-support.patch
 	source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.16/0100-Check-presence-on-tree-of-every-entity-after-every-a.patch
@@ -26,7 +26,6 @@ pkgbase = linux-rt-bfq
 	source = 99-linux.hook
 	source = linux.preset
 	source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
-	source = 0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
 	source = 0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
@@ -35,9 +34,9 @@ pkgbase = linux-rt-bfq
 	validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
 	sha512sums = ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662
 	sha512sums = SKIP
-	sha512sums = 496a8a85758b4bae9b3082c45d7e9c8a87bd10a8a2ffbb086f96b83e0ed2e3449ebe8bdd50d138219a55c96a93dd87c9d4802dc0962112e8e78115de77d3c363
+	sha512sums = 9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8
 	sha512sums = SKIP
-	sha512sums = 72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb
+	sha512sums = ba4a38055bd86e1284efbb2cd08645a8b687bf96fa0e64fc42345e2f98c5f58ddf62683f7943dd525ece39b1026a8751930eb02e75cc98314c6a8e91536ef822
 	sha512sums = SKIP
 	sha512sums = 77ebd687dec4025357fc8b192f26a8457bd42e124e9a84e3316f4a39dc5d02657a1a7f518ae652a9b826bc8043cf8dc3182f8c1afc8294cb1cb57b313f238bf5
 	sha512sums = 9737f30e748e043a1b6ab56bd0df6dc9607b4a2749243e599f5563b157aaf339ad43020a526a11a6fc809cc1abe50ac1cb12188bf5b367f6458fa0dbc2c1824d
@@ -50,7 +49,6 @@ pkgbase = linux-rt-bfq
 	sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74
 	sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
 	sha512sums = 26619b938a47c841f0c480a113cfbb1ee6f1121c21dfecbe246c1f7af7697f86cfb8253f09966eab2e386734ce4ad156159babdba4365c2f199c369c3d7e8ee8
-	sha512sums = f6aed92697c35e7919a0d784185e7af15b6be2762e3dd235267ca9744a826ac693d0ffcb07b9d1cc8571f57d518c1ce1c276cf7677e8375188f05f71d4added0
 	sha512sums = cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd
 
 pkgname = linux-rt-bfq
diff --git a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
deleted file mode 100644
index ecd2d721d1c1..000000000000
--- a/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From f593e0bde601ff2b4f84b7363e4dfcbbda652e6d Mon Sep 17 00:00:00 2001
-Message-Id: <f593e0bde601ff2b4f84b7363e4dfcbbda652e6d.1527290717.git.jan.steffens@gmail.com>
-In-Reply-To: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
-References: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Mon, 23 Apr 2018 14:16:03 +0300
-Subject: [PATCH 2/3] ACPI / watchdog: Prefer iTCO_wdt on Lenovo Z50-70
-
-WDAT table on Lenovo Z50-70 is using RTC SRAM (ports 0x70 and 0x71) to
-store state of the timer. This conflicts with Linux RTC driver
-(rtc-cmos.c) who fails to reserve those ports for itself preventing RTC
-from functioning. In addition the WDAT table seems not to be fully
-functional because it does not reset the system when the watchdog times
-out.
-
-On this system iTCO_wdt works just fine so we simply prefer to use it
-instead of WDAT. This makes RTC working again and also results working
-watchdog via iTCO_wdt.
-
-Reported-by: Peter Milley <pbmilley@gmail.com>
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
----
- drivers/acpi/acpi_watchdog.c | 59 ++++++++++++++++++++++++++++++------
- 1 file changed, 49 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
-index ebb626ffb5fa..4bde16fb97d8 100644
---- a/drivers/acpi/acpi_watchdog.c
-+++ b/drivers/acpi/acpi_watchdog.c
-@@ -12,41 +12,80 @@
- #define pr_fmt(fmt) "ACPI: watchdog: " fmt
- 
- #include <linux/acpi.h>
-+#include <linux/dmi.h>
- #include <linux/ioport.h>
- #include <linux/platform_device.h>
- 
- #include "internal.h"
- 
-+static const struct dmi_system_id acpi_watchdog_skip[] = {
-+	{
-+		/*
-+		 * On Lenovo Z50-70 there are two issues with the WDAT
-+		 * table. First some of the instructions use RTC SRAM
-+		 * to store persistent information. This does not work well
-+		 * with Linux RTC driver. Second, more important thing is
-+		 * that the instructions do not actually reset the system.
-+		 *
-+		 * On this particular system iTCO_wdt seems to work just
-+		 * fine so we prefer that over WDAT for now.
-+		 *
-+		 * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
-+		 */
-+		.ident = "Lenovo Z50-70",
-+		.matches = {
-+			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-+			DMI_MATCH(DMI_PRODUCT_NAME, "20354"),
-+			DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo Z50-70"),
-+		},
-+	},
-+	{}
-+};
-+
-+static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
-+{
-+	const struct acpi_table_wdat *wdat = NULL;
-+	acpi_status status;
-+
-+	if (acpi_disabled)
-+		return NULL;
-+
-+	if (dmi_check_system(acpi_watchdog_skip))
-+		return NULL;
-+
-+	status = acpi_get_table(ACPI_SIG_WDAT, 0,
-+				(struct acpi_table_header **)&wdat);
-+	if (ACPI_FAILURE(status)) {
-+		/* It is fine if there is no WDAT */
-+		return NULL;
-+	}
-+
-+	return wdat;
-+}
-+
- /**
-  * Returns true if this system should prefer ACPI based watchdog instead of
-  * the native one (which are typically the same hardware).
-  */
- bool acpi_has_watchdog(void)
- {
--	struct acpi_table_header hdr;
--
--	if (acpi_disabled)
--		return false;
--
--	return ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_WDAT, 0, &hdr));
-+	return !!acpi_watchdog_get_wdat();
- }
- EXPORT_SYMBOL_GPL(acpi_has_watchdog);
- 
- void __init acpi_watchdog_init(void)
- {
- 	const struct acpi_wdat_entry *entries;
- 	const struct acpi_table_wdat *wdat;
- 	struct list_head resource_list;
- 	struct resource_entry *rentry;
- 	struct platform_device *pdev;
- 	struct resource *resources;
- 	size_t nresources = 0;
--	acpi_status status;
- 	int i;
- 
--	status = acpi_get_table(ACPI_SIG_WDAT, 0,
--				(struct acpi_table_header **)&wdat);
--	if (ACPI_FAILURE(status)) {
-+	wdat = acpi_watchdog_get_wdat();
-+	if (!wdat) {
- 		/* It is fine if there is no WDAT */
- 		return;
- 	}
--- 
-2.17.0
-
diff --git a/PKGBUILD b/PKGBUILD
index bffd27918e03..8905e498d891 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -59,12 +59,12 @@ pkgbase=linux-rt-bfq
 # pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs')
 _major=4.16
 _srcname=linux-${_major}
-_minor=15
-_rtver=7
+_minor=18
+_rtver=9
 pkgver=${_major}.${_minor}.${_rtver}
 _pkgver=${_major}.${_minor}
 _rtpatchver=rt${_rtver}
-pkgrel=3
+pkgrel=1
 arch=('x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -103,7 +103,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
          # standard config files for mkinitcpio ramdisk
         'linux.preset'
         '0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch'
-        '0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch'
         '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch')
         
 _kernelname=${pkgbase#linux}
@@ -124,10 +123,6 @@ prepare() {
         msg "Disable USER_NS for non-root users by default"
         patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
     
-    ### Fix https://bugs.archlinux.org/task/56780
-        msg "Fix #56780"
-        patch -Np1 -i ../0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
-    
     ### Fix https://bugs.archlinux.org/task/56711
         msg "Fix #56711"
         patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
@@ -416,9 +411,9 @@ done
 
 sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2d06317dc1683c51a472a9a631573a9b1e7258d6281a2ee189897827f14662'
             'SKIP'
-            '496a8a85758b4bae9b3082c45d7e9c8a87bd10a8a2ffbb086f96b83e0ed2e3449ebe8bdd50d138219a55c96a93dd87c9d4802dc0962112e8e78115de77d3c363'
+            '9e1cf90b874c757393680026cb74500ca9fa22c0047ac820f4e5f43062125f8cf469f1e8e93a084b9ecc28a177e55c8b733c2fe620e46694a338f1b2ff4180f8'
             'SKIP'
-            '72e3418d30a1818921647543c150c634a492395aee86f581606be6ae91e9bb2e712c5fc1154f584b40639a0e84c8c40c0113db1bfedb664e308153caa89305cb'
+            'ba4a38055bd86e1284efbb2cd08645a8b687bf96fa0e64fc42345e2f98c5f58ddf62683f7943dd525ece39b1026a8751930eb02e75cc98314c6a8e91536ef822'
             'SKIP'
             '77ebd687dec4025357fc8b192f26a8457bd42e124e9a84e3316f4a39dc5d02657a1a7f518ae652a9b826bc8043cf8dc3182f8c1afc8294cb1cb57b313f238bf5'
             '9737f30e748e043a1b6ab56bd0df6dc9607b4a2749243e599f5563b157aaf339ad43020a526a11a6fc809cc1abe50ac1cb12188bf5b367f6458fa0dbc2c1824d'
@@ -431,7 +426,6 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2
             '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
             '26619b938a47c841f0c480a113cfbb1ee6f1121c21dfecbe246c1f7af7697f86cfb8253f09966eab2e386734ce4ad156159babdba4365c2f199c369c3d7e8ee8'
-            'f6aed92697c35e7919a0d784185e7af15b6be2762e3dd235267ca9744a826ac693d0ffcb07b9d1cc8571f57d518c1ce1c276cf7677e8375188f05f71d4added0'
             'cc8852b089aa24f588ad1af726503ecd1012ad7e1cbc47ea77f03a5f7aecd25306d40f2e16b8a1afeafe7e2e97b6b6840c9f462ed7be358090117e2e024df1bd')
             
 validpgpkeys=(