env: next-20240118

Signed-off-by: Nathan Chancellor <[email protected]>
nathanchance · Jan 18, 2024 · 7202fa7 · 7202fa7
1 parent 0971b5f
commit 7202fa7
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 41 deletions.
diff --git a/fish/functions/cbl_rb_fd.fish b/fish/functions/cbl_rb_fd.fish
@@ -29,7 +29,6 @@ function cbl_rb_fd -d "Rebase generic Fedora kernel on latest linux-next"
     for hash in $ln_commits
         git -C $CBL_BLD_P/linux-next fp -1 --stdout $hash | git am; or return
     end
-    set -a am_patches $ENV_FOLDER/pkgbuilds/linux-next-llvm/bcachefs-unused-variable-wb_flush_one.patch
     for patch in $am_patches
         git am -3 $patch; 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-20240117
+_srctag=next-20240118
 pkgver=${_srctag//-/.}
 pkgrel=1
 pkgdesc='linux-next'
@@ -26,19 +26,17 @@ source=(
   20231222_nathan_dmaengine_xilinx_xdma_fix_initialization_location_of_desc_in_xdma_channel_isr.patch
   20231222_nathan_dmaengine_xilinx_xdma_fix_operator_precedence_in_xdma_prep_interleaved_dma.patch
   20240104_nathan_platform_x86_intel_uncore_freq_fix_types_in_sysfs_callbacks.patch
-  bcachefs-unused-variable-wb_flush_one.patch
 )
 
 validpgpkeys=(
   '985B681FA45919699753A26489F91C0A41D5C07A'  # Stephen Rothwell
   '3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB'  # Mark Brown
 )
 sha256sums=('SKIP'
-            'a02891f9e90cf2e81bcb42e70ea8c885edb2cf388b804fdbcea96d48009a4678'
+            '937d97c59fab3f1451328a8d69a5e4796715e099b49ecc61efb627cdc409da3e'
             '7f26fe51d8b6d1fe27defafb41bfbb2d09ed6fcfd0e75b1e50e56e3bdf01cc2b'
             '284c768e567f1f860843fde9b4b3a7df9878a49c30b4647d3a79400ad266fd5e'
-            '2cfa151befee20012cf1907c4dd7d7ff60d5aaab69e7c3559c1e047de832e711'
-            'c3bdb37e53a4ff31b76e4ce665925f5badf1972ee246dff9acc3d180fd44dc04')
+            '2cfa151befee20012cf1907c4dd7d7ff60d5aaab69e7c3559c1e047de832e711')
 
 # This obviously ties this PKGBUILD to my machine but that is kind of the point :)
 _kmake() {

diff --git a/pkgbuilds/linux-next-llvm/bcachefs-unused-variable-wb_flush_one.patch b/pkgbuilds/linux-next-llvm/bcachefs-unused-variable-wb_flush_one.patch
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 Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0git (https://github.com/llvm/llvm-project b6f922fbf5e983122271aa12acb33f6172046d4d)"
+CONFIG_CC_VERSION_TEXT="ClangBuiltLinux clang version 18.0.0git (https://github.com/llvm/llvm-project 430a40d12eaa5a61792c4670955c110146902afb)"
 CONFIG_GCC_VERSION=0
 CONFIG_CC_IS_CLANG=y
 CONFIG_CLANG_VERSION=180000