diff options
| -rw-r--r-- | .SRCINFO | 20 | ||||
| -rw-r--r-- | 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch | 6 | ||||
| -rw-r--r-- | 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch | 12 | ||||
| -rw-r--r-- | 0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch | 37 | ||||
| -rw-r--r-- | 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch (renamed from 0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch) | 10 | ||||
| -rw-r--r-- | PKGBUILD | 21 |
6 files changed, 31 insertions, 75 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-macbook - pkgver = 4.15.3 - pkgrel = 2 + pkgver = 4.15.4 + pkgrel = 1 url = https://www.kernel.org/ arch = x86_64 license = GPL2 @@ -12,8 +12,8 @@ pkgbase = linux-macbook options = !strip source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.xz source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.15.tar.sign - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.3.xz - source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.3.sign + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.xz + source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.4.sign source = config source = 60-linux.hook source = 90-linux.hook @@ -24,13 +24,12 @@ pkgbase = linux-macbook source = 03-apple-poweroff-quirk-workaround.patch 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-ssb-Do-not-disable-PCI-host-on-non-Mips.patch - source = 0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch + source = 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886 validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769 sha256sums = SKIP - sha256sums = 6dd42389603bc6c83d2e6db1d736303e41d26cef479cad926b87711f261c9c35 + sha256sums = 5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8 sha256sums = SKIP sha256sums = 617d1a2b0160fc72098524a51501531556050cab0e466c9dbae5d60a78991bd2 sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21 @@ -40,10 +39,9 @@ pkgbase = linux-macbook sha256sums = bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42 sha256sums = 7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc sha256sums = 09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff - sha256sums = 95bda0b206b917ee907375bb0015b8f04f668bfea74706ce614442326a6be442 - sha256sums = 2a9adeea2d45513ee3ef0af9fb91c254f14500195e801581b55abcf4ff228eb0 - sha256sums = 990653b33a736b3941f03d8ca49795109f16507afa34b57dbce3c8e2d2fb26ca - sha256sums = 13bc8392b26d1ce0182060fba0f37f74dd7cdc6fff2fdea3240fc4e755621277 + sha256sums = c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863 + sha256sums = b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676 + sha256sums = 54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7 pkgname = linux-macbook pkgdesc = The Linux-macbook 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 07ea2e732e65..f155e964b1e2 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 44c5097b2711429f0d49d138681f67157982e729 Mon Sep 17 00:00:00 2001 -Message-Id: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> +From 05a43fb8b36cdaf6a3580f46cab334f2c2796544 Mon Sep 17 00:00:00 2001 +Message-Id: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.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/3] add sysctl to disallow unprivileged CLONE_NEWUSER by default Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com> 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 index 0ad802f035c8..97848fc18593 100644 --- 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 @@ -1,10 +1,10 @@ -From 7596bfa5ccb3e3a72443871a4c6d0c4f230c1cb5 Mon Sep 17 00:00:00 2001 -Message-Id: <7596bfa5ccb3e3a72443871a4c6d0c4f230c1cb5.1518653356.git.jan.steffens@gmail.com> -In-Reply-To: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> -References: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> +From 9ae12d036a480aa5352118c982ba76f2fb1640a3 Mon Sep 17 00:00:00 2001 +Message-Id: <9ae12d036a480aa5352118c982ba76f2fb1640a3.1518828081.git.jan.steffens@gmail.com> +In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.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 +Subject: [PATCH 2/3] 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 @@ -24,7 +24,7 @@ Signed-off-by: Jim Bride <jim.bride@linux.intel.com> 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 158438bb0389..69b16df868ea 100644 +index add4b2434aa3..14a8bef9fdfe 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1616,7 +1616,8 @@ static bool intel_edp_compare_alt_mode(struct drm_display_mode *m1, diff --git a/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch b/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch deleted file mode 100644 index ecea40c67f05..000000000000 --- a/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 509ca946c21ff2ae50c6404d191c87573a53a621 Mon Sep 17 00:00:00 2001 -Message-Id: <509ca946c21ff2ae50c6404d191c87573a53a621.1518653356.git.jan.steffens@gmail.com> -In-Reply-To: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> -References: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> -From: Sven Joachim <svenjoac@gmx.de> -Date: Fri, 26 Jan 2018 10:38:01 +0100 -Subject: [PATCH 3/4] ssb: Do not disable PCI host on non-Mips - -After upgrading an old laptop to 4.15-rc9, I found that the eth0 and -wlan0 interfaces had disappeared. It turns out that the b43 and b44 -drivers require SSB_PCIHOST_POSSIBLE which depends on -PCI_DRIVERS_LEGACY, a config option that only exists on Mips. - -Fixes: 58eae1416b80 ("ssb: Disable PCI host for PCI_DRIVERS_GENERIC") -Cc: stable@vger.org -Signed-off-by: Sven Joachim <svenjoac@gmx.de> -Reviewed-by: James Hogan <jhogan@kernel.org> ---- - drivers/ssb/Kconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig -index 71c73766ee22..65af12c3bdb2 100644 ---- a/drivers/ssb/Kconfig -+++ b/drivers/ssb/Kconfig -@@ -32,7 +32,7 @@ config SSB_BLOCKIO - - config SSB_PCIHOST_POSSIBLE - bool -- depends on SSB && (PCI = y || PCI = SSB) && PCI_DRIVERS_LEGACY -+ depends on SSB && (PCI = y || PCI = SSB) && (PCI_DRIVERS_LEGACY || !MIPS) - default y - - config SSB_PCIHOST --- -2.16.1 - diff --git a/0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch b/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch index 688462359503..4b490730e3c3 100644 --- a/0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch +++ b/0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch @@ -1,10 +1,10 @@ -From 782e9c805d19610d5821d1f75a3854ac587e2dac Mon Sep 17 00:00:00 2001 -Message-Id: <782e9c805d19610d5821d1f75a3854ac587e2dac.1518653356.git.jan.steffens@gmail.com> -In-Reply-To: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> -References: <44c5097b2711429f0d49d138681f67157982e729.1518653356.git.jan.steffens@gmail.com> +From cd0c80aa02dbfe649c743fa98fcc0d9f427e0827 Mon Sep 17 00:00:00 2001 +Message-Id: <cd0c80aa02dbfe649c743fa98fcc0d9f427e0827.1518828081.git.jan.steffens@gmail.com> +In-Reply-To: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> +References: <05a43fb8b36cdaf6a3580f46cab334f2c2796544.1518828081.git.jan.steffens@gmail.com> From: Juergen Gross <jgross@suse.com> Date: Thu, 1 Feb 2018 13:40:19 +0100 -Subject: [PATCH 4/4] x86/xen: init %gs very early to avoid page faults with +Subject: [PATCH 3/3] x86/xen: init %gs very early to avoid page faults with stack protector When running as Xen pv guest %gs is initialized some time after @@ -6,8 +6,8 @@ #pkgbase=linux # Build stock -ARCH kernel pkgbase=linux-macbook # Build kernel with a different name _srcname=linux-4.15 -pkgver=4.15.3 -pkgrel=2 +pkgver=4.15.4 +pkgrel=1 arch=('x86_64') url="https://www.kernel.org/" license=('GPL2') @@ -26,8 +26,7 @@ source=( 03-apple-poweroff-quirk-workaround.patch 0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch 0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - 0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch - 0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch + 0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch ) validpgpkeys=( 'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds @@ -35,7 +34,7 @@ validpgpkeys=( ) sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'SKIP' - '6dd42389603bc6c83d2e6db1d736303e41d26cef479cad926b87711f261c9c35' + '5f8344fcc6b15be5f53001bb18df342bf5877563239f03271c236e3a40db89e8' 'SKIP' '617d1a2b0160fc72098524a51501531556050cab0e466c9dbae5d60a78991bd2' 'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21' @@ -45,10 +44,9 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769' 'bb8af32880059e681396a250d8e78f600f248da8ad4f0e76d7923badb5ee8b42' '7c99aaeaea7837f83a3ad215cf07277934ccf39720acee7f1c371dc86bdf89fc' '09189eb269a9fd16898cf90a477df23306236fb897791e8d04e5a75d5007bbff' - '95bda0b206b917ee907375bb0015b8f04f668bfea74706ce614442326a6be442' - '2a9adeea2d45513ee3ef0af9fb91c254f14500195e801581b55abcf4ff228eb0' - '990653b33a736b3941f03d8ca49795109f16507afa34b57dbce3c8e2d2fb26ca' - '13bc8392b26d1ce0182060fba0f37f74dd7cdc6fff2fdea3240fc4e755621277') + 'c7951a3dfa6dcfd6f7c56d8d5c7c89cceb0e612ce3e6134d3fe23d1202b69863' + 'b1485882a9d26fe49b9fb2530259c2c39e03a3346ff63edcbc746f47ef693676' + '54380eafa1dfb42f7860a5eee9f521c14aa5fd2c9f5bfaa6e0537d75800225b7') _kernelname=${pkgbase#linux} : ${_kernelname:=-ARCH} @@ -73,11 +71,8 @@ prepare() { # https://bugs.archlinux.org/task/56711 patch -Np1 -i ../0002-drm-i915-edp-Only-use-the-alternate-fixed-mode-if-it.patch - # https://bugs.archlinux.org/task/57327 - patch -Np1 -i ../0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch - # https://bugs.archlinux.org/task/57500 - patch -Np1 -i ../0004-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch + patch -Np1 -i ../0003-x86-xen-init-gs-very-early-to-avoid-page-faults-with.patch cat ../config - >.config <<END CONFIG_LOCALVERSION="${_kernelname}" |