forked from AUR/linux-vfio
4.4.2
This commit is contained in:
Dan Ziemba
parent
4e37f9fde2
commit
f22d3b896f
12
.SRCINFO
12
.SRCINFO
@ -1,7 +1,7 @@
|
||||
# Generated by mksrcinfo v8
|
||||
# Tue Feb 2 20:15:53 UTC 2016
|
||||
# Thu Feb 18 18:29:26 UTC 2016
|
||||
pkgbase = linux-vfio
|
||||
pkgver = 4.4.1
|
||||
pkgver = 4.4.2
|
||||
pkgrel = 1
|
||||
url = http://www.kernel.org/
|
||||
arch = i686
|
||||
@ -15,28 +15,26 @@ pkgbase = linux-vfio
|
||||
options = !strip
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.sign
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.1.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.1.sign
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.2.xz
|
||||
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.2.sign
|
||||
source = config
|
||||
source = config.x86_64
|
||||
source = linux.preset
|
||||
source = change-default-console-loglevel.patch
|
||||
source = 0001-sdhci-revert.patch
|
||||
source = tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch
|
||||
source = 0001-4.4-revert-btrfs.patch
|
||||
source = 0001-4.4-revert-xfs.patch
|
||||
source = override_for_missing_acs_capabilities.patch
|
||||
source = i915_317.patch
|
||||
sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
|
||||
sha256sums = SKIP
|
||||
sha256sums = c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48
|
||||
sha256sums = 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c
|
||||
sha256sums = SKIP
|
||||
sha256sums = fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64
|
||||
sha256sums = 756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a
|
||||
sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
|
||||
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
|
||||
sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
|
||||
sha256sums = ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d
|
||||
sha256sums = 51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958
|
||||
sha256sums = ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad
|
||||
sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149
|
||||
|
||||
10
PKGBUILD
10
PKGBUILD
@ -2,7 +2,7 @@
|
||||
|
||||
pkgbase=linux-vfio
|
||||
_srcname=linux-4.4
|
||||
pkgver=4.4.1
|
||||
pkgver=4.4.2
|
||||
pkgrel=1
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.kernel.org/"
|
||||
@ -19,21 +19,19 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
||||
'linux.preset'
|
||||
'change-default-console-loglevel.patch'
|
||||
'0001-sdhci-revert.patch'
|
||||
'tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch'
|
||||
'0001-4.4-revert-btrfs.patch'
|
||||
'0001-4.4-revert-xfs.patch'
|
||||
'override_for_missing_acs_capabilities.patch'
|
||||
'i915_317.patch')
|
||||
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
||||
'SKIP'
|
||||
'c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48'
|
||||
'5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c'
|
||||
'SKIP'
|
||||
'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
|
||||
'756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
|
||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
|
||||
'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d'
|
||||
'51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
|
||||
'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad'
|
||||
'975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
|
||||
@ -59,10 +57,6 @@ prepare() {
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
|
||||
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
|
||||
|
||||
# fixes #47805 kernel panics on platform modules
|
||||
# https://bugzilla.kernel.org/show_bug.cgi?id=110751
|
||||
patch -Np1 -i "${srcdir}/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch"
|
||||
|
||||
# #47757 fix broken suspend from btrfs and xfs
|
||||
patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch"
|
||||
patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch"
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
|
||||
index 1dd6d3b..176b59f 100644
|
||||
--- a/drivers/base/platform.c
|
||||
+++ b/drivers/base/platform.c
|
||||
@@ -513,10 +513,15 @@ static int platform_drv_probe(struct device *_dev)
|
||||
return ret;
|
||||
|
||||
ret = dev_pm_domain_attach(_dev, true);
|
||||
- if (ret != -EPROBE_DEFER && drv->probe) {
|
||||
- ret = drv->probe(dev);
|
||||
- if (ret)
|
||||
- dev_pm_domain_detach(_dev, true);
|
||||
+ if (ret != -EPROBE_DEFER) {
|
||||
+ if (drv->probe) {
|
||||
+ ret = drv->probe(dev);
|
||||
+ if (ret)
|
||||
+ dev_pm_domain_detach(_dev, true);
|
||||
+ } else {
|
||||
+ /* don't fail if just dev_pm_domain_attach failed */
|
||||
+ ret = 0;
|
||||
+ }
|
||||
}
|
||||
|
||||
if (drv->prevent_deferred_probe && ret == -EPROBE_DEFER) {
|
||||
Loading…
Reference in New Issue
Block a user