summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO18
-rw-r--r--0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch77
-rw-r--r--PKGBUILD14
3 files changed, 14 insertions, 95 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ebe7df94d0e..7ff21828e04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
# Generated by mksrcinfo v8
-# Wed Dec 27 01:52:22 UTC 2017
+# Fri Dec 29 17:33:49 UTC 2017
pkgbase = linux-ck
- pkgver = 4.14.9
+ pkgver = 4.14.10
pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
@@ -13,8 +13,8 @@ pkgbase = linux-ck
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.9.xz
- source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.9.sign
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.10.xz
+ source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.14.10.sign
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -32,10 +32,9 @@ pkgbase = linux-ck
source = 0001-Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_sta.patch
source = 0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
source = 0003-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
- source = 0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch
sha256sums = f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7
sha256sums = SKIP
- sha256sums = 5edc955bb67b04c7ed426b1df17a3e322e32ad9fdda9c6abb53ab6eca7faf704
+ sha256sums = 16f560aa713b46c707f04a226f67dc31fdd280aae57dd19e0413d61df5336c74
sha256sums = SKIP
sha256sums = 6dd496a79efcc9c14e38a271bac6288225f997e9aa966ba9ea43e5445d276bed
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
@@ -54,7 +53,6 @@ pkgbase = linux-ck
sha256sums = ed3266ab03f836f57de0faf8a10ffd7566c909515c2649de99adaab2fac4aa32
sha256sums = 64a014f7e1b4588728b3ea9538beee67ec63fb792d890c7be9cc13ddc2121b00
sha256sums = 3d4c41086c077fbd515d04f5e59c0c258f700433c5da3365d960b696c2e56efb
- sha256sums = 95f0d0a94983b0dafd295f660a663f9be5ef2fcb9646098426a5d12b59f50638
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with the ck1 patchset featuring MuQSS CPU scheduler v0.162
@@ -64,12 +62,12 @@ pkgname = linux-ck
depends = kmod
depends = mkinitcpio>=0.7
optdepends = crda: to set the correct wireless channels of your country
- provides = linux-ck=4.14.9
+ provides = linux-ck=4.14.10
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
pkgdesc = Header files and scripts for building modules for Linux-ck kernel
depends = linux-ck
- provides = linux-ck-headers=4.14.9
- provides = linux-headers=4.14.9
+ provides = linux-ck-headers=4.14.10
+ provides = linux-headers=4.14.10
diff --git a/0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch b/0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch
deleted file mode 100644
index fe62f65af16..00000000000
--- a/0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 16b5ff888e251b8c4dedd3994d2e85ab25ea7fa4 Mon Sep 17 00:00:00 2001
-Message-Id: <16b5ff888e251b8c4dedd3994d2e85ab25ea7fa4.1514245036.git.jan.steffens@gmail.com>
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 18 Dec 2017 23:36:57 +0100
-Subject: [PATCH] ALSA: usb-audio: Fix the missing ctl name suffix at parsing
- SU
-
-The commit 89b89d121ffc ("ALSA: usb-audio: Add check return value for
-usb_string()") added the check of the return value from
-snd_usb_copy_string_desc(), which is correct per se, but it introduced
-a regression. In the original code, either the "Clock Source",
-"Playback Source" or "Capture Source" suffix is added after the
-terminal string, while the commit changed it to add the suffix only
-when get_term_name() is failing. It ended up with an incorrect ctl
-name like "PCM" instead of "PCM Capture Source".
-
-Also, even the original code has a similar bug: when the ctl name is
-generated from snd_usb_copy_string_desc() for the given iSelector, it
-also doesn't put the suffix.
-
-This patch addresses these issues: the suffix is added always when no
-static mapping is found. Also the patch tries to put more comments
-and cleans up the if/else block for better readability in order to
-avoid the same pitfall again.
-
-Fixes: 89b89d121ffc ("ALSA: usb-audio: Add check return value for usb_string()")
-Reported-and-tested-by: Mauro Santos <registo.mailling@gmail.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/usb/mixer.c | 27 ++++++++++++++++-----------
- 1 file changed, 16 insertions(+), 11 deletions(-)
-
-diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
-index 4fde4f8d4444a597..75bce127d768c613 100644
---- a/sound/usb/mixer.c
-+++ b/sound/usb/mixer.c
-@@ -2173,20 +2173,25 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid,
- kctl->private_value = (unsigned long)namelist;
- kctl->private_free = usb_mixer_selector_elem_free;
-
-- nameid = uac_selector_unit_iSelector(desc);
-+ /* check the static mapping table at first */
- len = check_mapped_name(map, kctl->id.name, sizeof(kctl->id.name));
-- if (len)
-- ;
-- else if (nameid)
-- len = snd_usb_copy_string_desc(state, nameid, kctl->id.name,
-- sizeof(kctl->id.name));
-- else
-- len = get_term_name(state, &state->oterm,
-- kctl->id.name, sizeof(kctl->id.name), 0);
--
- if (!len) {
-- strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
-+ /* no mapping ? */
-+ /* if iSelector is given, use it */
-+ nameid = uac_selector_unit_iSelector(desc);
-+ if (nameid)
-+ len = snd_usb_copy_string_desc(state, nameid,
-+ kctl->id.name,
-+ sizeof(kctl->id.name));
-+ /* ... or pick up the terminal name at next */
-+ if (!len)
-+ len = get_term_name(state, &state->oterm,
-+ kctl->id.name, sizeof(kctl->id.name), 0);
-+ /* ... or use the fixed string "USB" as the last resort */
-+ if (!len)
-+ strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));
-
-+ /* and add the proper suffix */
- if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)
- append_ctl_name(kctl, " Clock Source");
- else if ((state->oterm.type & 0xff00) == 0x0100)
---
-2.15.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 784290bf5e6..dc5254ca46f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -69,7 +69,7 @@ _use_current=
pkgbase=linux-ck
_srcname=linux-4.14
-pkgver=4.14.9
+pkgver=4.14.10
pkgrel=1
_ckpatchversion=1
arch=('x86_64')
@@ -103,7 +103,6 @@ source=(
0001-Revert-xfrm-Fix-stack-out-of-bounds-read-in-xfrm_sta.patch
0002-xfrm-Fix-stack-out-of-bounds-read-on-socket-policy-l.patch
0003-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
- 0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
@@ -111,7 +110,7 @@ validpgpkeys=(
)
sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'SKIP'
- '5edc955bb67b04c7ed426b1df17a3e322e32ad9fdda9c6abb53ab6eca7faf704'
+ '16f560aa713b46c707f04a226f67dc31fdd280aae57dd19e0413d61df5336c74'
'SKIP'
'6dd496a79efcc9c14e38a271bac6288225f997e9aa966ba9ea43e5445d276bed'
'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
@@ -129,8 +128,7 @@ sha256sums=('f81d59477e90a130857ce18dc02f4fbe5725854911db1e7ba770c7cd350f96a7'
'1d69940c6bf1731fa1d1da29b32ec4f594fa360118fe7b128c9810285ebf13e2'
'ed3266ab03f836f57de0faf8a10ffd7566c909515c2649de99adaab2fac4aa32'
'64a014f7e1b4588728b3ea9538beee67ec63fb792d890c7be9cc13ddc2121b00'
- '3d4c41086c077fbd515d04f5e59c0c258f700433c5da3365d960b696c2e56efb'
- '95f0d0a94983b0dafd295f660a663f9be5ef2fcb9646098426a5d12b59f50638')
+ '3d4c41086c077fbd515d04f5e59c0c258f700433c5da3365d960b696c2e56efb')
_kernelname=${pkgbase#linux}
@@ -156,9 +154,6 @@ prepare() {
# https://bugs.archlinux.org/task/56846
patch -Np1 -i ../0003-cgroup-fix-css_task_iter-crash-on-CSS_TASK_ITER_PROC.patch
- # https://bugs.archlinux.org/task/56830
- patch -Np1 -i ../0001-ALSA-usb-audio-Fix-the-missing-ctl-name-suffix-at-pa.patch
-
# fix naming schema in EXTRAVERSION of ck patch set
sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "../${_ckpatchname}"
@@ -174,6 +169,9 @@ prepare() {
# https://github.com/graysky2/kernel_gcc_patch
patch -Np1 -i "../${_gcc_patch}"
+ # https://www.spinics.net/lists/stable/msg207374.html
+ chmod +x tools/objtool/sync-check.sh
+
# Clean tree and copy ARCH config over
make mrproper