Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master z-rejected grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 
z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
 |   66 ----------
 z-kernels/nvidia_driver/DETAILS                                              
    |    6 
 z-kernels/nvidia_driver/HISTORY                                              
    |    8 +
 z-kernels/nvidia_driver/PRE_BUILD                                            
    |    6 
 4 files changed, 11 insertions(+), 75 deletions(-)

New commits:
commit 3dc2f36f40213a3ef1b185f2271b56e4baa4edcb
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    z-kernels/nvidia_driver: stable version 930.67

commit 32a8e968ead869d6ce827696178704451aa05580
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    z-kernels/nvidia_driver: stable version 390.59

diff --git 
a/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
 
b/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
deleted file mode 100644
index 66eedf8..0000000
--- 
a/z-kernels/nvidia_driver/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7e48f79e679c2d71067af48fcc77a5429dc77677 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
-Date: Thu, 5 Apr 2018 19:48:13 +0200
-Subject: [PATCH] fix incompatibility with linux 4.16 in 390.48
-
----
- kernel/common/inc/nv-linux.h | 43 ------------------------------------
- 1 file changed, 43 deletions(-)
-
-diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
-index 10fc418..ca6132c 100644
---- a/kernel/common/inc/nv-linux.h
-+++ b/kernel/common/inc/nv-linux.h
-@@ -1209,49 +1209,6 @@ static inline NvU32 nv_alloc_init_flags(int cached, 
int contiguous, int zeroed)
- static inline NvBool nv_dma_maps_swiotlb(struct pci_dev *dev)
- {
-     NvBool swiotlb_in_use = NV_FALSE;
--#if defined(CONFIG_SWIOTLB)
--  #if defined(NV_DMA_OPS_PRESENT) || defined(NV_GET_DMA_OPS_PRESENT)
--    /*
--     * We only use the 'dma_ops' symbol on older x86_64 kernels; later 
kernels,
--     * including those for other architectures, have converged on the
--     * get_dma_ops() interface.
--     */
--    #if defined(NV_GET_DMA_OPS_PRESENT)
--      #if defined(NV_DMA_MAP_OPS_PRESENT)
--    const struct dma_map_ops *ops = get_dma_ops(&dev->dev);
--      #else
--    const struct dma_mapping_ops *ops = get_dma_ops(&dev->dev);
--      #endif
--    #else
--    const struct dma_mapping_ops *ops = dma_ops;
--    #endif
--    #if defined(NV_DMA_MAP_OPS_PRESENT)
--    /*
--     * The switch from dma_mapping_ops -> dma_map_ops coincided with the
--     * switch from swiotlb_map_sg -> swiotlb_map_sg_attrs.
--     */
--      #if defined(NVCPU_AARCH64) && \
--          defined(NV_NONCOHERENT_SWIOTLB_DMA_OPS_PRESENT)
--    /* AArch64 exports these symbols directly */
--    swiotlb_in_use = ((ops == &noncoherent_swiotlb_dma_ops) ||
--                      (ops == &coherent_swiotlb_dma_ops));
--      #else
--    swiotlb_in_use = (ops->map_sg == swiotlb_map_sg_attrs);
--      #endif
--    #else
--    swiotlb_in_use = (ops->map_sg == swiotlb_map_sg);
--    #endif
--  #elif defined(NVCPU_X86_64)
--    /*
--     * Fallback for old 2.6 kernels - if the DMA operations infrastructure
--     * isn't in place, use the swiotlb flag. Before dma_ops was added, this
--     * flag used to be exported. It still exists in modern kernels but is no
--     * longer exported.
--     */
--    swiotlb_in_use = (swiotlb == 1);
--  #endif
--#endif
--
-     return swiotlb_in_use;
- }
- 
--- 
-2.17.0
-
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index 1ba1b26..8b836ea 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -1,6 +1,6 @@
 . $GRIMOIRE/FUNCTIONS
            SPELL=nvidia_driver
-  STABLE_VERSION=390.48
+  STABLE_VERSION=390.67
     BETA_VERSION=387.34
 case "${SMGL_COMPAT_ARCHS[1]}" in
         x86_64)
@@ -9,7 +9,7 @@ if [[ $NVIDIA_BETA == y ]]; then
      
SOURCE_HASH=sha512:6742768f1258a028c9ba56ad1d72f27d7eea4b6bfd324ba29c7f057ab5819816bd728aeaf2a8058031dadcd4c51bc6d08f0e0e0e26c68ed57955e90d68ac5a4b
 else
          VERSION=$STABLE_VERSION
-     
SOURCE_HASH=sha512:47f4bcc0d88d1e80ed0c03cacde96301b1c657bec88935ee2edf9b96726620f70c747a174f1a8725b56f4812961878c01df02c249ac4810dc4aedf62d1152a7f
+     
SOURCE_HASH=sha512:51478099a0f28674b04e87e26e0e142a0e55cc089e325de791f6b3ed99ef8d7bab074cd97e5e5144d046e970616201b0eba59f55ad958e3c435311d40e3e8dae
 fi
           SOURCE=NVIDIA-Linux-x86_64-$VERSION.run
       
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86_64/$VERSION/$SOURCE
@@ -23,7 +23,7 @@ if [[ $NVIDIA_BETA == y ]]; then
      
SOURCE_HASH=sha512:ba9362123a75f85a0a5a9dcc95c06bcb350a8dff2db864db30a73172db44006fa39eee8e23cf959ab2012b61b922d1f0d7ab225329815737819f27d1be300b95
 else
          VERSION=$STABLE_VERSION
-     
SOURCE_HASH=sha512:9d80616abbf1f95c89bb3e6bda864708adc887a62ccdf8865e956c305bb013b0e54ffb3f495805363ee60a9115ab5fb38adf1534750a6afb69a457a4d034daeb
+     
SOURCE_HASH=sha512:177ad1a4ae52fc00001461e65e264fe9f9bf0dc5e8974391311cb80f8bcfa309f12bf1bcb4b162684a01416cfbbaa76d3b81dff3fb08ff2f5e8644255cc22987
 fi
           SOURCE=NVIDIA-Linux-x86-$VERSION.run
       
SOURCE_URL=http://us.download.nvidia.com/XFree86/Linux-x86/$VERSION/$SOURCE
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index 076ea21..7f129dc 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,11 @@
+2018-06-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: stable versions 390.67
+
+2018-06-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * DETAILS: stable versions 390.59
+       * 0001-fix-incompatibility-with-linux-4.16-in-390.48.patch, PRE_BUILD:
+         remove obsolete patch
+
 2018-04-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS, PRE_BUILD, INSTALL,
          0001-fix-incompatibility-with-linux-4.16-in-390.48.patch:
diff --git a/z-kernels/nvidia_driver/PRE_BUILD 
b/z-kernels/nvidia_driver/PRE_BUILD
index acc161d..e7d7ff2 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -24,9 +24,3 @@ cd  $SOURCE_DIRECTORY/kernel     &&
 #
 sedit  's:depmod -ae:& \$(KERNEL_UNAME):'  Makefile
 
-if [[ "$NVIDIA_BETA" == "n" ]]; then
-  message "${MESSAGE_COLOR}patching for compatibility with linux 
4.16${DEFAULT_COLOR}" &&
-  cd $SOURCE_DIRECTORY &&
-  patch -p1 < 
"$SPELL_DIRECTORY/0001-fix-incompatibility-with-linux-4.16-in-390.48.patch"
-fi
-