Update to 5.15.4.pf2

- New upstream release based on 5.15.4
- Update kernel configs from arch and arch32
- Updated projectc patch-set

4 files changed, 31 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b85695d1bccc..27f9738cfcae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Nov 17 19:17:32 UTC 2021
+# Thu Nov 25 23:59:25 UTC 2021
 pkgbase = linux-pf
 	pkgdesc = Linux with the pf-kernel patch (uksm, BMQ, ZSTD, FSGSBASE and more)
-	pkgver = 5.15.0.pf1
+	pkgver = 5.15.4.pf2
 	pkgrel = 1
 	url = https://gitlab.com/post-factum/pf-kernel/wikis/README
 	arch = i686
@@ -24,8 +24,8 @@ pkgbase = linux-pf
 	source = config.i686
 	source = pf_defconfig
 	source = linux.preset
-	source = https://github.com/pfactum/pf-kernel/compare/v5.15...v5.15-pf1.diff
-	source = https://gitlab.com/alfredchen/projectc/raw/master/5.15/prjc_v5.15-r0.patch
+	source = https://github.com/pfactum/pf-kernel/compare/v5.15...v5.15-pf2.diff
+	source = https://gitlab.com/alfredchen/projectc/raw/master/5.15/prjc_v5.15-r1.patch
 	source = 90-linux.hook
 	source = 60-linux.hook
 	sha256sums = 57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8
@@ -33,8 +33,8 @@ pkgbase = linux-pf
 	sha256sums = 8c8065b992aca95154ebcd6e0ddda31ddf0c1979240c016cec34976888a342fa
 	sha256sums = 8723eb2d5e3473db978bfa7e8d94c80efeac61d71e7fad2f1214ad55671a33a2
 	sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
-	sha256sums = ab7dfc75abc1efdcf321614d5ebb41faa0382910c7e4750fad524ab87f864f02
-	sha256sums = decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c
+	sha256sums = 9281cae0b5f3864c56bc2b668b1fe0021926cf88ef22289638584af6870f9cec
+	sha256sums = 768239d739180c0199545b5c5cf2d78de6261aec769008e6a2b7e97c7477b756
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
 
@@ -56,7 +56,7 @@ pkgname = linux-pf
 	provides = NTFS3-MODULE
 	provides = UKSMD-BUILTIN
 	provides = V4L2LOOPBACK-MODULE
-	provides = linux-pf=5.15.0.pf1
+	provides = linux-pf=5.15.4.pf2
 	conflicts = linux-pf
 	replaces = kernel26-pf
 
@@ -67,7 +67,7 @@ pkgname = linux-pf-headers
 pkgname = linux-pf-preset-default
 	pkgdesc = Linux-pf default preset
 	install = linux.install
-	depends = linux-pf=5.15.0.pf1
-	provides = linux-pf-preset=5.15.0.pf1
+	depends = linux-pf=5.15.4.pf2
+	provides = linux-pf-preset=5.15.4.pf2
 	backup = etc/mkinitcpio.d/linux-pf.preset
 
diff --git a/PKGBUILD b/PKGBUILD
index 8a7881c98881..18bccbc18771 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -62,12 +62,12 @@ _minor=15
 _basekernel=${_major}.${_minor}
 _srcname=linux-${_basekernel}
 pkgbase=linux-pf
-_unpatched_sublevel=0
-_pfrel=1
+_unpatched_sublevel=4
+_pfrel=2
 _kernelname=pf
 _pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
 _pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
