summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO38
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch12
-rw-r--r--0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch (renamed from 0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch)6
-rw-r--r--0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch (renamed from 0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch)6
-rw-r--r--0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch (renamed from 0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch)6
-rw-r--r--0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch112
-rw-r--r--0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch (renamed from 0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch)6
-rw-r--r--0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch26
-rw-r--r--PKGBUILD33
-rw-r--r--config13
10 files changed, 83 insertions, 175 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9e1595546128..3c7da5184bc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = linux-rc
- pkgver = 5.10.4rc2
+ pkgver = 5.10.5rc1
pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
@@ -12,30 +12,30 @@ pkgbase = linux-rc
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.4-rc2.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.4-rc2.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.3.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.3.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.5-rc1.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.10.5-rc1.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.4.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.4.tar.sign
source = config
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
- source = 0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
- source = 0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
- source = 0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
- source = 0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+ source = 0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+ source = 0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+ source = 0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+ source = 0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+ source = 0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = fd03d186764458a33c10ae0e5d6c2f47ea2e74e6e08f6b80f195d750ce5af383e6f4eef9236def37515d1a41e9b62fb41e73e2f1ba802601ca81929fe0b6c8b3
+ b2sums = 3a4fa6e77721b0dc3b74e0e1c6d6af2aaf33286d5fc3bf6e0ae844cbed2f745cfa3fa8a83b406082e1e981125cf1c09a5df765e990a132713e7a05281a936394
b2sums = SKIP
- b2sums = 0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98
+ b2sums = 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec
b2sums = SKIP
- b2sums = ac86054c7dc7e47cdc256c652c47cc4dc2100d1110637253fcc986fb5bcbda0023e8525d36253b9111284fd4d68c2a111219d904ac0489fdc251b26fb92d7c86
- b2sums = 93567344c75bdd53b08bbae74d9cd6a99223825e37b59a762f7abd83ecf76e90d3a6d62d807d5ffe282aabbad21ae8c0e542fcf45e4419229de804068414d01d
- b2sums = 155b189c79c1631d1f709ad7b01fc0b1d94e9c7a31ba0eacaa2dcde80020e8b7b36bea2429668fcac440c97a11ea26051cf2912f3f7af070a3878c8d00d53c82
- b2sums = af8f9ad7ee3f78da380ca97be64179a5cf95216b0f3652a95536f313ac8a7fdb39657ec88ca70474582c56974d096691544afef5c31293194ef004710bcfbefa
- b2sums = da02f8893032c5658d2ba900355c3a576214e39c369faac6599fbbd2c416fee6f4efa7683f069b0269993a1f395cf373f27e2fc001206b95c7870a8f594c8ce5
- b2sums = 7733157d74983a5c2de0ab2aa1b41244ffa60e1fe038795fba1868a2410d2a91e23977462233628de85f3fea16921c48964f4c29e0a0af73e46cbd0dda26e05c
- b2sums = 9550885b97c06a796ff62923f2049cc7c6b6db3a31a1824e7b1bf6d1417e7243c8dff5bb358495c562880a821769c43f4aff258cf3e4e93f0642ac1881282496
+ b2sums = cb3a58e4eef8395b75887d94a84bba25f05fbec8f576a791623057a190a1d51b412a19ecf1b600ac3f9f6c46968eb0e130d571743e61afc231a97146ee4b52d0
+ b2sums = 7d2ef86a15ead6c946051c117a8ed97056e92a25a274455c5cc62ec65ff92bda7a50032b32c8019180f233a54e778becc45751741ae4d87db8f56ef520ca1e83
+ b2sums = 8ea9d2b7809728c3de05768fea5d8838fe20de8aaaed9106f26c0e8fc051921668d0c31345f200d06005403dec565690f828dbbcd38504079fe6fccbf742be61
+ b2sums = d361b313a3dcd761833b8e2e40201df5e5b93c472e8a06f4684feb24d6e174405e6e4328dc0c449b9b0263e87224b3e1f4a52c873b666a93055979c9d2e2bf59
+ b2sums = 2853fa5257b96b11bcbf60ed68df09938ebb15f81c1bb6aa763c721c4e55f440fd27f9a6b49e8f9a1788948928299810f9e8ea43f0759b06cae3dd140902f93e
+ b2sums = 46a30c86206717fe6804d8e88693b90382b07fdad91d8fd7220e398e41f87a4b5cb5be70285241a3fc81c62ced6021f1710ce0426f3161285c254db9e5484d86
+ b2sums = eec26b472efda62e27d26c2033158e970a5eadb30d38fc4de59c36fafe53efc1e220b7d57189abcd5a2697d242df8475cf2eebfd1ad6373804b5456dbcc14098
pkgname = linux-rc
pkgdesc = The release candidate kernel and modules
diff --git a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
index 07267e8cac68..5c8add1c1e44 100644
--- a/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
+++ b/0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
@@ -1,7 +1,7 @@
-From 048c6dda33c592ef025b372311eede5e05ef9cb7 Mon Sep 17 00:00:00 2001
+From 3a8bc83f97cb4ef7ad72a742382f373357d4d95b Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Mon, 16 Sep 2019 04:53:20 +0200
-Subject: [PATCH 1/9] ZEN: Add sysctl and CONFIG to disallow unprivileged
+Subject: [PATCH 1/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
CLONE_NEWUSER
Our default behavior continues to match the vanilla kernel.
@@ -63,7 +63,7 @@ index 0872a5a2e759..a40d8afeb1bb 100644
bool "PID Namespaces"
default y
diff --git a/kernel/fork.c b/kernel/fork.c
-index 6d266388d380..635146a691c1 100644
+index dc55f68a6ee3..15d29085d1ff 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -97,6 +97,10 @@
@@ -77,7 +77,7 @@ index 6d266388d380..635146a691c1 100644
#include <asm/pgalloc.h>
#include <linux/uaccess.h>
#include <asm/mmu_context.h>
-@@ -1862,6 +1866,10 @@ static __latent_entropy struct task_struct *copy_process(
+@@ -1863,6 +1867,10 @@ static __latent_entropy struct task_struct *copy_process(
if ((clone_flags & (CLONE_NEWUSER|CLONE_FS)) == (CLONE_NEWUSER|CLONE_FS))
return ERR_PTR(-EINVAL);
@@ -88,7 +88,7 @@ index 6d266388d380..635146a691c1 100644
/*
* Thread groups must share signals as well, and detached threads
* can only be started up within the thread group.
-@@ -2927,6 +2935,12 @@ int ksys_unshare(unsigned long unshare_flags)
+@@ -2928,6 +2936,12 @@ int ksys_unshare(unsigned long unshare_flags)
if (unshare_flags & CLONE_NEWNS)
unshare_flags |= CLONE_FS;
@@ -150,5 +150,5 @@ index e703d5d9cbe8..5758274feaee 100644
static DEFINE_MUTEX(userns_state_mutex);
--
-2.29.2
+2.30.0
diff --git a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch b/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
index 25fe50d48feb..5d60cc098ffc 100644
--- a/0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+++ b/0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
@@ -1,7 +1,7 @@
-From 538fc2513b46f71985af6cb12344fee501ef58a5 Mon Sep 17 00:00:00 2001
+From 0438f3011663ce01a981bb8b3af0e84e73551ecf Mon Sep 17 00:00:00 2001
From: Edward Vear <edwardvear@gmail.com>
Date: Tue, 27 Oct 2020 00:02:03 -0700
-Subject: [PATCH 3/9] Bluetooth: Fix attempting to set RPA timeout when
+Subject: [PATCH 2/8] Bluetooth: Fix attempting to set RPA timeout when
unsupported
During controller initialization, an LE Set RPA Timeout command is sent
@@ -45,5 +45,5 @@ index 502552d6e9af..c4aa2cbb9269 100644
/* Set RPA timeout */
--
-2.29.2
+2.30.0
diff --git a/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch b/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
index 454942cd5362..f49bf27f2adf 100644
--- a/0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+++ b/0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
@@ -1,7 +1,7 @@
-From 2dad55f373693e9e808fbdc836614162924990a2 Mon Sep 17 00:00:00 2001
+From e5e77ad2223f662e1615266d8ef39a8db7e65a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20H=C3=A4dicke?= <felixhaedicke@web.de>
Date: Thu, 19 Nov 2020 09:22:32 +0100
-Subject: [PATCH 4/9] HID: quirks: Add Apple Magic Trackpad 2 to
+Subject: [PATCH 3/8] HID: quirks: Add Apple Magic Trackpad 2 to
hid_have_special_driver list
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
@@ -32,5 +32,5 @@ index bf7ecab5d9e5..142e9dae2837 100644
#if IS_ENABLED(CONFIG_HID_MAYFLASH)
{ HID_USB_DEVICE(USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_PS3) },
--
-2.29.2
+2.30.0
diff --git a/0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch b/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
index 8e572055082b..c4bdae791036 100644
--- a/0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+++ b/0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
@@ -1,7 +1,7 @@
-From 1540b4377ebb3f46eac499e7596c3ec5be75551b Mon Sep 17 00:00:00 2001
+From 0128c7314a4d856461caacfdd528a7bffa03d41e Mon Sep 17 00:00:00 2001
From: Josef Bacik <josef@toxicpanda.com>
Date: Wed, 23 Dec 2020 14:41:00 -0500
-Subject: [PATCH 7/9] btrfs: Fix 500-2000% performance regression w/ 5.10
+Subject: [PATCH 5/8] btrfs: Fix 500-2000% performance regression w/ 5.10
Josef's tentative fix from
https://lore.kernel.org/linux-btrfs/0382080a1836a12c2d625f8a5bf899828eba204b.1608752315.git.josef@toxicpanda.com/
@@ -57,5 +57,5 @@ index 64099565ab8f..8a1ce11b6ed8 100644
loops++;
if (wait_ordered && !trans) {
--
-2.29.2
+2.30.0
diff --git a/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch b/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
deleted file mode 100644
index 4cb2e2b1d307..000000000000
--- a/0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From 39136f88e40628ff112fa5efd035e7707750d1a9 Mon Sep 17 00:00:00 2001
-From: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Date: Tue, 15 Dec 2020 10:33:34 -0500
-Subject: [PATCH 5/9] drm/amd/display: Add get_dig_frontend implementation for
- DCEx
-
-Some old ASICs might not implement/require get_dig_frontend helper; in
-this scenario, we can have a NULL pointer exception when we try to call
-it inside vbios disable operation. For example, this situation might
-happen when using Polaris12 with an eDP panel. This commit avoids this
-situation by adding a specific get_dig_frontend implementation for DCEx.
-
-Cc: Alex Deucher <alexander.deucher@amd.com>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: Harry Wentland <Harry.Wentland@amd.com>
-Cc: Nicholas Kazlauskas <Nicholas.Kazlauskas@amd.com>
-Cc: Chiawen Huang <chiawen.huang@amd.com>
-Reported-and-tested-by: Borislav Petkov <bp@suse.de>
-Acked-by: Alex Deucher <alexander.deucher@amd.com>
-Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
-Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-Cc: stable@vger.kernel.org
----
- .../drm/amd/display/dc/dce/dce_link_encoder.c | 44 ++++++++++++++++++-
- .../drm/amd/display/dc/dce/dce_link_encoder.h | 2 +
- 2 files changed, 44 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-index b409f6b2bfd8..56bc401536c5 100644
---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.c
-@@ -119,7 +119,8 @@ static const struct link_encoder_funcs dce110_lnk_enc_funcs = {
- .disable_hpd = dce110_link_encoder_disable_hpd,
- .is_dig_enabled = dce110_is_dig_enabled,
- .destroy = dce110_link_encoder_destroy,
-- .get_max_link_cap = dce110_link_encoder_get_max_link_cap
-+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap,
-+ .get_dig_frontend = dce110_get_dig_frontend
- };
-
- static enum bp_result link_transmitter_control(
-@@ -235,6 +236,44 @@ static void set_link_training_complete(
-
- }
-
-+unsigned int dce110_get_dig_frontend(struct link_encoder *enc)
-+{
-+ struct dce110_link_encoder *enc110 = TO_DCE110_LINK_ENC(enc);
-+ u32 value;
-+ enum engine_id result;
-+
-+ REG_GET(DIG_BE_CNTL, DIG_FE_SOURCE_SELECT, &value);
-+
-+ switch (value) {
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGA:
-+ result = ENGINE_ID_DIGA;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGB:
-+ result = ENGINE_ID_DIGB;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGC:
-+ result = ENGINE_ID_DIGC;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGD:
-+ result = ENGINE_ID_DIGD;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGE:
-+ result = ENGINE_ID_DIGE;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGF:
-+ result = ENGINE_ID_DIGF;
-+ break;
-+ case DCE110_DIG_FE_SOURCE_SELECT_DIGG:
-+ result = ENGINE_ID_DIGG;
-+ break;
-+ default:
-+ // invalid source select DIG
-+ result = ENGINE_ID_UNKNOWN;
-+ }
-+
-+ return result;
-+}
-+
- void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
- struct link_encoder *enc,
- uint32_t index)
-@@ -1665,7 +1704,8 @@ static const struct link_encoder_funcs dce60_lnk_enc_funcs = {
- .disable_hpd = dce110_link_encoder_disable_hpd,
- .is_dig_enabled = dce110_is_dig_enabled,
- .destroy = dce110_link_encoder_destroy,
-- .get_max_link_cap = dce110_link_encoder_get_max_link_cap
-+ .get_max_link_cap = dce110_link_encoder_get_max_link_cap,
-+ .get_dig_frontend = dce110_get_dig_frontend
- };
-
- void dce60_link_encoder_construct(
-diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-index cb714a48b171..fc6ade824c23 100644
---- a/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_link_encoder.h
-@@ -295,6 +295,8 @@ void dce110_link_encoder_connect_dig_be_to_fe(
- enum engine_id engine,
- bool connect);
-
-+unsigned int dce110_get_dig_frontend(struct link_encoder *enc);
-+
- void dce110_link_encoder_set_dp_phy_pattern_training_pattern(
- struct link_encoder *enc,
- uint32_t index);
---
-2.29.2
-
diff --git a/0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch b/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
index 04b0f7e6b79b..37532e1696d3 100644
--- a/0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+++ b/0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
@@ -1,7 +1,7 @@
-From 2059ba0b121bb366467fcefb35cef22cc23e2fe9 Mon Sep 17 00:00:00 2001
+From 61e5f6548784e507eb0662a71976a673436e6e3a Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 21 Dec 2020 20:14:02 +0100
-Subject: [PATCH 8/9] iwlwifi: Fix regression from UDP segmentation support
+Subject: [PATCH 6/8] iwlwifi: Fix regression from UDP segmentation support
Eric's tentative fix from
https://lore.kernel.org/linux-wireless/CANn89iJWG2n1s3j7EdpwkQQv-9dOY02V+FGYHAWguO4JiqWuJA@mail.gmail.com/
@@ -30,5 +30,5 @@ index fe1c538cd718..c27743a58f81 100644
if (qos) {
u8 *qc;
--
-2.29.2
+2.30.0
diff --git a/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch b/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
new file mode 100644
index 000000000000..e06f6ce72ea0
--- /dev/null
+++ b/0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
@@ -0,0 +1,26 @@
+From 00f09a6a8193b46c83ae1c8ff6623db011f90099 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Fri, 1 Jan 2021 06:20:32 +0100
+Subject: [PATCH 7/8] ALSA: hda/hdmi: fix locking in silent_stream_disable
+
+The code unlocked the wrong lock, leading to deadlocks.
+---
+ 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 2ddc27db8c01..d12b4799c3cb 100644
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1736,7 +1736,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 */
+--
+2.30.0
+
diff --git a/PKGBUILD b/PKGBUILD
index e5398bf812b1..d6022bd5fc7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@ _srcname=linux-5.10
_major=5.10
### on initial release this is null otherwise it is the current stable subversion
### ie 1,2,3 corresponding $_major.1, $_major.3 etc
-_minor=3
+_minor=4
_minorc=$((_minor+1))
### on initial release this is just $_major
_fullver=$_major.$_minor
#_fullver=$_major
-_rcver=2
+_rcver=1
_rcpatch=patch-${_major}.${_minorc}-rc${_rcver}
pkgver=${_major}.${_minorc}rc${_rcver}
arch=(x86_64)
@@ -29,27 +29,28 @@ source=(
https://www.kernel.org/pub/linux/kernel/v5.x/linux-$_fullver.tar.{xz,sign}
config # the main kernel config file
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
-0003-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
-0004-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
-0005-drm-amd-display-Add-get_dig_frontend-implementation-.patch
-0007-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
-0008-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+0002-Bluetooth-Fix-attempting-to-set-RPA-timeout-when-uns.patch
+0003-HID-quirks-Add-Apple-Magic-Trackpad-2-to-hid_have_sp.patch
+0005-btrfs-Fix-500-2000-performance-regression-w-5.10.patch
+0006-iwlwifi-Fix-regression-from-UDP-segmentation-support.patch
+0007-ALSA-hda-hdmi-fix-locking-in-silent_stream_disable.patch
+
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('fd03d186764458a33c10ae0e5d6c2f47ea2e74e6e08f6b80f195d750ce5af383e6f4eef9236def37515d1a41e9b62fb41e73e2f1ba802601ca81929fe0b6c8b3'
+b2sums=('3a4fa6e77721b0dc3b74e0e1c6d6af2aaf33286d5fc3bf6e0ae844cbed2f745cfa3fa8a83b406082e1e981125cf1c09a5df765e990a132713e7a05281a936394'
'SKIP'
- '0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98'
+ '57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec'
'SKIP'
- 'ac86054c7dc7e47cdc256c652c47cc4dc2100d1110637253fcc986fb5bcbda0023e8525d36253b9111284fd4d68c2a111219d904ac0489fdc251b26fb92d7c86'
- '93567344c75bdd53b08bbae74d9cd6a99223825e37b59a762f7abd83ecf76e90d3a6d62d807d5ffe282aabbad21ae8c0e542fcf45e4419229de804068414d01d'
- '155b189c79c1631d1f709ad7b01fc0b1d94e9c7a31ba0eacaa2dcde80020e8b7b36bea2429668fcac440c97a11ea26051cf2912f3f7af070a3878c8d00d53c82'
- 'af8f9ad7ee3f78da380ca97be64179a5cf95216b0f3652a95536f313ac8a7fdb39657ec88ca70474582c56974d096691544afef5c31293194ef004710bcfbefa'
- 'da02f8893032c5658d2ba900355c3a576214e39c369faac6599fbbd2c416fee6f4efa7683f069b0269993a1f395cf373f27e2fc001206b95c7870a8f594c8ce5'
- '7733157d74983a5c2de0ab2aa1b41244ffa60e1fe038795fba1868a2410d2a91e23977462233628de85f3fea16921c48964f4c29e0a0af73e46cbd0dda26e05c'
- '9550885b97c06a796ff62923f2049cc7c6b6db3a31a1824e7b1bf6d1417e7243c8dff5bb358495c562880a821769c43f4aff258cf3e4e93f0642ac1881282496')
+ 'cb3a58e4eef8395b75887d94a84bba25f05fbec8f576a791623057a190a1d51b412a19ecf1b600ac3f9f6c46968eb0e130d571743e61afc231a97146ee4b52d0'
+ '7d2ef86a15ead6c946051c117a8ed97056e92a25a274455c5cc62ec65ff92bda7a50032b32c8019180f233a54e778becc45751741ae4d87db8f56ef520ca1e83'
+ '8ea9d2b7809728c3de05768fea5d8838fe20de8aaaed9106f26c0e8fc051921668d0c31345f200d06005403dec565690f828dbbcd38504079fe6fccbf742be61'
+ 'd361b313a3dcd761833b8e2e40201df5e5b93c472e8a06f4684feb24d6e174405e6e4328dc0c449b9b0263e87224b3e1f4a52c873b666a93055979c9d2e2bf59'
+ '2853fa5257b96b11bcbf60ed68df09938ebb15f81c1bb6aa763c721c4e55f440fd27f9a6b49e8f9a1788948928299810f9e8ea43f0759b06cae3dd140902f93e'
+ '46a30c86206717fe6804d8e88693b90382b07fdad91d8fd7220e398e41f87a4b5cb5be70285241a3fc81c62ced6021f1710ce0426f3161285c254db9e5484d86'
+ 'eec26b472efda62e27d26c2033158e970a5eadb30d38fc4de59c36fafe53efc1e220b7d57189abcd5a2697d242df8475cf2eebfd1ad6373804b5456dbcc14098')
export KBUILD_BUILD_HOST=archlinux
diff --git a/config b/config
index a356f66e9f11..70c17a550e44 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.2-arch1 Kernel Configuration
+# Linux/x86 5.10.4-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
CONFIG_CC_IS_GCC=y
@@ -2288,7 +2288,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_MCHP23K256 is not set
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
+CONFIG_MTD_PHRAM=m
# CONFIG_MTD_MTDRAM is not set
CONFIG_MTD_BLOCK2MTD=m
@@ -4501,7 +4501,6 @@ CONFIG_GPIO_SYSFS=y
CONFIG_GPIO_CDEV=y
CONFIG_GPIO_CDEV_V1=y
CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_REGMAP=m
CONFIG_GPIO_MAX730X=m
#
@@ -4562,7 +4561,6 @@ CONFIG_GPIO_MADERA=m
CONFIG_GPIO_MSIC=y
CONFIG_GPIO_PALMAS=y
CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
CONFIG_GPIO_TPS65086=m
CONFIG_GPIO_TPS6586X=y
CONFIG_GPIO_TPS65910=y
@@ -4865,7 +4863,6 @@ CONFIG_SENSORS_UCD9000=m
CONFIG_SENSORS_UCD9200=m
CONFIG_SENSORS_XDPE122=m
CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SL28CPLD=m
CONFIG_SENSORS_SHT15=m
CONFIG_SENSORS_SHT21=m
CONFIG_SENSORS_SHT3x=m
@@ -4998,7 +4995,6 @@ CONFIG_XILINX_WATCHDOG=m
CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_RAVE_SP_WATCHDOG=m
CONFIG_MLX_WDT=m
-CONFIG_SL28CPLD_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_TWL4030_WATCHDOG=m
@@ -5156,8 +5152,6 @@ CONFIG_MFD_RT5033=m
CONFIG_MFD_RC5T583=y
CONFIG_MFD_SEC_CORE=y
CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
CONFIG_MFD_SM501=m
CONFIG_MFD_SM501_GPIO=y
CONFIG_MFD_SKY81452=m
@@ -8788,7 +8782,6 @@ CONFIG_PWM_LPSS=m
CONFIG_PWM_LPSS_PCI=m
CONFIG_PWM_LPSS_PLATFORM=m
CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
CONFIG_PWM_TWL=m
CONFIG_PWM_TWL_LED=m
@@ -9336,7 +9329,7 @@ CONFIG_TRUSTED_KEYS=m
CONFIG_ENCRYPTED_KEYS=m
CONFIG_KEY_DH_OPERATIONS=y
CONFIG_KEY_NOTIFICATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y