From c6b66537a87ab966350199ee22905eeeb53fe937 Mon Sep 17 00:00:00 2001
From: moonman <moonman.ca@gmail.com>
Date: Mon, 16 Dec 2013 13:55:00 -0700
Subject: [PATCH] core/linux update outdated aufs3 patch, some other minor
 config changes

---
 core/linux/PKGBUILD      | 22 +++++++---------------
 core/linux/config        |  7 ++++---
 core/linux/linux.install |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/core/linux/PKGBUILD b/core/linux/PKGBUILD
index 5c167c108..8b8aab0ca 100644
--- a/core/linux/PKGBUILD
+++ b/core/linux/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('linux' 'linux-headers')
 _kernelname=${pkgname#linux}
 _basekernel=3.1
 pkgver=${_basekernel}.10
-pkgrel=28
+pkgrel=29
 cryptover=1.6
 bfqver=v6r2
 uksmver=0.1.2.2
@@ -26,10 +26,7 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
         'memset.patch'
         'pciefix.patch'
         'support.patch'
-        'aufs3-kbuild.patch'
-        'aufs3-base.patch'
-        'aufs3-standalone.patch'
-        'aufs3-git-extras.patch'
+        'aufs3-3.1.patch.xz'
         'config'
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'change-default-console-loglevel.patch'
@@ -40,18 +37,16 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.bz2
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0003-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${_basekernel}.patch"
         "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${_basekernel}.0-${bfqver}/0004-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
         "http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
+
 md5sums=('8d43453f8159b2332ad410b19d86a931'
          'a8e1c25a93a685ec2a1c3a808715fe9d'
          '3146a693d9225343de2a8dbeb0c8e841'
          '39be2896f0b968d61a19b33da75ce6e0'
          '61dbbcdb0f35032ea7f82c5b1ef7c769'
          'f5d3635da03cb45904bedd69b47133de'
-         '3f64ed9d71499fe9293dc671f4e4087e'
-         '29628745258df910abfb8cb24ca3ccd9'
-         'c9e6e8bb0774a89f7f9bd30a13be7532'
-         '55b04499a4578e586cf5a4d0b69fc5aa'
-         'd0c9618f942ab76212c9434dc14ba9b3'
-         '84b2360d1fee9a97ab9e1fba1446b8c3'
+         'e77f1c6fa171b2cb3d08109c036af069'
+         '3486198be707229b40c493a05970f7ba'
+         'SKIP'
          '9d3c56a4b999c8bfbd4018089a62f662'
          'd00814b57448895e65fbbc800e8a58ba'
          '19685c92623a8176fe3ed41d1ef8c5d9'
@@ -94,10 +89,7 @@ msg2 "Add BFQ I/O scheduler patches"
   patch -Np1 -i "${srcdir}/0004-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${_basekernel}.0.patch"
 
 msg2 "Add AUFS3 patches"
-  patch -Np1 -i "${srcdir}/aufs3-kbuild.patch"
-  patch -Np1 -i "${srcdir}/aufs3-base.patch"
-  patch -Np1 -i "${srcdir}/aufs3-standalone.patch"
-  patch -Np1 -i "${srcdir}/aufs3-git-extras.patch"
+  patch -Np1 -i "${srcdir}/aufs3-3.1.patch"
 
   # add latest fixes from stable queue, if needed
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
diff --git a/core/linux/config b/core/linux/config
index 9da0e283f..8f57fd800 100644
--- a/core/linux/config
+++ b/core/linux/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.1.10-25 Kernel Configuration
+# Linux/arm 3.1.10-29 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -116,7 +116,7 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 # CONFIG_EXPERT is not set
@@ -400,7 +400,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=999999
-# CONFIG_COMPACTION is not set
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
 # CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_ZONE_DMA_FLAG=0
 CONFIG_VIRT_TO_BUS=y
diff --git a/core/linux/linux.install b/core/linux/linux.install
index 5676d8c0b..3ac21f1b0 100644
--- a/core/linux/linux.install
+++ b/core/linux/linux.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.1.10-26-ARCH
+KERNEL_VERSION=3.1.10-29-ARCH
 
 post_install () {
   # updating module dependencies