1 files changed, 24 insertions, 11 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 203ea8314208..e9c088f0c22f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,7 +12,7 @@ pkgbase=linux-jcore
 pkgname=('linux-jcore' 'linux-jcore-headers')
 _kernelname=-jcore
 _hostname=jcore
-pkgver=6.4
+pkgver=6.4.2
 pkgrel=1
 pkgdesc="Kernel for Manjaro/EndeavourOS/Arch (ACS override patch include)"
 arch=('x86_64')
@@ -24,22 +24,35 @@ options=('!strip')
 
 source=("https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$pkgver.tar.xz"
         'config'
+        # Upstream Patches
         # ARCH Patches
         '0101-ZEN_Add_sysctl_and_CONFIG_to_disallow_unprivileged_CLONE_NEWUSER.patch'
+        '0102-netfilter-nf_tables-unbind_non-anonymous.patch'
+        '0103-mm-disable_CONFIG_PER_VMA_LOCK.patch'
         # MANJARO Patches
-        'mt7921e_Perform_FLR_to_recovery_the_device.patch'
-        'rog_ally_sound.patch'
-        'hid-asus-rog-ally.patch'
-        'rog-ally-bluetooth.patch'
+        '0201-ACPI-resource-Remove-Zen-specific-match-and-quirks.patch'
+        '0202-amd-drm-fixes-6.4-2023-06-23.patch'
+        '0203-asus-ally-asus-hid-6.3-v2.patch'
+        '0203-Revert-drm-amd-display-edp-do-not-add-non-edid-timings.patch'
+        '0204-mt7921e_Perform_FLR_to_recovery_the_device.patch'
+        '0205-ALSA-hda-realtek-add-quirks-asus-ally-cs35l41.patch'
+        '0206-asus-ally-bluetooth.patch'
+        # HDR patches might create issues for now
+        #'0207-AMD-HDR.patch'
         # ACS override patch
         '0999-acs.gitpatch')
-sha256sums=('8fa0588f0c2ceca44cac77a0e39ba48c9f00a6b9dc69761c02a5d3efac8da7f3'
-            'c90891bab4641983a84cb196ab7bd2a444581563198e5d28d285bee7a56a136c'
+sha256sums=('a326ab224176c5b17c73c9ccad85f32e49b6e4e764861d57595727b7ef10062c'
+            'ec421d71481ff9b0db343c4a3992be50fc6439b2f5042bbb1069dd3c1e46a48c'
             '05f04019d4a2ee072238c32860fa80d673687d84d78ef436ae9332b6fb788467'
-            'd673d034fbcd80426fd8d9c6af56537c5fe5b55fe49d74e313474d7fc285ecc1'
-            '2b64a6f677e3b1278f7ae0080b3e58383e097c28e63672a800272ff66d435976'
+            '10dc7300ee9e0918bab033a50f48264fe1f90d92f621412bd3de32b714f447e8'
+            '7e79a1cc688189c66837611aa42ecf65a4f2fb071920830e9f4db923a13e9105'
+            '4273ddbb98140783d47107b521bd18545416df4730c088677ea0b8f8927399af'
+            '256d27c7c317421e74fa0f20623bf96f4c9ced2e3d1e4079e06520f726359b77'
             'a38b50b8c73332d3d16950bf8adcae7ead34391a60f74d05a58935cd3dc8a12d'
-            'b6806954a43ca362d80ea9ff4253a185eefb6afee5803749c7c1598bbcd86f6d'
+            'd17937d69876020c91a43a743cf6de550cffbf1978d40e4fb40bf54a96706719'
+            'd673d034fbcd80426fd8d9c6af56537c5fe5b55fe49d74e313474d7fc285ecc1'
+            'dafc7378178ff8f61386b922e705062569723cc72bb2fdd825d3ecaebf68a605'
+            'd5f95fe43882fb68c0a7e1ce8d831788e222f841de3e636e85a89ea655fed40e'
             '458d7e024d33d4965b14b9b987f01a2884ff28761cff5da7c6a54132a95e9f36')
 
 prepare() {
@@ -54,7 +67,7 @@ prepare() {
       patch -Np1 < "../$src"
   done
 
-  msg2 "0999-acs"
+  msg2 "apply 0999 acs override patch"
   patch --ignore-whitespace --fuzz 3 -p1 < "../0999-acs.gitpatch"
 
   cat "../config" > ./.config