Update to 5.10.4.pf2-1

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

3 files changed, 44 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ae5f47ff114..d0db1f63b675 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Tue Dec 22 04:41:35 UTC 2020
+# Thu Dec 31 02:21:02 UTC 2020
 pkgbase = linux-pf
 	pkgdesc = Linux with the pf-kernel patch (uksm, BMQ, ZSTD, FSGSBASE and more)
-	pkgver = 5.10.2.pf2
+	pkgver = 5.10.4.pf4
 	pkgrel = 1
 	url = https://gitlab.com/post-factum/pf-kernel/wikis/README
 	arch = i686
@@ -24,22 +24,20 @@ pkgbase = linux-pf
 	source = config.i686
 	source = pf_defconfig
 	source = linux.preset
-	source = https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf2.diff
-	source = https://gitlab.com/alfredchen/projectc/raw/master/5.10/prjc_v5.10-r0.patch
+	source = https://github.com/pfactum/pf-kernel/compare/v5.10...v5.10-pf4.diff
+	source = https://gitlab.com/alfredchen/projectc/raw/master/5.10/prjc_v5.10-r1.patch
 	source = 90-linux.hook
 	source = 60-linux.hook
-	source = fix_project_c.patch
 	source = 262e6ae7081df304fc625cf368d5c2cbba2bb991.patch
 	sha256sums = dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43
 	sha256sums = d8b28f67a0f0bc56e5de858141dee3607fbac48eac41b0e9f7f69685f7475b53
 	sha256sums = 19c6e90cfacacc1ab9eba8ff785c62d647b43316f565e8d7f2bf61024cda9237
 	sha256sums = b6aeb6c460f08443ecce4006d8da83c5f01a224ad2123998ae351b5357286bcd
 	sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864
-	sha256sums = 0644b56e863380e8deede43007cf8aa570c7ec1e22954833374a14a632d2add6
-	sha256sums = c170927afc35fab46856ae71cbc85cc5d46909846a001b10e997297c3938da2e
+	sha256sums = 34ffc6c43571590d7d299ada1a3b1d03ec37a4a3a6171ada0d7c494a71897454
+	sha256sums = 3db1c9aaae36336fdca8fe80fe87ed95732e63f1f445735f1f7f1c0d77240476
 	sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
 	sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
-	sha256sums = eadb99b082715cfb2f1a65a505678378c1c32a14d1fe409fd669ae49ae917407
 	sha256sums = 7908288d8549489d8ac1f7e523cb986c41c8306dbe4946cca890c6fc7c2d260b
 
 pkgname = linux-pf
@@ -57,7 +55,7 @@ pkgname = linux-pf
 	provides = linux-tomoyo
 	provides = VIRTUALBOX-GUEST-MODULES
 	provides = WIREGUARD-MODULE
-	provides = linux-pf=5.10.2.pf2
+	provides = linux-pf=5.10.4.pf4
 	conflicts = linux-pf
 	replaces = kernel26-pf
 
@@ -67,7 +65,7 @@ pkgname = linux-pf-headers
 pkgname = linux-pf-preset-default
 	pkgdesc = Linux-pf default preset
 	install = linux.install
-	depends = linux-pf=5.10.2.pf2
-	provides = linux-pf-preset=5.10.2.pf2
+	depends = linux-pf=5.10.4.pf4
+	provides = linux-pf-preset=5.10.4.pf4
 	backup = etc/mkinitcpio.d/linux-pf.preset
 
diff --git a/PKGBUILD b/PKGBUILD
index 22dc0ff6c8ef..2802bc4ee157 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Some lines from  kernel26-bfs and kernel26-ck
 # Credits to respective maintainers
 
-## 
+##
 ### PATCH AND BUILD OPTIONS
 #
 # taken from graysky linux-ck see: https://aur.archlinux.org/packages/linux-ck
@@ -22,7 +22,7 @@ _BATCH_MODE=n # enable batch mode
 #
 # http://en.gentoo-wiki.com/wiki/Safe_Cflags/Intel
 # http://en.gentoo-wiki.com/wiki/Safe_Cflags/AMD
