core/linux-kirkwood-dt to 4.11.3-2

core/linux-kirkwood-dt/PKGBUILD

@@ -8,7 +8,7 @@ _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
 pkgver=4.11.3
 srcver=${pkgver%.0}
-pkgrel=1
+pkgrel=2
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -24,7 +24,8 @@ 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')
+        'linux.preset'
+        "sata_mv_break.patch::https://github.com/torvalds/linux/commit/368e5fbdfc60732643f34f538823ed4bc8829827.patch")
 md5sums=('d8f9218277a3f0d2e1703676002be428'
          'ecfa3b7c697b4a229b06df88b23d2f42'
          'a6c6f6d930d43787117d00fc759c115b'
@@ -34,7 +35,8 @@ md5sums=('d8f9218277a3f0d2e1703676002be428'
          '56cf120f524e655e00919ffda40d3a6e'
          '79dd8cd94a574db6b2a024dec7c45a54'
          'f5a554eefbd337e71cca072e2d2cab45'
-         '959e49540dac4c5e689ad9037150a360')
+         '959e49540dac4c5e689ad9037150a360'
+         '100f7dc260382b6445c716d1b6b83221')
 
 prepare() {
   cd "${srcdir}/linux-${srcver}"
@@ -45,6 +47,12 @@ 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"

core/linux-kirkwood-dt/linux-kirkwood-dt.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-kirkwood-dt
-KERNEL_VERSION=4.11.3-1-ARCH
+KERNEL_VERSION=4.11.3-2-ARCH
 
 post_install () {
   # updating module dependencies