summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Schoenick2019-12-14 19:45:36 -0800
committerJohn Schoenick2019-12-14 19:45:36 -0800
commit58d79429fe9259fb78925dae6884e50e769a9a7d (patch)
tree08c9937fb4e6a9896a67bf9bfba307be9c24d991
parent10cd19d1e72ade442c61cb79bcbdbbf4e213c9a4 (diff)
parent86357c6909a62161873091de4d07885bc2eacc20 (diff)
downloadaur-58d79429fe9259fb78925dae6884e50e769a9a7d.tar.gz
Merge branch 'upstream' for 5.4.3
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--config2
3 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 655d5d93d96..c6faadc4979 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-fsync
pkgdesc = Linux
- pkgver = 5.4.2.arch1
+ pkgver = 5.4.3.arch1
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.4.2-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.4.3-arch1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,14 +15,14 @@ pkgbase = linux-fsync
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.2-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.4.3-arch1
source = config
source = futex-wait-multiple-5.2.1.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = b7f23bbc09b6c571b76f851f0389386a6f3a64f3d7b1b8509c8550228b0f4537
+ sha256sums = 5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0
sha256sums = b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942
pkgname = linux-fsync
diff --git a/PKGBUILD b/PKGBUILD
index b25f01e07f9..e4ca655b456 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
pkgbase=linux-fsync
-pkgver=5.4.2.arch1
+pkgver=5.4.3.arch1
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -26,7 +26,7 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'b7f23bbc09b6c571b76f851f0389386a6f3a64f3d7b1b8509c8550228b0f4537'
+ '5d58a2115892839997ae7dcca226697c34b656de7685cb3eb8696451dc5100a0'
'b8a9225b4b5cbabac26398d11cc26566e4407d150dacb92f3411c9bb8cc23942')
export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index e674971dea6..dff744f45e2 100644
--- a/config
+++ b/config
@@ -6759,7 +6759,7 @@ CONFIG_SND_YMFPCI=m
#
CONFIG_SND_HDA=m
CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
CONFIG_SND_HDA_HWDEP=y
CONFIG_SND_HDA_RECONFIG=y
CONFIG_SND_HDA_INPUT_BEEP=y