From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating b973425..c240a53 Fast-forward Documentation/kernel-per-CPU-kthreads.txt | 202 +++++++ arch/Kconfig | 3 + arch/arm/Kconfig | 3 +- arch/arm/Makefile | 2 +- arch/arm/common/mcpm_platsmp.c | 3 - arch/arm/include/asm/cmpxchg.h | 8 +- arch/x86/Kconfig | 1 - arch/x86/kernel/microcode_intel_early.c | 5 +- arch/x86/kernel/process.c | 5 +- arch/x86/mm/init.c | 19 +- drivers/block/rbd.c | 935 ++++++++++++++++++------------ drivers/mmc/host/mmci.c | 9 +- drivers/rtc/Kconfig | 2 - include/linux/time.h | 4 - kernel/cpu/idle.c | 2 + kernel/events/core.c | 240 +++----- kernel/time/Kconfig | 5 - kernel/time/tick-broadcast.c | 10 +- kernel/time/tick-sched.c | 3 +- kernel/timer.c | 2 +- kernel/trace/trace_events_filter.c | 4 + kernel/trace/trace_kprobe.c | 53 +- net/ceph/osd_client.c | 5 +- 23 files changed, 938 insertions(+), 587 deletions(-) create mode 100644 Documentation/kernel-per-CPU-kthreads.txt From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 b973425..c240a53 master -> origin/master
commit c240a539df4e2d50f86e2f31813ff6b7334cd493
Merge: ae3b29e b62fdd9
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed May 15 14:08:57 2013 -0700
Merge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"This includes a fix to a memory leak when adding filters to traces.
Also, Masami Hiramatsu fixed up some minor bugs that were discovered
by sparse."
* tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing/kprobes: Make print_*probe_event static
tracing/kprobes: Fix a sparse warning for incorrect type in assignment
tracing/kprobes: Use rcu_dereference_raw for tp->files
tracing: Fix leaks of filter preds
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found CLEAN scripts/basic CLEAN scripts/dtc CLEAN scripts/kconfig CLEAN include/config include/generated arch/microblaze/include/generated CLEAN .config include/generated/uapi/linux/version.h
HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config #
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found scripts/kconfig/conf --silentoldconfig Kconfig make: microblaze-unknown-uclinux-uclibc-gcc: Command not found WRAP arch/microblaze/include/generated/asm/clkdev.h WRAP arch/microblaze/include/generated/asm/exec.h WRAP arch/microblaze/include/generated/asm/trace_clock.h WRAP arch/microblaze/include/generated/asm/syscalls.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/data.o CC scripts/mod/empty.o /bin/sh: microblaze-unknown-uclinux-uclibc-gcc: command not found make[2]: *** [scripts/mod/empty.o] Error 127 make[1]: *** [scripts/mod] Error 2 make[1]: *** Waiting for unfinished jobs.... SHIPPED scripts/dtc/dtc-lexer.lex.c SHIPPED scripts/dtc/dtc-parser.tab.h CC kernel/bounds.s /bin/sh: microblaze-unknown-uclinux-uclibc-gcc: command not found make[1]: *** [kernel/bounds.s] Error 127 make: *** [prepare0] Error 2 make: *** Waiting for unfinished jobs.... SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/util.o HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o HOSTLD scripts/dtc/dtc make: *** [scripts] Error 2
Switched to branch 'master' Deleted branch next (was e3d7f09). From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Already up-to-date. From ../linux-2.6 * branch HEAD -> FETCH_HEAD Updating b973425..c240a53 Fast-forward Documentation/kernel-per-CPU-kthreads.txt | 202 +++++++ arch/Kconfig | 3 + arch/arm/Kconfig | 3 +- arch/arm/Makefile | 2 +- arch/arm/common/mcpm_platsmp.c | 3 - arch/arm/include/asm/cmpxchg.h | 8 +- arch/x86/Kconfig | 1 - arch/x86/kernel/microcode_intel_early.c | 5 +- arch/x86/kernel/process.c | 5 +- arch/x86/mm/init.c | 19 +- drivers/block/rbd.c | 935 ++++++++++++++++++------------ drivers/mmc/host/mmci.c | 9 +- drivers/rtc/Kconfig | 2 - include/linux/time.h | 4 - kernel/cpu/idle.c | 2 + kernel/events/core.c | 240 +++----- kernel/time/Kconfig | 5 - kernel/time/tick-broadcast.c | 10 +- kernel/time/tick-sched.c | 3 +- kernel/timer.c | 2 +- kernel/trace/trace_events_filter.c | 4 + kernel/trace/trace_kprobe.c | 53 +- net/ceph/osd_client.c | 5 +- 23 files changed, 938 insertions(+), 587 deletions(-) create mode 100644 Documentation/kernel-per-CPU-kthreads.txt From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + d04ea1c...8c9a4aa akpm -> linux-next/akpm (forced update) + 5b38932...c8f5f1d akpm-base -> linux-next/akpm-base (forced update) + e3d7f09...952ac86 master -> linux-next/master (forced update) b973425..c240a53 stable -> linux-next/stable * [new tag] next-20130516 -> next-20130516 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 b973425..c240a53 master -> origin/master Fetching linux-next Switched to a new branch 'next' Branch next set up to track remote branch master from linux-next.
commit 952ac867c0d6569a5b06260bf7e06740fa0eeb62
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu May 16 14:43:37 2013 +1000
Add linux-next specific files for 20130516
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found CLEAN .tmp_versions CLEAN scripts/basic CLEAN scripts/dtc CLEAN scripts/kconfig CLEAN include/config include/generated arch/microblaze/include/generated CLEAN .config include/generated/uapi/linux/version.h
linux_next configure log - PASS
HOSTCC scripts/basic/fixdep HOSTCC scripts/kconfig/conf.o SHIPPED scripts/kconfig/zconf.tab.c SHIPPED scripts/kconfig/zconf.lex.c SHIPPED scripts/kconfig/zconf.hash.c HOSTCC scripts/kconfig/zconf.tab.o HOSTLD scripts/kconfig/conf # # configuration written to .config #
linux_next compile log - FAILED
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found scripts/kconfig/conf --silentoldconfig Kconfig make: microblaze-unknown-uclinux-uclibc-gcc: Command not found WRAP arch/microblaze/include/generated/asm/clkdev.h WRAP arch/microblaze/include/generated/asm/exec.h WRAP arch/microblaze/include/generated/asm/trace_clock.h WRAP arch/microblaze/include/generated/asm/syscalls.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/data.o CC scripts/mod/empty.o /bin/sh: microblaze-unknown-uclinux-uclibc-gcc: command not found make[2]: *** [scripts/mod/empty.o] Error 127 make[1]: *** [scripts/mod] Error 2 make[1]: *** Waiting for unfinished jobs.... SHIPPED scripts/dtc/dtc-lexer.lex.c CC kernel/bounds.s /bin/sh: microblaze-unknown-uclinux-uclibc-gcc: command not found make[1]: *** [kernel/bounds.s] Error 127 make: *** [prepare0] Error 2 make: *** Waiting for unfinished jobs.... SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/util.o HOSTCC scripts/dtc/dtc-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o HOSTLD scripts/dtc/dtc make: *** [scripts] Error 2