Released 5.15.12.arch1

5 files changed, 22 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e4bbf7002a97..5a990ef890b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = linux-bnx2x-2.5g
 	pkgdesc = Linux
-	pkgver = 5.15.8.arch1
+	pkgver = 5.15.12.arch1
 	pkgrel = 1
-	url = https://github.com/archlinux/linux/commits/v5.15.8-arch1
+	url = https://github.com/archlinux/linux/commits/v5.15.12-arch1
 	arch = x86_64
 	license = GPL2
 	makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-bnx2x-2.5g
 	makedepends = xz
 	makedepends = git
 	options = !strip
-	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.15.8-arch1
+	source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.15.12-arch1
 	source = bnx2x_warpcore+8727_2_5g_sgmii_arch.patch
 	source = config
 	validpgpkeys = ABAF11C65A2970B130ABE3C479BE3E4300411886
@@ -24,7 +24,7 @@ pkgbase = linux-bnx2x-2.5g
 	validpgpkeys = C7E7849466FE2358343588377258734B41C31549
 	sha256sums = SKIP
 	sha256sums = d655669179109ae8e801a259c35dbe442ca67a49b9ceb6ca3ef0e56f48149a7d
-	sha256sums = 324a9d46c2338806a0c3ce0880c8d5e85c2ef30d342af3dc96f87b54fae7a586
+	sha256sums = 6ab7a66895804f832f1b9594b682be0e2e6982455a8fc3f7e87111e1c7dff866
 
 pkgname = linux-bnx2x-2.5g
 	pkgdesc = The Linux kernel and modules
diff --git a/.gitignore b/.gitignore
index 716fac3c4a96..d15729489d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 arch-package
 archlinux-linux
 repo
+build.log
diff --git a/PKGBUILD b/PKGBUILD
index f9625a0f2d9c..012d38d67819 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
 
 pkgbase=linux-bnx2x-2.5g
-pkgver=5.15.8.arch1
+pkgver=5.15.12.arch1
 pkgrel=1
 pkgdesc='Linux'
 _srctag=v${pkgver%.*}-${pkgver##*.}
@@ -27,7 +27,7 @@ validpgpkeys=(
 )
 sha256sums=('SKIP'
             'd655669179109ae8e801a259c35dbe442ca67a49b9ceb6ca3ef0e56f48149a7d'
-            '324a9d46c2338806a0c3ce0880c8d5e85c2ef30d342af3dc96f87b54fae7a586')
+            '6ab7a66895804f832f1b9594b682be0e2e6982455a8fc3f7e87111e1c7dff866')
 
 export KBUILD_BUILD_HOST=archlinux
 export KBUILD_BUILD_USER=$pkgbase
diff --git a/config b/config
index df045a39eb33..9681fe0fd538 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.5-arch1 Kernel Configuration
+# Linux/x86 5.15.12-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -2337,7 +2337,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_MTD_OOPS is not set
 CONFIG_MTD_PSTORE=m
 # CONFIG_MTD_SWAP is not set
-# CONFIG_MTD_PARTITIONED_MASTER is not set
+CONFIG_MTD_PARTITIONED_MASTER=y
 
 #
 # RAM/ROM/Flash chip drivers
@@ -2349,7 +2349,7 @@ CONFIG_MTD_MAP_BANK_WIDTH_2=y
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
-CONFIG_MTD_RAM=m
+# CONFIG_MTD_RAM is not set
 CONFIG_MTD_ROM=m
 # CONFIG_MTD_ABSENT is not set
 # end of RAM/ROM/Flash chip drivers
@@ -2360,7 +2360,7 @@ CONFIG_MTD_ROM=m
 # CONFIG_MTD_COMPLEX_MAPPINGS is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
+# CONFIG_MTD_PLATRAM is not set
 # end of Mapping drivers for chip access
 
 #
@@ -2373,7 +2373,9 @@ CONFIG_MTD_PLATRAM=m
 # CONFIG_MTD_SST25L is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
 CONFIG_MTD_BLOCK2MTD=m
 
 #
@@ -8392,7 +8394,6 @@ CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
 CONFIG_THINKPAD_ACPI_VIDEO=y
 CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
 CONFIG_THINKPAD_LMI=m
-CONFIG_X86_PLATFORM_DRIVERS_INTEL=y
 CONFIG_INTEL_ATOMISP2_PDX86=y
 CONFIG_INTEL_ATOMISP2_LED=m
 CONFIG_INTEL_SAR_INT1092=m
diff --git a/update.sh b/update.sh
index 8e4ca785150c..96338a302e09 100755
--- a/update.sh
+++ b/update.sh
@@ -12,7 +12,9 @@ git checkout -q packages/linux
 git pull -q
 c_ver=`grep ^pkgver= repos/core-x86_64/PKGBUILD | cut -d= -f2`
 
-if [[ $c_ver < $l_ver || $c_ver == $l_ver ]] ; then
+n_ver=`echo -e "$c_ver\n$l_ver" | sort -rV | head -n 1`
+
+if [ $n_ver = $l_ver ] ; then
     exit
 fi
 
@@ -30,7 +32,11 @@ sed -i -e '/^_package-docs() {/,/^}/d' PKGBUILD
 sed -i -e '/^pkgname=/s/ "$pkgbase-docs"//' PKGBUILD
 
 echo "Building package"
-time (makepkg --skippgpcheck -CcL >/dev/null)
+if [ "$1" = "--cron" ] ; then
+    time (makepkg --skippgpcheck -CcLm > $s_dir/build.log)
+else
+    time (makepkg --skippgpcheck -CcLm | tee $s_dir/build.log)
+fi
 
 for p in *.pkg.tar.zst; do
     mv $p repo