From a934e14b5aef1db0e88b169303d5aa6a8f1a12bf Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 24 Sep 2015 02:04:47 +0000
Subject: [PATCH] core/linux-armv7 to 4.2.1-1

---
 core/linux-armv7/PKGBUILD | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 3b01750e3..326072469 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-armv7
 _srcname=linux-4.2
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.2.0
-pkgrel=3
+pkgver=4.2.1
+pkgrel=1
 rcnrel=armv7-x2
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -16,7 +16,7 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
         "http://rcn-ee.com/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
         #"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs${pkgver%.*}"
         #"git+https://github.com/sfjro/aufs4-standalone.git#branch=aufs4.x-rcN"
@@ -30,7 +30,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         '0008-USB-armory-support.patch'
         'config')
 md5sums=('3d5ea06d767e2f35c999eeadafc76523'
-         '33171560f60e2695f92590e76ca030a5'
+         '3e1cc007d930f8760ef0730609dca035'
+         '442d9d927633bc61d9e7fd2d0d7e047a'
          '61f728f854713d17a3d4ef00f8e38f1e'
          'bc39bcc5d752155854f31eb7758db5e8'
          'e871d819421abab551d8219b62cccdf9'
@@ -45,7 +46,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #git apply --whitespace=nowarn ../patch-${pkgver}
+  git apply --whitespace=nowarn ../patch-${pkgver}
 
   # RCN patch
   git apply ../patch-${pkgver%.0}-${rcnrel}.diff