summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO40
-rw-r--r--0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch2
-rw-r--r--0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch (renamed from 0003-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch)4
-rw-r--r--0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch47
-rw-r--r--0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch (renamed from 0004-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch)8
-rw-r--r--0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch (renamed from 0005-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch)6
-rw-r--r--0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch (renamed from 0006-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch)4
-rw-r--r--0006-lg-laptop-Recognize-more-models.patch (renamed from 0007-lg-laptop-Recognize-more-models.patch)4
-rw-r--r--0007-Revert-drm-i915-Implement-Wa_1508744258.patch47
-rw-r--r--0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch37
-rw-r--r--PKGBUILD36
-rw-r--r--config8
12 files changed, 104 insertions, 139 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8cd8c546c6d..d74c84f5940 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = linux-ck
- pkgver = 5.15.5
- pkgrel = 2
+ pkgver = 5.15.6
+ pkgrel = 1
url = https://wiki.archlinux.org/index.php/Linux-ck
arch = x86_64
license = GPL2
@@ -12,34 +12,32 @@ pkgbase = linux-ck
makedepends = tar
makedepends = xz
options = !strip
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.5.tar.xz
- source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.5.tar.sign
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.6.tar.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.6.tar.sign
source = config
source = more-uarches-20211114.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/20211114.tar.gz
source = xanmod-patches-from-ck-8ba6612318090567422d49ccc79bc7bbe5484cfc.tar.gz::https://github.com/xanmod/linux-patches/archive/8ba6612318090567422d49ccc79bc7bbe5484cfc.tar.gz
source = 0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- source = 0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
- source = 0003-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
- source = 0004-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
- source = 0005-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
- source = 0006-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
- source = 0007-lg-laptop-Recognize-more-models.patch
- source = 0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch
+ source = 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+ source = 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ source = 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+ source = 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+ source = 0006-lg-laptop-Recognize-more-models.patch
+ source = 0007-Revert-drm-i915-Implement-Wa_1508744258.patch
validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
- b2sums = 2921b549a44ff4202ab96d35d6b7ce99bef914db5c1dba066fb7c4b146ef987d1aed53d0773fbe07cd6bb3b964d40b6f3f8c47f6a04149ea1c64e2f8f87343bb
+ b2sums = dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1064b77926f86d93c7035634db8ba8f6c1e2d957ff749b34e218c565c7
b2sums = SKIP
- b2sums = 1154722c5d8a33dedbd18679724ef34ac3aa96900c53aa8ebbba10ea87b0aaa0363d278b0aa4e5e5fed7e85c05e9b7892ba6bdd72f87117f584fef785d6f91d0
+ b2sums = 4b6759fae0abc440292b310aed12bd12bbfbc172f968572ee9b8a9164c844b3f2a12f81b1fdf5ed86d75403f0c5be5d57933292e22c2973ef14f481bf78a3f7e
b2sums = 534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d
b2sums = cf589ec357a96b9e573bce298bb1d64fa50339ea047767f2a730a8dc9808e2316b3e7c885d730233ba50d570725d4c72632d1b74a371ef02ac471d4c944fe63e
- b2sums = d107ab04b9f187fa78481a83ac90e9d9e335d2fd6a5eba07cd48bfa659999f3d54afd2b01b8c1d49faf7b95c7ceee37ca038e2169e252dc9938228b7176204de
- b2sums = 2857d0a1b79ba768bbc321ac7461b0cdd19e9ecbc8f10674b47f834c7f19c8771e3adec842f796b138da8f8ecd1b955a9de332072f0b3d776667956a1ec26c13
- b2sums = f6319aaf6cd1b040cee8fbd8c9ad993b011586037cef249f679efda0e5eb819b08d96abdf91f08d70e634e5d958aee8c756068ce38f34e33893f27d511c8efbe
- b2sums = 640d8a6ff7394d2cab6ac949ce73cb14696165897f9c453a8cfafa93a071f3cbcdd5db90c0e6e35ec4f33276912034f1232bdb419029746d78c351dc2120eab8
- b2sums = ff0599fb11714b2a1399a7c9b568e688472a8ed646c8a2eacfe78593cc4beae4d0675151d0a7742b15d6dbf815ce6a99678fca5da69defedee1416aadee6773d
- b2sums = 87eb24ff13fa79660383749e6fb7f5aaaf42c725877f839d7c8be087c1692ac66ed2f3c66b1c779c9b8d823c798fd732eb4dcba091fd0ddce65de11c5eef07a2
- b2sums = c842942c45c0fa816b9e5e6a4893a61986126fddb94c02854640f136d06ac20abc0fcc65b0f7196cc5a647fc075f343ad7da54fa541b46d75f00fac07b0063d1
- b2sums = 0876ef25a850e218948d2f595732c51714b04dbc88a14fc1c599034eb2c4d742f171ff3fce1fcae628050f29aa48495c92a58471058649797fb1f1734cc5d7e0
+ b2sums = d3949a2c42bef49159ebbb03a6a0428d7733149a62e5211cff160da068139f39655cf45b5557ed491a9078253d892ea7fe64e41010d95dad073e565b7616e587
+ b2sums = 3ccad696e49c2d8b6202cabceefcbbfbbe3f7d29a5a895552a03b2c5418b6f7570ce06614d3b34fb0ca6d765e8becf69466b3d9997393f02a9a1efc2de214407
+ b2sums = 709d734efdc407ac250af9527a9bf42abb5d19be8432e5670b28e68d4de65d38b36edfde5c83636870340adc8ec4bea36703f3ab54e4c7cd8cf46eb805751498
+ b2sums = e698661f8246d46eea768b0115e98c70179a1ff3c5931ec5bacabb476bfce3fb01c3b754065cbdcf36730e59b317b7b74d5b9a305b649a22b6af20abd999e89e
+ b2sums = c3eb2897afb99d51911f92372d4c9d37297c0910d4cd17b24b70c85a1ef95bf8f6c280bc9f43d2dc80593756628c7dcdd721f3f4bbbed8bf74ef347844606ddf
+ b2sums = bfef7971cb082ed938da787335404a788530f84b9b3416e8a6983556d1e69e552e777fd4dd276662da5808973e0896e8024b8227c601add98c4c72093a03d1ce
+ b2sums = dfa875a75daae7f65dcadcbfc0fe025133f838594b59f9d158c5eff5bb86dab33e34aba4fc215c91d397c6bcff0a60d7368d08d3b1c4b73c5562518d0f6f88c0
pkgname = linux-ck
pkgdesc = The Linux-ck kernel and modules with ck's hrtimer patches
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 d3dd9c3465e..643e49a7bda 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,4 +1,4 @@
-From ddfcf9d61c8e8c85f10da9342641abd96b988d4c Mon Sep 17 00:00:00 2001
+From e640cb2990858fa20aba91e73ed4fc48c94ec201 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/8] ZEN: Add sysctl and CONFIG to disallow unprivileged
diff --git a/0003-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch b/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
index ee0859fa815..909f5291062 100644
--- a/0003-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+++ b/0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
@@ -1,7 +1,7 @@
-From b791689a01733490accfbec492aa000e70db4cb9 Mon Sep 17 00:00:00 2001
+From 1ac8f753e4249e6864c1c42070ba957ceef1f82a Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Thu, 18 Nov 2021 22:53:31 +0100
-Subject: [PATCH 3/8] PCI: Add more NVIDIA controllers to the MSI masking quirk
+Subject: [PATCH 2/8] PCI: Add more NVIDIA controllers to the MSI masking quirk
For: https://bugs.archlinux.org/task/72734
For: https://bugs.archlinux.org/task/72777
diff --git a/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch b/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
deleted file mode 100644
index 770755316da..00000000000
--- a/0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 31d5f32df63c575edb494b4d87779f8030f32700 Mon Sep 17 00:00:00 2001
-From: Larry Finger <Larry.Finger@lwfinger.net>
-Date: Sun, 7 Nov 2021 11:35:43 -0600
-Subject: [PATCH 2/8] staging: r8188eu: Fix breakage introduced when 5G code
- was removed
-
-In commit 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions
-and code"), two entries were removed from RTW_ChannelPlanMap[], but not replaced
-with zeros. The position within this table is important, thus the patch broke
-systems operating in regulatory domains osted later than entry 0x13 in the table.
-Unfortunately, the FCC entry comes before that point and most testers did not see
-this problem.
-
-Reported-and-tested-by: Zameer Manji <zmanji@gmail.com>
-Reported-by: kernel test robot <lkp@intel.com>
-Fixes: 221abd4d478a ("staging: r8188eu: Remove no more necessary definitions and code")
-Cc: Stable <stable@vger.kernel.org> # v5.5+
-Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
-For: https://bugs.archlinux.org/task/72659
-For: https://bugs.archlinux.org/task/72760
----
- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-index 5a472a4954b0..e5c907ac10fc 100644
---- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-+++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c
-@@ -104,6 +104,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
- {0x01}, /* 0x10, RT_CHANNEL_DOMAIN_JAPAN */
- {0x02}, /* 0x11, RT_CHANNEL_DOMAIN_FCC_NO_DFS */
- {0x01}, /* 0x12, RT_CHANNEL_DOMAIN_JAPAN_NO_DFS */
-+ {0x00}, /* 0x13 */
- {0x02}, /* 0x14, RT_CHANNEL_DOMAIN_TAIWAN_NO_DFS */
- {0x00}, /* 0x15, RT_CHANNEL_DOMAIN_ETSI_NO_DFS */
- {0x00}, /* 0x16, RT_CHANNEL_DOMAIN_KOREA_NO_DFS */
-@@ -115,6 +116,7 @@ static struct rt_channel_plan_map RTW_ChannelPlanMap[RT_CHANNEL_DOMAIN_MAX] = {
- {0x00}, /* 0x1C, */
- {0x00}, /* 0x1D, */
- {0x00}, /* 0x1E, */
-+ {0x00}, /* 0x1F, */
- /* 0x20 ~ 0x7F , New Define ===== */
- {0x00}, /* 0x20, RT_CHANNEL_DOMAIN_WORLD_NULL */
- {0x01}, /* 0x21, RT_CHANNEL_DOMAIN_ETSI1_NULL */
---
-2.34.1
-
diff --git a/0004-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch b/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
index ee30c1b81a9..ec4c57e3fd8 100644
--- a/0004-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+++ b/0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
@@ -1,7 +1,7 @@
-From 9d27a8f230c4d6ff6a936c227e08cf2d4370f5cc Mon Sep 17 00:00:00 2001
+From 74db74ec6ce112c6137d51610429e7ac9ea5b6c1 Mon Sep 17 00:00:00 2001
From: Ajay Garg <ajaygargnsit@gmail.com>
Date: Tue, 12 Oct 2021 19:26:53 +0530
-Subject: [PATCH 4/8] iommu: intel: do deep dma-unmapping, to avoid
+Subject: [PATCH 3/8] iommu: intel: do deep dma-unmapping, to avoid
kernel-flooding.
Origins at :
@@ -71,10 +71,10 @@ Link: https://lore.kernel.org/linux-iommu/20211012135653.3852-1-ajaygargnsit@gma
1 file changed, 2 insertions(+)
diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
-index 9a356075d345..58b4f6cd0efd 100644
+index 78f8c8e6803e..d8da48a91ba3 100644
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
-@@ -5094,6 +5094,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
+@@ -5092,6 +5092,8 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
gather->freelist = domain_unmap(dmar_domain, start_pfn,
last_pfn, gather->freelist);
diff --git a/0005-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch b/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
index 9293b7f738d..9ae648cf5c7 100644
--- a/0005-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+++ b/0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
@@ -1,7 +1,7 @@
-From c9f82c4d609a59b1cf15981bf096ccc448290d8b Mon Sep 17 00:00:00 2001
+From 62f1f7606485d450b23f86bc18dab101e7a2443d Mon Sep 17 00:00:00 2001
From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Date: Thu, 18 Nov 2021 21:18:01 -0800
-Subject: [PATCH 5/8] cpufreq: intel_pstate: ITMT support for overclocked
+Subject: [PATCH 4/8] cpufreq: intel_pstate: ITMT support for overclocked
system
On systems with overclocking enabled, CPPC Highest Performance can be
@@ -23,7 +23,7 @@ Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
1 file changed, 10 insertions(+)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
-index dafa631582ba..7307b3c4a4c4 100644
+index e15c3bc17a55..8a2c6b58b652 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -335,6 +335,8 @@ static void intel_pstste_sched_itmt_work_fn(struct work_struct *work)
diff --git a/0006-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch b/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
index af34bd5bcc7..9b038eb9038 100644
--- a/0006-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+++ b/0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
@@ -1,7 +1,7 @@
-From 45f6ca918de13164a3213594f37a0ebed5506bdf Mon Sep 17 00:00:00 2001
+From ae3386d67597db29ad2ba2685815e224a39897bc Mon Sep 17 00:00:00 2001
From: Kiran K <kiran.k@intel.com>
Date: Wed, 13 Oct 2021 13:35:11 +0530
-Subject: [PATCH 6/8] Bluetooth: btintel: Fix bdaddress comparison with garbage
+Subject: [PATCH 5/8] Bluetooth: btintel: Fix bdaddress comparison with garbage
value
Intel Read Verision(TLV) data is parsed into a local structure variable
diff --git a/0007-lg-laptop-Recognize-more-models.patch b/0006-lg-laptop-Recognize-more-models.patch
index cb7f97dc84b..9a77b6af24e 100644
--- a/0007-lg-laptop-Recognize-more-models.patch
+++ b/0006-lg-laptop-Recognize-more-models.patch
@@ -1,7 +1,7 @@
-From d8bbc459909a15bb5ad00b86475011172fab957c Mon Sep 17 00:00:00 2001
+From 675d4b66de78eec370cf5053eecdf00b26780af3 Mon Sep 17 00:00:00 2001
From: Matan Ziv-Av <matan@svgalib.org>
Date: Tue, 23 Nov 2021 22:14:55 +0200
-Subject: [PATCH 7/8] lg-laptop: Recognize more models
+Subject: [PATCH 6/8] lg-laptop: Recognize more models
LG uses 5 instead of 0 in the third digit (second digit after 2019) of the year string to indicate newer models in the same year. Handle this case as well.
diff --git a/0007-Revert-drm-i915-Implement-Wa_1508744258.patch b/0007-Revert-drm-i915-Implement-Wa_1508744258.patch
new file mode 100644
index 00000000000..e3b31caa30b
--- /dev/null
+++ b/0007-Revert-drm-i915-Implement-Wa_1508744258.patch
@@ -0,0 +1,47 @@
+From 2b3efb722d72940a61adb5898d92d8ebacd9e3a8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= <jose.souza@intel.com>
+Date: Fri, 19 Nov 2021 06:09:30 -0800
+Subject: [PATCH 7/8] Revert "drm/i915: Implement Wa_1508744258"
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This workarounds are causing hangs, because I missed the fact that it
+needs to be enabled for all cases and disabled when doing a resolve
+pass.
+
+So KMD only needs to whitelist it and UMD will be the one setting it
+on per case.
+
+This reverts commit 28ec02c9cbebf3feeaf21a59df9dfbc02bda3362.
+
+Fixes: https://gitlab.freedesktop.org/drm/intel/-/issues/4145
+Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
+Fixes: 28ec02c9cbeb ("drm/i915: Implement Wa_1508744258")
+Reviewed-by: Matt Atwood <matthew.s.atwood@intel.com>
+For: https://bugs.archlinux.org/task/72752
+---
+ drivers/gpu/drm/i915/gt/intel_workarounds.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c
+index aae609d7d85d..6b5ab19a2ada 100644
+--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c
++++ b/drivers/gpu/drm/i915/gt/intel_workarounds.c
+@@ -621,13 +621,6 @@ static void gen12_ctx_workarounds_init(struct intel_engine_cs *engine,
+ FF_MODE2_GS_TIMER_MASK,
+ FF_MODE2_GS_TIMER_224,
+ 0, false);
+-
+- /*
+- * Wa_14012131227:dg1
+- * Wa_1508744258:tgl,rkl,dg1,adl-s,adl-p
+- */
+- wa_masked_en(wal, GEN7_COMMON_SLICE_CHICKEN1,
+- GEN9_RHWO_OPTIMIZATION_DISABLE);
+ }
+
+ static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine,
+--
+2.34.1
+
diff --git a/0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch b/0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch
deleted file mode 100644
index 1697f546202..00000000000
--- a/0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From c749301ebee82eb5e97dec14b6ab31a4aabe37a6 Mon Sep 17 00:00:00 2001
-From: Damien Le Moal <damien.lemoal@wdc.com>
-Date: Fri, 20 Aug 2021 16:02:55 +0900
-Subject: [PATCH] scsi: sd: Fix sd_do_mode_sense() buffer length handling
-
-For devices that explicitly asked for MODE SENSE(10) use, make sure that
-scsi_mode_sense() is called with a buffer of at least 8 bytes so that the
-sense header fits.
-
-Link: https://lore.kernel.org/r/20210820070255.682775-4-damien.lemoal@wdc.com
-Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
-Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
----
- drivers/scsi/sd.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
-index cbd9999f93a6..71fa70b42c2b 100644
---- a/drivers/scsi/sd.c
-+++ b/drivers/scsi/sd.c
-@@ -2604,6 +2604,13 @@ sd_do_mode_sense(struct scsi_disk *sdkp, int dbd, int modepage,
- unsigned char *buffer, int len, struct scsi_mode_data *data,
- struct scsi_sense_hdr *sshdr)
- {
-+ /*
-+ * If we must use MODE SENSE(10), make sure that the buffer length
-+ * is at least 8 bytes so that the mode sense header fits.
-+ */
-+ if (sdkp->device->use_10_for_ms && len < 8)
-+ len = 8;
-+
- return scsi_mode_sense(sdkp->device, dbd, modepage, buffer, len,
- SD_TIMEOUT, sdkp->max_retries, data,
- sshdr);
---
-2.34.1
-
diff --git a/PKGBUILD b/PKGBUILD
index 09211c0d0ee..69eb46c79fa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -64,8 +64,8 @@ _subarch=
### IMPORTANT: Do no edit below this line unless you know what you're doing
pkgbase=linux-ck
-pkgver=5.15.5
-pkgrel=2
+pkgver=5.15.6
+pkgrel=1
arch=(x86_64)
url="https://wiki.archlinux.org/index.php/Linux-ck"
license=(GPL2)
@@ -86,31 +86,29 @@ source=(
"more-uarches-$_gcc_more_v.tar.gz::https://github.com/graysky2/kernel_compiler_patch/archive/$_gcc_more_v.tar.gz"
"xanmod-patches-from-ck-$_commit.tar.gz::https://github.com/xanmod/linux-patches/archive/$_commit.tar.gz"
0001-ZEN-Add-sysctl-and-CONFIG-to-disallow-unprivileged-C.patch
- 0002-staging-r8188eu-Fix-breakage-introduced-when-5G-code.patch
- 0003-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
- 0004-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
- 0005-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
- 0006-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
- 0007-lg-laptop-Recognize-more-models.patch
- 0008-scsi-sd-Fix-sd_do_mode_sense-buffer-length-handling.patch
+ 0002-PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch
+ 0003-iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch
+ 0004-cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch
+ 0005-Bluetooth-btintel-Fix-bdaddress-comparison-with-garb.patch
+ 0006-lg-laptop-Recognize-more-models.patch
+ 0007-Revert-drm-i915-Implement-Wa_1508744258.patch
)
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
)
-b2sums=('2921b549a44ff4202ab96d35d6b7ce99bef914db5c1dba066fb7c4b146ef987d1aed53d0773fbe07cd6bb3b964d40b6f3f8c47f6a04149ea1c64e2f8f87343bb'
+b2sums=('dedcff13b0829b9bdfc4998a9bedcf932dee48ade3bef722ccbd8fc7bef9832462ac2f1064b77926f86d93c7035634db8ba8f6c1e2d957ff749b34e218c565c7'
'SKIP'
- '1154722c5d8a33dedbd18679724ef34ac3aa96900c53aa8ebbba10ea87b0aaa0363d278b0aa4e5e5fed7e85c05e9b7892ba6bdd72f87117f584fef785d6f91d0'
+ '4b6759fae0abc440292b310aed12bd12bbfbc172f968572ee9b8a9164c844b3f2a12f81b1fdf5ed86d75403f0c5be5d57933292e22c2973ef14f481bf78a3f7e'
'534091fb5034226d48f18da2114305860e67ee49a1d726b049a240ce61df83e840a9a255e5b8fa9279ec07dd69fb0aea6e2e48962792c2b5367db577a4423d8d'
'cf589ec357a96b9e573bce298bb1d64fa50339ea047767f2a730a8dc9808e2316b3e7c885d730233ba50d570725d4c72632d1b74a371ef02ac471d4c944fe63e'
- 'd107ab04b9f187fa78481a83ac90e9d9e335d2fd6a5eba07cd48bfa659999f3d54afd2b01b8c1d49faf7b95c7ceee37ca038e2169e252dc9938228b7176204de'
- '2857d0a1b79ba768bbc321ac7461b0cdd19e9ecbc8f10674b47f834c7f19c8771e3adec842f796b138da8f8ecd1b955a9de332072f0b3d776667956a1ec26c13'
- 'f6319aaf6cd1b040cee8fbd8c9ad993b011586037cef249f679efda0e5eb819b08d96abdf91f08d70e634e5d958aee8c756068ce38f34e33893f27d511c8efbe'
- '640d8a6ff7394d2cab6ac949ce73cb14696165897f9c453a8cfafa93a071f3cbcdd5db90c0e6e35ec4f33276912034f1232bdb419029746d78c351dc2120eab8'
- 'ff0599fb11714b2a1399a7c9b568e688472a8ed646c8a2eacfe78593cc4beae4d0675151d0a7742b15d6dbf815ce6a99678fca5da69defedee1416aadee6773d'
- '87eb24ff13fa79660383749e6fb7f5aaaf42c725877f839d7c8be087c1692ac66ed2f3c66b1c779c9b8d823c798fd732eb4dcba091fd0ddce65de11c5eef07a2'
- 'c842942c45c0fa816b9e5e6a4893a61986126fddb94c02854640f136d06ac20abc0fcc65b0f7196cc5a647fc075f343ad7da54fa541b46d75f00fac07b0063d1'
- '0876ef25a850e218948d2f595732c51714b04dbc88a14fc1c599034eb2c4d742f171ff3fce1fcae628050f29aa48495c92a58471058649797fb1f1734cc5d7e0')
+ 'd3949a2c42bef49159ebbb03a6a0428d7733149a62e5211cff160da068139f39655cf45b5557ed491a9078253d892ea7fe64e41010d95dad073e565b7616e587'
+ '3ccad696e49c2d8b6202cabceefcbbfbbe3f7d29a5a895552a03b2c5418b6f7570ce06614d3b34fb0ca6d765e8becf69466b3d9997393f02a9a1efc2de214407'
+ '709d734efdc407ac250af9527a9bf42abb5d19be8432e5670b28e68d4de65d38b36edfde5c83636870340adc8ec4bea36703f3ab54e4c7cd8cf46eb805751498'
+ 'e698661f8246d46eea768b0115e98c70179a1ff3c5931ec5bacabb476bfce3fb01c3b754065cbdcf36730e59b317b7b74d5b9a305b649a22b6af20abd999e89e'
+ 'c3eb2897afb99d51911f92372d4c9d37297c0910d4cd17b24b70c85a1ef95bf8f6c280bc9f43d2dc80593756628c7dcdd721f3f4bbbed8bf74ef347844606ddf'
+ 'bfef7971cb082ed938da787335404a788530f84b9b3416e8a6983556d1e69e552e777fd4dd276662da5808973e0896e8024b8227c601add98c4c72093a03d1ce'
+ 'dfa875a75daae7f65dcadcbfc0fe025133f838594b59f9d158c5eff5bb86dab33e34aba4fc215c91d397c6bcff0a60d7368d08d3b1c4b73c5562518d0f6f88c0')
export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index 3f559d6f80f..df045a39eb3 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.3-arch1 Kernel Configuration
+# Linux/x86 5.15.5-arch1 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
CONFIG_CC_IS_GCC=y
@@ -2335,6 +2335,7 @@ CONFIG_MTD_BLOCK=m
# CONFIG_SSFDC is not set
# CONFIG_SM_FTL is not set
# CONFIG_MTD_OOPS is not set
+CONFIG_MTD_PSTORE=m
# CONFIG_MTD_SWAP is not set
# CONFIG_MTD_PARTITIONED_MASTER is not set
@@ -9663,6 +9664,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="zstd"
# CONFIG_PSTORE_PMSG is not set
# CONFIG_PSTORE_FTRACE is not set
CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
# CONFIG_SYSV_FS is not set
CONFIG_UFS_FS=m
# CONFIG_UFS_FS_WRITE is not set