env: next-20231129

Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · Nov 29, 2023 · d2debc8 · d2debc8
1 parent 2b84681
commit d2debc8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/fish/functions/cbl_rb_fd.fish b/fish/functions/cbl_rb_fd.fish
@@ -19,10 +19,10 @@ function cbl_rb_fd -d "Rebase generic Fedora kernel on latest linux-next"
     for patch in $b4_patches
         b4 shazam -l -P _ -s $patch; or return
     end
+    set -a crl_patches https://git.kernel.org/akpm/mm/p/31710e6afbbe0138baa00bc0ee1f2607e120edc4 # buffer: add cast in grow_buffers() to avoid a multiplication libcall
     for patch in $crl_patches
         crl $patch | git am -3; or return
     end
-    set -a ln_commits d2b5fb34d3b9cebd98866a536ccf546004ca1d4c
     for hash in $ln_commits
         git -C $CBL_BLD_P/linux-next fp -1 --stdout $hash | git am; or return
     end

diff --git a/fish/functions/cbl_rb_pi.fish b/fish/functions/cbl_rb_pi.fish
@@ -24,14 +24,13 @@ function cbl_rb_pi -d "Rebase Raspberry Pi kernel on latest linux-next"
     for revert in $reverts
         git revert --mainline 1 --no-edit $revert; or return
     end
-    set -a b4_patches https://lore.kernel.org/all/20231128-arm64-vdso32-missing-prototypes-error-v1-1-0fdd403cea07@kernel.org/ # arm64: vdso32: Define BUILD_VDSO32_64 to correct prototypes
     for patch in $b4_patches
         b4 shazam -l -P _ -s $patch; or return
     end
+    set -a crl_patches https://git.kernel.org/akpm/mm/p/31710e6afbbe0138baa00bc0ee1f2607e120edc4 # buffer: add cast in grow_buffers() to avoid a multiplication libcall
     for patch in $crl_patches
         crl $patch | git am -3; or return
     end
-    set -a ln_commits d2b5fb34d3b9cebd98866a536ccf546004ca1d4c
     for hash in $ln_commits
         git -C $CBL_BLD_P/linux-next fp -1 --stdout $hash | git am; or return
     end

diff --git a/pkgbuilds/linux-next-llvm/PKGBUILD b/pkgbuilds/linux-next-llvm/PKGBUILD
@@ -3,7 +3,7 @@
 
 _localversion=-llvm
 pkgname=linux-next$_localversion
-_srctag=next-20231128
+_srctag=next-20231129
 pkgver=${_srctag//-/.}
 pkgrel=1
 pkgdesc='linux-next'
@@ -31,7 +31,7 @@ validpgpkeys=(
   '3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB'  # Mark Brown
 )
 sha256sums=('SKIP'
-            '6b56a21bcc590e28289b85c711b2442f3e9a9f24e0e9dc1fa85d487df6fb6dc1'
+            '26d59a05b943e77543301819377e1ce138fa599e0655b0b77e165b78bbf2d1aa'
             '60497e772dac092274c623976a03e4ac6cd8aaf6e880179b869f920fc69ea7db')
 
 # This obviously ties this PKGBUILD to my machine but that is kind of the point :)

diff --git a/pkgbuilds/linux-next-llvm/config b/pkgbuilds/linux-next-llvm/config
@@ -2,7 +2,7 @@
 # Automatically generated file; DO NOT EDIT.
 # Linux/x86 6.7.0-rc3 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0 (https://github.com/llvm/llvm-project 92b821f2dcddbfa934689e10d8f11df150ab1043)"
+CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0 (https://github.com/llvm/llvm-project d6783c7c98ac7a02290d17c5109052f9d71ed914)"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
 CONFIG_CLANG_VERSION=180000