Update to 4.4.2

3 files changed, 9 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69eeb1580c36..ca9455ec2929 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Tue Feb  2 19:32:53 UTC 2016
+# Fri Feb 19 23:23:35 UTC 2016
 pkgbase = linux-bld
-	pkgver = 4.4.1
+	pkgver = 4.4.2
 	pkgrel = 1
 	url = https://github.com/rmullick/linux
 	arch = i686
@@ -13,8 +13,8 @@ pkgbase = linux-bld
 	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/v4.x/patch-4.4.2.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.2.sign
 	source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = config
 	source = config.x86_64
@@ -25,12 +25,11 @@ pkgbase = linux-bld
 	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
 	source = https://raw.githubusercontent.com/rmullick/bld-patches/master/BLD-4.4.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
 	sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
 	sha256sums = SKIP
-	sha256sums = c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48
+	sha256sums = 5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c
 	sha256sums = SKIP
 	sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
 	sha256sums = fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64
@@ -42,7 +41,6 @@ pkgbase = linux-bld
 	sha256sums = 69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25
 	sha256sums = 66f800ae606ae197dc80f3207d4e688fd3981ee6eab11b52ce84fcf3aed977ff
 	sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
-	sha256sums = ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d
 	sha256sums = 51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958
 	sha256sums = ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad
 
@@ -54,14 +52,14 @@ pkgname = linux-bld
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = kernel26-bld=4.4.1
+	provides = kernel26-bld=4.4.2
 	conflicts = kernel26-bld
 	replaces = kernel26-bld
 	backup = etc/mkinitcpio.d/linux-bld.preset
 
 pkgname = linux-bld-headers
 	pkgdesc = Header files and scripts for building modules for Linux-bld kernel
-	provides = kernel26-bld-headers=4.4.1
+	provides = kernel26-bld-headers=4.4.2
 	conflicts = kernel26-bld-headers
 	replaces = kernel26-bld-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index 2987e1e426c3..968b9e02ef9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase=linux-bld       # Build kernel with a different name
 _srcname=linux-4.4
 pkgname=(linux-bld linux-bld-headers)
 _kernelname=-bld
-pkgver=4.4.1
+pkgver=4.4.2
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://github.com/rmullick/linux"
@@ -32,14 +32,13 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 	"${_bfqpath}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${_bfqversion}-for.patch"
         "https://raw.githubusercontent.com/rmullick/bld-patches/master/${_BLDpatch}"
         "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"
         )
 
 sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
             'SKIP'
-            'c0218043e61da3921cd14579ae4a8774a6fdad91667a9fdb851d0a35f62edb48'
+            '5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c'
             'SKIP'
             'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
             'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
@@ -51,7 +50,6 @@ sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
             '69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25'
             '66f800ae606ae197dc80f3207d4e688fd3981ee6eab11b52ce84fcf3aed977ff'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
-            'ab57037ecee0a425c612babdff47c831378bca0bff063a1308599989a350226d'
             '51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
             'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad')
 
@@ -109,10 +107,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"
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) {