4.4.15

3 files changed, 53 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f9a0954bc9a7..237fb6f22161 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Jul 27 05:58:10 UTC 2016
+# Wed Jul 27 06:02:58 UTC 2016
 pkgbase = linux-vfio-lts
-	pkgver = 4.4.14
-	pkgrel = 1
+	pkgver = 4.4.15
+	pkgrel = 2
 	url = http://www.kernel.org/
 	arch = i686
 	arch = x86_64
@@ -15,24 +15,26 @@ pkgbase = linux-vfio-lts
 	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.14.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.14.sign
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.15.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.15.sign
 	source = config
 	source = config.x86_64
 	source = linux.preset
 	source = change-default-console-loglevel.patch
 	source = 0001-sdhci-revert.patch
+	source = ecryptfs.patch
 	source = override_for_missing_acs_capabilities.patch
 	source = i915_317.patch
 	sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
 	sha256sums = SKIP
-	sha256sums = 63b67f25867d6f0c9e8721d0d4c39c902622d0351055808ada340909ed566509
+	sha256sums = 69fcb928e4958f87fb134d0f6acf98072655b5572dd3497c3a0844882f261bf8
 	sha256sums = SKIP
 	sha256sums = fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64
 	sha256sums = 756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
+	sha256sums = a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7
 	sha256sums = 975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149
 	sha256sums = b5a8eebbe75e1801b35d2f5197eba6f57123c224e09e97a7eb526f1fa58ac918
 
diff --git a/PKGBUILD b/PKGBUILD
index 47959296cc72..35d5094fbd4a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgbase=linux-vfio-lts
 _srcname=linux-4.4
-pkgver=4.4.14
-pkgrel=1
+pkgver=4.4.15
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -19,17 +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'
+        'ecryptfs.patch'
         'override_for_missing_acs_capabilities.patch'
         'i915_317.patch')
 sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
             'SKIP'
-            '63b67f25867d6f0c9e8721d0d4c39c902622d0351055808ada340909ed566509'
+            '69fcb928e4958f87fb134d0f6acf98072655b5572dd3497c3a0844882f261bf8'
             'SKIP'
             'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
             '756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
+            'a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7'
             '975f79348119bfba8dd972a9fbfe6b38484c45bfd228f2f6d48a0c02426ba149'
             'b5a8eebbe75e1801b35d2f5197eba6f57123c224e09e97a7eb526f1fa58ac918')
 validpgpkeys=(
@@ -47,6 +49,9 @@ prepare() {
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
+
+  # https://bugs.archlinux.org/task/50126 - broken ecryptfs
+  patch -p1 -i "${srcdir}/ecryptfs.patch"
   
   # revert http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=9faac7b95ea4f9e83b7a914084cc81ef1632fd91
   # fixes #47778 sdhci broken on some boards
diff --git a/ecryptfs.patch b/ecryptfs.patch
new file mode 100644
index 000000000000..c542789a81a7
--- /dev/null
+++ b/ecryptfs.patch
@@ -0,0 +1,37 @@
+From: Tyler Hicks <tyhicks <at> canonical.com>
+Subject: [PATCH] eCryptfs: Fix directory open regression in linux-stable
+Newsgroups: gmane.comp.file-systems.ecryptfs.general, gmane.linux.kernel.stable
+Date: 2016-06-29 03:39:41 GMT (14 hours and 12 minutes ago)
+
+Cherry-picking mainline commit 2f36db71009304b3f0b95afacd8eba1f9f046b87
+introduces a regression in eCryptfs when mainline commit
+6a480a7842545ec520a91730209ec0bae41694c1 (4.6+) is not present. The
+regression causes all attempts at opening directory files to fail with
+EMEDIUMTYPE when the lower filesystem's file_operations for directory
+files do not implement mmap.
+
+This is a simple fix that allows the check for the lower file's mmap
+implementation to be ignored if the lower file is a directory.
+
+Signed-off-by: Tyler Hicks <tyhicks <at> canonical.com>
+Tested-by: Tyler Hicks <tyhicks <at> canonical.com> # 4.4.y, 3.18.y
+Cc: <stable <at> vger.kernel.org> # 4.5-
+---
+ fs/ecryptfs/kthread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/ecryptfs/kthread.c b/fs/ecryptfs/kthread.c
+index e818f5a..b9faeab 100644
+--- a/fs/ecryptfs/kthread.c	2016-06-30 23:32:07.029678000 +0200
++++ b/fs/ecryptfs/kthread.c	2016-06-30 23:34:13.022284475 +0200
+@@ -171,7 +171,7 @@ int ecryptfs_privileged_open(struct file
+ 		goto out;
+ 	}
+ have_file:
+-	if ((*lower_file)->f_op->mmap == NULL) {
++	if ((*lower_file)->f_op->mmap == NULL && !d_is_dir(lower_dentry)) {
+ 		fput(*lower_file);
+ 		*lower_file = NULL;
+ 		rc = -EMEDIUMTYPE;
+-- 
+2.7.4