From f85a82a647e781001f8b7faf5a8148dd3306ae82 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 16 Jun 2018 20:33:00 -0400
Subject: [PATCH] linux-testing: 4.17-rc7 -> 4.18-rc1

---
 pkgs/os-specific/linux/kernel/common-config.nix | 10 ++++++----
 pkgs/os-specific/linux/kernel/linux-testing.nix |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index d1314431abe1..93732f1c6f84 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -368,7 +368,7 @@ with stdenv.lib;
   ${optionalString (! stdenv.hostPlatform.isAarch32)
     (if versionOlder version "3.14" then ''
         CC_STACKPROTECTOR? y # Detect buffer overflows on the stack
-      '' else ''
+      '' else optionalString (versionOlder version "4.18") ''
         CC_STACKPROTECTOR_REGULAR? y
       '')}
   ${optionalString (versionAtLeast version "3.12") ''
@@ -647,7 +647,7 @@ with stdenv.lib;
     X86_X2APIC y
     IRQ_REMAP y
   ''}
-  
+
   # needed for iwd WPS support (wpa_supplicant replacement)
   ${optionalString (versionAtLeast version "4.7") ''
     KEY_DH_OPERATIONS y
@@ -690,10 +690,12 @@ with stdenv.lib;
 
   CRC32_SELFTEST? n
   CRYPTO_TEST? n
-  DRM_DEBUG_MM_SELFTEST? n
+  ${optionalString (versionOlder version "4.18") ''
+    DRM_DEBUG_MM_SELFTEST? n
+    LNET_SELFTEST? n
+  ''}
   EFI_TEST? n
   GLOB_SELFTEST? n
-  LNET_SELFTEST? n
   LOCK_TORTURE_TEST? n
   MTD_TESTS? n
   NOTIFIER_ERROR_INJECTION? n
diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4794685a7555..d1732af9f5eb 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPackages, hostPlatform, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.17-rc7";
-  modDirVersion = "4.17.0-rc7";
-  extraMeta.branch = "4.17";
+  version = "4.18-rc1";
+  modDirVersion = "4.18.0-rc1";
+  extraMeta.branch = "4.18";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0kibvll2h4wvfbfxral7jsjajaijw0jb0scpjascwh66d7cxbbbr";
+    sha256 = "1wzxnzhxmzn5gygxs1vm4iawknpivr5kn1mav8l1ll3q7s5xqjnr";
   };
 
   # Should the testing kernels ever be built on Hydra?