upkg, added patch from arch to fix disapiring of wlan cards

5 files changed, 65 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0fda0f2e12f6..f95bcb81b830 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Feb  2 06:54:57 UTC 2018
+# Sat Feb 10 09:45:43 UTC 2018
 pkgbase = linux-pf
 	pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS).
-	pkgver = 4.15.1
+	pkgver = 4.15.2
 	pkgrel = 1
 	url = http://pf.natalenko.name/
 	arch = i686
@@ -20,20 +20,22 @@ pkgbase = linux-pf
 	source = config.i686
 	source = config.x86_64
 	source = linux.preset
-	source = https://github.com/pfactum/pf-kernel/compare/v4.15...v4.15-pf1.diff
+	source = https://github.com/pfactum/pf-kernel/compare/v4.15...v4.15-pf2.diff
 	source = 90-linux.hook
 	source = 60-linux.hook
 	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
 	sha256sums = 5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769
 	sha256sums = 102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395
 	sha256sums = 943e1e6e1518edc8ab86023805f8f88f3672871a4039ccf8a9e97c33e95ae395
 	sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
-	sha256sums = 8621c69b3cb7a2ebe085e0b54d6eab9e3f3f6c113671a905e6a8e39b25c995b9
+	sha256sums = 25b06ca29edab2f7b8a2546de382c4ba05d2c23bbfc9fbd30a0363da374997ea
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
-	sha256sums = 7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc
-	sha256sums = ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215
+	sha256sums = b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe
+	sha256sums = 68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e
+	sha256sums = b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be
 
 pkgname = linux-pf
 	pkgdesc = Linux kernel and modules with the pf-kernel patch (uksm, PDS)
@@ -45,11 +47,10 @@ pkgname = linux-pf
 	optdepends = linux-docs: Kernel hackers manual - HTML documentation that comes with the Linux kernel.
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = pm-utils: utilities and scripts for suspend and hibernate power management
-	optdepends = x
 	optdepends = nvidia-pf: NVIDIA drivers for linux-pf
 	optdepends = nvidia-beta-all: NVIDIA drivers for all installed kernels
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed. Useful for make localmodconfig.
-	provides = linux-pf=4.15.1
+	provides = linux-pf=4.15.2
 	provides = linux-tomoyo
 	conflicts = linux-pf
 	conflicts = kernel26-pf
@@ -58,13 +59,13 @@ pkgname = linux-pf
 pkgname = linux-pf-headers
 	pkgdesc = Header files and scripts for building modules for linux-pf kernel.
 	depends = linux-pf
-	provides = linux-pf-headers=4.15.1
+	provides = linux-pf-headers=4.15.2
 	conflicts = linux-pf-headers
 
 pkgname = linux-pf-preset-default
 	pkgdesc = Linux-pf default preset
 	install = linux.install
-	depends = linux-pf=4.15.1
-	provides = linux-pf-preset=4.15.1
+	depends = linux-pf=4.15.2
+	provides = linux-pf-preset=4.15.2
 	backup = etc/mkinitcpio.d/linux-pf.preset
 
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 a92ee30c4a2e..ec60bc9f300b 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 4aefcc4253233dce6ac5938e01371074958b8f1c Mon Sep 17 00:00:00 2001
-Message-Id: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com>
+From d817891efd179bdb0b5d30fa8aafaeb2a96af76c Mon Sep 17 00:00:00 2001
+Message-Id: <d817891efd179bdb0b5d30fa8aafaeb2a96af76c.1518115547.git.jan.steffens@gmail.com>
 From: Serge Hallyn <serge.hallyn@canonical.com>
 Date: Fri, 31 May 2013 19:12:12 +0100
-Subject: [PATCH 1/2] 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 e570b9c3cab3..22141236e8b8 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 3383f4060f7fe25afd5f863fe169fd2f286ab237 Mon Sep 17 00:00:00 2001
-Message-Id: <3383f4060f7fe25afd5f863fe169fd2f286ab237.1517188106.git.jan.steffens@gmail.com>
-In-Reply-To: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com>
-References: <4aefcc4253233dce6ac5938e01371074958b8f1c.1517188106.git.jan.steffens@gmail.com>
+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: Jim Bride <jim.bride@linux.intel.com>
 Date: Mon, 6 Nov 2017 13:38:57 -0800
-Subject: [PATCH 2/2] 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
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
new file mode 100644
index 000000000000..f1102e0b92a4
--- /dev/null
+++ b/0003-ssb-Do-not-disable-PCI-host-on-non-Mips.patch
@@ -0,0 +1,37 @@
+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 879f148d6558..b296b477835b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ _minor=15
 _basekernel=${_major}.${_minor}
 _srcname=linux-${_major}.${_minor}
 pkgbase=linux-pf
-_pfrel=1
+_pfrel=2
 _kernelname=-pf
 _pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
 _pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
@@ -85,6 +85,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekerne
         "60-linux.hook"
         '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'
        )
 # 	'cx23885_move_CI_AC_registration_to_a_separate_function.patch'     
 
@@ -103,6 +104,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
   # end linux-ARCH patches
 
   # fix ci  invalid PC card inserted issue hopefully
@@ -678,9 +681,10 @@ sha256sums=('5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769'
             '102d518779dc312af35faf7e07ff01df3c04521d40d8757fc4e8eba9c595c395'
             '943e1e6e1518edc8ab86023805f8f88f3672871a4039ccf8a9e97c33e95ae395'
             '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
-            '8621c69b3cb7a2ebe085e0b54d6eab9e3f3f6c113671a905e6a8e39b25c995b9'
+            '25b06ca29edab2f7b8a2546de382c4ba05d2c23bbfc9fbd30a0363da374997ea'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            '7b7363b53c68f52b119df994c9c08d4f29271b408f021366ab23f862518bd9bc'
-            'ac996455cddccc312d93e63845d92b2d8ab8fb53208a221948d28c76c678d215')
+            'b20e25656c9423591afd0325fe26320f50bc3421ff204acbfe5dd88ffb3866fe'
+            '68575230693b374eb68e6100e719c71a196db57fe0ac79ddae02fe72b404e09e'
+            'b21406c060cf601f879528cfa1b83f524c44d8ecd99689c331a7c6326653d0be')