[nvidia-kmod] Update to 370.23 beta

[Leigh Scott]

commit 358ee8e45a6788e2f930acfb66497ff78c88dc02
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Fri Aug 19 11:16:32 2016 +0100

    Update to 370.23 beta

 nv-linux-arm.patch          |  2 +-
 nv-linux-arm2.patch         |  2 +-
 nvidia-4.7_kernel-pt1.patch | 15 ---------------
 nvidia-4.7_kernel_pt2.patch | 46 ---------------------------------------------
 nvidia-4.8_kernel.patch     |  8 ++++----
 nvidia-kmod.spec            | 15 ++++++---------
 6 files changed, 12 insertions(+), 76 deletions(-)
---
diff --git a/nv-linux-arm.patch b/nv-linux-arm.patch
index 6e382ae..fe5ff1e 100644
--- a/nv-linux-arm.patch
+++ b/nv-linux-arm.patch
@@ -1,7 +1,7 @@
 diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h
 --- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.arm 2015-01-11 04:30:46.000000000 +0000
 +++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h	2015-01-16 23:20:16.785229307 +0000
-@@ -257,7 +257,8 @@ NV_STATUS nvos_forward_error_to_cray(str
+@@ -260,7 +260,8 @@ NV_STATUS nvos_forward_error_to_cray(str
   * NVIDIA graphics driver has no way of knowing and is unlikely
   * to work correctly.
   */
diff --git a/nv-linux-arm2.patch b/nv-linux-arm2.patch
index f03eb32..6c717bf 100644
--- a/nv-linux-arm2.patch
+++ b/nv-linux-arm2.patch
@@ -1,7 +1,7 @@
 diff -up nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h
 --- nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h.swf	2015-07-22 02:40:54.000000000 +0200
 +++ nvidiapkg-armv7hl/kernel/common/inc/nv-linux.h	2015-07-29 14:07:14.866367595 +0200
-@@ -153,7 +153,7 @@ static inline uid_t __kuid_val(kuid_t ui
+@@ -156,7 +156,7 @@ static inline uid_t __kuid_val(kuid_t ui
  #include <linux/dma-mapping.h>
  #endif
  
diff --git a/nvidia-4.8_kernel.patch b/nvidia-4.8_kernel.patch
index 7abf2d1..ec3a2e3 100644
--- a/nvidia-4.8_kernel.patch
+++ b/nvidia-4.8_kernel.patch
@@ -8,7 +8,7 @@
  #include "nvidia-drm-priv.h"
  #include "nvidia-drm-drv.h"
  #include "nvidia-drm-fb.h"
-@@ -36,7 +37,9 @@
+@@ -37,7 +38,9 @@
  #include "nvidia-drm-ioctl.h"
  
  #include <drm/drmP.h>
@@ -19,7 +19,7 @@
  #include <drm/drm_crtc_helper.h>
  
  #if defined(NV_DRM_DRM_GEM_H_PRESENT)
-@@ -419,7 +422,11 @@
+@@ -420,7 +423,11 @@
  
  static
  void nvidia_drm_master_drop(struct drm_device *dev,
@@ -31,7 +31,7 @@
  {
      struct nvidia_drm_device *nv_dev = dev->dev_private;
      int ret;
-@@ -452,7 +459,11 @@
+@@ -453,7 +460,11 @@
      mutex_lock(&dev->master_mutex);
  
      if (!file_priv->is_master ||
@@ -43,7 +43,7 @@
      {
          goto done;
      }
-@@ -473,7 +484,11 @@
+@@ -474,7 +485,11 @@
       * NVKMS modeset ownership, because nvidia_drm_master_set()'s call to
       * grabOwnership() will fail.
       */
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 7f1aa44..c28a9f9 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,9 +8,9 @@
 
 Name:          nvidia-kmod
 Epoch:         1
-Version:       367.35
+Version:       370.23
 # Taken over by kmodtool
-Release:       2%{?dist}
+Release:       1%{?dist}
 Summary:       NVIDIA display driver kernel module
 Group:         System Environment/Kernel
 License:       Redistributable, no modification permitted
@@ -19,9 +19,7 @@ URL:           http://www.nvidia.com/
 Source11:      nvidia-kmodtool-excludekernel-filterfile
 Patch0:        nv-linux-arm.patch
 Patch1:        nv-linux-arm2.patch
-Patch2:        nvidia-4.7_kernel-pt1.patch
-Patch3:        nvidia-4.7_kernel_pt2.patch
-Patch4:        nvidia-4.8_kernel.patch
+Patch2:        nvidia-4.8_kernel.patch
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -49,11 +47,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
 # patch loop
 %patch0 -p1
 %patch1 -p1
-%ifarch x86_64
 %patch2 -p1
-%endif
-%patch3 -p1
-%patch4 -p1
 
 for kernel_version  in %{?kernel_versions} ; do
     cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -85,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Aug 19 2016 Leigh Scott <leigh123linux at googlemail.com> - 1:370.27-1
+- Update to 370.23 beta
+
 * Wed Aug 10 2016 leigh scott <leigh123linux at googlemail.com> - 1:367.35-2
 - patch for 4.8rc kernel