[arch-commits] Commit in linux/trunk (2 files)

[Jan Steffens]

    Date: Tuesday, December 5, 2017 @ 19:35:04
  Author: heftig
Revision: 311648

4.14.4-1

Modified:
  linux/trunk/PKGBUILD
Deleted:
  linux/trunk/0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch

-----------------------------------------------------------------+
 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch |   38 ----------
 PKGBUILD                                                        |   11 --
 2 files changed, 3 insertions(+), 46 deletions(-)

Deleted: 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
===================================================================
--- 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch	2017-12-05 19:20:35 UTC (rev 311647)
+++ 0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch	2017-12-05 19:35:04 UTC (rev 311648)
@@ -1,38 +0,0 @@
-From 34bc85a1577be5f2f6ccd2c17fc5870c83ab510b Mon Sep 17 00:00:00 2001
-Message-Id: <34bc85a1577be5f2f6ccd2c17fc5870c83ab510b.1510965801.git.jan.steffens at gmail.com>
-From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens at 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 at rwth-aachen.de>
-Signed-off-by: Andy Shevchenko <andriy.shevchenko at 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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-05 19:20:35 UTC (rev 311647)
+++ PKGBUILD	2017-12-05 19:35:04 UTC (rev 311648)
@@ -5,7 +5,7 @@
 pkgbase=linux               # Build stock -ARCH kernel
 #pkgbase=linux-custom       # Build kernel with a different name
 _srcname=linux-4.14
-pkgver=4.14.3
+pkgver=4.14.4
 pkgrel=1
 arch=('x86_64')
 url="https://www.kernel.org/"
@@ -21,7 +21,6 @@
   '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
@@ -29,13 +28,12 @@
 )
 sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
             'SKIP'
-            'e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7'
+            'e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84'
             'SKIP'
             'a68e94064f040d60e8e4c3380efeee085b54d252d527e960dd17ac688505d5b6'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
-            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
-            '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd')
+            'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
 
 _kernelname=${pkgbase#linux}
 
@@ -50,9 +48,6 @@
   # 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