remove Arch Linux git format-patch patches

Arch now builds their kernels from their github repo
https://git.archlinux.org/svntogit/packages.git/commit/repos/core-x86_64?h=packages/linux&id=973e9461f3f2a558bfc49f49d659ea3f7e5aec44

hence, instead of cloning and deblobbing their repo, I'll maintain
the diff (of Arch's kernel and vanilla) as a patch in our repos.
Also, be careful, DO NOT USE CONFIG_LOCALVERSION_AUTO=y, and remember
to always use CONFIG_LOCALVERSION="$_kernelname" in the config.$KARCH file

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

4 files changed, 0 insertions, 523 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
deleted file mode 100644
index 72c4f979e..000000000
--- a/libre/linux-libre/0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From a2d2476ffec7d988b1a5396586869570e0d6f9d8 Mon Sep 17 00:00:00 2001
-Message-Id: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.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
- default
-
-Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
-[bwh: Remove unneeded binary sysctl bits]
-Signed-off-by: Daniel Micay <danielmicay@gmail.com>
----
- kernel/fork.c           | 15 +++++++++++++++
- kernel/sysctl.c         | 12 ++++++++++++
- kernel/user_namespace.c |  3 +++
- 3 files changed, 30 insertions(+)
-
-diff --git a/kernel/fork.c b/kernel/fork.c
-index a5d21c42acfc..675eb3f3a1d1 100644
---- a/kernel/fork.c
-+++ b/kernel/fork.c
-@@ -103,6 +103,11 @@
- 
- #define CREATE_TRACE_POINTS
- #include <trace/events/task.h>
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#else
-+#define unprivileged_userns_clone 0
-+#endif
- 
- /*
-  * Minimum number of threads to boot the kernel
-@@ -1592,6 +1597,10 @@ static __latent_entropy struct task_struct *copy_process(
- 	if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
- 		return ERR_PTR(-EINVAL);
- 
-+	if ((clone_flags & CLONE_NEWUSER) && !unprivileged_userns_clone)
-+		if (!capable(CAP_SYS_ADMIN))
-+			return ERR_PTR(-EPERM);
-+
- 	/*
- 	 * Thread groups must share signals as well, and detached threads
- 	 * can only be started up within the thread group.
-@@ -2386,6 +2395,12 @@ int ksys_unshare(unsigned long unshare_flags)
- 	if (unshare_flags & CLONE_NEWNS)
- 		unshare_flags |= CLONE_FS;
- 
-+	if ((unshare_flags & CLONE_NEWUSER) && !unprivileged_userns_clone) {
-+		err = -EPERM;
-+		if (!capable(CAP_SYS_ADMIN))
-+			goto bad_unshare_out;
-+	}
-+
- 	err = check_unshare_flags(unshare_flags);
- 	if (err)
- 		goto bad_unshare_out;
-diff --git a/kernel/sysctl.c b/kernel/sysctl.c
-index 6a78cf70761d..35a1d24282f4 100644
---- a/kernel/sysctl.c
-+++ b/kernel/sysctl.c
-@@ -105,6 +105,9 @@ extern int core_uses_pid;
- extern char core_pattern[];
- extern unsigned int core_pipe_limit;
- #endif
-+#ifdef CONFIG_USER_NS
-+extern int unprivileged_userns_clone;
-+#endif
- extern int pid_max;
- extern int pid_max_min, pid_max_max;
- extern int percpu_pagelist_fraction;
-@@ -519,6 +522,15 @@ static struct ctl_table kern_table[] = {
- 		.proc_handler	= proc_dointvec,
- 	},
- #endif
-+#ifdef CONFIG_USER_NS
-+	{
-+		.procname	= "unprivileged_userns_clone",
-+		.data		= &unprivileged_userns_clone,
-+		.maxlen		= sizeof(int),
-+		.mode		= 0644,
-+		.proc_handler	= proc_dointvec,
-+	},
-+#endif
- #ifdef CONFIG_PROC_SYSCTL
- 	{
- 		.procname	= "tainted",
-diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
-index 246d4d4ce5c7..f64432b45cec 100644
---- a/kernel/user_namespace.c
-+++ b/kernel/user_namespace.c
-@@ -26,6 +26,9 @@
- #include <linux/bsearch.h>
- #include <linux/sort.h>
- 
-+/* sysctl */
-+int unprivileged_userns_clone;
-+
- static struct kmem_cache *user_ns_cachep __read_mostly;
- static DEFINE_MUTEX(userns_state_mutex);
- 
--- 
-2.18.0
-
diff --git a/libre/linux-libre/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/libre/linux-libre/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
deleted file mode 100644
index 8c4ceba16..000000000
--- a/libre/linux-libre/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-From bc49947e26285cf644492f9d58981e3c985d8c76 Mon Sep 17 00:00:00 2001
-Message-Id: <bc49947e26285cf644492f9d58981e3c985d8c76.1531335939.git.jan.steffens@gmail.com>
-In-Reply-To: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-References: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-From: Jani Nikula <jani.nikula@intel.com>
-Date: Wed, 16 May 2018 11:01:10 +0300
-Subject: [PATCH 2/4] 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 cd6e87756509..492b0cb9bb2b 100644
---- a/drivers/gpu/drm/i915/intel_dp.c
-+++ b/drivers/gpu/drm/i915/intel_dp.c
-@@ -1674,23 +1674,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,
-@@ -1737,16 +1720,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;
-@@ -6123,7 +6098,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;
-@@ -6178,14 +6152,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;
- 		}
- 	}
- 
-@@ -6222,8 +6195,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 a80fbad9be0f..7f3e83f17adb 100644
---- a/drivers/gpu/drm/i915/intel_drv.h
-+++ b/drivers/gpu/drm/i915/intel_drv.h
-@@ -269,7 +269,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 */
-@@ -1820,7 +1819,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 384b37e2da70..f349b3920199 100644
---- a/drivers/gpu/drm/i915/intel_dsi.c
-+++ b/drivers/gpu/drm/i915/intel_dsi.c
-@@ -1852,7 +1852,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 6604806f89d5..61d908e0df0e 100644
---- a/drivers/gpu/drm/i915/intel_dvo.c
-+++ b/drivers/gpu/drm/i915/intel_dvo.c
-@@ -542,7 +542,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 34dd1e5233ac..48f618dc9abb 100644
---- a/drivers/gpu/drm/i915/intel_lvds.c
-+++ b/drivers/gpu/drm/i915/intel_lvds.c
-@@ -1180,8 +1180,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 41d00b1603e3..b443278e569c 100644
---- a/drivers/gpu/drm/i915/intel_panel.c
-+++ b/drivers/gpu/drm/i915/intel_panel.c
-@@ -1928,30 +1928,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.18.0
-
diff --git a/libre/linux-libre/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch b/libre/linux-libre/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
deleted file mode 100644
index 00ae30e9e..000000000
--- a/libre/linux-libre/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-From 598ca9d1cc714cb530141c20a90dc25d34f861fd Mon Sep 17 00:00:00 2001
-Message-Id: <598ca9d1cc714cb530141c20a90dc25d34f861fd.1531335939.git.jan.steffens@gmail.com>
-In-Reply-To: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-References: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-From: Mika Westerberg <mika.westerberg@linux.intel.com>
-Date: Tue, 22 May 2018 14:16:50 +0300
-Subject: [PATCH 3/4] ACPI / watchdog: Prefer iTCO_wdt always when WDAT table
- uses RTC SRAM
-
-After we added quirk for Lenovo Z50-70 it turns out there are at least
-two more systems where WDAT table includes instructions accessing RTC
-SRAM. Instead of quirking each system separately, look for such
-instructions in the table and automatically prefer iTCO_wdt if found.
-
-Link: https://bugzilla.kernel.org/show_bug.cgi?id=199033
-Reported-by: Arnold Guy <aurnoldg@gmail.com>
-Reported-by: Alois Nespor <nespor@fssp.cz>
-Reported-by: Yury Pakin <zxwarior@gmail.com>
-Reported-by: Ihor Chyhin <ihorchyhin@ukr.net>
-Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
-Acked-by: Guenter Roeck <linux@roeck-us.net>
----
- drivers/acpi/acpi_watchdog.c | 72 ++++++++++++++++++++++--------------
- 1 file changed, 45 insertions(+), 27 deletions(-)
-
-diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
-index 4bde16fb97d8..95600309ce42 100644
---- a/drivers/acpi/acpi_watchdog.c
-+++ b/drivers/acpi/acpi_watchdog.c
-@@ -12,54 +12,72 @@
- #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"),
--		},
--	},
--	{}
--};
-+#ifdef CONFIG_RTC_MC146818_LIB
-+#include <linux/mc146818rtc.h>
-+
-+/*
-+ * There are several systems where the WDAT table is accessing RTC SRAM to
-+ * store persistent information. This does not work well with the Linux RTC
-+ * driver so on those systems we skip WDAT driver and prefer iTCO_wdt
-+ * instead.
-+ *
-+ * See also https://bugzilla.kernel.org/show_bug.cgi?id=199033.
-+ */
-+static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat)
-+{
-+	const struct acpi_wdat_entry *entries;
-+	int i;
-+
-+	entries = (struct acpi_wdat_entry *)(wdat + 1);
-+	for (i = 0; i < wdat->entries; i++) {
-+		const struct acpi_generic_address *gas;
-+
-+		gas = &entries[i].register_region;
-+		if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO) {
-+			switch (gas->address) {
-+			case RTC_PORT(0):
-+			case RTC_PORT(1):
-+			case RTC_PORT(2):
-+			case RTC_PORT(3):
-+				return true;
-+			}
-+		}
-+	}
-+
-+	return false;
-+}
-+#else
-+static bool acpi_watchdog_uses_rtc(const struct acpi_table_wdat *wdat)
-+{
-+	return false;
-+}
-+#endif
- 
- 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;
- 	}
- 
-+	if (acpi_watchdog_uses_rtc(wdat)) {
-+		pr_info("Skipping WDAT on this system because it uses RTC SRAM\n");
-+		return NULL;
-+	}
-+
- 	return wdat;
- }
- 
--- 
-2.18.0
-
diff --git a/libre/linux-libre/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch b/libre/linux-libre/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
deleted file mode 100644
index de3385e8d..000000000
--- a/libre/linux-libre/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 32a72bee7a275f47c235fdb36249703c892ce8d8 Mon Sep 17 00:00:00 2001
-Message-Id: <32a72bee7a275f47c235fdb36249703c892ce8d8.1531335939.git.jan.steffens@gmail.com>
-In-Reply-To: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-References: <a2d2476ffec7d988b1a5396586869570e0d6f9d8.1531335939.git.jan.steffens@gmail.com>
-From: Denis Kenzior <denkenz@gmail.com>
-Date: Tue, 19 Jun 2018 10:39:50 -0500
-Subject: [PATCH 4/4] mac80211: disable BHs/preemption in
- ieee80211_tx_control_port()
-
-On pre-emption enabled kernels the following print was being seen due to
-missing local_bh_disable/local_bh_enable calls.  mac80211 assumes that
-pre-emption is disabled in the data path.
-
-    BUG: using smp_processor_id() in preemptible [00000000] code: iwd/517
-    caller is __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
-    [...]
-    Call Trace:
-    dump_stack+0x5c/0x80
-    check_preemption_disabled.cold.0+0x46/0x51
-    __ieee80211_subif_start_xmit+0x144/0x210 [mac80211]
-
-Fixes: 911806491425 ("mac80211: Add support for tx_control_port")
-Signed-off-by: Denis Kenzior <denkenz@gmail.com>
-[commit message rewrite, fixes tag]
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
----
- net/mac80211/tx.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
-index 05a265cd573d..7404a5114597 100644
---- a/net/mac80211/tx.c
-+++ b/net/mac80211/tx.c
-@@ -4800,7 +4800,9 @@ int ieee80211_tx_control_port(struct wiphy *wiphy, struct net_device *dev,
- 	skb_reset_network_header(skb);
- 	skb_reset_mac_header(skb);
- 
-+	local_bh_disable();
- 	__ieee80211_subif_start_xmit(skb, skb->dev, flags);
-+	local_bh_enable();
- 
- 	return 0;
- }
--- 
-2.18.0
-