From 173cd5c7d4ffe23b6fa098f18d4017c6207a60c8 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sat, 21 May 2016 16:05:09 +0000
Subject: [PATCH] core/linux-armv7 to 4.6.0-3

---
 core/linux-armv7/PKGBUILD |  8 ++++----
 core/linux-armv7/config   | 17 ++---------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 92ab6ed84..d0bb6736c 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -8,8 +8,8 @@ _srcname=linux-4.6
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
 pkgver=4.6.0
-pkgrel=2
-rcnrel=armv7-x3
+pkgrel=3
+rcnrel=armv7-x4
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -32,7 +32,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
 md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
-         'e46d2cc532fa010d589de5e2784ffa24'
+         'a8596af2a59a5c2bceab959ffaff210b'
          '1b4bb8c2a33606ede339e5661f0e7fb8'
          '8e2d392b751e5cf1862f1472d0d7a992'
          '56ce0f700dcee0584183452d15c96b58'
@@ -41,7 +41,7 @@ md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
          '2f7506cf70805d688a880e19e2f3e20a'
          '276e39a7d0ff9bac45607ef4d50e0ab9'
          '1c76d22a3281e9539222ee242da5a7fb'
-         'd4b2cdaddec64332fda466eb4b27348c'
+         'faaaef5c1ae18fcd62d536e604f5eb8b'
          '1813b39074d01af6548951764a0f6444'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index 4f11d1c88..ab0f741cd 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.6.0-2 Kernel Configuration
+# Linux/arm 4.6.0-3 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -787,8 +787,7 @@ CONFIG_KEXEC=y
 CONFIG_ATAGS_PROC=y
 # CONFIG_CRASH_DUMP is not set
 CONFIG_AUTO_ZRELADDR=y
-CONFIG_EFI_STUB=y
-CONFIG_EFI=y
+# CONFIG_EFI is not set
 
 #
 # CPU Power Management
@@ -6367,7 +6366,6 @@ CONFIG_RTC_DRV_DS2404=m
 CONFIG_RTC_DRV_DA9052=y
 CONFIG_RTC_DRV_DA9055=m
 CONFIG_RTC_DRV_DA9063=m
-CONFIG_RTC_DRV_EFI=y
 CONFIG_RTC_DRV_STK17TA8=m
 CONFIG_RTC_DRV_M48T86=m
 CONFIG_RTC_DRV_M48T35=m
@@ -7241,15 +7239,6 @@ CONFIG_ARM_PSCI_FW=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_HAVE_ARM_SMCCC=y
 
-#
-# EFI (Extensible Firmware Interface) Support
-#
-CONFIG_EFI_VARS=m
-CONFIG_EFI_ESRT=y
-CONFIG_EFI_PARAMS_FROM_FDT=y
-CONFIG_EFI_RUNTIME_WRAPPERS=y
-CONFIG_EFI_ARMSTUB=y
-
 #
 # File systems
 #
@@ -7367,7 +7356,6 @@ CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_TMPFS_XATTR=y
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_CONFIGFS_FS=y
-CONFIG_EFIVAR_FS=m
 CONFIG_MISC_FILESYSTEMS=y
 CONFIG_ORANGEFS_FS=m
 CONFIG_ADFS_FS=m
@@ -7996,7 +7984,6 @@ CONFIG_IRQ_POLL=y
 CONFIG_MPILIB=m
 CONFIG_LIBFDT=y
 CONFIG_OID_REGISTRY=y
-CONFIG_UCS2_STRING=y
 CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y