summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO26
-rw-r--r--0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch38
-rw-r--r--PKGBUILD14
3 files changed, 16 insertions, 62 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22cfc13ae514..eb0e8a0bec8f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-bfq-mq
- pkgver = 4.14.3
+ pkgver = 4.14.4
pkgrel = 1
url = https://github.com/Algodev-github/bfq-mq/
arch = x86_64
@@ -12,8 +12,8 @@ pkgbase = linux-bfq-mq
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 = https://raw.githubusercontent.com/sirlucjan/kernel_gcc_patch/master/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v4.13+.patch
source = https://gitlab.com/sirlucjan/kernel-patches/raw/master/4.14/4.14-bfq-sq-mq-git-20171114.patch
source = https://gitlab.com/tom81094/custom-patches/raw/master/bfq-mq/tentative/T0001-Check-presence-on-tree-of-every-entity-after-every-a.patch
@@ -31,12 +31,11 @@ pkgbase = linux-bfq-mq
source = 90-linux.hook
source = 99-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 = 8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8
sha256sums = 0cfc2877c3772c946855c4dedb442843a7ec71d6cf47dfee69c40fd329405824
@@ -55,7 +54,6 @@ pkgbase = linux-bfq-mq
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
sha256sums = 5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184
sha256sums = ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65
- sha256sums = 6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd
pkgname = linux-bfq-mq
pkgdesc = The Linux-bfq-mq kernel and modules with the BFQ-MQ scheduler
@@ -66,19 +64,19 @@ pkgname = linux-bfq-mq
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
- provides = linux-bfq-mq=4.14.3
- provides = linux=4.14.3
+ provides = linux-bfq-mq=4.14.4
+ provides = linux=4.14.4
backup = etc/mkinitcpio.d/linux-bfq-mq.preset
pkgname = linux-bfq-mq-headers
pkgdesc = Header files and scripts for building modules for Linux-bfq-mq kernel
- depends = linux-bfq-mq=4.14.3
- provides = linux-bfq-mq-headers=4.14.3
- provides = linux-headers=4.14.3
+ depends = linux-bfq-mq=4.14.4
+ provides = linux-bfq-mq-headers=4.14.4
+ provides = linux-headers=4.14.4
pkgname = linux-bfq-mq-docs
pkgdesc = Kernel hackers manual - HTML documentation that comes with the Linux-bfq-mq kernel
- depends = linux-bfq-mq=4.14.3
- provides = linux-bfq-mq-docs=4.14.3
- provides = linux-docs=4.14.3
+ depends = linux-bfq-mq=4.14.4
+ provides = linux-bfq-mq-docs=4.14.4
+ provides = linux-docs=4.14.4
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 2f6386654b68..b04810fabeb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,7 +69,7 @@ _mq_enable=
pkgbase=linux-bfq-mq
#pkgbase=linux-custom # Build kernel with a different name
-pkgver=4.14.3
+pkgver=4.14.4
_srcpatch="${pkgver##*\.*\.}"
_srcname="linux-${pkgver%%\.${_srcpatch}}"
pkgrel=1
@@ -134,12 +134,11 @@ source=(# mainline kernel patches
# pacman hook for remove initramfs
'99-linux.hook'
# standard config files for mkinitcpio ramdisk
- 'linux.preset'
- '0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch')
+ 'linux.preset')
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
- 'e13995c11d0c2d3379c887666dbfaca619200fb8853db6d5d67f97d47fd959b7'
+ 'e9dcf9aad5977289940cd6e3762af02b87a725ba6c1a9f4af86958dc621e3a84'
'SKIP'
'8b00041911e67654b0bd9602125853a1a94f6155c5cac4f886507554c8324ee8'
'0cfc2877c3772c946855c4dedb442843a7ec71d6cf47dfee69c40fd329405824'
@@ -157,8 +156,7 @@ sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
'75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
'5f6ba52aaa528c4fa4b1dc097e8930fad0470d7ac489afcb13313f289ca32184'
- 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65'
- '6f1d9b6a119bfab150a0bc1f550609dd9290328df709b67c984f0a6b0abe8afd')
+ 'ad6344badc91ad0630caacde83f7f9b97276f80d26a20619a87952be65492c65')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -172,10 +170,6 @@ prepare() {
### Add upstream patch
msg "Add upstream patch"
patch -p1 -i ../patch-${pkgver}
-
- ### Fix https://bugs.archlinux.org/task/56207
- msg "Fix bug #56207"
- patch -Np1 -i ../0001-platform-x86-hp-wmi-Fix-tablet-mode-detection-for-co.patch
### Patch source with BFQ-SQ-MQ
msg "Fix naming schema in BFQ-SQ-MQ patch"