diff options
| -rw-r--r-- | .SRCINFO | 18 | ||||
| -rw-r--r-- | 0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch | 24 | ||||
| -rw-r--r-- | PKGBUILD | 17 |
3 files changed, 13 insertions, 46 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sat Feb 13 12:06:16 UTC 2016 +# Thu Feb 25 15:33:02 UTC 2016 pkgbase = linux-rt-bfq - pkgver = 4.4.1_rt6 + pkgver = 4.4.2_rt7 pkgrel = 1 url = http://algo.ing.unimo.it arch = i686 @@ -13,10 +13,10 @@ pkgbase = linux-rt-bfq options = !strip source = http://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 = http://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 = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.1-rt6.patch.xz - source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.1-rt6.patch.sign + source = http://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 = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.2-rt7.patch.xz + source = http://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patch-4.4.2-rt7.patch.sign source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.4.0.patch source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0002-block-introduce-the-BFQ-v7r11-I-O-sched-for-4.4.0.patch source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-v7r11/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch @@ -27,14 +27,13 @@ pkgbase = linux-rt-bfq source = config.x86_64 source = fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch source = 0004-sdhci-revert.patch - source = 0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch source = 0007-4.4-revert-btrfs.patch source = 0008-4.4-revert-xfs.patch sha512sums = 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e sha512sums = SKIP - sha512sums = b117b6f88dd713a33691306e483d5c42bcf61091d91f7248e1537ac7f7b96380f5f7df81f399cecda13d9388ad7aa52ed2e6d46f7b27706d2f197b8e64c330b3 + sha512sums = 3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c sha512sums = SKIP - sha512sums = c6efdd48e7e0dd10c7b7892cc2524e23f8fcd0c60b31f07ab42ed06227f22cd554bbeea1a11133d74cab5c7c17a61c935ea4a9aa9cfc1c57b7f517eb6f10a85b + sha512sums = 2ab9c7bdf2f5b43a74840a82f34f4a354c3a0c21407993ca1afc84b077f29a5a1e34079d70705a59f853e4c48665d763ffd379e3637c6dc8616cfafc517c6280 sha512sums = SKIP sha512sums = bfd5d1a2d8f203e4d13914d311e8cc79b81695a41dc24179074cb05a5a9b5b0cc89a77062c6b8f79c850281aaa0d02dce40e23750aea7d1015f675c1cc024027 sha512sums = 275b7573adf648325ab950f8a8be7753f2efac0c4cd5030d31b0482fca0b9b9886c85dec989acde15eadf128366c250ecbd19d5527bfb41f472425fef43e93fd @@ -46,7 +45,6 @@ pkgbase = linux-rt-bfq sha512sums = 56ce250e1b14b03b28dfdf03923ffd173d05edc5fe9dcf5daecd121370e618d62eb8448b930503d69989c9c7ee3e3d8b64768962e78f5a1d08ba1267405192df sha512sums = 326dc571c072d4c47381852f16c00c8a7b27d11a5e6ff0f60f5e3a21d4a833c1e467dda1c2a5c04a6611af48bb6ef017f9183ea4ee578aab1a07e91e44d4e528 sha512sums = be80d7ee558595d4b17b07a5a2b729d9a9503c963ec1b19bac6a87601eaefd28075aea7fb6d9c77e2e15e063fc6a8a2e8744bc1efe63e2a58b8c3ede0d89c821 - sha512sums = a4580a922f8c1e26a4c41065e1690ee15a6ca8c096b329c2dde048ff11eef4c98348d9b4c87702862e0bf4cfaeff5122d4aca9d3b4085efc805068dd79c7f30c sha512sums = 9ebfcb5bfa613bd6b2c2817d3487bd22c2fbbb5f686f68c28912813be141d584b33cc8d8f175ce7cf10ec686902f7336c966b04b00d6aa5409298f1474c58035 sha512sums = 321a4817ca9a7486f7bf212978e6eeab1481b31c37d35209d7062be7d9f360d5b1f26b2dc45a4c46879c2d14b4ed212b322ea91d0fb85f74d6c298a7cc2a3198 diff --git a/0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch b/0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch deleted file mode 100644 index 691ab79b9d2f..000000000000 --- a/0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch +++ /dev/null @@ -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) { @@ -52,8 +52,8 @@ pkgbase=linux-rt-bfq pkgname=('linux-rt-bfq' 'linux-rt-bfq-headers' 'linux-rt-bfq-docs') _kernelname=-rt-bfq _srcname=linux-4.4 -_pkgver=4.4.1 -_rtpatchver=rt6 +_pkgver=4.4.2 +_rtpatchver=rt7 pkgver=${_pkgver}_${_rtpatchver} pkgrel=1 arch=('i686' 'x86_64') @@ -81,7 +81,6 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz" 'config' 'config.x86_64' 'fix-race-in-PRT-wait-for-completion-simple-wait-code_Nvidia-RT.patch' '0004-sdhci-revert.patch' - '0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch' '0007-4.4-revert-btrfs.patch' '0008-4.4-revert-xfs.patch') @@ -107,11 +106,6 @@ prepare() { msg "Fixes #47778 sdhci broken on some boards" patch -Rp1 -i "${srcdir}/0004-sdhci-revert.patch" - ### Fixes #47805 kernel panics on platform modules - # https://bugzilla.kernel.org/show_bug.cgi?id=110751 - msg "Fixes #47805 kernel panics on platform modules" - patch -Np1 -i "${srcdir}/0006-tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch" - ### Fix broken suspend from btrfs and xfs msg "Fix #47757" patch -Np1 -i "${srcdir}/0007-4.4-revert-btrfs.patch" @@ -471,9 +465,9 @@ package_linux-rt-bfq-docs() { sha512sums=('13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e' 'SKIP' - 'b117b6f88dd713a33691306e483d5c42bcf61091d91f7248e1537ac7f7b96380f5f7df81f399cecda13d9388ad7aa52ed2e6d46f7b27706d2f197b8e64c330b3' + '3222ddc913d14cd4b4ae999890afb580db9a79337dcd42876db6bbf08d351982bb1849fd97152915b570a3408ddd2be645e851736615f90ad8354244116ae12c' 'SKIP' - 'c6efdd48e7e0dd10c7b7892cc2524e23f8fcd0c60b31f07ab42ed06227f22cd554bbeea1a11133d74cab5c7c17a61c935ea4a9aa9cfc1c57b7f517eb6f10a85b' + '2ab9c7bdf2f5b43a74840a82f34f4a354c3a0c21407993ca1afc84b077f29a5a1e34079d70705a59f853e4c48665d763ffd379e3637c6dc8616cfafc517c6280' 'SKIP' 'bfd5d1a2d8f203e4d13914d311e8cc79b81695a41dc24179074cb05a5a9b5b0cc89a77062c6b8f79c850281aaa0d02dce40e23750aea7d1015f675c1cc024027' '275b7573adf648325ab950f8a8be7753f2efac0c4cd5030d31b0482fca0b9b9886c85dec989acde15eadf128366c250ecbd19d5527bfb41f472425fef43e93fd' @@ -485,7 +479,6 @@ sha512sums=('13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab71 '56ce250e1b14b03b28dfdf03923ffd173d05edc5fe9dcf5daecd121370e618d62eb8448b930503d69989c9c7ee3e3d8b64768962e78f5a1d08ba1267405192df' '326dc571c072d4c47381852f16c00c8a7b27d11a5e6ff0f60f5e3a21d4a833c1e467dda1c2a5c04a6611af48bb6ef017f9183ea4ee578aab1a07e91e44d4e528' 'be80d7ee558595d4b17b07a5a2b729d9a9503c963ec1b19bac6a87601eaefd28075aea7fb6d9c77e2e15e063fc6a8a2e8744bc1efe63e2a58b8c3ede0d89c821' - 'a4580a922f8c1e26a4c41065e1690ee15a6ca8c096b329c2dde048ff11eef4c98348d9b4c87702862e0bf4cfaeff5122d4aca9d3b4085efc805068dd79c7f30c' '9ebfcb5bfa613bd6b2c2817d3487bd22c2fbbb5f686f68c28912813be141d584b33cc8d8f175ce7cf10ec686902f7336c966b04b00d6aa5409298f1474c58035' '321a4817ca9a7486f7bf212978e6eeab1481b31c37d35209d7062be7d9f360d5b1f26b2dc45a4c46879c2d14b4ed212b322ea91d0fb85f74d6c298a7cc2a3198') @@ -495,4 +488,4 @@ validpgpkeys=( '64254695FFF0AA4466CC19E67B96E8162A8CF5D1' # Sebastian Andrzej Siewior '5ED9A48FC54C0A22D1D0804CEBC26CDB5A56DE73' # Steven Rostedt 'E644E2F1D45FA0B2EAA02F33109F098506FF0B14' # Thomas Gleixner - )
\ No newline at end of file + ) |