diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD
index 4b3493ef8..5f826ce31 100644
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@@ -8,13 +8,13 @@ _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
 pkgver=4.2.1
 srcver=${pkgver%.0}
-pkgrel=1
+pkgrel=2
 cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
-bfqver=v7r9
+bfqver=v7r8
 
 ### BFQ patch kernel version
-bfqkern=${pkgver:0:3}
-# bfqkern=4.1
+# bfqkern=${pkgver:0:3}
+bfqkern=4.1
 
 ### AUFS branch name
 # aufsbranch="aufs${pkgver:0:3}"
@@ -40,14 +40,14 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
 
 md5sums=('2a538d1dac3f5426c7a8ab8ef20e95c2'
          '777d455648bd9d6017bc2620347596e8'
-         '2131d373316f79befbe0f83337e73414'
+         '17cbcffe875ed69b9d30e347438b4bea'
          '5faf5d5f9aadf621942bd03c3b993947'
          '9b5a265440abf57d2052838f31486a3a'
          '09d44b9f07abfaeaf4f688ee52034786'
          '8fb4d3b7cc970351f3b5078b7893a107'
-         'd34a32919f9f51c97295a05da5492fc1'
-         'dae2aa6bc4071d44f9dd33b2bab160a6'
-         '9ebc77f51164998355eac3a3c7d13511')
+         '74bf103542cbdee0363819309adb97a2'
+         'f09baae3c7add4ed9bedde22ae3efe19'
+         'bd8cc19a31d1cf8aeeaf9245057c4f9b')
 
 prepare() {
   cd "${srcdir}/linux-${srcver}"
diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config
index af2b8569b..c71a32784 100644
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.2.1-1 Kernel Configuration
+# Linux/arm 4.2.1-2 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -286,7 +286,7 @@ CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_IOSCHED_BFQ=y
-CONFIG_BFQ_GROUP_IOSCHED=y
+CONFIG_CGROUP_BFQIO=y
 # CONFIG_DEFAULT_DEADLINE is not set
 # CONFIG_DEFAULT_CFQ is not set
 CONFIG_DEFAULT_BFQ=y