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

[Levente Polyak]

    Date: Saturday, January 9, 2021 @ 17:09:31
  Author: anthraxx
Revision: 405867

upgpkg: linux-hardened 5.10.6.a-1

Modified:
  linux-hardened/trunk/PKGBUILD
  linux-hardened/trunk/config
Deleted:
  linux-hardened/trunk/ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch

-------------------------------------------------------------------------+
 ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch |   36 ----------
 PKGBUILD                                                                |   14 +--
 config                                                                  |    3 
 3 files changed, 6 insertions(+), 47 deletions(-)

Deleted: ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch
===================================================================
--- ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch	2021-01-09 15:18:33 UTC (rev 405866)
+++ ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch	2021-01-09 17:09:31 UTC (rev 405867)
@@ -1,36 +0,0 @@
-From 3d5c5fdcee0f9a94deb0472e594706018b00aa31 Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai at suse.de>
-Date: Fri, 1 Jan 2021 09:38:52 +0100
-Subject: ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable()
-
-The silent_stream_disable() function introduced by the commit
-b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to
-DP") takes the per_pin->lock mutex, but it unlocks the wrong one,
-spec->pcm_lock, which causes a deadlock.  This patch corrects it.
-
-Fixes: b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to DP")
-Reported-by: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-Cc: <stable at vger.kernel.org>
-Acked-by: Kai Vehmanen <kai.vehmanen at linux.intel.com>
-Link: https://lore.kernel.org/r/20210101083852.12094-1-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai at suse.de>
----
- sound/pci/hda/patch_hdmi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
-index 1e4a4b83fbf6f..74d246a0dc6de 100644
---- a/sound/pci/hda/patch_hdmi.c
-+++ b/sound/pci/hda/patch_hdmi.c
-@@ -1733,7 +1733,7 @@ static void silent_stream_disable(struct hda_codec *codec,
- 	per_pin->silent_stream = false;
- 
-  unlock_out:
--	mutex_unlock(&spec->pcm_lock);
-+	mutex_unlock(&per_pin->lock);
- }
- 
- /* update ELD and jack state via audio component */
--- 
-cgit 1.2.3-1.el7
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-09 15:18:33 UTC (rev 405866)
+++ PKGBUILD	2021-01-09 17:09:31 UTC (rev 405867)
@@ -4,8 +4,8 @@
 # Contributor: Thomas Baechler <thomas at archlinux.org>
 
 pkgbase=linux-hardened
-pkgver=5.10.5.a
-pkgrel=2
+pkgver=5.10.6.a
+pkgrel=1
 pkgdesc='Security-Hardened Linux'
 url='https://github.com/anthraxx/linux-hardened'
 arch=(x86_64)
@@ -20,8 +20,6 @@
   https://www.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/${_srcname}.tar.{xz,sign}
   https://github.com/anthraxx/${pkgbase}/releases/download/${pkgver}/${pkgbase}-${pkgver}.patch{,.sig}
   config         # the main kernel config file
-  ALSA-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch
-  revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch::'https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/plain/queue-5.10/revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch?id=2f168cf391c8f615a95ab7d5264db880b225ab22'
 )
 validpgpkeys=(
   'ABAF11C65A2970B130ABE3C479BE3E4300411886'  # Linus Torvalds
@@ -28,13 +26,11 @@
   '647F28654894E3BD457199BE38DBBDC86092693E'  # Greg Kroah-Hartman
   'E240B57E2C4630BA768E2F26FC1B547C8D8172C8'  # Levente Polyak
 )
-sha256sums=('3991a9e16a187d78d5f414d89236ae5d7f404a69e60c4c42a9d262ee19612ef4'
+sha256sums=('7767d02c1cb5eb2a8d3c2b15a3f93e85b98baa6e9d93a3b9e3ec0e959d0a690b'
             'SKIP'
-            '7d7709d52c1dc80d07a0f6afeae99e5a55c2b012f2b5f995e426c2bc80b102bb'
+            '7862c3dae1721557ffb6ea62e0d5a94ba1eeca445a7373d0abb5ec0c7f823ea3'
             'SKIP'
-            'f5872ca178ea33ad5fbcf3ad24662111979dd82108a8037fbab737b9e923c05f'
-            'e6f6e235a3d97c624e0a3b3ac32f57c0794a4ff651c06445b41719f0fe6c49c6'
-            '5a9a3feaa46d4347572d86e2aa3a0a967d0de239598d7bde3444940367d8e08c')
+            'f3a46621377e121eaac60136379c54e83913b0dded670e8dae3cdbb07f29f9aa')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase

Modified: config
===================================================================
--- config	2021-01-09 15:18:33 UTC (rev 405866)
+++ config	2021-01-09 17:09:31 UTC (rev 405867)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.5.a Kernel Configuration
+# Linux/x86 5.10.6.a Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -9718,7 +9718,6 @@
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
-CONFIG_DMA_VIRT_OPS=y
 CONFIG_SWIOTLB=y
 CONFIG_DMA_COHERENT_POOL=y
 CONFIG_DMA_CMA=y