-# http://www.linuxforge.net/docs/linux/linux-gcc.php 
+# http://www.linuxforge.net/docs/linux/linux-gcc.php
 # http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html
 
 # DETAILS FOR using 'make localmodconfig'
@@ -32,7 +32,7 @@ _BATCH_MODE=n # enable batch mode
 # WARNING - make CERTAIN that all modules are modprobed BEFORE you begin making the pkg!
 #
 # To keep track of which modules are needed for your specific system/hardware, give my module_db script
-# a try: http://aur.archlinux.org/packages.php?ID=41689  Note that if you use my script, this PKGBUILD 
+# a try: http://aur.archlinux.org/packages.php?ID=41689  Note that if you use my script, this PKGBUILD
 # will auto run the 'sudo modprobed_db reload' for you to probe all the modules you have logged!
 #
 # More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed_db
@@ -62,12 +62,12 @@ _minor=10
 _basekernel=${_major}.${_minor}
 _srcname=linux-${_basekernel}
 pkgbase=linux-pf
-_unpatched_sublevel=2
-_pfrel=2
+_unpatched_sublevel=4
+_pfrel=4
 _kernelname=pf
 _pfpatchhome="https://github.com/pfactum/pf-kernel/compare"
 _pfpatchname="v$_major.$_minor...v$_major.$_minor-pf$_pfrel.diff"
