From fc756910a08ea970ef0a7d703593191f3da6c9fe Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 12 Jul 2018 00:35:14 +0000
Subject: [PATCH] core/linux-armv7-rc to 4.18.rc4-1

---
 core/linux-armv7-rc/PKGBUILD | 10 +++++-----
 core/linux-armv7-rc/config   | 26 ++++++--------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index 44df4fee8..048b2d28c 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -4,8 +4,8 @@
 buildarch=4
 
 _rcver=4.18
-_rcrel=3
-_rcnrel=armv7-x1
+_rcrel=4
+_rcnrel=armv7-x2
 
 pkgbase=linux-armv7-rc
 _srcname=linux-${_rcver}-rc${_rcrel}
@@ -39,8 +39,8 @@ source=("https://git.kernel.org/torvalds/t/${_srcname}.tar.gz"
         'kernel_data_key.vbprivk'
         'linux.preset'
         '99-linux.hook')
-md5sums=('16a311ed0980e551245dfb599e33a191'
-         '307392dc31f244fe40a31f6c0ae7725e'
+md5sums=('51370aee062f2de27d69ffb60d7459e8'
+         '7ede2f5d17b1312b67145ae8252a6ab4'
          'c4f74b028dfceb555d86d34e92da3edd'
          '7f319acd7cb3d5ff5aa620515e8a98a4'
          '43530e94207944841174e955907d775c'
@@ -54,7 +54,7 @@ md5sums=('16a311ed0980e551245dfb599e33a191'
          '2a5e6f64473eeb367b68e24def0dd6f9'
          '754247fc3b6d7300e30ae208a8212cfc'
          '3b7e9848510efaccbc2c8daba28f8065'
-         '2297e79cc778b2f14a444e39a5db4406'
+         '64ea83c2ba0c3a94648f394e915463f9'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index f7f7b8b38..1be15cc94 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,10 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.18.0-rc3-1 Kernel Configuration
+# Linux/arm 4.18.0-rc4-1 Kernel Configuration
 #
 
 #
-# Compiler: gcc (GCC) 8.1.0
+# Compiler: gcc (GCC) 8.1.1 20180531
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -28,7 +28,7 @@ CONFIG_ARM_PATCH_PHYS_VIRT=y
 CONFIG_GENERIC_BUG=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80100
+CONFIG_GCC_VERSION=80101
 CONFIG_CLANG_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -3307,7 +3307,7 @@ CONFIG_KEYBOARD_ADP5589=m
 CONFIG_KEYBOARD_QT1070=m
 CONFIG_KEYBOARD_QT2160=m
 # CONFIG_KEYBOARD_DLINK_DIR685 is not set
-CONFIG_KEYBOARD_LKKBD=m
+# CONFIG_KEYBOARD_LKKBD is not set
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_TCA6416=m
@@ -3325,7 +3325,7 @@ CONFIG_KEYBOARD_TEGRA=m
 CONFIG_KEYBOARD_OPENCORES=m
 CONFIG_KEYBOARD_SAMSUNG=y
 CONFIG_KEYBOARD_STOWAWAY=m
-CONFIG_KEYBOARD_SUNKBD=m
+# CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_STMPE is not set
 CONFIG_KEYBOARD_SUN4I_LRADC=m
 CONFIG_KEYBOARD_OMAP4=m
@@ -3857,21 +3857,7 @@ CONFIG_SPI_SPIDEV=m
 CONFIG_SPI_TLE62X0=m
 # CONFIG_SPI_SLAVE is not set
 # CONFIG_SPMI is not set
-CONFIG_HSI=m
-CONFIG_HSI_BOARDINFO=y
-
-#
-# HSI controllers
-#
-CONFIG_OMAP_SSI=m
-
-#
-# HSI clients
-#
-CONFIG_NOKIA_MODEM=m
-CONFIG_CMT_SPEECH=m
-CONFIG_SSI_PROTOCOL=m
-# CONFIG_HSI_CHAR is not set
+# CONFIG_HSI is not set
 CONFIG_PPS=y
 # CONFIG_PPS_DEBUG is not set