Sync with -ARCH

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

8 files changed, 399 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8cacfdf7923d..bb4b55ac3b4b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-rt-bfq
 	pkgver = 4.16.8.3
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Algodev-github/bfq-mq/
 	arch = x86_64
 	license = GPL2
@@ -27,9 +27,10 @@ pkgbase = linux-rt-bfq
 	source = 99-linux.hook
 	source = linux.preset
 	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-Partially-revert-swiotlb-remove-various-exports.patch
-	source = 0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.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
+	source = 0004-Partially-revert-swiotlb-remove-various-exports.patch
+	source = 0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
@@ -52,10 +53,11 @@ pkgbase = linux-rt-bfq
 	sha512sums = 4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44
 	sha512sums = 6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74
 	sha512sums = 2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf
-	sha512sums = d4a5dadbdbbb8a2c2c3b4b5e77ea19664e0742825648d10635ce3b7642f01d71d51fd8ed58dcfd686981ef9c3f83965746686231b9bac1974809be1618e60373
-	sha512sums = 071c38539db9660e743cca5514a5b2c10e79716c59435976f7cd18bd77254b39e1cdba6386ac6938c00c7585e1834508f85bc65f4d2af28246dae864b71b06b3
-	sha512sums = 6c4bf0d5230e7a3e895f88cf6cc84d6df550fefa2c865e4d5853e02682e781c5a149fb4f853ac7513f335271415fae4a4edf13139de4ba067102e9d8083c22a0
-	sha512sums = f5a6e9e6244ed2bb336f359a65ba922226f76319c216eae3c1acca137084ab0c89372d8ec2299d0377ad909534a5d13d8db9a9376e357d600518c81811256d07
+	sha512sums = e8229ab81b771f485a28162481ffee88235083195f90c9793aad4714f145609520b6c05104fc02ac40fd0a049836fe34145b5c6a452887015a6f5b0c42da6c8e
+	sha512sums = 2178029acb13aae77350cd77dbf78533501a3a0684be7ec6bb0df0c02a3b6d8f59d1c2a77d0171f9eab960211ea90c581a17c3cfaf336267837611d0c0be6795
+	sha512sums = 3b59662258d609b24eb294ce2f7d97384ebd30590c07e257f8957ef7d56fd9bba689b7e814fe3ca9dd481d77d259bdeeeaef9ed48f10673ef7c95b30bdccefde
+	sha512sums = f7fdcb1fe5d882af14c72e9e59d0133c713c84394702c110b7ab8eedceecd4165b4e09c0a1860439b918f6095ff6c4e586334c9d7517229f7c7f9b9538177a81
+	sha512sums = 7b8b72c8fbf99347b0b999d0e90f70a3721c8dd23589d8abd4cd6656120fb91d66b16b423f42b416a164a4ba2413dccf10587b2ed53aec14a9c040067353fb23
 
 pkgname = linux-rt-bfq
 	pkgdesc = Linux Kernel and modules with the RT patch and the BFQ scheduler.
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 9f834791260f..3dc78f9e6c4c 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 ee91df95bf010fad44be5d2564e7d40038987f19 Mon Sep 17 00:00:00 2001
+Message-Id: <ee91df95bf010fad44be5d2564e7d40038987f19.1527290717.git.jan.steffens@gmail.com>
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/4] 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/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
new file mode 100644
index 000000000000..4727df9b6d72
--- /dev/null
+++ b/0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch
@@ -0,0 +1,125 @@
+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/5] 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/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
deleted file mode 100644
index e33c05ae5b15..000000000000
--- a/0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-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: Jim Bride <jim.bride@linux.intel.com>
-Date: Mon, 6 Nov 2017 13:38:57 -0800
-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
-eDP if available."), the patch allows for the use of an alternate fixed
-mode if it is available, but the patch was not ensuring that the only
-time the alternate mode is used is when it is specifically requested.
-This patch adds an additional comparison to intel_edp_compare_alt_mode
-to ensure that we only use the alternate mode if it is directly
-requested.
-
-Fixes: dc911f5bd8aac ("Allow alternate fixed mode for eDP if available.")
-Cc: David Weinehall <david.weinehall@linux.intel.com>
-Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
-Signed-off-by: Jim Bride <jim.bride@linux.intel.com>
----
- drivers/gpu/drm/i915/intel_dp.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
-index 79521da5d11d..837cbaa55a2b 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1597,7 +1597,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
- 			m1->vdisplay == m2->vdisplay &&
- 			m1->vsync_start == m2->vsync_start &&
- 			m1->vsync_end == m2->vsync_end &&
--			m1->vtotal == m2->vtotal);
-+			m1->vtotal == m2->vtotal &&
-+			m1->vrefresh == m2->vrefresh);
- 	return bres;
- }
- 
--- 
-2.17.0
-
diff --git a/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
new file mode 100644
index 000000000000..6e16c580ea83
--- /dev/null
+++ b/0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
@@ -0,0 +1,242 @@
+From b7438d9dd645801027ab11470850033da0521338 Mon Sep 17 00:00:00 2001
+Message-Id: <b7438d9dd645801027ab11470850033da0521338.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: Jani Nikula <jani.nikula@intel.com>
+Date: Wed, 16 May 2018 11:01:10 +0300
+Subject: [PATCH 3/5] Revert "drm/i915/edp: Allow alternate fixed mode for eDP
+ if available."
+
+This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e.
+
+Per the report, no matter what display mode you select with xrandr, the
+i915 driver will always select the alternate fixed mode. For the
+reporter this means that the display will always run at 40Hz which is
+quite annoying. This may be due to the mode comparison.
+
+But there are some other potential issues. The choice of alt_fixed_mode
+seems dubious. It's the first non-preferred mode, but there are no
+guarantees that the only difference would be refresh rate. Similarly,
+there may be more than one preferred mode in the probed modes list, and
+the commit changes the preferred mode selection to choose the last one
+on the list instead of the first.
+
+(Note that the probed modes list is the raw, unfiltered, unsorted list
+of modes from drm_add_edid_modes(), not the pretty result after a
+drm_helper_probe_single_connector_modes() call.)
+
+Finally, we already have eerily similar code in place to find the
+downclock mode for DRRS that seems like could be reused here.
+
+Back to the drawing board.
+
+Note: This is a hand-crafted revert due to conflicts. If it fails to
+backport, please just try reverting the original commit directly.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105469
+Reported-by: Rune Petersen <rune@megahurts.dk>
+Reported-by: Mark Spencer <n7u4722r35@ynzlx.anonbox.net>
+Fixes: dc911f5bd8aa ("drm/i915/edp: Allow alternate fixed mode for eDP if available.")
+Cc: Clint Taylor <clinton.a.taylor@intel.com>
+Cc: David Weinehall <david.weinehall@linux.intel.com>
+Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
+Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Cc: Jani Nikula <jani.nikula@intel.com>
+Cc: Chris Wilson <chris@chris-wilson.co.uk>
+Cc: Jim Bride <jim.bride@linux.intel.com>
+Cc: Jani Nikula <jani.nikula@linux.intel.com>
+Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+Cc: intel-gfx@lists.freedesktop.org
+Cc: <stable@vger.kernel.org> # v4.14+
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani.nikula@intel.com
+---
+ drivers/gpu/drm/i915/intel_dp.c    | 38 ++++--------------------------
+ drivers/gpu/drm/i915/intel_drv.h   |  2 --
+ drivers/gpu/drm/i915/intel_dsi.c   |  2 +-
+ drivers/gpu/drm/i915/intel_dvo.c   |  2 +-
+ drivers/gpu/drm/i915/intel_lvds.c  |  3 +--
+ drivers/gpu/drm/i915/intel_panel.c |  6 -----
+ 6 files changed, 8 insertions(+), 45 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
+index 79521da5d11d..de0d0f83551e 100644
+--- a/drivers/gpu/drm/i915/intel_dp.c
++++ b/drivers/gpu/drm/i915/intel_dp.c
+@@ -1584,23 +1584,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp,
+ 	return bpp;
+ }
+ 
+-static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1,
+-				       struct drm_display_mode *m2)
+-{
+-	bool bres = false;
+-
+-	if (m1 && m2)
+-		bres = (m1->hdisplay == m2->hdisplay &&
+-			m1->hsync_start == m2->hsync_start &&
+-			m1->hsync_end == m2->hsync_end &&
+-			m1->htotal == m2->htotal &&
+-			m1->vdisplay == m2->vdisplay &&
+-			m1->vsync_start == m2->vsync_start &&
+-			m1->vsync_end == m2->vsync_end &&
+-			m1->vtotal == m2->vtotal);
+-	return bres;
+-}
+-
+ bool
+ intel_dp_compute_config(struct intel_encoder *encoder,
+ 			struct intel_crtc_state *pipe_config,
+@@ -1647,16 +1630,8 @@ intel_dp_compute_config(struct intel_encoder *encoder,
+ 		pipe_config->has_audio = intel_conn_state->force_audio == HDMI_AUDIO_ON;
+ 
+ 	if (intel_dp_is_edp(intel_dp) && intel_connector->panel.fixed_mode) {
+-		struct drm_display_mode *panel_mode =
+-			intel_connector->panel.alt_fixed_mode;
+-		struct drm_display_mode *req_mode = &pipe_config->base.mode;
+-
+-		if (!intel_edp_compare_alt_mode(req_mode, panel_mode))
+-			panel_mode = intel_connector->panel.fixed_mode;
+-
+-		drm_mode_debug_printmodeline(panel_mode);
+-
+-		intel_fixed_panel_mode(panel_mode, adjusted_mode);
++		intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
++				       adjusted_mode);
+ 
+ 		if (INTEL_GEN(dev_priv) >= 9) {
+ 			int ret;
+@@ -5821,7 +5796,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ 	struct drm_i915_private *dev_priv = to_i915(dev);
+ 	struct drm_connector *connector = &intel_connector->base;
+ 	struct drm_display_mode *fixed_mode = NULL;
+-	struct drm_display_mode *alt_fixed_mode = NULL;
+ 	struct drm_display_mode *downclock_mode = NULL;
+ 	bool has_dpcd;
+ 	struct drm_display_mode *scan;
+@@ -5876,14 +5850,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ 	}
+ 	intel_connector->edid = edid;
+ 
+-	/* prefer fixed mode from EDID if available, save an alt mode also */
++	/* prefer fixed mode from EDID if available */
+ 	list_for_each_entry(scan, &connector->probed_modes, head) {
+ 		if ((scan->type & DRM_MODE_TYPE_PREFERRED)) {
+ 			fixed_mode = drm_mode_duplicate(dev, scan);
+ 			downclock_mode = intel_dp_drrs_init(
+ 						intel_connector, fixed_mode);
+-		} else if (!alt_fixed_mode) {
+-			alt_fixed_mode = drm_mode_duplicate(dev, scan);
++			break;
+ 		}
+ 	}
+ 
+@@ -5920,8 +5893,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
+ 			      pipe_name(pipe));
+ 	}
+ 
+-	intel_panel_init(&intel_connector->panel, fixed_mode, alt_fixed_mode,
+-			 downclock_mode);
++	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+ 	intel_connector->panel.backlight.power = intel_edp_backlight_power;
+ 	intel_panel_setup_backlight(connector, pipe);
+ 
+diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
+index 30f791f89d64..9b75b82a2956 100644
+--- a/drivers/gpu/drm/i915/intel_drv.h
++++ b/drivers/gpu/drm/i915/intel_drv.h
+@@ -264,7 +264,6 @@ struct intel_encoder {
+ 
+ struct intel_panel {
+ 	struct drm_display_mode *fixed_mode;
+-	struct drm_display_mode *alt_fixed_mode;
+ 	struct drm_display_mode *downclock_mode;
+ 
+ 	/* backlight */
+@@ -1720,7 +1719,6 @@ void intel_overlay_reset(struct drm_i915_private *dev_priv);
+ /* intel_panel.c */
+ int intel_panel_init(struct intel_panel *panel,
+ 		     struct drm_display_mode *fixed_mode,
+-		     struct drm_display_mode *alt_fixed_mode,
+ 		     struct drm_display_mode *downclock_mode);
+ void intel_panel_fini(struct intel_panel *panel);
+ void intel_fixed_panel_mode(const struct drm_display_mode *fixed_mode,
+diff --git a/drivers/gpu/drm/i915/intel_dsi.c b/drivers/gpu/drm/i915/intel_dsi.c
+index f67d321376e4..551bf1c14093 100644
+--- a/drivers/gpu/drm/i915/intel_dsi.c
++++ b/drivers/gpu/drm/i915/intel_dsi.c
+@@ -1851,7 +1851,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv)
+ 	connector->display_info.width_mm = fixed_mode->width_mm;
+ 	connector->display_info.height_mm = fixed_mode->height_mm;
+ 
+-	intel_panel_init(&intel_connector->panel, fixed_mode, NULL, NULL);
++	intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
+ 	intel_panel_setup_backlight(connector, INVALID_PIPE);
+ 
+ 	intel_dsi_add_properties(intel_connector);
+diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
+index 754baa00bea9..05bd65e37cb5 100644
+--- a/drivers/gpu/drm/i915/intel_dvo.c
++++ b/drivers/gpu/drm/i915/intel_dvo.c
+@@ -537,7 +537,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv)
+ 			 */
+ 			intel_panel_init(&intel_connector->panel,
+ 					 intel_dvo_get_current_mode(intel_encoder),
+-					 NULL, NULL);
++					 NULL);
+ 			intel_dvo->panel_wants_dither = true;
+ 		}
+ 
+diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
+index 7ed6f7b69556..ab5a63f007eb 100644
+--- a/drivers/gpu/drm/i915/intel_lvds.c
++++ b/drivers/gpu/drm/i915/intel_lvds.c
+@@ -1128,8 +1128,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv)
+ out:
+ 	mutex_unlock(&dev->mode_config.mutex);
+ 
+-	intel_panel_init(&intel_connector->panel, fixed_mode, NULL,
+-			 downclock_mode);
++	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+ 	intel_panel_setup_backlight(connector, INVALID_PIPE);
+ 
+ 	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
+diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
+index fa6831f8c004..c0ac6d6bf8ef 100644
+--- a/drivers/gpu/drm/i915/intel_panel.c
++++ b/drivers/gpu/drm/i915/intel_panel.c
+@@ -1924,30 +1924,24 @@ intel_panel_init_backlight_funcs(struct intel_panel *panel)
+ 
+ int intel_panel_init(struct intel_panel *panel,
+ 		     struct drm_display_mode *fixed_mode,
+-		     struct drm_display_mode *alt_fixed_mode,
+ 		     struct drm_display_mode *downclock_mode)
+ {
+ 	intel_panel_init_backlight_funcs(panel);
+ 
+ 	panel->fixed_mode = fixed_mode;
+-	panel->alt_fixed_mode = alt_fixed_mode;
+ 	panel->downclock_mode = downclock_mode;
+ 
+ 	return 0;
+ }
+ 
+ void intel_panel_fini(struct intel_panel *panel)
+ {
+ 	struct intel_connector *intel_connector =
+ 		container_of(panel, struct intel_connector, panel);
+ 
+ 	if (panel->fixed_mode)
+ 		drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
+ 
+-	if (panel->alt_fixed_mode)
+-		drm_mode_destroy(intel_connector->base.dev,
+-				panel->alt_fixed_mode);
+-
+ 	if (panel->downclock_mode)
+ 		drm_mode_destroy(intel_connector->base.dev,
+ 				panel->downclock_mode);
+-- 
+2.17.0
+
diff --git a/0003-Partially-revert-swiotlb-remove-various-exports.patch b/0004-Partially-revert-swiotlb-remove-various-exports.patch
index de1bdde951b0..775d4ca95afd 100644
--- a/0003-Partially-revert-swiotlb-remove-various-exports.patch
+++ b/0004-Partially-revert-swiotlb-remove-various-exports.patch
@@ -4,7 +4,7 @@ In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffe
 References: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.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/4] Partially revert "swiotlb: remove various exports"