-_projectcpatchname=prjc_v5.10-r0.patch
+_projectcpatchname=prjc_v5.10-r1.patch
 _CPUSUFFIXES_KBUILD=(
   CORE2 K7 K8 K10 BARCELONA BOBCAT BULLDOZER PILEDRIVER STEAMROLLER MEXCAVATOR ZEN ZEN2 MPSC
   ATOM PENTIUMII PENTIUMIII PENTIUMM PENTIUM4 NEHALEM SANDYBRIDGE
@@ -92,10 +92,9 @@ source=("https://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekerne
         "https://gitlab.com/alfredchen/projectc/raw/master/$_major.$_minor/$_projectcpatchname"
         "90-linux.hook"
         "60-linux.hook"
-        "fix_project_c.patch"
         '262e6ae7081df304fc625cf368d5c2cbba2bb991.patch'
        )
-# 	'cx23885_move_CI_AC_registration_to_a_separate_function.patch'     
+# 	'cx23885_move_CI_AC_registration_to_a_separate_function.patch'
 
 
 
@@ -107,8 +106,7 @@ prepare() {
 
 
   patch -Np1 -R < ${srcdir}/262e6ae7081df304fc625cf368d5c2cbba2bb991.patch
-  patch -Np1 < ${srcdir}/fix_project_c.patch
-  
+
   if [ "$CARCH" = "x86_64" ]; then
 	  cat "${startdir}/config.x86_64" >| .config
   else
@@ -120,7 +118,7 @@ prepare() {
 
   _arch=$CARCH
 
-  
+
   # disable NUMA since 99.9% of users do not have multiple CPUs but do have multiple cores in one CPU
   # see, https://bugs.archlinux.org/task/31187
   if [ -n "$_NUMA_off" ] && [ "${CARCH}" = "x86_64" ]; then
@@ -163,7 +161,7 @@ build() {
           -i "$srcdir/linux-${_basekernel}/.config"
       export _PKGOPT=y
     fi
-    
+
     _BATCH_MODE=y
   fi
 
@@ -214,12 +212,12 @@ build() {
     else
       msg "Using stock ARCH kernel .config (with BFS and BFQ)."
     fi
-    
+
     # Make some good use of MAKEFLAGS
     # MAKEFLAGS=`grep -v '#' /etc/makepkg.conf | grep MAKEFLAGS= | sed s/MAKEFLAGS=// | sed s/\"//g`
-    
+
     # make prepare
-    
+
     # Options for additional configuration
     echo
     msg "Kernel configuration options before build:"
@@ -256,7 +254,7 @@ build() {
     CPU=$(sed -e "s/CONFIG_GENERIC_CPU=y/GENERIC/" <<<$CPU)
     CPU=$(sed -e "s/^686$/GENERIC/" <<<$CPU)
     cp -f .config ${startdir}/config.$CPU-$CARCH
-    
+
     # Give option to rename package according to CPU
     echo
     if [[ "$CPU" != "GENERIC" ]]; then
@@ -280,7 +278,7 @@ build() {
 	      export _PKGOPT=y
       fi
     fi
-    
+
   fi  # batch check ends here
 
   # only export non-generic
@@ -288,7 +286,7 @@ build() {
     export CPU
     export LCPU
   fi
-  
+
   # rewrite configuration
   make olddefconfig
 
@@ -320,7 +318,7 @@ _package() {
         pkgdesc="${pkgdesc} AMD K7 optimized."
         ;;
       K8)
-        pkgname="${pkgbase}-k8" 
+        pkgname="${pkgbase}-k8"
         pkgdesc="${pkgdesc} AMD K8 optimized."
 	      ;;
       K10)
@@ -431,14 +429,14 @@ _package() {
         # Workaround against mksrcinfo getting the $pkdesc wrong
         pkgname="${pkgbase}"
         pkgdesc="${pkgdesc}"
-          ::
+        ::
     esac
 
 
     if [[ "$pkgname" != "$pkgbase" ]]; then
       # If optimized build, conflict with generi
       conflicts=('linux-pf')
-      provides+=(${pkgbase}=$pkgver) 
+      provides+=(${pkgbase}=$pkgver)
     fi
   fi
 
@@ -488,7 +486,7 @@ _package-headers() {
   pkgname=${pkgbase}-headers
   pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
 
-  
+
   cd "${srcdir}/${_srcname}"
   local _builddir="${pkgdir}/usr/lib/modules/$(<version)/build"
 
@@ -500,14 +498,14 @@ _package-headers() {
 
 
   msg2 "Installing build files..."
-  install -dm755 "${_builddir}" 
+  install -dm755 "${_builddir}"
   install -Dt "${_builddir}" -m644 Makefile .config Module.symvers System.map version \
           vmlinux localversion.*
   install -Dt "${_builddir}/kernel" -m644 kernel/Makefile
 
-  
+
   install -D -m644 arch/${KARCH}/Makefile -t "${_builddir}/arch/${KARCH}/"
-  
+
   if [ "${CARCH}" = "i686" ]; then
     install -Dm644 arch/${KARCH}/Makefile_32.cpu -t "${_builddir}/arch/${KARCH}/"
   fi
@@ -515,7 +513,7 @@ _package-headers() {
   # copy files necessary for later builds, like nvidia and vmware
   cp -a scripts "${_builddir}"
 
- 
+
   msg2 "Installing headers..."
   cp -t "$_builddir" -a include
   # copy arch includes for external modules
@@ -529,15 +527,15 @@ _package-headers() {
 
   install -Dt "${_builddir}/drivers/md" -m644 drivers/md/*.h
   install -Dt "${_builddir}/net/mac80211" -m644 net/mac80211/*.h
-  
+
   # http://bugs.archlinux.org/task/13146
   install -Dt "${_builddir}/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
-  
+
   # http://bugs.archlinux.org/task/20402
   install -Dt "${_builddir}/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
   install -Dt "${_builddir}/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
   install -Dt "${_builddir}/drivers/media/tuners" -m644 drivers/media/tuners/*.h
-  
+
   # and...
   # http://bugs.archlinux.org/task/11194
   ###
@@ -546,9 +544,9 @@ _package-headers() {
   ### LINE THAT CAUSES MAKEPKG TO END IN AN ERROR
   ###
   if [ -d include/config/dvb/ ]; then
-    install -Dm644 -t "${_builddir}/include/config/dvb/" include/config/dvb/*.h 
+    install -Dm644 -t "${_builddir}/include/config/dvb/" include/config/dvb/*.h
   fi
-  
+
   # add xfs and shmem for aufs building
   mkdir -p "${_builddir}/"{fs/xfs,mm}
 
@@ -620,13 +618,13 @@ _package-preset-default()
   # install mkinitcpio preset file
   #sed "${_subst}" ../linux-pf.preset |
   #  install -Dm644 /dev/stdin "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
-  
+
   # install pacman hooks
   sed "${_subst}" "${srcdir}"/60-linux.hook |
     install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/60-${pkgbase}.hook"
   sed "${_subst}" "${srcdir}"/90-linux.hook |
     install -Dm644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/90-${pkgbase}.hook"
-  
+
   # set correct depmod command for install
   #sed \
     #  -e  "s/KERNEL_NAME=.*/KERNEL_NAME=${_kernelname}/" \
@@ -665,10 +663,9 @@ sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
             '19c6e90cfacacc1ab9eba8ff785c62d647b43316f565e8d7f2bf61024cda9237'
             'b6aeb6c460f08443ecce4006d8da83c5f01a224ad2123998ae351b5357286bcd'
             '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864'
-            '0644b56e863380e8deede43007cf8aa570c7ec1e22954833374a14a632d2add6'
-            'c170927afc35fab46856ae71cbc85cc5d46909846a001b10e997297c3938da2e'
+            '34ffc6c43571590d7d299ada1a3b1d03ec37a4a3a6171ada0d7c494a71897454'
+            '3db1c9aaae36336fdca8fe80fe87ed95732e63f1f445735f1f7f1c0d77240476'
             '75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919'
             'ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21'
-            'eadb99b082715cfb2f1a65a505678378c1c32a14d1fe409fd669ae49ae917407'
             '7908288d8549489d8ac1f7e523cb986c41c8306dbe4946cca890c6fc7c2d260b')
 # vim:set ts=2 sw=2 tw=0 et:
diff --git a/config.x86_64 b/config.x86_64
index a356f66e9f11..d58bbcc8a9c6 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.10.2-arch1 Kernel Configuration
+# Linux/x86 5.10.4-arch1 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.0"
 CONFIG_CC_IS_GCC=y
@@ -4501,7 +4501,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CDEV=y
 CONFIG_GPIO_CDEV_V1=y
 CONFIG_GPIO_GENERIC=m
-CONFIG_GPIO_REGMAP=m
 CONFIG_GPIO_MAX730X=m
 
 #
@@ -4562,7 +4561,6 @@ CONFIG_GPIO_MADERA=m
 CONFIG_GPIO_MSIC=y
 CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_RC5T583=y
-CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_TPS65086=m
 CONFIG_GPIO_TPS6586X=y
 CONFIG_GPIO_TPS65910=y
@@ -4865,7 +4863,6 @@ CONFIG_SENSORS_UCD9000=m
 CONFIG_SENSORS_UCD9200=m
 CONFIG_SENSORS_XDPE122=m
 CONFIG_SENSORS_ZL6100=m
-CONFIG_SENSORS_SL28CPLD=m
 CONFIG_SENSORS_SHT15=m
 CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHT3x=m
@@ -4998,7 +4995,6 @@ CONFIG_XILINX_WATCHDOG=m
 CONFIG_ZIIRAVE_WATCHDOG=m
 CONFIG_RAVE_SP_WATCHDOG=m
 CONFIG_MLX_WDT=m
-CONFIG_SL28CPLD_WATCHDOG=m
 CONFIG_CADENCE_WATCHDOG=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_TWL4030_WATCHDOG=m
@@ -5156,8 +5152,6 @@ CONFIG_MFD_RT5033=m
 CONFIG_MFD_RC5T583=y
 CONFIG_MFD_SEC_CORE=y
 CONFIG_MFD_SI476X_CORE=m
-CONFIG_MFD_SIMPLE_MFD_I2C=m
-CONFIG_MFD_SL28CPLD=m
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_MFD_SKY81452=m
@@ -8788,7 +8782,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 CONFIG_PWM_PCA9685=m
-CONFIG_PWM_SL28CPLD=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
 
@@ -9336,7 +9329,7 @@ CONFIG_TRUSTED_KEYS=m
 CONFIG_ENCRYPTED_KEYS=m
 CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
-# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y