Merge remote-tracking branch 'upstream/master'
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
Shaquille Soekhlal 2022-04-25 17:45:58 +02:00
commit c09bed986a
3 changed files with 11 additions and 11 deletions

View File

@ -1,8 +1,8 @@
pkgbase = linux-vfio pkgbase = linux-vfio
pkgdesc = Linux pkgdesc = Linux
pkgver = 5.17.1.arch1 pkgver = 5.17.4.arch1
pkgrel = 1 pkgrel = 1
url = https://github.com/archlinux/linux/commits/v5.17.1-arch1 url = https://github.com/archlinux/linux/commits/v5.17.4-arch1
arch = x86_64 arch = x86_64
license = GPL2 license = GPL2
makedepends = bc makedepends = bc
@ -20,7 +20,7 @@ pkgbase = linux-vfio
makedepends = imagemagick makedepends = imagemagick
makedepends = git makedepends = git
options = !strip options = !strip
source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.17.1-arch1 source = archlinux-linux::git+https://github.com/archlinux/linux?signed#tag=v5.17.4-arch1
source = config source = config
source = add-acs-overrides.patch source = add-acs-overrides.patch
source = i915-vga-arbiter.patch source = i915-vga-arbiter.patch
@ -29,7 +29,7 @@ pkgbase = linux-vfio
validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30 validpgpkeys = A2FF3A36AAA56654109064AB19802F8B0D70FC30
validpgpkeys = C7E7849466FE2358343588377258734B41C31549 validpgpkeys = C7E7849466FE2358343588377258734B41C31549
sha256sums = SKIP sha256sums = SKIP
sha256sums = bd1e57c15d4eb62024d2ee935b54d36e74e73b22c3800b45ecf9233521a9f74b sha256sums = 3f02a0f2fe820f678d15fb0efce04e3716bdc7590d452317bf1b0b63f3b31cd2
sha256sums = b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77 sha256sums = b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77
sha256sums = d502ffaea89becded796ba79b7ff5aded8e5f86a479161c89214848871e49ed1 sha256sums = d502ffaea89becded796ba79b7ff5aded8e5f86a479161c89214848871e49ed1

View File

@ -4,7 +4,7 @@
# Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org> # Upstream: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
pkgbase=linux-vfio pkgbase=linux-vfio
pkgver=5.17.1.arch1 pkgver=5.17.4.arch1
pkgrel=1 pkgrel=1
pkgdesc='Linux' pkgdesc='Linux'
_srctag=v${pkgver%.*}-${pkgver##*.} _srctag=v${pkgver%.*}-${pkgver##*.}
@ -31,7 +31,7 @@ validpgpkeys=(
'C7E7849466FE2358343588377258734B41C31549' # David Runge <dvzrv@archlinux.org> 'C7E7849466FE2358343588377258734B41C31549' # David Runge <dvzrv@archlinux.org>
) )
sha256sums=('SKIP' sha256sums=('SKIP'
'bd1e57c15d4eb62024d2ee935b54d36e74e73b22c3800b45ecf9233521a9f74b' '3f02a0f2fe820f678d15fb0efce04e3716bdc7590d452317bf1b0b63f3b31cd2'
'b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77' 'b90be7b79652be61f7d50691000f6a8c75a240dc2eee2667b68d984f67583f77'
'd502ffaea89becded796ba79b7ff5aded8e5f86a479161c89214848871e49ed1') 'd502ffaea89becded796ba79b7ff5aded8e5f86a479161c89214848871e49ed1')

10
config
View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/x86 5.17.0-arch1 Kernel Configuration # Linux/x86 5.17.4-arch1 Kernel Configuration
# #
CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0"
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
@ -2526,8 +2526,8 @@ CONFIG_BLK_DEV_RNBD_SERVER=m
# #
# NVME Support # NVME Support
# #
CONFIG_NVME_CORE=y CONFIG_NVME_CORE=m
CONFIG_BLK_DEV_NVME=y CONFIG_BLK_DEV_NVME=m
CONFIG_NVME_MULTIPATH=y CONFIG_NVME_MULTIPATH=y
CONFIG_NVME_HWMON=y CONFIG_NVME_HWMON=y
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
@ -3073,7 +3073,7 @@ CONFIG_NET_DSA_XRS700X=m
CONFIG_NET_DSA_XRS700X_I2C=m CONFIG_NET_DSA_XRS700X_I2C=m
CONFIG_NET_DSA_XRS700X_MDIO=m CONFIG_NET_DSA_XRS700X_MDIO=m
CONFIG_NET_DSA_QCA8K=m CONFIG_NET_DSA_QCA8K=m
CONFIG_NET_DSA_REALTEK_SMI=m CONFIG_NET_DSA_REALTEK=m
CONFIG_NET_DSA_SMSC_LAN9303=m CONFIG_NET_DSA_SMSC_LAN9303=m
CONFIG_NET_DSA_SMSC_LAN9303_I2C=m CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
@ -6582,7 +6582,7 @@ CONFIG_DUMMY_CONSOLE_ROWS=25
CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
# end of Console display driver support # end of Console display driver support