update to 4.4.25

3 files changed, 10 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 62e42ced2a19..26b0b47ef5a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 5.0.1
-# Tue Aug  9 18:54:17 UTC 2016
+# Wed Oct 19 23:54:59 UTC 2016
 pkgbase = linux-netbook
-	pkgver = 4.4.16
-	pkgrel = 2
+	pkgver = 4.4.25
+	pkgrel = 1
 	url = https://github.com/korrode/linux-netbook
 	arch = i686
 	license = GPL2
@@ -13,24 +13,22 @@ pkgbase = linux-netbook
 	makedepends = bc
 	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/patch-4.4.16.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.25.xz
 	source = config
 	source = linux-netbook.preset
 	source = change-default-console-loglevel.patch
 	source = 0001-sdhci-revert.patch
-	source = ecryptfs.patch
 	source = 0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11.patch::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 = 0002-block-introduce-the-BFQ-v7r11-I-O-sched.patch::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 = 0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11.patch::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 = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
 	source = interactive_governor-linux4.4-20160501.patch
 	sha256sums = 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2
-	sha256sums = 7181b6cb3a1611dab9179f57846a3f03bf2705aa3e4cddd9fbd0398bde50d5f9
+	sha256sums = 5c5599ae77435cf35a6b59c4bd0c49cd928c66d4bbdb6c0e39974318c8c3d31e
 	sha256sums = b8a40f9fbc69f848f8b3165a8882fa6a22f6e81d3564f31b95a738b6c3cb25ef
 	sha256sums = e794216a8ae80182b506957e313586777a5bbb1ccf0760d904a933c511768127
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = 5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375
-	sha256sums = a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7
 	sha256sums = d1cf14cc696b0f716454fe8eb9746383700889d5d22ad829611f0433cc77b4ce
 	sha256sums = b17c3fb18c5b8c20a45a38198f293679ca6aef08d16f12cd816a5cfafac4b2c4
 	sha256sums = 69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25
@@ -45,12 +43,12 @@ pkgname = linux-netbook
 	depends = kmod
 	depends = mkinitcpio>=0.7
 	optdepends = crda: to set the correct wireless channels of your country
-	provides = linux-netbook-manjaro=4.4.16
+	provides = linux-netbook-manjaro=4.4.25
 	replaces = linux-netbook-manjaro
 	backup = etc/mkinitcpio.d/linux-netbook.preset
 
 pkgname = linux-netbook-headers
 	pkgdesc = Header files and scripts for building modules for Linux-netbook kernel
-	provides = linux-netbook-manjaro-headers=4.4.16
+	provides = linux-netbook-manjaro-headers=4.4.25
 	replaces = linux-netbook-manjaro-headers
 
diff --git a/PKGBUILD b/PKGBUILD
index fb5dca29626d..4fc87c2bea46 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 pkgbase=linux-netbook
 _srcname=linux-4.4
 _bfq=v7r11
-pkgver=4.4.16
-pkgrel=2
+pkgver=4.4.25
+pkgrel=1
 arch=('i686')
 url="https://github.com/korrode/linux-netbook"
 license=('GPL2')
@@ -20,7 +20,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         # ARCH patches
         "change-default-console-loglevel.patch"
         "0001-sdhci-revert.patch"
-        "ecryptfs.patch"
         # BFQ patches
         "0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-${_bfq}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${_bfq}-4.4.0.patch"
         "0002-block-introduce-the-BFQ-${_bfq}-I-O-sched.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.4.0-${_bfq}/0002-block-introduce-the-BFQ-${_bfq}-I-O-sched-for-4.4.0.patch"
@@ -30,12 +29,11 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         # Interactive CPUFreq governor patches
         "interactive_governor-linux4.4-20160501.patch")
 sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
-            '7181b6cb3a1611dab9179f57846a3f03bf2705aa3e4cddd9fbd0398bde50d5f9'
+            '5c5599ae77435cf35a6b59c4bd0c49cd928c66d4bbdb6c0e39974318c8c3d31e'
             'b8a40f9fbc69f848f8b3165a8882fa6a22f6e81d3564f31b95a738b6c3cb25ef'
             'e794216a8ae80182b506957e313586777a5bbb1ccf0760d904a933c511768127'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
-            'a2e240ab338f02ebde278131cf5810e9aa3846a8238e3d26dc235eace05ab4e7'
             'd1cf14cc696b0f716454fe8eb9746383700889d5d22ad829611f0433cc77b4ce'
             'b17c3fb18c5b8c20a45a38198f293679ca6aef08d16f12cd816a5cfafac4b2c4'
             '69a21bc286a628128cfc4723558829cb6ff6c2d7c4dfd4468457898674187b25'
@@ -52,9 +50,6 @@ 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
   # https://bugzilla.kernel.org/show_bug.cgi?id=106541
diff --git a/ecryptfs.patch b/ecryptfs.patch
deleted file mode 100644
index c542789a81a7..000000000000
--- a/ecryptfs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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