From 42f46f6fee44f16e6bf0051c0e79fc6ac5feaa1f Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 29 Oct 2014 02:36:56 +0000
Subject: [PATCH] core/linux-armv7-rc to 3.18.rc2-1

---
 core/linux-armv7-rc/PKGBUILD | 26 +++++++++++++-------------
 core/linux-armv7-rc/config   | 29 ++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/core/linux-armv7-rc/PKGBUILD b/core/linux-armv7-rc/PKGBUILD
index 846c2c242..3e07a4a40 100644
--- a/core/linux-armv7-rc/PKGBUILD
+++ b/core/linux-armv7-rc/PKGBUILD
@@ -4,8 +4,8 @@
 buildarch=4
 
 _rcver=3.18
-_rcrel=1
-_rcnrel=armv7-x0
+_rcrel=2
+_rcnrel=armv7-x1
 
 pkgbase=linux-armv7-rc
 _srcname=linux-3.$((${_rcver##*.}-1))
@@ -28,14 +28,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         '0004-fix-mvsdio-eMMC-timing.patch'
         'config')
 md5sums=('fb30d0f29214d75cddd2faa94f73d5cf'
-         'e765b9b3a7db1a947467cb27dbc15314'
-         '0d54ee2abc3d1c654afec80918bb7323'
+         'cdc96388a5c70f5f385925caab06db12'
+         'c2e362c3c65d62706956964aef1261df'
          'SKIP'
          'bf5c78900f42d0ae6b7f45d8b88ba7f8'
          '4e54599d103d95f9eadd3a4c6a413da0'
          '11889f6e6873f79059c5d9bf3fcc0cf8'
          'e728042f0d32a7d2e0610ed3eaf4ad52'
-         '9499eb8a54de02cb9d5fc7ea51431416')
+         'c32f739244d68e0290c913c7a3f7af42')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -53,15 +53,15 @@ prepare() {
   git apply ../0004-fix-mvsdio-eMMC-timing.patch
 
   # AUFS patches
-  #cp -ru "${srcdir}/aufs3-standalone/Documentation" .
-  #cp -ru "${srcdir}/aufs3-standalone/fs" .
-  #cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
-  #cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
+  cp -ru "${srcdir}/aufs3-standalone/Documentation" .
+  cp -ru "${srcdir}/aufs3-standalone/fs" .
+  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
+  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
 
-  #git apply ../aufs3-standalone/aufs3-kbuild.patch
-  #git apply ../aufs3-standalone/aufs3-base.patch
-  #git apply ../aufs3-standalone/aufs3-mmap.patch
-  #git apply ../aufs3-standalone/aufs3-standalone.patch
+  git apply ../aufs3-standalone/aufs3-kbuild.patch
+  git apply ../aufs3-standalone/aufs3-base.patch
+  git apply ../aufs3-standalone/aufs3-mmap.patch
+  git apply ../aufs3-standalone/aufs3-standalone.patch
 
   cat "${srcdir}/config" > ./.config
 
diff --git a/core/linux-armv7-rc/config b/core/linux-armv7-rc/config
index f6a99d852..b20646d9d 100644
--- a/core/linux-armv7-rc/config
+++ b/core/linux-armv7-rc/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.18.0-rc1-1 Kernel Configuration
+# Linux/arm 3.18.0-rc2-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2132,6 +2132,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
@@ -2580,8 +2581,8 @@ CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
 CONFIG_RTL8723BE=m
 CONFIG_RTL8188EE=m
-# CONFIG_RTL8192EE is not set
-# CONFIG_RTL8821AE is not set
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
@@ -3470,6 +3471,7 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 CONFIG_THERMAL_GOV_FAIR_SHARE=y
 CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 # CONFIG_THERMAL_EMULATION is not set
@@ -3501,9 +3503,11 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_SOFT_WATCHDOG is not set
 CONFIG_DA9052_WATCHDOG=y
 # CONFIG_DA9055_WATCHDOG is not set
+# CONFIG_DA9063_WATCHDOG is not set
 # CONFIG_GPIO_WATCHDOG is not set
 CONFIG_XILINX_WATCHDOG=y
 # CONFIG_ARM_SP805_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
 CONFIG_HAVE_S3C2410_WATCHDOG=y
 CONFIG_S3C2410_WATCHDOG=y
 # CONFIG_DW_WATCHDOG is not set
@@ -6087,6 +6091,7 @@ CONFIG_QUOTACTL=y
 CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
+CONFIG_OVERLAYFS_FS=m
 
 #
 # Caches
@@ -6189,6 +6194,24 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_FS is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+CONFIG_AUFS_SBILIST=y
+CONFIG_AUFS_HNOTIFY=y
+CONFIG_AUFS_HFSNOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_FHSM=y
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y