From 20d7760bc430fade52c2a2e99ecb1d57b3a7862e Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 31 Jan 2014 09:26:52 -0600
Subject: [PATCH] merge to:
https://github.com/RobertCNelson/linux/commit/e7651b819e90da924991d727d3c007200a18670d
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
patches/example_imx_v6_v7_defconfig | 2 +-
patches/example_omap2plus_defconfig | 1 +
patches/ref_multi_v7_defconfig | 1 +
tools/config-checker.sh | 2 --
version.sh | 4 ++--
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/patches/example_imx_v6_v7_defconfig b/patches/example_imx_v6_v7_defconfig
index 29e7f0abd..66f9aa91f 100644
--- a/patches/example_imx_v6_v7_defconfig
+++ b/patches/example_imx_v6_v7_defconfig
@@ -536,6 +536,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set
# CONFIG_ZBUD is not set
+# CONFIG_ZSMALLOC is not set
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
@@ -2545,7 +2546,6 @@ CONFIG_STAGING=y
# CONFIG_TRANZPORT is not set
# CONFIG_LINE6_USB is not set
# CONFIG_VT6656 is not set
-# CONFIG_ZSMALLOC is not set
# CONFIG_USB_ENESTORAGE is not set
# CONFIG_BCM_WIMAX is not set
# CONFIG_FT1000 is not set
diff --git a/patches/example_omap2plus_defconfig b/patches/example_omap2plus_defconfig
index 1a3fa97df..6fb48a44c 100644
--- a/patches/example_omap2plus_defconfig
+++ b/patches/example_omap2plus_defconfig
@@ -535,6 +535,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CMA=y
# CONFIG_CMA_DEBUG is not set
# CONFIG_ZBUD is not set
+# CONFIG_ZSMALLOC is not set
CONFIG_FORCE_MAX_ZONEORDER=12
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
diff --git a/patches/ref_multi_v7_defconfig b/patches/ref_multi_v7_defconfig
index f984611b8..ad36f1dd3 100644
--- a/patches/ref_multi_v7_defconfig
+++ b/patches/ref_multi_v7_defconfig
@@ -603,6 +603,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
# CONFIG_FRONTSWAP is not set
# CONFIG_CMA is not set
# CONFIG_ZBUD is not set
+# CONFIG_ZSMALLOC is not set
CONFIG_FORCE_MAX_ZONEORDER=12
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
diff --git a/tools/config-checker.sh b/tools/config-checker.sh
index 72b47fba2..ac737ad51 100755
--- a/tools/config-checker.sh
+++ b/tools/config-checker.sh
@@ -498,8 +498,6 @@ check_config_builtin
#check_config_disabled
#zram
-config="CONFIG_STAGING"
-check_config_builtin
config="CONFIG_ZSMALLOC"
check_config_builtin
config="CONFIG_ZRAM"
diff --git a/version.sh b/version.sh
index 7e910d72d..8d247f58d 100644
--- a/version.sh
+++ b/version.sh
@@ -29,10 +29,10 @@ toolchain="gcc_linaro_gnueabihf_4_8"
#Kernel/Build
KERNEL_REL=3.13
KERNEL_TAG=${KERNEL_REL}
-BUILD=armv7-devel-r37
+BUILD=armv7-devel-r38
#v3.X-rcX + upto SHA
-KERNEL_SHA="cdfc83075fb76369a31e6c187d0cebcab9f8b9c8"
+KERNEL_SHA="e7651b819e90da924991d727d3c007200a18670d"
#git branch
#BRANCH="v3.13.x"
--
GitLab