From 1ed65d4ca6d70217836a0e00f69ec7f1b6dc735a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 12 Mar 2019 04:01:11 +0000
Subject: [PATCH] core/linux-armv7 to 5.0.1-1

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

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 1012cc1dc..e614b43af 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,16 +7,16 @@ pkgbase=linux-armv7
 _srcname=linux-5.0
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=5.0.0
+pkgver=5.0.1
 pkgrel=1
-rcnrel=armv7-x2
+rcnrel=armv7-x3
 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/v5.x/${_srcname}.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v5.x/patch-${pkgver}.xz"
+        "http://www.kernel.org/pub/linux/kernel/v5.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'
@@ -35,7 +35,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
         '60-linux.hook'
         '90-linux.hook')
 md5sums=('7381ce8aac80a01448e065ce795c19c0'
-         '055dbd896520b581f21287eff0fc2ff0'
+         '488f0f1b00a0861b4c3ddf578f1bd548'
+         '7da240e8310b58209fdaa691316cdae1'
          '186d831eddea59ab5cc7c62cc4696897'
          'd9a7a634715fa7219159573bd61d3ff7'
          '495ec4bfb1e4a12cca55a3c9bde58bdc'
@@ -45,7 +46,7 @@ md5sums=('7381ce8aac80a01448e065ce795c19c0'
          '5a4a3385293b0d6b156f393a2c685475'
          'e4a4d30642990394812eb996de6705d5'
          '21170922884a1ab0aa7d0711e1012b5f'
-         'b89208f0b9fd4df6e31ce5f11f6d1837'
+         '755381699e648363d67728934b6284de'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -57,7 +58,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 fc6736398..212b18ce4 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.0.0-1 Kernel Configuration
+# Linux/arm 5.0.1-1 Kernel Configuration
 #
 
 #
@@ -3731,8 +3731,8 @@ CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 CONFIG_SERIAL_SAMSUNG_UARTS=4
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_TEGRA=y
-# CONFIG_SERIAL_MAX3100 is not set
-# CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=m
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
 # CONFIG_SERIAL_UARTLITE is not set
@@ -8406,6 +8406,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