From 4d031759fed9f0a8632c6115a513b5abdcd15239 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 24 Nov 2017 16:49:27 +0000
Subject: [PATCH] core/linux-am33x to 4.14.1-1

---
 core/linux-am33x/PKGBUILD | 13 +++++++------
 core/linux-am33x/config   |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD
index 5222a7229..2f98be775 100644
--- a/core/linux-am33x/PKGBUILD
+++ b/core/linux-am33x/PKGBUILD
@@ -7,16 +7,16 @@ pkgbase=linux-am33x
 _srcname=linux-4.14
 _kernelname=${pkgbase#linux}
 _desc="TI AM335x Beaglebone (Black)"
-pkgver=4.14.0
+pkgver=4.14.1
 pkgrel=1
-rcnrel=bone3
+rcnrel=bone5
 arch=('armv7h')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' '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"
         "git+https://github.com/RobertCNelson/bb.org-overlays.git"
         '0001-add-lcd-cape-for-chiliboard.patch'
@@ -25,11 +25,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux.preset'
         '99-linux.hook')
 md5sums=('bacdb9ffdcd922aa069a5e1520160e24'
-         'b6ac7c63457e9579fe02a1c3f2950364'
+         '67622696833123f68345614fdd512c3f'
+         'f4d7cab90fe89f2762edb0745d274e45'
          'SKIP'
          'dc780fbf3d4d1175a94232d7ba1e3cb3'
          '5698870a716fed205215d258cc71e296'
-         'df364e772269ed20149444be0b018401'
+         'ad293b115519ddfd3c4649768c463f51'
          '78ccc998f27eec49a9d5490218b1b1ab'
          '79fa396e3f9a09a85156d6d7c2d34b58')
 
@@ -37,7 +38,7 @@ prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # RCN patch
   git apply ../patch-${pkgver%.0}-${rcnrel}.diff
diff --git a/core/linux-am33x/config b/core/linux-am33x/config
index e5bf3e9ad..7f1a2fe21 100644
--- a/core/linux-am33x/config
+++ b/core/linux-am33x/config
@@ -6016,6 +6016,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