diff --git a/patch.sh b/patch.sh
index 74b1754a13ffbd4df9d104522c2b7ed035cd5e02..581f7f539e1ef30cc9d033ad38418ad89805e8d5 100644
--- a/patch.sh
+++ b/patch.sh
@@ -54,11 +54,6 @@ revert () {
echo "dir: revert"
}
-arm () {
- echo "dir: arm"
-# ${git} "${DIR}/patches/arm/0001-deb-pkg-Simplify-architecture-matching-for-cross-bui.patch"
-}
-
drivers () {
echo "dir: drivers"
${git} "${DIR}/patches/drivers/0001-ARM-i.MX6-Wandboard-add-wifi-bt-rfkill-driver.patch"
@@ -340,6 +335,7 @@ fixes () {
echo "dir: fixes"
${git} "${DIR}/patches/fixes/0001-imx6q-work-around-fec-tx-queue-timeouts-when-SATA-SD.patch"
${git} "${DIR}/patches/fixes/0002-fix-compilation-of-imx-hdmi.patch"
+ ${git} "${DIR}/patches/fixes/0003-Makefile-extra.patch"
}
vivante () {
@@ -368,7 +364,6 @@ saucy () {
}
#revert
-arm
drivers
imx_next
omap_next
diff --git a/patches/arm/0001-deb-pkg-Simplify-architecture-matching-for-cross-bui.patch b/patches/arm/0001-deb-pkg-Simplify-architecture-matching-for-cross-bui.patch
deleted file mode 100644
index 7c2d27ef6b440bc9ae57050a224055d1aae99b76..0000000000000000000000000000000000000000
--- a/patches/arm/0001-deb-pkg-Simplify-architecture-matching-for-cross-bui.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 1b4c2bc7af46a8d7cba2bc1d4aa8fd814dc1c3cc Mon Sep 17 00:00:00 2001
-From: maximilian attems <max@xxxxxxx>
-Date: Thu, 6 Sep 2012 15:22:02 +0200
-Subject: [PATCH] deb-pkg: Simplify architecture matching for cross building
-
-No point in invoking dpkg to get the archticture of the host
-we build on. Instead directly use the logic implemented
-in create_package(). No need anymore to override arch.
-
-While at it fix the linux images to be for the specific
-built arch.
-
-Signed-off-by: maximilian attems <max@xxxxxxx>
----
- scripts/package/builddeb | 78 +++++++++++++++++++++++-------------------------
- 1 file changed, 38 insertions(+), 40 deletions(-)
-
-diff --git a/scripts/package/builddeb b/scripts/package/builddeb
-index 90e521f..1b2fc99 100644
---- a/scripts/package/builddeb
-+++ b/scripts/package/builddeb
-@@ -27,42 +27,9 @@ create_package() {
-
- # Attempt to find the correct Debian architecture
- local forcearch="" debarch=""
-- case "$UTS_MACHINE" in
-- i386|ia64|alpha)
-- debarch="$UTS_MACHINE" ;;
-- x86_64)
-- debarch=amd64 ;;
-- sparc*)
-- debarch=sparc ;;
-- s390*)
-- debarch=s390 ;;
-- ppc*)
-- debarch=powerpc ;;
-- parisc*)
-- debarch=hppa ;;
-- mips*)
-- debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
-- arm*)
-- debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
-- *)
-- echo "" >&2
-- echo "** ** ** WARNING ** ** **" >&2
-- echo "" >&2
-- echo "Your architecture doesn't have it's equivalent" >&2
-- echo "Debian userspace architecture defined!" >&2
-- echo "Falling back to using your current userspace instead!" >&2
-- echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
-- echo "" >&2
-- esac
-- if [ -n "$KBUILD_DEBARCH" ] ; then
-- debarch="$KBUILD_DEBARCH"
-- fi
-- if [ -n "$debarch" ] ; then
-- forcearch="-DArchitecture=$debarch"
-- fi
-
- # Create the package
-- dpkg-gencontrol -isp $forcearch -p$pname -P"$pdir"
-+ dpkg-gencontrol -p$pname -P"$pdir"
- dpkg --build "$pdir" ..
- }
-
-@@ -85,6 +52,38 @@ kernel_headers_packagename=linux-headers-$version
- libc_headers_packagename=linux-libc-dev
- dbg_packagename=$packagename-dbg
-
-+# Attempt to find the correct Debian architecture
-+case "$UTS_MACHINE" in
-+i386|ia64|alpha)
-+ debarch="$UTS_MACHINE" ;;
-+x86_64)
-+ debarch=amd64 ;;
-+sparc*)
-+ debarch=sparc ;;
-+s390*)
-+ debarch=s390 ;;
-+ppc*)
-+ debarch=powerpc ;;
-+parisc*)
-+ debarch=hppa ;;
-+mips*)
-+ debarch=mips$(grep -q CPU_LITTLE_ENDIAN=y $KCONFIG_CONFIG && echo el) ;;
-+arm*)
-+ debarch=arm$(grep -q CONFIG_AEABI=y $KCONFIG_CONFIG && echo el) ;;
-+*)
-+ echo "" >&2
-+ echo "** ** ** WARNING ** ** **" >&2
-+ echo "" >&2
-+ echo "Your architecture doesn't have it's equivalent" >&2
-+ echo "Debian userspace architecture defined!" >&2
-+ echo "Falling back to using your current userspace instead!" >&2
-+ echo "Please add support for $UTS_MACHINE to ${0} ..." >&2
-+ echo "" >&2
-+esac
-+if [ -n "$KBUILD_DEBARCH" ] ; then
-+ debarch="$KBUILD_DEBARCH"
-+fi
-+
- if [ "$ARCH" = "um" ] ; then
- packagename=user-mode-linux-$version
- fi
-@@ -269,8 +268,8 @@ else
- Package: $packagename
- Provides: linux-image, linux-image-2.6, linux-modules-$version
- Suggests: $fwpackagename
--Architecture: any
--Description: Linux kernel, version $version
-+Architecture: $debarch
-+Description: Linux kernel, version $version on $debarch
- This package contains the Linux kernel, modules and corresponding other
- files, version: $version.
- EOF
-@@ -288,15 +287,14 @@ mkdir -p "$destdir"
- (cd $objtree; cp $KCONFIG_CONFIG $destdir/.config) # copy .config manually to be where it's expected to be
- ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
- rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
--arch=$(dpkg --print-architecture)
-
- cat <<EOF >> debian/control
-
- Package: $kernel_headers_packagename
-+Architecture: $debarch
- Provides: linux-headers, linux-headers-2.6
--Architecture: $arch
--Description: Linux kernel headers for $KERNELRELEASE on $arch
-- This package provides kernel header files for $KERNELRELEASE on $arch
-+Description: Linux kernel headers for $KERNELRELEASE on $debarch
-+ This package provides kernel header files for $KERNELRELEASE on $debarch
- .
- This is useful for people who need to build external modules
- EOF
---
-1.8.4.rc3
-
diff --git a/patches/defconfig b/patches/defconfig
index d752e4687f29c1297f5630cb8832f7944f4bbbc5..d0e153eabb698155cebeeaede2726562fc72e9cd 100644
--- a/patches/defconfig
+++ b/patches/defconfig
@@ -276,7 +276,7 @@ CONFIG_EFI_PARTITION=y
CONFIG_IOSCHED_NOOP=y
CONFIG_IOSCHED_DEADLINE=y
CONFIG_IOSCHED_CFQ=y
-# CONFIG_CFQ_GROUP_IOSCHED is not set
+CONFIG_CFQ_GROUP_IOSCHED=y
# CONFIG_DEFAULT_DEADLINE is not set
CONFIG_DEFAULT_CFQ=y
# CONFIG_DEFAULT_NOOP is not set
diff --git a/patches/fixes/0003-Makefile-extra.patch b/patches/fixes/0003-Makefile-extra.patch
new file mode 100644
index 0000000000000000000000000000000000000000..9d094b47eeed200976e1a14a02bfb967af59d31d
--- /dev/null
+++ b/patches/fixes/0003-Makefile-extra.patch
@@ -0,0 +1,26 @@
+From bfbb3b1412aa165c2b64975491ac80928ae976e5 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Mon, 3 Feb 2014 14:31:28 -0600
+Subject: [PATCH 3/3] Makefile: extra )
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 606ef7c..3574708 100644
+--- a/Makefile
++++ b/Makefile
+@@ -606,7 +606,7 @@ ifdef CONFIG_CC_STACKPROTECTOR_REGULAR
+ stackp-flag := -fstack-protector
+ ifeq ($(call cc-option, $(stackp-flag)),)
+ $(warning Cannot use CONFIG_CC_STACKPROTECTOR: \
+- -fstack-protector not supported by compiler))
++ -fstack-protector not supported by compiler)
+ endif
+ else ifdef CONFIG_CC_STACKPROTECTOR_STRONG
+ stackp-flag := -fstack-protector-strong
+--
+1.8.5.3
+
diff --git a/patches/omap_clock/0001-Added-the-Texas-Instruments-OMAP-Clock-driver-origin.patch b/patches/omap_clock/0001-Added-the-Texas-Instruments-OMAP-Clock-driver-origin.patch
deleted file mode 100644
index a8e9b280bd265921baef04ce0635dd5c66899fe9..0000000000000000000000000000000000000000
--- a/patches/omap_clock/0001-Added-the-Texas-Instruments-OMAP-Clock-driver-origin.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 4aa2a75ce483a75b66e0c03400e89a0713a3efb9 Mon Sep 17 00:00:00 2001
-From: Teknoman117 <linux.robotdude@gmail.com>
-Date: Wed, 24 Jul 2013 02:57:08 -0700
-Subject: [PATCH 1/3] Added the Texas Instruments OMAP Clock driver originally
-
-Added the Texas Instruments OMAP Clock driver originally found here:
-http://lkml.indiana.edu/hypermail/linux/kernel/1304.1/04079.html
-
-Signed-off-by: Teknoman117 <linux.robotdude@gmail.com>
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- drivers/clk/Makefile | 1 +
- drivers/clk/omap/Makefile | 1 +
- drivers/clk/omap/clk.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 102 insertions(+)
- create mode 100644 drivers/clk/omap/Makefile
- create mode 100644 drivers/clk/omap/clk.c
-
-diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile
-index 0c16e9c..e24476d 100644
---- a/drivers/clk/Makefile
-+++ b/drivers/clk/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_ARCH_VT8500) += clk-vt8500.o
- obj-$(CONFIG_ARCH_SIRF) += sirf/
- obj-$(CONFIG_ARCH_ZYNQ) += zynq/
- obj-$(CONFIG_ARCH_TEGRA) += tegra/
-+obj-$(CONFIG_ARCH_OMAP) += omap/
- obj-$(CONFIG_PLAT_SAMSUNG) += samsung/
- obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o
- obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/
-diff --git a/drivers/clk/omap/Makefile b/drivers/clk/omap/Makefile
-new file mode 100644
-index 0000000..0303c0b
---- /dev/null
-+++ b/drivers/clk/omap/Makefile
-@@ -0,0 +1 @@
-+obj-y += clk.o
-diff --git a/drivers/clk/omap/clk.c b/drivers/clk/omap/clk.c
-new file mode 100644
-index 0000000..f7f432d
---- /dev/null
-+++ b/drivers/clk/omap/clk.c
-@@ -0,0 +1,100 @@
-+/*
-+ * Texas Instruments OMAP Clock driver
-+ *
-+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
-+ * Nishanth Menon <nm@xxxxxx>
-+ * Tony Lindgren <tony@xxxxxxxxxxx>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2 as
-+ * published by the Free Software Foundation.
-+ *
-+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
-+ * kind, whether express or implied; without even the implied warranty
-+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/clkdev.h>
-+#include <linux/clk-provider.h>
-+#include <linux/kernel.h>
-+#include <linux/module.h>
-+#include <linux/of_device.h>
-+#include <linux/platform_device.h>
-+#include <linux/string.h>
-+
-+static const struct of_device_id omap_clk_of_match[] = {
-+ {.compatible = "ti,omap-clock",},
-+ {},
-+};
-+
-+/**
-+ * omap_clk_src_get() - Get OMAP clock from node name when needed
-+ * @clkspec: clkspec argument
-+ * @data: unused
-+ *
-+ * REVISIT: We assume the following:
-+ * 1. omap clock names end with _ck
-+ * 2. omap clock names are under 32 characters in length
-+ */
-+static struct clk *omap_clk_src_get(struct of_phandle_args *clkspec, void *data)
-+{
-+ struct clk *clk;
-+ char clk_name[32];
-+ struct device_node *np = clkspec->np;
-+
-+ /* Set up things so consumer can call clk_get() with name */
-+ snprintf(clk_name, 32, "%s_ck", np->name);
-+ clk = clk_get(NULL, clk_name);
-+ if (IS_ERR(clk))
-+ {
-+ pr_err("%s: could not get clock %s(%ld)\n", __func__,
-+ clk_name, PTR_ERR(clk));
-+ goto out;
-+ }
-+ clk_put(clk);
-+
-+out:
-+ return clk;
-+}
-+
-+/**
-+ * omap_clk_probe() - create link from DT definition to clock data
-+ * @pdev: device node
-+ *
-+ * NOTE: We assume that omap clocks are not removed.
-+ */
-+static int omap_clk_probe(struct platform_device *pdev)
-+{
-+ int res;
-+ struct device_node *np = pdev->dev.of_node;
-+
-+ /* This allows the driver to of_clk_get() */
-+ res = of_clk_add_provider(np, omap_clk_src_get, NULL);
-+ if (res)
-+ dev_err(&pdev->dev, "could not add provider(%d)\n", res);
-+
-+ return res;
-+}
-+
-+/* We assume here that OMAP clocks will not be removed */
-+static struct platform_driver omap_clk_driver =
-+{
-+ .probe = omap_clk_probe,
-+ .driver =
-+ {
-+ .name = "omap_clk",
-+ .of_match_table = of_match_ptr(omap_clk_of_match),
-+ },
-+};
-+
-+static int __init omap_clk_init(void)
-+{
-+ return platform_driver_register(&omap_clk_driver);
-+}
-+
-+arch_initcall(omap_clk_init);
-+
-+MODULE_DESCRIPTION("OMAP Clock driver");
-+MODULE_AUTHOR("Texas Instruments Inc.");
-+MODULE_LICENSE("GPL v2");
---
-1.8.5.2
-
diff --git a/patches/omap_clock/0001-beagle-xm-use-ti-abb-for-1Ghz-operation.patch b/patches/omap_clock/0001-beagle-xm-use-ti-abb-for-1Ghz-operation.patch
deleted file mode 100644
index 6b85f7119dc3810aaaafd35869d1311f263df190..0000000000000000000000000000000000000000
--- a/patches/omap_clock/0001-beagle-xm-use-ti-abb-for-1Ghz-operation.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 167212042a08cda6c02db8bc3b7a8c3313b1f571 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 30 Jan 2014 12:46:45 -0600
-Subject: [PATCH] beagle-xm use ti-abb for 1Ghz operation
-
-v3.14-rc0: sysclk -> dpll1_ck
-rebased with Nishanth Menon patchset
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- arch/arm/boot/dts/omap3-beagle-xm.dts | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
-index bb5dad0..49d995a 100644
---- a/arch/arm/boot/dts/omap3-beagle-xm.dts
-+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
-@@ -16,6 +16,26 @@
- cpus {
- cpu@0 {
- cpu0-supply = <&vcc>;
-+ operating-points = <
-+ /* kHz uV */
-+ 300000 1012500
-+ 600000 1200000
-+ 800000 1325000
-+ 1000000 1380000
-+ >;
-+ };
-+ };
-+
-+ ocp {
-+ abb_mpu_iva: regulator-abb-mpu {
-+ clocks = <&dpll1_ck>;
-+ ti,abb_info = <
-+ /* uV ABB efuse rbb_m fbb_m vset_m */
-+ 1012500 0 0 0 0 0 /* Bypass */
-+ 1200000 3 0 0 0 0 /* RBB mandatory */
-+ 1320000 1 0 0 0 0 /* FBB mandatory */
-+ 1380000 1 0 0 0 0
-+ >;
- };
- };
-
---
-1.8.5.3
-
diff --git a/patches/omap_clock/0002-Add-the-clock-bindings-to-omap3.dtsi-that-were-made-.patch b/patches/omap_clock/0002-Add-the-clock-bindings-to-omap3.dtsi-that-were-made-.patch
deleted file mode 100644
index f0b869e5e7b357094c2005acf6f57d2c87e761a7..0000000000000000000000000000000000000000
--- a/patches/omap_clock/0002-Add-the-clock-bindings-to-omap3.dtsi-that-were-made-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 323f82a6afcbf57c8f3912555b6baa9057ebf4e8 Mon Sep 17 00:00:00 2001
-From: Teknoman117 <linux.robotdude@gmail.com>
-Date: Wed, 24 Jul 2013 03:00:18 -0700
-Subject: [PATCH 2/3] Add the clock bindings to omap3.dtsi that were made
- available through the omap-clock device tree driver. Adds the pll1 clock
- handles which drives the CPU frequency, and subsequently the ability to
- change its clock speed, and also add the system reference clock. Originally
- found here: http://lkml.indiana.edu/hypermail/linux/kernel/1304.1/04074.html
-
----
- arch/arm/boot/dts/omap3.dtsi | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
-index e16850d..e81738e 100644
---- a/arch/arm/boot/dts/omap3.dtsi
-+++ b/arch/arm/boot/dts/omap3.dtsi
-@@ -33,6 +33,8 @@
-
- cpu@0 {
- compatible = "arm,cortex-a8";
-+ clocks = <&dpll1>;
-+ clock-names = "cpu";
- device_type = "cpu";
- reg = <0x0>;
- };
-@@ -45,6 +47,16 @@
- ti,hwmods = "debugss";
- };
-
-+ sysclk: sys {
-+ #clock-cells = <0>;
-+ compatible = "ti,omap-clock";
-+ };
-+
-+ dpll1: dpll1 {
-+ #clock-cells = <0>;
-+ compatible = "ti,omap-clock";
-+ };
-+
- /*
- * The soc node represents the soc top level view. It is used for IPs
- * that are not memory mapped in the MPU view or for the MPU itself.
---
-1.8.5.1
-
diff --git a/patches/omap_clock/0003-Now-this-one-is-mine-lol.-Reading-through-the-ti-abb.patch b/patches/omap_clock/0003-Now-this-one-is-mine-lol.-Reading-through-the-ti-abb.patch
deleted file mode 100644
index acedfdb2cdc4efeea9db2a6839783198bf5e096e..0000000000000000000000000000000000000000
--- a/patches/omap_clock/0003-Now-this-one-is-mine-lol.-Reading-through-the-ti-abb.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From fffa074f199bf5ca172a34e52a74fd37f4360581 Mon Sep 17 00:00:00 2001
-From: Teknoman117 <linux.robotdude@gmail.com>
-Date: Wed, 24 Jul 2013 03:02:20 -0700
-Subject: [PATCH 3/3] Now this one is mine lol. Reading through the ti-abb
- documentation, I used their example and pulled the proper operating point
- settings for OPP1G, or the magic 1 GHz point on the Beagleboard xM. I've
- added the new operating points to the CPU entry and added the abb bindings
- for the beagleboard xm. Its nice that once again, we finally have a safe way
- of running the BBxM to its specifications after almost a year and a half of
- stagnating behind the kernel. Now 3.11-rc2 has 1 GHz support for the BBxM. So
- awesome ;)
-
----
- arch/arm/boot/dts/omap3-beagle-xm.dts | 27 +++++++++++++++++++++++++++
- 1 file changed, 27 insertions(+)
-
-diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
-index 1fb396e..6c8e033 100644
---- a/arch/arm/boot/dts/omap3-beagle-xm.dts
-+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
-@@ -16,9 +16,36 @@
- cpus {
- cpu@0 {
- cpu0-supply = <&vcc>;
-+ operating-points = <
-+ /* kHz uV */
-+ 300000 1012500
-+ 600000 1200000
-+ 800000 1325000
-+ 1000000 1380000
-+ >;
- };
- };
-
-+ abb: regulator-abb {
-+ compatible = "ti,abb-v1";
-+ regulator-name = "abb";
-+ #address-cell = <0>;
-+ #size-cells = <0>;
-+ reg = <0x483072f0 0x8>, <0x48306818 0x4>;
-+ reg-names = "base-address", "int-address";
-+ ti,tranxdone-status-mask = <0x4000000>;
-+ clocks = <&sysclk>;
-+ ti,settling-time = <30>;
-+ ti,clock-cycles = <8>;
-+ ti,abb_info = <
-+ /* uV ABB efuse rbb_m fbb_m vset_m */
-+ 1012500 0 0 0 0 0 /* Bypass */
-+ 1200000 3 0 0 0 0 /* RBB mandatory */
-+ 1320000 1 0 0 0 0 /* FBB mandatory */
-+ 1380000 1 0 0 0 0
-+ >;
-+ };
-+
- memory {
- device_type = "memory";
- reg = <0x80000000 0x20000000>; /* 512 MB */
---
-1.8.5.1
-
diff --git a/tools/config-checker.sh b/tools/config-checker.sh
index 49d0086ae1100ca5c8ba148172521d9dc71452ef..67fa4daf67e577af2c2a83afe152470fcd563ecd 100755
--- a/tools/config-checker.sh
+++ b/tools/config-checker.sh
@@ -126,12 +126,12 @@ config="CONFIG_RESOURCE_COUNTERS"
check_config_builtin
config="CONFIG_MEMCG"
check_config_builtin
-config="CONFIG_MEMCG_DISABLED"
-check_config_builtin
+#config="CONFIG_MEMCG_DISABLED"
+#check_config_builtin
config="CONFIG_MEMCG_SWAP"
check_config_builtin
-config="CONFIG_MEMCG_SWAP_ENABLED"
-check_config_disabled
+#config="CONFIG_MEMCG_SWAP_ENABLED"
+#check_config_disabled
config="CONFIG_CGROUP_PERF"
check_config_builtin
config="CONFIG_CGROUP_SCHED"
@@ -154,8 +154,8 @@ config="CONFIG_PID_NS"
check_config_builtin
config="CONFIG_NET_NS"
check_config_builtin
-config="CONFIG_UIDGID_STRICT_TYPE_CHECKS"
-check_config_builtin
+#config="CONFIG_UIDGID_STRICT_TYPE_CHECKS"
+#check_config_builtin
config="CONFIG_SCHED_AUTOGROUP"
check_config_builtin
config="CONFIG_MM_OWNER"
@@ -237,6 +237,13 @@ check_config_builtin
config="CONFIG_KARMA_PARTITION"
check_config_builtin
+#
+# IO Schedulers
+#
+
+config="CONFIG_CFQ_GROUP_IOSCHED"
+check_config_builtin
+
#
# CPU Core family selection
#
diff --git a/version.sh b/version.sh
index 94f40bf93cdcbef859c41b0b4d298c0a22b66982..0d45c534d9162e4849f3a525045c1d9eb0c1a748 100644
--- a/version.sh
+++ b/version.sh
@@ -29,7 +29,7 @@ toolchain="gcc_linaro_gnueabihf_4_8"
#Kernel/Build
KERNEL_REL=3.14
KERNEL_TAG=${KERNEL_REL}-rc1
-BUILD=armv7-devel-r45
+BUILD=armv7-devel-r46
#v3.X-rcX + upto SHA
#KERNEL_SHA="8a1f006ad302ea178aefb1f8c67e679c696289e9"