upgpkg: nvidia-173xx-dkms 173.14.39-6

Update to linux 4.3

3 files changed, 36 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 253d38f29e4f..7959a0f7205a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Jan 20 03:55:07 UTC 2016
 pkgbase = nvidia-173xx-dkms
 	pkgdesc = NVIDIA kernel module sources (DKMS), 173xx branch
 	pkgver = 173.14.39
-	pkgrel = 5
+	pkgrel = 6
 	url = http://www.nvidia.com/
 	install = nvidia-dkms.install
 	arch = i686
@@ -20,11 +22,13 @@ pkgbase = nvidia-173xx-dkms
 	source = linux-3.17.patch
 	source = linux-3.19.patch
 	source = linux-4.0.patch
+	source = linux-4.3.patch
 	source = dkms.conf
 	md5sums = 6dfb34d8fdf35c1637932f95d2216c46
 	md5sums = a2042d1f47d3f7c8b380237bd0b35863
 	md5sums = be7d8583f27021dde68e87239d547457
 	md5sums = c84147f5645290b6d840e987e5413536
+	md5sums = 20bde657bb715e16295d7e82fe799fca
 	md5sums = d784fa643442852babc56f60705387a4
 
 pkgname = nvidia-173xx-dkms
diff --git a/PKGBUILD b/PKGBUILD
index c2b94a46a966..69f40ead92ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=nvidia-173xx-dkms
 pkgver=173.14.39
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA kernel module sources (DKMS), 173xx branch"
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && _arch=x86
@@ -24,6 +24,7 @@ source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.
          linux-3.17.patch
          linux-3.19.patch
          linux-4.0.patch
+         linux-4.3.patch
          dkms.conf)
 options=(!strip)
 [ "$CARCH" = "i686"   ] && md5sums=('5b423543428554ef33a200fbbe3cb9fc')
@@ -32,6 +33,7 @@ md5sums+=('6dfb34d8fdf35c1637932f95d2216c46'
           'a2042d1f47d3f7c8b380237bd0b35863'
           'be7d8583f27021dde68e87239d547457'
           'c84147f5645290b6d840e987e5413536'
+          '20bde657bb715e16295d7e82fe799fca'
           'd784fa643442852babc56f60705387a4')
 
 prepare() {
@@ -46,6 +48,7 @@ prepare() {
   patch -p1 -i "$srcdir/linux-3.17.patch"
   patch -p1 -i "$srcdir/linux-3.19.patch"
   patch -p1 -i "$srcdir/linux-4.0.patch"
+  patch -p1 -i "$srcdir/linux-4.3.patch"
 }
 
 package() {
diff --git a/linux-4.3.patch b/linux-4.3.patch
new file mode 100644
index 000000000000..30dd5fe79a0c
--- /dev/null
+++ b/linux-4.3.patch
@@ -0,0 +1,27 @@
+diff -Naur nv.orig/nv.c nv/nv.c
+--- nv.orig/nv.c	2016-01-20 04:11:03.974819000 +0100
++++ nv/nv.c	2016-01-20 04:11:48.095900342 +0100
+@@ -574,7 +574,8 @@
+     void *v
+ )
+ {
+-    return seq_puts(s, s->private);
++    seq_puts(s, s->private);
++    return 0;
+ }
+ 
+ NV_DEFINE_PROCFS_SINGLE_FILE(text_file);
+diff -Naur nv.orig/nv-linux.h nv/nv-linux.h
+--- nv.orig/nv-linux.h	2016-01-20 04:11:03.958152000 +0100
++++ nv/nv-linux.h	2016-01-20 04:11:48.095900342 +0100
+@@ -143,6 +143,10 @@
+ #include <linux/seq_file.h>
+ #endif
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
++#undef CONFIG_MTRR
++#endif
++
+ #ifdef CONFIG_MTRR
+ #include <asm/mtrr.h>
+ #endif