From a7e01e77a43caa0c2bbbbc57e6a021632f31a710 Mon Sep 17 00:00:00 2001
From: moonman <moonman.ca@gmail.com>
Date: Fri, 23 Oct 2015 09:49:55 +0000
Subject: [PATCH] core/linux-imx6-cubox-dt to 3.14.55-1

---
 core/linux-imx6-cubox-dt/PKGBUILD                 | 15 ++++-----------
 .../linux-imx6-cubox-dt.install                   |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/core/linux-imx6-cubox-dt/PKGBUILD b/core/linux-imx6-cubox-dt/PKGBUILD
index 296edd425..ebd0f0a52 100644
--- a/core/linux-imx6-cubox-dt/PKGBUILD
+++ b/core/linux-imx6-cubox-dt/PKGBUILD
@@ -11,12 +11,12 @@ buildarch=4
 pkgbase=linux-imx6-cubox-dt
 pkgname=('linux-imx6-cubox-dt' 'linux-headers-imx6-cubox-dt')
 # pkgname=linux-custom       # Build kernel with a different name
-_commit=2fd4643d05a7b7ab4eb3fb66cf4df8f2a3006e19
+_commit=20918af90b87ceb9bdd597a6c72c378dd28a6b43
 _srcname=linux-imx6-3.14-${_commit}
 _kernelname=${pkgname#linux}
 _basekernel=3.14
-pkgver=${_basekernel}.54
-pkgrel=2
+pkgver=${_basekernel}.55
+pkgrel=1
 cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
 bfqver=v7r8
 
@@ -32,20 +32,18 @@ source=("linux-${_commit}::https://github.com/moonman/linux-imx6-3.14/archive/${
         "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
         "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
         "ftp://teambelgium.net/bfq/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
-        'https://github.com/moonman/linux-imx6-3.14/commit/427f994587dde5a0064e85614a631c075481c4ba.patch'
         'config'
         '001_cec.patch'
         '002_cec.patch'
         '003_cec.patch')
 
-md5sums=('42ddf343f1d247b0e0685cae366fefcd'
+md5sums=('8786267e5c98bf88e387c6bec58c96d7'
          '8fb4d3b7cc970351f3b5078b7893a107'
          'SKIP'
          '1b276abe16d14e133f3f28d9c9e6bd68'
          'defe6b5df33f8c11c2bf45f67ad35d8d'
          '2c10ccc1169884d2f12ba95fe11d29fd'
          '3baee38bf7fdcd47b2cc9628949b5784'
-         '4cd794bab0abedf5c6eea5a991cc939c'
          '1ea8de6e5c6cae2e33f5767c7f16174e'
          '8bf79a580704e8dab806f58043720a90'
          '6391a74bf1d451b74df6f189a25cf642'
@@ -54,10 +52,6 @@ md5sums=('42ddf343f1d247b0e0685cae366fefcd'
 prepare() {
   cd "${srcdir}/${_srcname}"
 
-  # Fixes infinate list on 'ip rule list'
-  # Remove when fixed upstram
-  patch -R -Np1 -i ${srcdir}/427f994587dde5a0064e85614a631c075481c4ba.patch
-
   msg2 "Fix hci_vhci no minor warning"
   patch -Np1 -i ${srcdir}/0001-Bluetooth-allocate-static-minor-for-vhci.patch
 
@@ -132,7 +126,6 @@ package_linux-imx6-cubox-dt() {
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=('kernel26' "linux=${pkgver}" 'aufs_friendly' 'cryptodev_friendly')
   conflicts=('linux-trimslice' 'linux-omap')
-  backup=("etc/mkinitcpio.d/${pkgname}.preset")
   install=${pkgname}.install
 
   cd "${srcdir}/${_srcname}"
diff --git a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install
index 226200b98..0c308b6a8 100644
--- a/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install
+++ b/core/linux-imx6-cubox-dt/linux-imx6-cubox-dt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-imx6-cubox-dt
-KERNEL_VERSION=3.14.53-1-ARCH
+KERNEL_VERSION=3.14.55-1-ARCH
 
 post_install () {
   # updating module dependencies