diff options
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 12 | ||||
| -rw-r--r-- | Revert-duplicate-S0ix-patch.patch | 26 |
3 files changed, 7 insertions, 39 deletions
@@ -1,6 +1,6 @@ pkgbase = linux-xanmod-rog pkgdesc = Linux Xanmod - pkgver = 5.15.7.xanmod1 + pkgver = 5.15.8.xanmod1 pkgrel = 1 url = http://www.xanmod.org/ arch = x86_64 @@ -18,10 +18,9 @@ pkgbase = linux-xanmod-rog options = !strip source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz source = https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.sign - source = https://github.com/xanmod/linux/releases/download/5.15.7-xanmod1/patch-5.15.7-xanmod1.xz + source = https://github.com/xanmod/linux/releases/download/5.15.8-xanmod1/patch-5.15.8-xanmod1.xz source = choose-gcc-optimization.sh source = sphinx-workaround.patch - source = Revert-duplicate-S0ix-patch.patch source = PCI-Add-more-NVIDIA-controllers-to-the-MSI-masking-q.patch source = iommu-intel-do-deep-dma-unmapping-to-avoid-kernel-fl.patch source = cpufreq-intel_pstate-ITMT-support-for-overclocked-sy.patch @@ -49,10 +48,9 @@ pkgbase = linux-xanmod-rog validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E sha256sums = 57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8 sha256sums = SKIP - sha256sums = 8ecfb8a32f3fb4f1cc9a124087a54758527a745c7f1606c44529b89ee09033cd + sha256sums = 161647b83dfbb24666b84bd865c266d66e590e0cd663cb3b144b395c1d38676e sha256sums = 5b8eddb90671f3e8469a023b7ed0d3c5a9521f662affa1d541063e273b64dba8 sha256sums = 52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb - sha256sums = dbe7547f9b4716ca0909fb064d2ece5478906c85578eb7ee5418c175aa70651a sha256sums = 20c0926964a4286486c3ae1dd05014767f42388316a7d60b4f52639536fbd615 sha256sums = 6c48a3e96b49ddb6ece78f3abb1a8a889a77c097f93b14ab052f1e19eda05076 sha256sums = 54f161457cc4de4ebd5770c16f14f7a47f1dbbc4f1af83dec651e6a8b1eaad56 @@ -75,9 +75,9 @@ _makenconfig= ### IMPORTANT: Do no edit below this line unless you know what you're doing pkgbase=linux-xanmod-rog -xanmod=5.15.7-xanmod1 +xanmod=5.15.8-xanmod1 pkgver=${xanmod//-/.} -#pkgver=5.15.7.prexan0 +#pkgver=5.15.8.prexan0 # NOTE: version sort is important here, pick something that sorts 'before' .xanmodY to avoid downgrade warnings pkgrel=1 pkgdesc='Linux Xanmod' @@ -102,12 +102,9 @@ source=("https://cdn.kernel.org/pub/linux/kernel/v${_branch}/linux-${_major}.tar "choose-gcc-optimization.sh" "sphinx-workaround.patch" - # revert duplicate s0ix patch from xanmod so our later patch applies - "Revert-duplicate-S0ix-patch.patch" - # apply incremental kernel updates ahead of official Xanmod release #"https://cdn.kernel.org/pub/linux/kernel/v5.x/patch-5.15.1.xz" - #"https://cdn.kernel.org/pub/linux/kernel/v5.x/incr/patch-5.15.6-7.xz" + #"https://cdn.kernel.org/pub/linux/kernel/v5.x/incr/patch-5.15.7-8.xz" #"Linux-5.15.7.patch.xz" # Arch: misc hotfixes @@ -163,10 +160,9 @@ validpgpkeys=( sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8' 'SKIP' - '8ecfb8a32f3fb4f1cc9a124087a54758527a745c7f1606c44529b89ee09033cd' + '161647b83dfbb24666b84bd865c266d66e590e0cd663cb3b144b395c1d38676e' '5b8eddb90671f3e8469a023b7ed0d3c5a9521f662affa1d541063e273b64dba8' '52fc0fcd806f34e774e36570b2a739dbdf337f7ff679b1c1139bee54d03301eb' - 'dbe7547f9b4716ca0909fb064d2ece5478906c85578eb7ee5418c175aa70651a' '20c0926964a4286486c3ae1dd05014767f42388316a7d60b4f52639536fbd615' '6c48a3e96b49ddb6ece78f3abb1a8a889a77c097f93b14ab052f1e19eda05076' '54f161457cc4de4ebd5770c16f14f7a47f1dbbc4f1af83dec651e6a8b1eaad56' diff --git a/Revert-duplicate-S0ix-patch.patch b/Revert-duplicate-S0ix-patch.patch deleted file mode 100644 index 52031cf9611e..000000000000 --- a/Revert-duplicate-S0ix-patch.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b3863a9f2fc39a1dc23bf164ec3e92506afd4684 Mon Sep 17 00:00:00 2001 -From: Scott B <arglebargle@arglebargle.dev> -Date: Wed, 8 Dec 2021 10:10:08 -0800 -Subject: [PATCH] Revert duplicate S0ix patch - -This reverts commit cb65ee0c7e5981c4eca2cb3c30b389d020c3afb6. ---- - drivers/platform/x86/amd-pmc.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c -index 54b88bedecdf..fc95620101e8 100644 ---- a/drivers/platform/x86/amd-pmc.c -+++ b/drivers/platform/x86/amd-pmc.c -@@ -70,7 +70,7 @@ - #define AMD_CPU_ID_CZN AMD_CPU_ID_RN - #define AMD_CPU_ID_YC 0x14B5 - --#define PMC_MSG_DELAY_MIN_US 50 -+#define PMC_MSG_DELAY_MIN_US 100 - #define RESPONSE_REGISTER_LOOP_MAX 20000 - - #define SOC_SUBSYSTEM_IP_MAX 12 --- -2.34.1 - |