Forum | Documentation | Website | Blog

Skip to content
Snippets Groups Projects
Commit c8c93530 authored by Robert Nelson's avatar Robert Nelson
Browse files

v3.8-rc: merge to 1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf


Signed-off-by: default avatarRobert Nelson <robertcnelson@gmail.com>
parent 0bf2d943
Branches
Tags
No related merge requests found
...@@ -96,6 +96,7 @@ CONFIG_RCU_FANOUT_LEAF=16 ...@@ -96,6 +96,7 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set # CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_NOCB_CPU is not set
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=17 CONFIG_LOG_BUF_SHIFT=17
......
...@@ -89,6 +89,7 @@ CONFIG_RCU_FANOUT_LEAF=16 ...@@ -89,6 +89,7 @@ CONFIG_RCU_FANOUT_LEAF=16
# CONFIG_RCU_FANOUT_EXACT is not set # CONFIG_RCU_FANOUT_EXACT is not set
# CONFIG_RCU_FAST_NO_HZ is not set # CONFIG_RCU_FAST_NO_HZ is not set
# CONFIG_TREE_RCU_TRACE is not set # CONFIG_TREE_RCU_TRACE is not set
# CONFIG_RCU_NOCB_CPU is not set
CONFIG_IKCONFIG=y CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=16 CONFIG_LOG_BUF_SHIFT=16
...@@ -2555,7 +2556,7 @@ CONFIG_DEBUG_INFO=y ...@@ -2555,7 +2556,7 @@ CONFIG_DEBUG_INFO=y
# CONFIG_DEBUG_CREDENTIALS is not set # CONFIG_DEBUG_CREDENTIALS is not set
# CONFIG_BOOT_PRINTK_DELAY is not set # CONFIG_BOOT_PRINTK_DELAY is not set
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_RCU_CPU_STALL_INFO is not set # CONFIG_RCU_CPU_STALL_INFO is not set
# CONFIG_RCU_TRACE is not set # CONFIG_RCU_TRACE is not set
# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_KPROBES_SANITY_TEST is not set
......
...@@ -27,7 +27,7 @@ KERNEL_TAG=${KERNEL_REL} ...@@ -27,7 +27,7 @@ KERNEL_TAG=${KERNEL_REL}
BUILD=d0 BUILD=d0
#v3.X-rcX + upto SHA #v3.X-rcX + upto SHA
KERNEL_SHA="414a6750e59b0b687034764c464e9ddecac0f7a6" KERNEL_SHA="1ebaf4f4e6912199f8a4e30ba3ab55da2b71bcdf"
#git branch #git branch
#BRANCH="v3.8.x" #BRANCH="v3.8.x"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment