diff options
-rw-r--r-- | .SRCINFO | 26 | ||||
-rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 8 | ||||
-rw-r--r-- | 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch | 36 | ||||
-rw-r--r-- | 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch | 12 | ||||
-rw-r--r-- | 0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch | 46 | ||||
-rw-r--r-- | PKGBUILD | 21 | ||||
-rw-r--r-- | config | 8 |
7 files changed, 105 insertions, 52 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Tue Jul 10 19:53:46 UTC 2018 +# Mon Jul 16 19:28:04 UTC 2018 pkgbase = linux-rc - pkgver = 4.17.6rc1 + pkgver = 4.17.7rc1 pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 @@ -13,10 +13,10 @@ pkgbase = linux-rc options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.17.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.17.6-rc1.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.17.6-rc1.sign - source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.5.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.5.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.17.7-rc1.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/stable-review/patch-4.17.7-rc1.sign + source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.6.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.17.6.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -24,19 +24,21 @@ pkgbase = linux-rc source = 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch source = 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch source = 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch + source = 0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch sha256sums = 9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13 sha256sums = SKIP - sha256sums = 5041d4009352c42543acb125e7fa5acf086c901101194fbff5e97931bd4ac06b + sha256sums = 8a120a679afbe9165758d7fcb25f0be827bd52bde2e5f204736ea2bc1d6df263 sha256sums = SKIP - sha256sums = cc18fcf14df25f0bab047aa180b9362bd4f3ce96f1b05e1f7764cfcc0e271bbd + sha256sums = 7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf sha256sums = SKIP - sha256sums = 0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17 + sha256sums = f8e890eac9779a89009c1e2339f757e9781864df09805211fad005146fe2578b sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919 sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65 - sha256sums = e3c08f9b91611186e5ec579187ecea2a0143e5c2dc7ffc30ac6ea6e2b6d130fd - sha256sums = 5403dead9161344b2c01027526146a250147680f4a2d32a54d40c55fc1becc8a - sha256sums = d55e7de60b12bca26ded4c1bb8eb5860a9092374914a201a0f6a0ed2849d099f + sha256sums = 92f848d0e21fbb2400e50d1c1021514893423641e5450896d7b1d88aa880b2b9 + sha256sums = fc3c50ae6bd905608e0533a883ab569fcf54038fb9d6569b391107d9fd00abbc + sha256sums = bc50c605bd0e1fa7437c21ddef728b83b6de3322b988e14713032993dfa1fc69 + sha256sums = 66284102261c4ed53db050e9045c8672ba0e5171884b46e58f6cd417774d8578 pkgname = linux-rc pkgdesc = The release candidate kernel and modules 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 ef2a8aa685c8..72c4f979ef86 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 9a5adbc45b1c7d43fe4b27936f2a6939660617a1 Mon Sep 17 00:00:00 2001 -Message-Id: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +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/3] 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> @@ -99,5 +99,5 @@ index 246d4d4ce5c7..f64432b45cec 100644 static DEFINE_MUTEX(userns_state_mutex); -- -2.17.1 +2.18.0 diff --git a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch index 8d44c5532a8b..8c4ceba16c97 100644 --- a/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch +++ b/0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch @@ -1,10 +1,10 @@ -From 6cc33158e691a70111672a6105c7a37e66e6d3c3 Mon Sep 17 00:00:00 2001 -Message-Id: <6cc33158e691a70111672a6105c7a37e66e6d3c3.1528777685.git.jan.steffens@gmail.com> -In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> -References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +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/3] Revert "drm/i915/edp: Allow alternate fixed mode for eDP +Subject: [PATCH 2/4] Revert "drm/i915/edp: Allow alternate fixed mode for eDP if available." This reverts commit dc911f5bd8aacfcf8aabd5c26c88e04c837a938e. @@ -61,10 +61,10 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20180516080110.22770-1-jani. 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 b7b4cfdeb974..48cb8df5ae97 100644 +index cd6e87756509..492b0cb9bb2b 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c -@@ -1671,23 +1671,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, +@@ -1674,23 +1674,6 @@ static int intel_dp_compute_bpp(struct intel_dp *intel_dp, return bpp; } @@ -88,7 +88,7 @@ index b7b4cfdeb974..48cb8df5ae97 100644 bool intel_dp_compute_config(struct intel_encoder *encoder, struct intel_crtc_state *pipe_config, -@@ -1734,16 +1717,8 @@ intel_dp_compute_config(struct intel_encoder *encoder, +@@ -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) { @@ -107,7 +107,7 @@ index b7b4cfdeb974..48cb8df5ae97 100644 if (INTEL_GEN(dev_priv) >= 9) { int ret; -@@ -6121,7 +6096,6 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -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; @@ -115,7 +115,7 @@ index b7b4cfdeb974..48cb8df5ae97 100644 struct drm_display_mode *downclock_mode = NULL; bool has_dpcd; struct drm_display_mode *scan; -@@ -6176,14 +6150,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6178,14 +6152,13 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, } intel_connector->edid = edid; @@ -132,7 +132,7 @@ index b7b4cfdeb974..48cb8df5ae97 100644 } } -@@ -6220,8 +6193,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, +@@ -6222,8 +6195,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp, pipe_name(pipe)); } @@ -163,10 +163,10 @@ index a80fbad9be0f..7f3e83f17adb 100644 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 51a1d6868b1e..cf39ca90d887 100644 +index 384b37e2da70..f349b3920199 100644 --- a/drivers/gpu/drm/i915/intel_dsi.c +++ b/drivers/gpu/drm/i915/intel_dsi.c -@@ -1846,7 +1846,7 @@ void intel_dsi_init(struct drm_i915_private *dev_priv) +@@ -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; @@ -176,10 +176,10 @@ index 51a1d6868b1e..cf39ca90d887 100644 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 eb0c559b2715..a70d767313aa 100644 +index 6604806f89d5..61d908e0df0e 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c -@@ -536,7 +536,7 @@ void intel_dvo_init(struct drm_i915_private *dev_priv) +@@ -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), @@ -189,10 +189,10 @@ index eb0c559b2715..a70d767313aa 100644 } diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c -index e125d16a1aa7..d278f24ba6ae 100644 +index 34dd1e5233ac..48f618dc9abb 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c -@@ -1175,8 +1175,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) +@@ -1180,8 +1180,7 @@ void intel_lvds_init(struct drm_i915_private *dev_priv) out: mutex_unlock(&dev->mode_config.mutex); @@ -238,5 +238,5 @@ index 41d00b1603e3..b443278e569c 100644 drm_mode_destroy(intel_connector->base.dev, panel->downclock_mode); -- -2.17.1 +2.18.0 diff --git a/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch b/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch index b4db2ad36a1e..00ae30e9e4ac 100644 --- a/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch +++ b/0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch @@ -1,10 +1,10 @@ -From 1e45a10dbea00f3a9ead21a9b3d25ad00021261d Mon Sep 17 00:00:00 2001 -Message-Id: <1e45a10dbea00f3a9ead21a9b3d25ad00021261d.1528777685.git.jan.steffens@gmail.com> -In-Reply-To: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> -References: <9a5adbc45b1c7d43fe4b27936f2a6939660617a1.1528777685.git.jan.steffens@gmail.com> +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/3] ACPI / watchdog: Prefer iTCO_wdt always when WDAT table +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 @@ -128,5 +128,5 @@ index 4bde16fb97d8..95600309ce42 100644 } -- -2.17.1 +2.18.0 diff --git a/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch b/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch new file mode 100644 index 000000000000..de3385e8d517 --- /dev/null +++ b/0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch @@ -0,0 +1,46 @@ +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 + @@ -5,8 +5,8 @@ pkgbase=linux-rc pkgrel=1 _srcname=linux-4.17 -_stable=4.17.5 -_patchver=4.17.6 +_stable=4.17.6 +_patchver=4.17.7 _rcver=1 pkgver=${_patchver}rc${_rcver} _rcpatch=patch-${_patchver}-rc${_rcver} @@ -29,6 +29,7 @@ source=( 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-Revert-drm-i915-edp-Allow-alternate-fixed-mode-for-e.patch 0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch + 0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -36,17 +37,18 @@ validpgpkeys=( ) sha256sums=('9faa1dd896eaea961dc6e886697c0b3301277102e5bc976b2758f9a62d3ccd13' 'SKIP' - '5041d4009352c42543acb125e7fa5acf086c901101194fbff5e97931bd4ac06b' + '8a120a679afbe9165758d7fcb25f0be827bd52bde2e5f204736ea2bc1d6df263' 'SKIP' - 'cc18fcf14df25f0bab047aa180b9362bd4f3ce96f1b05e1f7764cfcc0e271bbd' + '7699b2246e4ed1e284f2947d5e0b66653c27574995caf6a02a3280bd055cfedf' 'SKIP' - '0269d9a56f0d0306c9bd5c179a7e32214b0a1c082d3bca581661203b27305f17' + 'f8e890eac9779a89009c1e2339f757e9781864df09805211fad005146fe2578b' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919' 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65' - 'e3c08f9b91611186e5ec579187ecea2a0143e5c2dc7ffc30ac6ea6e2b6d130fd' - '5403dead9161344b2c01027526146a250147680f4a2d32a54d40c55fc1becc8a' - 'd55e7de60b12bca26ded4c1bb8eb5860a9092374914a201a0f6a0ed2849d099f') + '92f848d0e21fbb2400e50d1c1021514893423641e5450896d7b1d88aa880b2b9' + 'fc3c50ae6bd905608e0533a883ab569fcf54038fb9d6569b391107d9fd00abbc' + 'bc50c605bd0e1fa7437c21ddef728b83b6de3322b988e14713032993dfa1fc69' + '66284102261c4ed53db050e9045c8672ba0e5171884b46e58f6cd417774d8578') _kernelname=${pkgbase#linux} @@ -72,6 +74,9 @@ prepare() { # https://bugs.archlinux.org/task/56780 patch -Np1 -i ../0003-ACPI-watchdog-Prefer-iTCO_wdt-always-when-WDAT-table.patch + # Fix iwd provoking a BUG + patch -Np1 -i ../0004-mac80211-disable-BHs-preemption-in-ieee80211_tx_cont.patch + cat ../config - >.config <<END CONFIG_LOCALVERSION="${_kernelname}" CONFIG_LOCALVERSION_AUTO=n @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.17.0-1 Kernel Configuration +# Linux/x86 4.17.6-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -6292,7 +6292,7 @@ CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m -CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m +# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m @@ -6815,7 +6815,7 @@ CONFIG_USB_SERIAL_WISHBONE=m CONFIG_USB_SERIAL_SSU100=m CONFIG_USB_SERIAL_QT2=m CONFIG_USB_SERIAL_UPD78F0730=m -# CONFIG_USB_SERIAL_DEBUG is not set +CONFIG_USB_SERIAL_DEBUG=m # # USB Miscellaneous drivers @@ -7383,7 +7383,6 @@ CONFIG_SYNC_FILE=y # CONFIG_SW_SYNC is not set CONFIG_DCA=m CONFIG_AUXDISPLAY=y -CONFIG_CHARLCD=m CONFIG_HD44780=m CONFIG_KS0108=m CONFIG_KS0108_PORT=0x378 @@ -7396,6 +7395,7 @@ CONFIG_PANEL=m CONFIG_PANEL_PARPORT=0 CONFIG_PANEL_PROFILE=5 # CONFIG_PANEL_CHANGE_MESSAGE is not set +CONFIG_CHARLCD=m CONFIG_UIO=m CONFIG_UIO_CIF=m CONFIG_UIO_PDRV_GENIRQ=m |