From 483ab04ae24cf1e1608223e5d6e1cb1245bef2ba Mon Sep 17 00:00:00 2001
From: moonman <moonman.ca@gmail.com>
Date: Fri, 16 Jun 2017 19:10:41 -0600
Subject: [PATCH] core/linux-kirkwood-dt to 4.11.5-1

---
 core/linux-kirkwood-dt/PKGBUILD | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
index be090eadf..38a3c89c1 100644
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=2
 pkgbase=linux-kirkwood-dt
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=4.11.4
+pkgver=4.11.5
 srcver=${pkgver%.0}
 pkgrel=1
 arch=('arm')
@@ -24,8 +24,7 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         "bfq4.patch::http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.11.0-v8r11/0004-blk-bfq-turn-BFQ-v7r11-for-4.11.0-into-BFQ-v8r11-for.patch"
         'fix_shortread_on_huge_media.patch'
         'goflexhome_fdt.patch'
-        'linux.preset'
-        "sata_mv_break.patch::https://github.com/torvalds/linux/commit/368e5fbdfc60732643f34f538823ed4bc8829827.patch")
+        'linux.preset')
 md5sums=('b42388665bf214eb8f37407dcf07571a'
          'ecfa3b7c697b4a229b06df88b23d2f42'
          'a6c6f6d930d43787117d00fc759c115b'
@@ -47,12 +46,6 @@ prepare() {
   # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=11535&p=55350#p55350
   patch -Np1 -i "${srcdir}/fix_shortread_on_huge_media.patch"
 
-  # Revert patch that breaks sata_mv
-  # https://archlinuxarm.org/forum/viewtopic.php?f=15&t=11764
-  # Commit 368e5fbdfc60732643f34f538823ed4bc8829827 upstream
-  # https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit/?id=368e5fbdfc60732643f34f538823ed4bc8829827
-  patch -Np1 -R -i "${srcdir}/sata_mv_break.patch"
-
   msg2 "Add Arch Linux ARM patch for ARMv5te plug computers"
   patch -Np1 -i "${srcdir}/archlinuxarm.patch"
   patch -Np1 -i "${srcdir}/goflexhome_fdt.patch"