linux-selinux 4.14.4-1 update

3 files changed, 7 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4d6942952e3..fbea40a3f3b8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-selinux
-	pkgver = 4.14.3
+	pkgver = 4.14.4
 	pkgrel = 1
 	url = https://www.kernel.org/
 	arch = x86_64
@@ -13,24 +13,22 @@ pkgbase = linux-selinux
 	options = !strip
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.14.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.3.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.3.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.4.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.4.sign
 	source = config
 	source = 60-linux.hook
 	source = 90-linux.hook
 	source = linux.preset
-	source = 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
 	sha256sums = SKIP
-	sha256sums = e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7
+	sha256sums = e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84
 	sha256sums = SKIP
 	sha256sums = 82a618bc632af7213a9a90a39fca2e7c42c370c393564569848fc172abf0781f
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
-	sha256sums = 6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd
 
 pkgname = linux-selinux
 	pkgdesc = The Linux-selinux kernel and modules
diff --git a/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch b/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
deleted file mode 100644
index bb85169ae041..000000000000
--- a/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 34bc85a1577be5f2f6ccd2c17fc5870c83ab510b Mon Sep 17 00:00:00 2001
-Message-Id: <34bc85a1577be5f2f6ccd2c17fc5870c83ab510b.1510965801.git.jan.steffens@gmail.com>
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
-Date: Fri, 3 Nov 2017 03:01:53 +0100
-Subject: [PATCH] platform/x86: hp-wmi: Fix tablet mode detection for
- convertibles
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet
-state fetchers") consolidated the methods for docking and laptop mode
-detection, but omitted to apply the correct mask for the laptop mode
-(it always uses the constant for docking).
-
-Fixes: f9cf3b2880cc ("platform/x86: hp-wmi: Refactor dock and tablet state fetchers")
-Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
----
- drivers/platform/x86/hp-wmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
-index b4ed3dc983d5229c..b4224389febebe46 100644
---- a/drivers/platform/x86/hp-wmi.c
-+++ b/drivers/platform/x86/hp-wmi.c
-@@ -297,7 +297,7 @@ static int hp_wmi_hw_state(int mask)
- 	if (state < 0)
- 		return state;
- 
--	return state & 0x1;
-+	return !!(state & mask);
- }
- 
- static int __init hp_wmi_bios_2008_later(void)
--- 
-2.15.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 790da7074840..ed8bb7bd560e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgbase=linux-selinux
 _srcname=linux-4.14
-pkgver=4.14.3
+pkgver=4.14.4
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -22,7 +22,6 @@ source=(
   '60-linux.hook'  # pacman hook for depmod
   '90-linux.hook'  # pacman hook for initramfs regeneration
   'linux.preset'   # standard config files for mkinitcpio ramdisk
-  '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch'
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -30,13 +29,12 @@ validpgpkeys=(
 )
 sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
             'SKIP'
-            'e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7'
+            'e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84'
             'SKIP'
             '82a618bc632af7213a9a90a39fca2e7c42c370c393564569848fc172abf0781f'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
-            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd')
+            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 
 _kernelname=${pkgbase#linux}
 
@@ -51,9 +49,6 @@ prepare() {
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
-  # https://bugs.archlinux.org/task/56207
-  patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
-
   cp -Tf ../config .config
 
   if [ "${_kernelname}" != "" ]; then