aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
-rw-r--r--config13
3 files changed, 9 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1baed676feca..d08b3ada0a95 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-vfio
pkgdesc = Linux
- pkgver = 5.10.3.arch1
+ pkgver = 5.10.4.arch2
pkgrel = 1
- url = https://git.archlinux.org/linux.git/log/?h=v5.10.3-arch1
+ url = https://git.archlinux.org/linux.git/log/?h=v5.10.4-arch2
arch = x86_64
license = GPL2
makedepends = bc
@@ -20,7 +20,7 @@ pkgbase = linux-vfio
makedepends = imagemagick
makedepends = git
options = !strip
- source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.10.3-arch1
+ source = archlinux-linux::git+https://git.archlinux.org/linux.git?signed#tag=v5.10.4-arch2
source = config
source = add-acs-overrides.patch
source = i915-vga-arbiter.patch
@@ -28,7 +28,7 @@ pkgbase = linux-vfio
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
sha256sums = SKIP
- sha256sums = d8b28f67a0f0bc56e5de858141dee3607fbac48eac41b0e9f7f69685f7475b53
+ sha256sums = 458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a
sha256sums = d3723da5cff1dce0a29bb704264dacccab559373a00fbbe97b12745dcf144b3d
sha256sums = 167dbad8da63a70df243273b8a246357215f832406063d2637d87a1ae2b6f1bb
diff --git a/PKGBUILD b/PKGBUILD
index b7190f4c7f99..06ca171bbe60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
# Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-vfio
-pkgver=5.10.3.arch1
+pkgver=5.10.4.arch2
pkgrel=1
pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -30,7 +30,7 @@ validpgpkeys=(
'A2FF3A36AAA56654109064AB19802F8B0D70FC30' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- 'd8b28f67a0f0bc56e5de858141dee3607fbac48eac41b0e9f7f69685f7475b53'
+ '458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
'd3723da5cff1dce0a29bb704264dacccab559373a00fbbe97b12745dcf144b3d'
'167dbad8da63a70df243273b8a246357215f832406063d2637d87a1ae2b6f1bb')
diff --git a/config b/config
index a356f66e9f11..70c17a550e44 100644
--- a/config
+++ b/config
@@ -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
@@ -2288,7 +2288,7 @@ CONFIG_MTD_CFI_I2=y
# CONFIG_MTD_MCHP23K256 is not set
# CONFIG_MTD_SST25L is not set
# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
+CONFIG_MTD_PHRAM=m
# CONFIG_MTD_MTDRAM is not set
CONFIG_MTD_BLOCK2MTD=m
@@ -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