PKGBUILD: Upgrading to 5.6.10.5.

Removing now included ALSA patches.

5 files changed, 16 insertions, 108 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28017d953843..a0776ede7740 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-rt
 	pkgdesc = Linux RT
-	pkgver = 5.6.4.3
+	pkgver = 5.6.10.5
 	pkgrel = 1
 	url = https://wiki.linuxfoundation.org/realtime/start
 	arch = x86_64
@@ -15,28 +15,24 @@ pkgbase = linux-rt
 	makedepends = python-sphinx_rtd_theme
 	makedepends = xmlto
 	options = !strip
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.4.tar.xz
-	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.4.tar.sign
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.4-rt3.patch.xz
-	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.4-rt3.patch.sign
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.10.tar.xz
+	source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.6.10.tar.sign
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.10-rt5.patch.xz
+	source = https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patch-5.6.10-rt5.patch.sign
 	source = config
 	source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-	source = 0001-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
-	source = 0001-ALSA-ice1724-Fix-invalid-access-for-enumerated-ctl-i.patch
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
 	validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
 	validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
 	validpgpkeys = 64254695FFF0AA4466CC19E67B96E8162A8CF5D1
 	validpgpkeys = 5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73
 	validpgpkeys = E644E2F1D45FA0B2EAA02F33109F098506FF0B14
-	sha256sums = 5df1741e550cb6fa7471530f42da98bac5093e693e2c4f3aef4393d8135b9d91
+	sha256sums = 7bdc96827a9db8de79cd13d74a1c5fe8915674f793e592387f2903cb225801b9
 	sha256sums = SKIP
-	sha256sums = a9bb755ad66269d209c7b1f66034be9eae0901ea8440bab7b5c2ad1a2ec7eed5
+	sha256sums = f712f8225069bc2cc6cf5080724483dff871fb5bdf41bdeeeb00a0087a28c116
 	sha256sums = SKIP
-	sha256sums = 52d177093cf226208efbf13137909d3f05c8e586bf3c7f7b355a7a4ee537b572
+	sha256sums = d7203e4d164a7040de524227a072ae3d5155cffb905762af9e12ae224b131245
 	sha256sums = ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85
-	sha256sums = d9032bb428c42e093f2686ae2830133c3600496f93574b3b41dc0ec69af6d5ad
-	sha256sums = bc53f7ec92126955e221698e634d2185909e83bc526f7ff9c7ad86da3fd8c8f4
 
 pkgname = linux-rt
 	pkgdesc = The Linux RT kernel and modules