+Subject: [PATCH 4/5] Partially revert "swiotlb: remove various exports"
 
 This partially reverts commit 4bd89ed39b2ab8dc4ac4b6c59b07d420b0213bec.
 The proprietary NVIDIA driver needs one of the exports.
diff --git a/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch b/0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
index 009251cb3e6e..1347693a8b0f 100644
--- a/0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
+++ b/0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
@@ -4,7 +4,7 @@ In-Reply-To: <1d8e17daf031e219d904ef93718081534c9e8cea.1526520263.git.jan.steffe
 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 4/4] xhci: Fix USB3 NULL pointer dereference at logical
+Subject: [PATCH 5/5] xhci: Fix USB3 NULL pointer dereference at logical
  disconnect.
 
 Hub driver will try to disable a USB3 device twice at logical disconnect,
diff --git a/PKGBUILD b/PKGBUILD
index 50fa57195336..e2942c677238 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,7 +64,7 @@ _rtver=3
 pkgver=${_major}.${_minor}.${_rtver}
 _pkgver=${_major}.${_minor}
 _rtpatchver=rt${_rtver}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url="https://github.com/Algodev-github/bfq-mq/"
 license=('GPL2')
@@ -102,9 +102,10 @@ 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-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch'
-        '0003-Partially-revert-swiotlb-remove-various-exports.patch'
-        '0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch')
+        '0002-ACPI-watchdog-Prefer-iTCO_wdt-on-Lenovo-Z50-70.patch'
+        '0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch'
+        '0004-Partially-revert-swiotlb-remove-various-exports.patch'
+        '0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch')
         
 _kernelname=${pkgbase#linux}
 : ${_kernelname:=-rt-bfq}
@@ -124,17 +125,21 @@ 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 ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch    
+        patch -Np1 -i ../0003-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch    
     
     ### NVIDIA driver compat
         msg "NVIDIA driver compat"
-        patch -Np1 -i ../0003-Partially-revert-swiotlb-remove-various-exports.patch
+        patch -Np1 -i ../0004-Partially-revert-swiotlb-remove-various-exports.patch
     
     ### Fix https://bugs.archlinux.org/task/58237
         msg "Fix #58237"
-        patch -Np1 -i ../0004-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
+        patch -Np1 -i ../0005-xhci-Fix-USB3-NULL-pointer-dereference-at-logical-di.patch
     
     ### Fix gcc8 bogus warnings
         msg "Fix gcc8 bogus warnings"
@@ -441,10 +446,11 @@ sha512sums=('ab47849314b177d0eec9dbf261f33972b0d89fb92fb0650130ffa7abc2f36c0fab2
             '4a8b324aee4cccf3a512ad04ce1a272d14e5b05c8de90feb82075f55ea3845948d817e1b0c6f298f5816834ddd3e5ce0a0e2619866289f3c1ab8fd2f35f04f44'
             '6346b66f54652256571ef65da8e46db49a95ac5978ecd57a507c6b2a28aee70bb3ff87045ac493f54257c9965da1046a28b72cb5abb0087204d257f14b91fd74'
             '2dc6b0ba8f7dbf19d2446c5c5f1823587de89f4e28e9595937dd51a87755099656f2acec50e3e2546ea633ad1bfd1c722e0c2b91eef1d609103d8abdc0a7cbaf'
-            'd4a5dadbdbbb8a2c2c3b4b5e77ea19664e0742825648d10635ce3b7642f01d71d51fd8ed58dcfd686981ef9c3f83965746686231b9bac1974809be1618e60373'
-            '071c38539db9660e743cca5514a5b2c10e79716c59435976f7cd18bd77254b39e1cdba6386ac6938c00c7585e1834508f85bc65f4d2af28246dae864b71b06b3'
-            '6c4bf0d5230e7a3e895f88cf6cc84d6df550fefa2c865e4d5853e02682e781c5a149fb4f853ac7513f335271415fae4a4edf13139de4ba067102e9d8083c22a0'
-            'f5a6e9e6244ed2bb336f359a65ba922226f76319c216eae3c1acca137084ab0c89372d8ec2299d0377ad909534a5d13d8db9a9376e357d600518c81811256d07')
+            'e8229ab81b771f485a28162481ffee88235083195f90c9793aad4714f145609520b6c05104fc02ac40fd0a049836fe34145b5c6a452887015a6f5b0c42da6c8e'
+            '2178029acb13aae77350cd77dbf78533501a3a0684be7ec6bb0df0c02a3b6d8f59d1c2a77d0171f9eab960211ea90c581a17c3cfaf336267837611d0c0be6795'
+            '3b59662258d609b24eb294ce2f7d97384ebd30590c07e257f8957ef7d56fd9bba689b7e814fe3ca9dd481d77d259bdeeeaef9ed48f10673ef7c95b30bdccefde'
+            'f7fdcb1fe5d882af14c72e9e59d0133c713c84394702c110b7ab8eedceecd4165b4e09c0a1860439b918f6095ff6c4e586334c9d7517229f7c7f9b9538177a81'
+            '7b8b72c8fbf99347b0b999d0e90f70a3721c8dd23589d8abd4cd6656120fb91d66b16b423f42b416a164a4ba2413dccf10587b2ed53aec14a9c040067353fb23')
             
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds