update to 4.15.15-1

6 files changed, 32 insertions, 74 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0336cf115018..e28e68e01afd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue Feb 13 04:15:13 UTC 2018
+# Wed Apr 11 13:06:47 UTC 2018
 pkgbase = linux-x205ta
-	pkgver = 4.15.2
+	pkgver = 4.15.15
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -14,14 +14,13 @@ pkgbase = linux-x205ta
 	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.2.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.2.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.15.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.15.15.sign
 	source = 60-linux.hook
 	source = 90-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-ssb-Do-not-disable-PCI-host-on-non-Mips.patch
 	source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/fix_c-state_patch_v4.15.patch
 	source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/Revert-several-pm-4.15-rc1-merges-for-low-power-suspend.patch
 	source = https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/Revert-several-pm-4.15-rc1-merges-for-low-power-suspend-2-rc6.patch
@@ -32,14 +31,13 @@ pkgbase = linux-x205ta
 	source = config_x205ta
 	sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769
 	sha256sums = SKIP
-	sha256sums = 812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847
+	sha256sums = d8e7f93e24db5517a1be2030a765431120e07f7cd55e510d0de562c70e45bc00
 	sha256sums = SKIP
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
-	sha256sums = b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe
-	sha256sums = 68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e
-	sha256sums = b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be
+	sha256sums = 4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab
+	sha256sums = 12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485
 	sha256sums = e576fcf6b61c50b7ea358e9980c4d04901adfe9b050b87bf45506a8452202505
 	sha256sums = dfc7fe519d8b95fbe263889ad8e432c55a89d915e905b7729a2ffc958c310754
 	sha256sums = 1772125253dbe3cd6e191bc8ab5c0297e294d4778857c9e90e22e4999af00929
@@ -47,7 +45,7 @@ pkgbase = linux-x205ta
 	sha256sums = ad0f318809d074ee387f48fdfcb711b0fa3eb378867ac65c6da3d490834e649d
 	sha256sums = e3e3873d7d5d781913e1e2f3a7968d0cf0967ee70be0db58bff91c31b37fabe8
 	sha256sums = e9d407c4e437c6e93d8c985fcd496dee0115dcc6c616ee56129fe7a9e96bb746
-	sha256sums = 2d8638cc71ffa3277315a171a60bcb5fd7fd07e2c6e9c0a6d1615e15f9f647d7
+	sha256sums = c75b5d9cc7236e4a8a1021f4703212a5eb084d6b69ffc1ce2dd450df219b480b
 
 pkgname = linux-x205ta
 	pkgdesc = The Linux-x205ta kernel and modules, with patches and config for ASUS x205ta.
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 ec60bc9f300b..b39ed26b751d 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 d817891efd179bdb0b5d30fa8aafaeb2a96af76c Mon Sep 17 00:00:00 2001
-Message-Id: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
+From 188720e92122385994143a06cb16a930053eb503 Mon Sep 17 00:00:00 2001
+Message-Id: <188720e92122385994143a06cb16a930053eb503.1520639721.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/2] 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.16.1
+2.16.2
 
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 22141236e8b8..2383c31fddd9 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 f256ec7564d904b5c245c34a7cb091e6912b22c3 Mon Sep 17 00:00:00 2001
-Message-Id: <f256ec7564d904b5c245c34a7cb091e6912b22c3.1518115547.git.jan.steffens@gmail.com>
-In-Reply-To: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
-References: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
+From 704e31424615c87ad82424a9b09a452d762daed0 Mon Sep 17 00:00:00 2001
+Message-Id: <704e31424615c87ad82424a9b09a452d762daed0.1520639721.git.jan.steffens@gmail.com>
+In-Reply-To: <188720e92122385994143a06cb16a930053eb503.1520639721.git.jan.steffens@gmail.com>
+References: <188720e92122385994143a06cb16a930053eb503.1520639721.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/3] drm/i915/edp: Only use the alternate fixed mode if it's
+Subject: [PATCH 2/2] 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,
@@ -38,5 +38,5 @@ index 158438bb0389..69b16df868ea 100644
  }
  
 -- 
-2.16.1
+2.16.2
 
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 f1102e0b92a4..000000000000
--- a/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1a0e4c170e4622947c0d1d530d63a3241a99b93c Mon Sep 17 00:00:00 2001
-Message-Id: <1a0e4c170e4622947c0d1d530d63a3241a99b93c.1518115547.git.jan.steffens@gmail.com>
-In-Reply-To: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
-References: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
-From: Sven Joachim <svenjoac@gmx.de>
-Date: Fri, 26 Jan 2018 10:38:01 +0100
-Subject: [PATCH 3/3] 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/PKGBUILD b/PKGBUILD
index 5494600561c4..7264abef8ac0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=linux-x205ta
 _srcname=linux-4.15
-pkgver=4.15.2
+pkgver=4.15.15
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -20,7 +20,6 @@ source=(
   linux.preset   # standard config files for mkinitcpio ramdisk
   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
   https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/fix_c-state_patch_v4.15.patch
   https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/Revert-several-pm-4.15-rc1-merges-for-low-power-suspend.patch
   https://raw.githubusercontent.com/harryharryharry/x205ta-patches/master/4.15-patches/Revert-several-pm-4.15-rc1-merges-for-low-power-suspend-2-rc6.patch
@@ -37,14 +36,13 @@ validpgpkeys=(
 )
 sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
             'SKIP'
-            '812499c5d0cc5183606dc9388084df162ca2eb5fa374d8f8b00136fd82825847'
+            'd8e7f93e24db5517a1be2030a765431120e07f7cd55e510d0de562c70e45bc00'
             'SKIP'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            'b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe'
-            '68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e'
-            'b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be'
+            '4ffdc2a458845c2a7c03c735477dbf51b5b01b10568bf577b37a29e872135cab'
+            '12b281dc45f1954cc3f52276927bb2965c3132c0a8bd7f485869ced2c541d485'
             'e576fcf6b61c50b7ea358e9980c4d04901adfe9b050b87bf45506a8452202505'
             'dfc7fe519d8b95fbe263889ad8e432c55a89d915e905b7729a2ffc958c310754'
             '1772125253dbe3cd6e191bc8ab5c0297e294d4778857c9e90e22e4999af00929'
@@ -52,7 +50,7 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
             'ad0f318809d074ee387f48fdfcb711b0fa3eb378867ac65c6da3d490834e649d'
             'e3e3873d7d5d781913e1e2f3a7968d0cf0967ee70be0db58bff91c31b37fabe8'
             'e9d407c4e437c6e93d8c985fcd496dee0115dcc6c616ee56129fe7a9e96bb746'
-            '2d8638cc71ffa3277315a171a60bcb5fd7fd07e2c6e9c0a6d1615e15f9f647d7')
+            'c75b5d9cc7236e4a8a1021f4703212a5eb084d6b69ffc1ce2dd450df219b480b')
 
 
 _kernelname=${pkgbase#linux}
@@ -73,9 +71,6 @@ 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
-
   # Here start x205ta patches, refer to https://goo.gl/dcXIM0 for harryharryharry's guide which is the main starting point
   # for info on these patches.
   
@@ -128,8 +123,10 @@ prepare() {
 
   # Here ends x205ta stuff.
 
-  # set extraversion to pkgrel
-  sed -i "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" Makefile
+  # set extraversion to pkgrel and empty localversion
+  sed -e "/^EXTRAVERSION =/s/=.*/= -${pkgrel}/" \
+      -e "/^EXTRAVERSION =/aLOCALVERSION =" \
+      -i Makefile
 
   # don't run depmod on 'make install'. We'll do this ourselves in packaging
   sed -i '2iexit 0' scripts/depmod.sh
@@ -152,7 +149,7 @@ prepare() {
 build() {
   cd ${_srcname}
 
-  make ${MAKEFLAGS} LOCALVERSION= bzImage modules
+  make bzImage modules
 }
 
 _package() {
@@ -166,12 +163,12 @@ _package() {
   cd ${_srcname}
 
   # get kernel version
-  _kernver="$(make LOCALVERSION= kernelrelease)"
+  _kernver="$(make kernelrelease)"
   _basekernel=${_kernver%%-*}
   _basekernel=${_basekernel%.*}
 
   mkdir -p "${pkgdir}"/{boot,usr/lib/modules}
-  make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
+  make INSTALL_MOD_PATH="${pkgdir}/usr" modules_install
   cp arch/x86/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
 
   # make room for external modules
diff --git a/config_x205ta b/config_x205ta
index 527acd5aeb38..89e0904df067 100644
--- a/config_x205ta
+++ b/config_x205ta
@@ -54,7 +54,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
 # CONFIG_COMPILE_TEST is not set
 CONFIG_LOCALVERSION="-x205ta"
-# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_LOCALVERSION_AUTO=n
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y
 CONFIG_HAVE_KERNEL_LZMA=y