summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorShayne Hartford (ShayBox)2020-05-05 23:38:53 -0400
committerShayne Hartford (ShayBox)2020-05-05 23:38:53 -0400
commit310bc1977fb754041821b74ef9b86689e233145c (patch)
tree5dfa3833de3987d0d249a7473b70c1ab518e6495
parent7abacf994b4e7f1b98e1cc1b6160b6735c51f003 (diff)
downloadaur-310bc1977fb754041821b74ef9b86689e233145c.tar.gz
5.6.10
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--add-acs-overrides.patch12
-rw-r--r--config6
4 files changed, 17 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4c71e2cd392..82941132b0c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = linux-zen-vfio
pkgdesc = Linux ZEN
- pkgver = 5.6.3.zen1
+ pkgver = 5.6.10.zen1
pkgrel = 1
- url = https://github.com/zen-kernel/zen-kernel/commits/v5.6.3-zen1
+ url = https://github.com/zen-kernel/zen-kernel/commits/v5.6.10-zen1
arch = x86_64
license = GPL2
makedepends = bc
@@ -15,7 +15,7 @@ pkgbase = linux-zen-vfio
makedepends = imagemagick
makedepends = git
options = !strip
- source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.6.3-zen1
+ source = zen-kernel::git+https://github.com/zen-kernel/zen-kernel?signed#tag=v5.6.10-zen1
source = config
source = add-acs-overrides.patch
source = i915-vga-arbiter.patch
@@ -24,8 +24,8 @@ pkgbase = linux-zen-vfio
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
validpgpkeys = 8218F88849AAC522E94CF470A5E9288C4FA415FA
sha256sums = SKIP
- sha256sums = 1ec82ca781239be0657384dbd2cce6c75910508639720adec8f05e9909b7d49b
- sha256sums = 4938b7121862e54c614668d1f662fcdd37e0c4f11cf386a425f9d4c3849d00ef
+ sha256sums = 01db2a42315527698b76edee1a836af56b805e18c363086aa7cc57db377ad553
+ sha256sums = 1f11475db0778b7c4a4d6b07c86c2421ea01a653d6ee18d564204903d1ec0a8b
sha256sums = 094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf
sha256sums = 8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c
diff --git a/PKGBUILD b/PKGBUILD
index 1d5303ce361..bc08cf0c87c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Shayne Hartford<shayneehartford@gmail.com>
pkgbase=linux-zen-vfio
-pkgver=5.6.3.zen1
+pkgver=5.6.10.zen1
pkgrel=1
pkgdesc='Linux ZEN'
_srctag=v${pkgver%.*}-${pkgver##*.}
@@ -28,8 +28,8 @@ validpgpkeys=(
'8218F88849AAC522E94CF470A5E9288C4FA415FA' # Jan Alexander Steffens (heftig)
)
sha256sums=('SKIP'
- '1ec82ca781239be0657384dbd2cce6c75910508639720adec8f05e9909b7d49b'
- '4938b7121862e54c614668d1f662fcdd37e0c4f11cf386a425f9d4c3849d00ef'
+ '01db2a42315527698b76edee1a836af56b805e18c363086aa7cc57db377ad553'
+ '1f11475db0778b7c4a4d6b07c86c2421ea01a653d6ee18d564204903d1ec0a8b'
'094a29902b52cec2f0840219225a1458ca925f875524ecb7827da62a33c74ccf'
'8cb21e0b3411327b627a9dd15b8eb773295a0d2782b1a41b2a8839d1b2f5778c')
diff --git a/add-acs-overrides.patch b/add-acs-overrides.patch
index bb4a63e9c5f..ce4efd0f19b 100644
--- a/add-acs-overrides.patch
+++ b/add-acs-overrides.patch
@@ -179,14 +179,14 @@ index fbeb9f73ef28..3bf409c65609 100644
/*
* Decoding should be disabled for a PCI device during BAR sizing to avoid
* conflict. But doing so may cause problems on host bridge and perhaps other
-@@ -4701,6 +4801,8 @@ static const struct pci_dev_acs_enabled {
- { PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs },
- /* Amazon Annapurna Labs */
- { PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs },
+@@ -4796,6 +4896,8 @@ static const struct pci_dev_acs_enabled {
+ { PCI_VENDOR_ID_ZHAOXIN, 0x9083, pci_quirk_mf_endpoint_acs },
+ /* Zhaoxin Root/Downstream Ports */
+ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs },
+ /* allow acs for any */
+ { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides },
{ 0 }
};
-
+
--
-5.5.6
+5.6.10
diff --git a/config b/config
index 7035b9737ed..593509fc89e 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.6.3-zen1 Kernel Configuration
+# Linux/x86 5.6.8-zen1 Kernel Configuration
#
#
@@ -4468,7 +4468,7 @@ CONFIG_I2C_CROS_EC_TUNNEL=m
CONFIG_I2C_FSI=m
# end of I2C Hardware Bus support
-# CONFIG_I2C_STUB is not set
+CONFIG_I2C_STUB=m
CONFIG_I2C_SLAVE=y
CONFIG_I2C_SLAVE_EEPROM=m
# CONFIG_I2C_DEBUG_CORE is not set
@@ -9880,7 +9880,7 @@ CONFIG_NFS_FSCACHE=y
# CONFIG_NFS_USE_LEGACY_DNS is not set
CONFIG_NFS_USE_KERNEL_DNS=y
CONFIG_NFS_DEBUG=y
-CONFIG_NFS_DISABLE_UDP_SUPPORT=y
+# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set
CONFIG_NFSD=m
CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y