diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | config.x86_64 | 2 | ||||
| -rw-r--r-- | linux.install | 2 | ||||
| -rw-r--r-- | tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch | 24 |
6 files changed, 14 insertions, 46 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Feb 13 15:46:27 UTC 2016 +# Sun Feb 21 20:59:31 UTC 2016 pkgbase = linux-pf pkgdesc = Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS included), TuxOnIce, BFQ] and aufs3 - pkgver = 4.4.4 + pkgver = 4.4.5 pkgrel = 1 url = http://pf.natalenko.name/ arch = i686 @@ -20,21 +20,19 @@ pkgbase = linux-pf source = config.x86_64 source = linux.preset source = change-default-console-loglevel.patch - source = http://pf.natalenko.name/sources/4.4/patch-4.4-pf4.xz + source = http://pf.natalenko.name/sources/4.4/patch-4.4-pf5.xz source = git+https://github.com/sfjro/aufs4-standalone#branch=aufs4.4 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 sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 - sha256sums = 5f0e331c8eced56d0e0f85a1dc1a42686a606cbd95100a18b8570cce85022c58 - sha256sums = dc9277eedda6e151f8ce7488f95ba66094775b89e882ad08c06484fe440dcea9 + sha256sums = 9723aaf2fc695670102574b6e38fe0736c34edc8413b05a5ff517e5542b654e6 + sha256sums = affcfe37189534a75f766a1ba2d334fefdfb57538feca5144db64309de0f7515 sha256sums = 82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864 sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99 - sha256sums = 6d59c2433fb4c28fa2635ba96386701d4511a8204b0070b0aa75a8afac7c35c8 + sha256sums = c1edc12b4484834fb59707cf68cd4e5d4fb75ec5e05545bef36e085ee5ddbed2 sha256sums = SKIP sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375 - sha256sums = ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d sha256sums = 51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958 sha256sums = ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad @@ -10,7 +10,7 @@ _minor=4 _basekernel=${_major}.${_minor} _srcname=linux-${_major}.${_minor} pkgbase=linux-pf -_pfrel=4 +_pfrel=5 _kernelname=-pf _pfpatchhome="http://pf.natalenko.name/sources/${_basekernel}/" _pfpatchname="patch-${_basekernel}${_kernelname}${_pfrel}" @@ -85,8 +85,7 @@ source=("ftp://www.kernel.org/pub/linux/kernel/v${_major}.x/linux-${_basekernel} "${_pfpatchhome}${_pfpatchname}.xz" # the -pf patchset "git+$_aufs3#branch=aufs4.4" '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-btrfs.patch' '0001-4.4-revert-xfs.patch' ) # 'cx23885_move_CI_AC_registration_to_a_separate_function.patch' @@ -139,10 +138,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" @@ -712,13 +707,12 @@ pkgdesc="Linux kernel and modules with the pf-kernel patch [-ck patchset (BFS in # makepkg -g >>PKGBUILD sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2' - '5f0e331c8eced56d0e0f85a1dc1a42686a606cbd95100a18b8570cce85022c58' - 'dc9277eedda6e151f8ce7488f95ba66094775b89e882ad08c06484fe440dcea9' + '9723aaf2fc695670102574b6e38fe0736c34edc8413b05a5ff517e5542b654e6' + 'affcfe37189534a75f766a1ba2d334fefdfb57538feca5144db64309de0f7515' '82d660caa11db0cd34fd550a049d7296b4a9dcd28f2a50c81418066d6e598864' '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99' - '6d59c2433fb4c28fa2635ba96386701d4511a8204b0070b0aa75a8afac7c35c8' + 'c1edc12b4484834fb59707cf68cd4e5d4fb75ec5e05545bef36e085ee5ddbed2' 'SKIP' '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375' - 'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d' '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958' 'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad') @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.4 Kernel Configuration +# Linux/x86 4.4.5 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y diff --git a/config.x86_64 b/config.x86_64 index 3a2554cdc26b..527abcc60fcc 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.4 Kernel Configuration +# Linux/x86 4.4.5 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/linux.install b/linux.install index fc9cfc7c70b0..014a9b8e4302 100644 --- a/linux.install +++ b/linux.install @@ -3,7 +3,7 @@ # arg 2: the old package version KERNEL_NAME=-pf -KERNEL_VERSION=4.4.4-pf +KERNEL_VERSION=4.4.5-pf # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch b/tpmdd-devel-v3-base-platform-fix-binding-for-drivers-without-probe-callback.patch deleted file mode 100644 index 691ab79b9d2f..000000000000 --- a/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) { |