diff --git a/0001-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch b/0001-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
deleted file mode 100644
index 484fac704a3c..000000000000
--- a/0001-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 59b4a3ed754311917646a1032da4a42cdc2cfde6 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 7 Apr 2020 10:36:22 +0200
-Subject: [PATCH] ALSA: hda: Fix potential access overflow in beep helper
-
-The beep control helper function blindly stores the values in two
-stereo channels no matter whether the actual control is mono or
-stereo.  This is practically harmless, but it annoys the recently
-introduced sanity check, resulting in an error when the checker is
-enabled.
-
-This patch corrects the behavior to store only on the defined array
-member.
-
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207139
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/pci/hda/hda_beep.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c
-index f5fd62ed4df5..841523f6b88d 100644
---- a/sound/pci/hda/hda_beep.c
-+++ b/sound/pci/hda/hda_beep.c
-@@ -290,8 +290,12 @@ int snd_hda_mixer_amp_switch_get_beep(struct snd_kcontrol *kcontrol,
- {
- 	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
- 	struct hda_beep *beep = codec->beep;
-+	int chs = get_amp_channels(kcontrol);
-+
- 	if (beep && (!beep->enabled || !ctl_has_mute(kcontrol))) {
--		ucontrol->value.integer.value[0] =
-+		if (chs & 1)
-+			ucontrol->value.integer.value[0] = beep->enabled;
-+		if (chs & 2)
- 			ucontrol->value.integer.value[1] = beep->enabled;
- 		return 0;
- 	}
--- 
-2.25.0
-
diff --git a/0001-ALSA-ice1724-Fix-invalid-access-for-enumerated-ctl-i.patch b/0001-ALSA-ice1724-Fix-invalid-access-for-enumerated-ctl-i.patch
deleted file mode 100644
index dcaf4245145e..000000000000
--- a/0001-ALSA-ice1724-Fix-invalid-access-for-enumerated-ctl-i.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8cd18c2bdaf1ddb117654fd1ba4befbf770bf2b5 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Tue, 7 Apr 2020 10:31:44 +0200
-Subject: [PATCH] ALSA: ice1724: Fix invalid access for enumerated ctl items
-
-The access to Analog Capture Source control value implemented in
-prodigy_hifi.c is wrong, as caught by the recently introduced sanity
-check; it should be accessing value.enumerated.item[] instead of
-value.integer.value[].  This patch corrects the wrong access pattern.
-
-BugLink: https://bugzilla.kernel.org/show_bug.cgi?id=207139
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
----
- sound/pci/ice1712/prodigy_hifi.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/sound/pci/ice1712/prodigy_hifi.c b/sound/pci/ice1712/prodigy_hifi.c
-index 91f83cef0e56..9aa12a67d370 100644
---- a/sound/pci/ice1712/prodigy_hifi.c
-+++ b/sound/pci/ice1712/prodigy_hifi.c
-@@ -536,7 +536,7 @@ static int wm_adc_mux_enum_get(struct snd_kcontrol *kcontrol,
- 	struct snd_ice1712 *ice = snd_kcontrol_chip(kcontrol);
- 
- 	mutex_lock(&ice->gpio_mutex);
--	ucontrol->value.integer.value[0] = wm_get(ice, WM_ADC_MUX) & 0x1f;
-+	ucontrol->value.enumerated.item[0] = wm_get(ice, WM_ADC_MUX) & 0x1f;
- 	mutex_unlock(&ice->gpio_mutex);
- 	return 0;
- }
-@@ -550,7 +550,7 @@ static int wm_adc_mux_enum_put(struct snd_kcontrol *kcontrol,
- 
- 	mutex_lock(&ice->gpio_mutex);
- 	oval = wm_get(ice, WM_ADC_MUX);
--	nval = (oval & 0xe0) | ucontrol->value.integer.value[0];
-+	nval = (oval & 0xe0) | ucontrol->value.enumerated.item[0];
- 	if (nval != oval) {
- 		wm_put(ice, WM_ADC_MUX, nval);
- 		change = 1;
--- 
-2.25.0
-
diff --git a/PKGBUILD b/PKGBUILD
index aa39373727fc..6c638f5de33a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: David Runge <dvzrv@archlinux.org>
 
 pkgbase=linux-rt
-_pkgver=5.6.4
-_rtpatchver=3
+_pkgver=5.6.10
+_rtpatchver=5
 pkgver="${_pkgver}.${_rtpatchver}"
 pkgrel=1
 pkgdesc='Linux RT'
@@ -20,9 +20,7 @@ source=(
   "https://www.kernel.org/pub/linux/kernel/projects/rt/${_pkgver%.*}/older/patch-${_pkgver}-rt${_rtpatchver}.patch.xz"
   "https://www.kernel.org/pub/linux/kernel/projects/rt/${_pkgver%.*}/older/patch-${_pkgver}-rt${_rtpatchver}.patch.sign"
   config
-  0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-  0001-ALSA-hda-Fix-potential-access-overflow-in-beep-helpe.patch
-  0001-ALSA-ice1724-Fix-invalid-access-for-enumerated-ctl-i.patch)
+  0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch)
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
@@ -31,14 +29,12 @@ validpgpkeys=(
   '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73'  # Steven Rostedt
   'E644E2F1D45FA0B2EAA02F33109F098506FF0B14'  # Thomas Gleixner
 )
-sha256sums=('5df1741e550cb6fa7471530f42da98bac5093e693e2c4f3aef4393d8135b9d91'
+sha256sums=('7bdc96827a9db8de79cd13d74a1c5fe8915674f793e592387f2903cb225801b9'
             'SKIP'
-            'a9bb755ad66269d209c7b1f66034be9eae0901ea8440bab7b5c2ad1a2ec7eed5'
+            'f712f8225069bc2cc6cf5080724483dff871fb5bdf41bdeeeb00a0087a28c116'
             'SKIP'
-            '52d177093cf226208efbf13137909d3f05c8e586bf3c7f7b355a7a4ee537b572'
-            'ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85'
-            'd9032bb428c42e093f2686ae2830133c3600496f93574b3b41dc0ec69af6d5ad'
-            'bc53f7ec92126955e221698e634d2185909e83bc526f7ff9c7ad86da3fd8c8f4')
+            'd7203e4d164a7040de524227a072ae3d5155cffb905762af9e12ae224b131245'
+            'ad3275a696348703c57f05b9626e7fbab7243299da32e52044ff51666f810e85')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 116232845cfb..381a044dc17b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.4 Kernel Configuration
+# Linux/x86 5.6.10 Kernel Configuration
 #
 
 #