From 766ec416830ac779f8f3473aad256b3be3529898 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 5 Jun 2016 18:59:27 +0000
Subject: [PATCH] core/linux-armv7 to 4.6.1-1

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

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index d0bb6736c..e67eefd72 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,8 +7,8 @@ pkgbase=linux-armv7
 _srcname=linux-4.6
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.6.0
-pkgrel=3
+pkgver=4.6.1
+pkgrel=1
 rcnrel=armv7-x4
 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/sid-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'
@@ -32,7 +32,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
 md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
-         'a8596af2a59a5c2bceab959ffaff210b'
+         'e3479d9c8a0e8757c16eb03a4258587c'
+         'f6e34bed8234d9e994be67d9a7fd3e5b'
          '1b4bb8c2a33606ede339e5661f0e7fb8'
          '8e2d392b751e5cf1862f1472d0d7a992'
          '56ce0f700dcee0584183452d15c96b58'
@@ -41,7 +42,7 @@ md5sums=('d2927020e24a76da4ab482a8bc3e9ef3'
          '2f7506cf70805d688a880e19e2f3e20a'
          '276e39a7d0ff9bac45607ef4d50e0ab9'
          '1c76d22a3281e9539222ee242da5a7fb'
-         'faaaef5c1ae18fcd62d536e604f5eb8b'
+         'a9addf71c437ac6affe488e2bdf701e1'
          '1813b39074d01af6548951764a0f6444'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
@@ -51,7 +52,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 ab0f741cd..3a08a6d99 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.6.0-3 Kernel Configuration
+# Linux/arm 4.6.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -668,12 +668,13 @@ CONFIG_PCI_STUB=m
 #
 CONFIG_PCI_DRA7XX=y
 CONFIG_PCI_MVEBU=y
-# CONFIG_PCIE_DW_PLAT is not set
+CONFIG_PCIE_DW_PLAT=y
 CONFIG_PCIE_DW=y
 # CONFIG_PCI_EXYNOS is not set
 CONFIG_PCI_IMX6=y
 CONFIG_PCI_TEGRA=y
-# CONFIG_PCI_HOST_GENERIC is not set
+CONFIG_PCI_HOST_COMMON=y
+CONFIG_PCI_HOST_GENERIC=y
 # CONFIG_PCI_KEYSTONE is not set
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_LAYERSCAPE is not set
@@ -7410,6 +7411,7 @@ CONFIG_UFS_FS=m
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
+# CONFIG_AUFS_FS is not set
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y