From 7bd97cd22b103244400944b408e43e24d631b355 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 4 Feb 2018 02:49:13 +0000
Subject: [PATCH] core/linux-armv7 to 4.15.1-1

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

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index 9988f2d20..5afeea993 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -7,16 +7,16 @@ pkgbase=linux-armv7
 _srcname=linux-4.15
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
-pkgver=4.15.0
+pkgver=4.15.1
 pkgrel=1
-rcnrel=armv7-x0
+rcnrel=armv7-x1
 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'
@@ -34,7 +34,8 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'linux.preset'
         '99-linux.hook')
 md5sums=('0d701ac1e2a67d47ce7127432df2c32b'
-         '668d1c13bae50edde29f35bb34f55581'
+         '839159e4710e11dcc836023b3d7b1bf7'
+         '8873b80961fedb375228142022b3924d'
          '7fe0862ef33a0c05a7cfc586a4f1dfe1'
          '6a4f027a2558741fa932b2bbc0de27eb'
          'd5759bba814aaf3fe0ec4d230cca28e9'
@@ -44,7 +45,7 @@ md5sums=('0d701ac1e2a67d47ce7127432df2c32b'
          '3ae78bd2c88a5beaf85d3f9ff53289d0'
          'd7aee2b9e035fbc7e8ed2142251cba05'
          'ce8d5eed57e2841ae3021dd375b9ca8a'
-         'd74c03593eafdad8a6e644c8658deb45'
+         '26eec77cb9bb71caca55940f9bac9aed'
          '4f2379ed84258050edb858ee8d281678'
          '61c5ff73c136ed07a7aadbf58db3d96a'
          '584777ae88bce2c5659960151b64c7d8'
@@ -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 7d299f5c2..df846ce66 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.15.0-1 Kernel Configuration
+# Linux/arm 4.15.1-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -1010,6 +1010,8 @@ CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
 # CONFIG_SMC is not set
 CONFIG_INET=y
+CONFIG_WIREGUARD=m
+# CONFIG_WIREGUARD_DEBUG is not set
 CONFIG_IP_MULTICAST=y
 CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_FIB_TRIE_STATS=y