Update to 4.7.1-1

4 files changed, 21 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cfb8e0ce71ce..d729177de4c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Thu Aug 11 21:24:37 UTC 2016
+# Tue Aug 16 19:34:45 UTC 2016
 pkgbase = linux-ck
-	pkgver = 4.7
+	pkgver = 4.7.1
 	pkgrel = 1
 	url = https://wiki.archlinux.org/index.php/Linux-ck
 	arch = i686
@@ -14,6 +14,8 @@ pkgbase = linux-ck
 	options = !strip
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.7.tar.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.7.1.sign
 	source = config.x86_64
 	source = config
 	source = linux-ck.preset
@@ -26,8 +28,10 @@ pkgbase = linux-ck
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.7.0-v8r2/0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r2-for.patch
 	sha256sums = 5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10
 	sha256sums = SKIP
-	sha256sums = 824cb32b52956d4bc0ebae5030e3cbd201a37a067655b6907831f9883423a396
-	sha256sums = ff364c328a1a83a5f486fcc07883c5b4ad888458e0fbda3a6d60f610e3917ff7
+	sha256sums = 838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e
+	sha256sums = SKIP
+	sha256sums = 049fd48a4cf1d26ec243d861f23f9e5113bf37816ea1a985008164198929989e
+	sha256sums = cf843f5f58d826206d6311a680f38554eddc5ff81b8f308b3e7da1419b962a5b
 	sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
 	sha256sums = e8d70729a7a58bac904d9a7a52ae4d46feec671afa307e6814895d74daf5ffbc
@@ -46,7 +50,7 @@ pkgname = linux-ck
 	optdepends = crda: to set the correct wireless channels of your country
 	optdepends = nvidia-ck: nVidia drivers for linux-ck
 	optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
-	provides = linux-ck=4.7
+	provides = linux-ck=4.7.1
 	conflicts = kernel26-ck
 	conflicts = linux-ck-corex
 	conflicts = linux-ck-p4
@@ -71,8 +75,8 @@ pkgname = linux-ck
 pkgname = linux-ck-headers
 	pkgdesc = Header files and scripts to build modules for linux-ck.
 	depends = linux-ck
-	provides = linux-ck-headers=4.7
-	provides = linux-headers=4.7
+	provides = linux-ck-headers=4.7.1
+	provides = linux-headers=4.7.1
 	conflicts = kernel26-ck-headers
 	conflicts = linux-ck-corex-headers
 	conflicts = linux-ck-p4-headers
diff --git a/PKGBUILD b/PKGBUILD
index 0799b328dd40..070fc60bc1d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ _BFQ_enable_=
 pkgname=(linux-ck linux-ck-headers)
 _kernelname=-ck
 _srcname=linux-4.7
-pkgver=4.7
+pkgver=4.7.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="https://wiki.archlinux.org/index.php/Linux-ck"
@@ -69,8 +69,8 @@ _bfqp3='0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-for.patch'
 _bfqp4='0004-block-bfq-turn-BFQ-v7r11-for-4.7.0-into-BFQ-v8r2-for.patch'
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 "https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
-#"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
-#"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
+"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
 'config.x86_64' 'config'
 'linux-ck.preset'
 'change-default-console-loglevel.patch'
@@ -85,8 +85,10 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
 "$_bfqpath/$_bfqp4")
 sha256sums=('5190c3d1209aeda04168145bf50569dc0984f80467159b1dc50ad731e3285f10'
             'SKIP'
-            '824cb32b52956d4bc0ebae5030e3cbd201a37a067655b6907831f9883423a396'
-            'ff364c328a1a83a5f486fcc07883c5b4ad888458e0fbda3a6d60f610e3917ff7'
+            '838fa595436fbf9f70759aa43c1cacd83cc0adc95d166648c1625ebd50fad04e'
+            'SKIP'
+            '049fd48a4cf1d26ec243d861f23f9e5113bf37816ea1a985008164198929989e'
+            'cf843f5f58d826206d6311a680f38554eddc5ff81b8f308b3e7da1419b962a5b'
             '2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             'e8d70729a7a58bac904d9a7a52ae4d46feec671afa307e6814895d74daf5ffbc'
@@ -104,7 +106,7 @@ prepare() {
 	cd "${_srcname}"
 
 	# add upstream patch
-	#patch -p1 -i "${srcdir}/patch-${pkgver}"
+	patch -p1 -i "${srcdir}/patch-${pkgver}"
 
 	# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
 	# remove this when a Kconfig knob is made available by upstream
diff --git a/config b/config
index c36e9408904f..a4d478f069da 100644
--- a/config
+++ b/config
@@ -6394,7 +6394,7 @@ CONFIG_ASYNC_TX_DMA=y
 #
 # DMABUF options
 #
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m
 CONFIG_KS0108_PORT=0x378
diff --git a/config.x86_64 b/config.x86_64
index cfdc7e32119c..8b00e2941197 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -6159,7 +6159,7 @@ CONFIG_DMA_ENGINE_RAID=y
 #
 # DMABUF options
 #
-# CONFIG_SYNC_FILE is not set
+CONFIG_SYNC_FILE=y
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y
 CONFIG_KS0108=m