From 9929fdc477461b171d0b335723ccf2e529079451 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 7 Nov 2014 02:07:42 +0000
Subject: [PATCH] core/linux-armv5-rc to 3.18.rc3-1

---
 core/linux-armv5-rc/PKGBUILD |  6 +++---
 core/linux-armv5-rc/config   | 27 +++++++++++++++++++--------
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/core/linux-armv5-rc/PKGBUILD b/core/linux-armv5-rc/PKGBUILD
index b7bb17c14..7ebc0620e 100644
--- a/core/linux-armv5-rc/PKGBUILD
+++ b/core/linux-armv5-rc/PKGBUILD
@@ -4,7 +4,7 @@
 buildarch=2
 
 _rcver=3.18
-_rcrel=2
+_rcrel=3
 
 pkgbase=linux-armv5-rc
 _srcname=linux-3.$((${_rcver##*.}-1))
@@ -27,14 +27,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'archlinuxarm.patch'
         'config')
 md5sums=('fb30d0f29214d75cddd2faa94f73d5cf'
-         'cdc96388a5c70f5f385925caab06db12'
+         '84109345d207976c0a899b1d29bfeddd'
          'SKIP'
          'e3911eef007c122d23fd8ad7e91d69bf'
          '3a1e689563354c2f9f2d2764e1baa334'
          'a88071c80e1c2b22637894ae148c74b8'
          'e64077ce856769fc3af2a15ae95d8310'
          'e319a8e1a596a39a8951fc6454664b15'
-         'c7f55d2d777cbb833a91725f8e0e39e2')
+         '9f9ab7555a0b8c8cb1837c113950a881')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-armv5-rc/config b/core/linux-armv5-rc/config
index b204e1a9d..03fc30025 100644
--- a/core/linux-armv5-rc/config
+++ b/core/linux-armv5-rc/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.0-rc2-1 Kernel Configuration
+# Linux/arm 3.18.0-rc3-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -151,6 +151,7 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_HAVE_UID16=y
+CONFIG_BPF=y
 CONFIG_EXPERT=y
 CONFIG_UID16=y
 # CONFIG_SGETMASK_SYSCALL is not set
@@ -167,6 +168,7 @@ CONFIG_EPOLL=y
 CONFIG_SIGNALFD=y
 CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
+CONFIG_BPF_SYSCALL=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
 CONFIG_ADVISE_SYSCALLS=y
@@ -513,7 +515,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
-CONFIG_CPUFREQ_DT=y
+CONFIG_CPUFREQ_DT=m
 
 #
 # ARM CPU frequency scaling drivers
@@ -1648,6 +1650,7 @@ CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
 CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER=m
 CONFIG_LOOPBACK_TARGET=m
 CONFIG_ISCSI_TARGET=m
 # CONFIG_FUSION is not set
@@ -2587,11 +2590,11 @@ CONFIG_THERMAL_OF=y
 CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
-# CONFIG_THERMAL_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
-# CONFIG_THERMAL_GOV_BANG_BANG is not set
-# CONFIG_THERMAL_GOV_USER_SPACE is not set
-# CONFIG_CPU_THERMAL is not set
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
 CONFIG_KIRKWOOD_THERMAL=m
 # CONFIG_ARMADA_THERMAL is not set
@@ -4095,7 +4098,15 @@ CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 CONFIG_DMA_ENGINE_RAID=y
 # CONFIG_AUXDISPLAY is not set
-# CONFIG_UIO is not set
+CONFIG_UIO=m
+# CONFIG_UIO_CIF is not set
+# CONFIG_UIO_PDRV_GENIRQ is not set
+# CONFIG_UIO_DMEM_GENIRQ is not set
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_SERCOS3 is not set
+# CONFIG_UIO_PCI_GENERIC is not set
+# CONFIG_UIO_NETX is not set
+# CONFIG_UIO_MF624 is not set
 # CONFIG_VIRT_DRIVERS is not set
 
 #
@@ -4571,7 +4582,7 @@ CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=y
-# CONFIG_OVERLAYFS_FS is not set
+CONFIG_OVERLAYFS_FS=m
 
 #
 # Caches