diff --git a/core/linux-kirkwood-dt/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch b/core/linux-kirkwood-dt/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch
deleted file mode 100644
index 5b9effa57..000000000
--- a/core/linux-kirkwood-dt/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0daf37ef3f4ad76f3e56f888b48111c1b6c9119d Mon Sep 17 00:00:00 2001
-From: Arianna Avanzini <avanzini.arianna@gmail.com>
-Date: Sun, 17 Aug 2014 07:07:24 -0500
-Subject: [PATCH] block: Switch from BFQ-v7r6 for 3.16.0 to BFQ-v7r6 for
- 3.17.0-rc1
-
----
- block/bfq-cgroup.c | 2 +-
- block/bfq.h        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c
-index f742806..eb140eb 100644
---- a/block/bfq-cgroup.c
-+++ b/block/bfq-cgroup.c
-@@ -871,7 +871,7 @@ struct cgroup_subsys bfqio_cgrp_subsys = {
- 	.can_attach = bfqio_can_attach,
- 	.attach = bfqio_attach,
- 	.css_free = bfqio_destroy,
--	.base_cftypes = bfqio_files,
-+	.legacy_cftypes = bfqio_files,
- };
- #else
- static inline void bfq_init_entity(struct bfq_entity *entity,
-diff --git a/block/bfq.h b/block/bfq.h
-index ebbd040..34b37bf 100644
---- a/block/bfq.h
-+++ b/block/bfq.h
-@@ -1,5 +1,5 @@
- /*
-- * BFQ-v7r5 for 3.16.0: data structures and common functions prototypes.
-+ * BFQ-v7r5 for 3.17.0-rc1: data structures and common functions prototypes.
-  *
-  * Based on ideas and code from CFQ:
-  * Copyright (C) 2003 Jens Axboe <axboe@kernel.dk>
--- 
-2.0.4
-
diff --git a/core/linux-kirkwood-dt/PKGBUILD b/core/linux-kirkwood-dt/PKGBUILD
index 775ab7da0..73823dc95 100644
--- a/core/linux-kirkwood-dt/PKGBUILD
+++ b/core/linux-kirkwood-dt/PKGBUILD
@@ -7,10 +7,10 @@ buildarch=2
 pkgbase=linux-kirkwood-dt
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood DT"
-pkgver=3.17.1
+pkgver=3.17.2
 pkgrel=1
 cryptodev_commit=6aa62a2c320b04f55fdfe0ed015c3d9b48997239
-bfqver=v7r5
+bfqver=v7r6
 
 arch=('arm')
 url="http://www.kernel.org/"
@@ -24,33 +24,26 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${pkgver}.tar.xz"
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
-        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
-#        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}"
+#        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs3.x-rcN"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${pkgver:0:4}"
         'cryptodev::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz'
-#        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
-#        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
-#        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
-########REMOVE WHEN BFQ for 3.17 is released
-        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-3.16.patch"
-        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-3.16.patch"
-        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/3.16.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-3.16.0.patch"
-        '0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch'
-#######EVOMER##########
+        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
+        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
+        "http://algo.ing.unimo.it/people/paolo/disk_sched/patches/${pkgver:0:4}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
         'goflexhome_dtb.patch'
         'pogo_e02_dtb.patch')
 
-md5sums=('51765eb37215681798f0bd13450f49ef'
+md5sums=('87444e6f0906e2ec783cf0ed6aab1a56'
          '9b7d775077cfdedcea3e77fa73fe99da'
          'e319a8e1a596a39a8951fc6454664b15'
-         'SKIP'
+         'd75a7fa1f615485cd27b232bc1391838'
          '9b5a265440abf57d2052838f31486a3a'
          '09d44b9f07abfaeaf4f688ee52034786'
          'SKIP'
          'ddf7876487c876f6676ef0e050e9d204'
-         '27b45e15c3f9855792808498af21f664'
-         '812c18775a53e337f1b2c7cd9078bff1'
-         'e903ed2c79546d2f0ec41e7e631c62f7'
-         '90a1fe58e60b17e0e5647a38776e8f43'
+         '065dfb596e42d2c92a34936ae9e718cd'
+         'f5523479e045810acd2baf05f12f7b2c'
+         '0202585b76071b7ca1263515e2b4f23b'
          'e42c64b6f4b54f382cf3d7e8d82968f1'
          '341f8164dad19b6baf05d764a800862a')
 
@@ -85,15 +78,9 @@ msg2 "Add Arch Linux ARM patch for ARMv5te plug computers, mach-types"
   patch -Np1 -i "${srcdir}/pogo_e02_dtb.patch"
 
 msg2 "Add BFQ patches"
-#  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
-#  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
-#  patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
-##REMOVE WHEN BFQ for 3.17 is out
-  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-3.16.patch"
-  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-3.16.patch"
-  patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-3.16.0.patch"  
-  patch -Np1 -i "${srcdir}/0001-block-Switch-from-BFQ-v7r6-for-3.16.0-to-BFQ-v7r6-for-3.17.0-rc1.patch"
-##EVOMER###
+  patch -Np1 -i "${srcdir}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${pkgver:0:4}.patch"
+  patch -Np1 -i "${srcdir}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${pkgver:0:4}.patch"
+  patch -Np1 -i "${srcdir}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${pkgver:0:4}.0.patch"
 
   cat "${srcdir}/config" > ./.config