From 7b7b69d5dfdb3cada0096042fe26a901e6cf9be4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 13 Jun 2018 00:04:31 +0000
Subject: [PATCH] core/linux-armv7 to 4.17.1-1

---
 core/linux-armv7/PKGBUILD | 15 ++++++++-------
 core/linux-armv7/config   |  7 ++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index ccc360d32..febe35e13 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,16 +7,16 @@ pkgbase=linux-armv7
 _srcname=linux-4.17
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.17.0
-pkgrel=2
-rcnrel=armv7-x0
+pkgver=4.17.1
+pkgrel=1
+rcnrel=armv7-x2
 arch=('armv7h')
 url="http://www.kernel.org/"
 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'
@@ -38,7 +38,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux.preset'
         '99-linux.hook')
 md5sums=('5bb13a03274b66b56c85b26682e407d7'
-         'b9e5c7fbb3025d4ec02b61319a1a9fad'
+         '8f430fc5bf2fd5a6ec5da8b4a08473d8'
+         '37fb6baa5e23af99f3421e27c8eef39a'
          '659aa5898b6182ba855dff9584d0b77b'
          '09112f7298d00fb453b6789286d01334'
          'ada6bd5d1519869a0f60cc3523ea2394'
@@ -52,7 +53,7 @@ md5sums=('5bb13a03274b66b56c85b26682e407d7'
          'a4d211d0d0920f6f529c22273e1c4708'
          '8b7f6296bb24f5d6b1d2088cd0fdcb79'
          '52e2a87d059ea401640195b9f9253673'
-         'decf517506ef7f60b5c59dab99deb082'
+         '6dd2120443b2c7d09ae13ed487e51001'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -63,7 +64,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 e29990ee5..d51942189 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.17.0-2 Kernel Configuration
+# Linux/arm 4.17.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -6647,8 +6647,8 @@ CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
 #
 # CONFIG_LEDS_AAT1290 is not set
 # CONFIG_LEDS_AS3645A is not set
-CONFIG_LEDS_BCM6328=m
-CONFIG_LEDS_BCM6358=m
+# CONFIG_LEDS_BCM6328 is not set
+# CONFIG_LEDS_BCM6358 is not set
 CONFIG_LEDS_LM3530=m
 CONFIG_LEDS_LM3642=m
 # CONFIG_LEDS_LM3692X is not set
@@ -8186,6 +8186,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