From c9c224a3222977233f2b0cb0b01c73a54601ebea Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 18 Aug 2016 00:28:53 +0000
Subject: [PATCH] core/linux-armv7 to 4.7.1-1

---
 core/linux-armv7/PKGBUILD | 13 +++++++------
 core/linux-armv7/config   |  5 ++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 815641ee9..90483b1ed 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-armv7
 _srcname=linux-4.7
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.7.0
-pkgrel=4
+pkgver=4.7.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' 'vboot-utils' 'dtc')
 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/stretch-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
@@ -34,7 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
 md5sums=('5276563eb1f39a048e4a8a887408c031'
-         'cf1f124778116d3cd428594e4f14f78c'
+         'b87c3627d4c3e3043f46c6422dfd83b0'
+         '104aaa3cd9f2e31112a1483b207bc2de'
          'cf20eda38cc118be2463bf00c199f8ab'
          'f60b1d12c439f2c41fc05a7c3ee8a6ef'
          '3216f91cb1091a2ee5cb5a4a0860e6bd'
@@ -45,7 +46,7 @@ md5sums=('5276563eb1f39a048e4a8a887408c031'
          '3cfeb151fe472bd5a62d5e12ed41058b'
          '63e5984133bd4230e259c23c39b90875'
          '9794384e9f8c8524e814a6177247ceab'
-         '0d25ef953a09b9f09c317fa786a0720f'
+         '75edd205b0b3a79f4be6fdde52c13005'
          '1813b39074d01af6548951764a0f6444'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
@@ -55,7 +56,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
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index 356954b18..1dc2606d8 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.7.0-4 Kernel Configuration
+# Linux/arm 4.7.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -2245,8 +2245,7 @@ CONFIG_SCSI_UFSHCD_PCI=m
 CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 # CONFIG_FCOE is not set
-CONFIG_SCSI_SNIC=m
-# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+# CONFIG_SCSI_SNIC is not set
 CONFIG_SCSI_DMX3191D=m
 # CONFIG_SCSI_FUTURE_DOMAIN is not set
 # CONFIG_SCSI_IPS is not set