-_projectcpatchname=prjc_v5.15-r0.patch
+_projectcpatchname=prjc_v5.15-r1.patch
 _CPUSUFFIXES_KBUILD=(
   CORE2 K7 K8 K10 BARCELONA BOBCAT BULLDOZER PILEDRIVER STEAMROLLER MEXCAVATOR ZEN ZEN2 MPSC
   ATOM PENTIUMII PENTIUMIII PENTIUMM PENTIUM4 NEHALEM SANDYBRIDGE
@@ -662,12 +662,12 @@ eval "package_linux-pf${LCPU+-$LCPU}() {
 
 
 sha256sums=('57b2cf6991910e3b67a1b3490022e8a0674b6965c74c12da1e99d138d1991ee8'
-            '0eecdc29b3bde4bccda282c4c04ef114250fedddcf3dbf07a3cc201dce35838f'
-            '8c8065b992aca95154ebcd6e0ddda31ddf0c1979240c016cec34976888a342fa'
+            '324a9d46c2338806a0c3ce0880c8d5e85c2ef30d342af3dc96f87b54fae7a586'
+            'ab1407647e26dee1e9d631ea51c0dc0dfc5ee170fa02492ac5075d6518fe780f'
             '8723eb2d5e3473db978bfa7e8d94c80efeac61d71e7fad2f1214ad55671a33a2'
             '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
-            'ab7dfc75abc1efdcf321614d5ebb41faa0382910c7e4750fad524ab87f864f02'
-            'decd4a55c0d47b1eb808733490cdfea1207a2022d46f06d04a3cc60fdcb3f32c'
+            '9281cae0b5f3864c56bc2b668b1fe0021926cf88ef22289638584af6870f9cec'
+            '768239d739180c0199545b5c5cf2d78de6261aec769008e6a2b7e97c7477b756'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21')
 # vim:set ts=2 sw=2 tw=0 et:
diff --git a/config.i686 b/config.i686
index b005a39b07f9..a65535b681a4 100644
--- a/config.i686
+++ b/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.2-arch1 Kernel Configuration
+# Linux/x86 5.15.4-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -10165,7 +10165,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
@@ -10293,11 +10293,11 @@ CONFIG_CRYPTO_ZSTD=y
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m
diff --git a/config.x86_64 b/config.x86_64
index 1fcf3c105437..df045a39eb33 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.15.2-arch1 Kernel Configuration
+# Linux/x86 5.15.5-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0"
 CONFIG_CC_IS_GCC=y
@@ -828,6 +828,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
 CONFIG_ARCH_USE_MEMREMAP_PROT=y
 CONFIG_LOCK_EVENT_COUNTS=y
 CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+CONFIG_ARCH_HAS_CC_PLATFORM=y
 CONFIG_HAVE_STATIC_CALL=y
 CONFIG_HAVE_STATIC_CALL_INLINE=y
 CONFIG_HAVE_PREEMPT_DYNAMIC=y
@@ -2334,6 +2335,7 @@ CONFIG_MTD_BLOCK=m
 # CONFIG_SSFDC is not set
 # CONFIG_SM_FTL is not set
 # CONFIG_MTD_OOPS is not set
+CONFIG_MTD_PSTORE=m
 # CONFIG_MTD_SWAP is not set
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 
@@ -9662,6 +9664,11 @@ CONFIG_PSTORE_COMPRESS_DEFAULT="zstd"
 # CONFIG_PSTORE_PMSG is not set
 # CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
+CONFIG_PSTORE_ZONE=m
+CONFIG_PSTORE_BLK=m
+CONFIG_PSTORE_BLK_BLKDEV=""
+CONFIG_PSTORE_BLK_KMSG_SIZE=64
+CONFIG_PSTORE_BLK_MAX_REASON=2
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
 # CONFIG_UFS_FS_WRITE is not set
@@ -9918,7 +9925,7 @@ CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_RNG_DEFAULT=m
+CONFIG_CRYPTO_RNG_DEFAULT=y
 CONFIG_CRYPTO_AKCIPHER2=y
 CONFIG_CRYPTO_AKCIPHER=y
 CONFIG_CRYPTO_KPP2=y
@@ -10071,11 +10078,11 @@ CONFIG_CRYPTO_ZSTD=y
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_MENU=m
+CONFIG_CRYPTO_DRBG_MENU=y
 CONFIG_CRYPTO_DRBG_HMAC=y
 CONFIG_CRYPTO_DRBG_HASH=y
 CONFIG_CRYPTO_DRBG_CTR=y
-CONFIG_CRYPTO_DRBG=m
+CONFIG_CRYPTO_DRBG=y
 CONFIG_CRYPTO_JITTERENTROPY=y
 CONFIG_CRYPTO_USER_API=m
 CONFIG_CRYPTO_USER_API_HASH=m