Linux Kernel https://git.stealer.net/cgit.cgi/user/sven/linux.git/atom?h=v3.0.9 2011-11-11T17:36:57Z 2011-11-11T17:36:57Z Srinivas Kandagatla srinivas.kandagatla@st.com 2011-08-02T17:49:52Z urn:sha1:2d92f691cd1a1be5cdefb10d559fdd7443d4df7a commit 3f198dfee49d2e9c30583c62b0c79286c78c7b44 upstream. Help text under choice menu is never displayed because it does not have symbol name associated with it, however many kconfigs have help text under choice, assuming that it will be displayed when user selects help. for example in Kconfig if we have: choice prompt "Choice" ---help--- HELP TEXT ... config A bool "A" config B bool "B" endchoice Without this patch "HELP TEXT" is not displayed when user selects help option when "Choice" is highlighted from menuconfig or xconfig or gconfig. This patch changes the logic in menu_get_ext_help to display help for cases which dont have symbol names like choice. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com> Reviewed-by: Stuart Menefy <stuart.menefy@st.com> Reviewed-by: Arnaud Lacombe <lacombar@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 2011-07-13T21:16:53Z Linus Torvalds torvalds@linux-foundation.org 2011-07-13T21:16:53Z urn:sha1:6ac556daa7822fdda585e2c387739abb0646c6ef * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Do not write to builddir in modules_install 2011-07-12T11:36:30Z Michal Marek mmarek@suse.cz 2011-07-12T09:54:48Z urn:sha1:8fc62e59425389a6d48429b9d146223122743435 Let depmod.sh create a temporary directory in /tmp instead of writing to the build directory as root. The mktemp utility should be available on any recent system (and there is already scripts/gen_initramfs_list.sh relying on it). Reported-by: Christian Kujau <lists@nerdbynature.de> Signed-off-by: Michal Marek <mmarek@suse.cz> 2011-06-16T03:03:59Z Joe Perches joe@perches.com 2011-06-15T22:08:17Z urn:sha1:17441227f6258fc379c6ebfe21c3eec43b6f0de3 Warn about uses of printk_ratelimit() because it uses a global state and can hide subsequent useful messages. Signed-off-by: Joe Perches <joe@perches.com> Cc: Andy Whitcroft <apw@canonical.com> Cc: Richard Weinberger <richard@nod.at> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> 2011-06-09T21:05:54Z Michal Marek mmarek@suse.cz 2011-06-09T14:35:41Z urn:sha1:bfe5424a8b31624e7a476f959d552999f931e7c7 depmod from module-init-tools < 3.13 and the busybox depmod check if the kernel release starts with <num>.<num>.<num>. To support these versions, we create a symlink with two numbers prepended. Signed-off-by: Michal Marek <mmarek@suse.cz> 2011-06-09T21:05:54Z Michal Marek mmarek@suse.cz 2011-06-09T13:35:22Z urn:sha1:fc4da9a3e68b1f64237fafda084f61067f568a99 Do not bloat the Makefile with multiline shell statements. No user-visible change intended. Signed-off-by: Michal Marek <mmarek@suse.cz> 2011-06-09T09:48:19Z Peter Foley pefoley2@verizon.net 2011-06-09T00:58:32Z urn:sha1:181e976327cf33095837c579608ebed42d2ad992 This patch silences a Makefile.asm-generic message by defining a dummy rule for all. make -f /usr/src/git/scripts/Makefile.asm-generic \ obj=arch/x86/include/generated/asm make[1]: Nothing to be done for `all'. Signed-off-by: Peter Foley <pefoley2@verizon.net> Signed-off-by: Michal Marek <mmarek@suse.cz> 2011-05-28T19:55:55Z Linus Torvalds torvalds@linux-foundation.org 2011-05-28T19:55:55Z urn:sha1:c4a227d89f758e582fd167bb15245f2704de99ef * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits) perf: Fix SIGIO handling perf top: Don't stop if no kernel symtab is found perf top: Handle kptr_restrict perf top: Remove unused macro perf events: initialize fd array to -1 instead of 0 perf tools: Make sure kptr_restrict warnings fit 80 col terms perf tools: Fix build on older systems perf symbols: Handle /proc/sys/kernel/kptr_restrict perf: Remove duplicate headers ftrace: Add internal recursive checks tracing: Update btrfs's tracepoints to use u64 interface tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine ftrace: Set ops->flag to enabled even on static function tracing tracing: Have event with function tracer check error return ftrace: Have ftrace_startup() return failure code jump_label: Check entries limit in __jump_label_update ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM scripts/tags.sh: Add magic for trace-events for etags too scripts/tags.sh: Fix ctags for DEFINE_EVENT() x86/ftrace: Fix compiler warning in ftrace.c ... 2011-05-27T17:25:02Z Linus Torvalds torvalds@linux-foundation.org 2011-05-27T17:25:02Z urn:sha1:e52e713ec30a31e9a4663d9aebbaae5ec07466a6 * 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs: Create Documentation/security/, move LSM-, credentials-, and keys-related files from Documentation/ to Documentation/security/, add Documentation/security/00-INDEX, and update all occurrences of Documentation/<moved_file> to Documentation/security/<moved_file>. 2011-05-27T12:28:09Z Ingo Molnar mingo@elte.hu 2011-05-27T12:28:09Z urn:sha1:d6a72fe465f4c54654a1d5488daeb820b4ecf275