From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating c240a53..ec50f2a Fast-forward Documentation/power/devices.txt | 15 ++- Documentation/power/interface.txt | 4 +- Documentation/power/notifiers.txt | 6 +- Documentation/power/states.txt | 30 +++-- MAINTAINERS | 2 +- drivers/acpi/ac.c | 33 +++++ drivers/acpi/ec.c | 4 +- drivers/acpi/processor_driver.c | 8 +- drivers/acpi/processor_idle.c | 29 ++-- drivers/acpi/scan.c | 3 +- drivers/acpi/video.c | 8 ++ drivers/base/power/common.c | 12 +- drivers/char/ipmi/ipmi_bt_sm.c | 4 +- drivers/char/ipmi/ipmi_devintf.c | 14 +- drivers/char/ipmi/ipmi_msghandler.c | 3 +- drivers/char/ipmi/ipmi_si_intf.c | 16 ++- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 15 ++- drivers/cpufreq/arm_big_little.c | 7 +- drivers/cpufreq/arm_big_little.h | 5 + drivers/cpufreq/arm_big_little_dt.c | 9 +- drivers/cpufreq/cpufreq-cpu0.c | 27 +++- drivers/cpufreq/cpufreq.c | 10 +- drivers/cpufreq/cpufreq_governor.c | 11 +- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 1 - drivers/cpufreq/cpufreq_stats.c | 7 +- drivers/cpufreq/intel_pstate.c | 122 +++-------------- drivers/cpufreq/kirkwood-cpufreq.c | 4 - drivers/gpu/drm/qxl/qxl_cmd.c | 29 ++-- drivers/gpu/drm/qxl/qxl_display.c | 17 +-- drivers/gpu/drm/qxl/qxl_drv.h | 7 - drivers/gpu/drm/qxl/qxl_ioctl.c | 1 + drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 12 +- drivers/net/ntb_netdev.c | 2 + drivers/ntb/ntb_hw.c | 10 +- drivers/ntb/ntb_transport.c | 175 ++++++++++++++++--------- drivers/target/iscsi/iscsi_target.c | 63 ++++----- drivers/target/iscsi/iscsi_target_erl1.c | 7 +- drivers/target/iscsi/iscsi_target_parameters.c | 8 +- drivers/target/iscsi/iscsi_target_parameters.h | 4 +- drivers/target/target_core_configfs.c | 11 +- drivers/target/target_core_device.c | 14 -- drivers/target/target_core_file.c | 9 +- drivers/target/target_core_iblock.c | 2 + drivers/target/target_core_internal.h | 1 - drivers/target/target_core_rd.c | 21 ++- drivers/target/target_core_rd.h | 1 + drivers/target/target_core_transport.c | 13 +- include/acpi/acpiosxf.h | 2 +- include/acpi/processor.h | 10 +- include/drm/drm_os_linux.h | 9 -- include/linux/kref.h | 33 +++++ include/target/target_core_base.h | 5 - kernel/kmod.c | 5 + kernel/rcutree_plugin.h | 4 +- kernel/workqueue.c | 10 +- 58 files changed, 493 insertions(+), 406 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 c240a53..ec50f2a master -> origin/master
commit ec50f2a97a4a7098a81b40030e0bfe28bdc43740
Merge: d5fe85a e9ced8e
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu May 16 19:01:46 2013 -0700
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Fix for radeon nomodeset regression, old radeon interface cliprects
fix, 2 qxl crasher fixes, and a couple of minor cleanups.
I may have a new AMD hw support branch next week, its one of those
doesn't affect anything existing just adds new support, I'll see how
it shapes up and I might ask you to take it, just thought I'd warn in
advance."
* 'drm-next' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: restore nomodeset operation (v2)
qxl: fix bug with object eviction and update area
drm/qxl: drop active_user_framebuffer as its unneeded
qxl: drop unused variable.
drm/qxl: fix ioport interactions for kernel submitted commands.
drm: remove unused wrapper macros
drm/radeon: check incoming cliprects pointer
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found CLEAN scripts/basic CLEAN scripts/kconfig CLEAN include/config CLEAN .config
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 SHIPPED scripts/dtc/dtc-lexer.lex.c 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-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc.o HOSTCC scripts/dtc/flattree.o 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.... 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 952ac86). 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 c240a53..ec50f2a Fast-forward Documentation/power/devices.txt | 15 ++- Documentation/power/interface.txt | 4 +- Documentation/power/notifiers.txt | 6 +- Documentation/power/states.txt | 30 +++-- MAINTAINERS | 2 +- drivers/acpi/ac.c | 33 +++++ drivers/acpi/ec.c | 4 +- drivers/acpi/processor_driver.c | 8 +- drivers/acpi/processor_idle.c | 29 ++-- drivers/acpi/scan.c | 3 +- drivers/acpi/video.c | 8 ++ drivers/base/power/common.c | 12 +- drivers/char/ipmi/ipmi_bt_sm.c | 4 +- drivers/char/ipmi/ipmi_devintf.c | 14 +- drivers/char/ipmi/ipmi_msghandler.c | 3 +- drivers/char/ipmi/ipmi_si_intf.c | 16 ++- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 15 ++- drivers/cpufreq/arm_big_little.c | 7 +- drivers/cpufreq/arm_big_little.h | 5 + drivers/cpufreq/arm_big_little_dt.c | 9 +- drivers/cpufreq/cpufreq-cpu0.c | 27 +++- drivers/cpufreq/cpufreq.c | 10 +- drivers/cpufreq/cpufreq_governor.c | 11 +- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 1 - drivers/cpufreq/cpufreq_stats.c | 7 +- drivers/cpufreq/intel_pstate.c | 122 +++-------------- drivers/cpufreq/kirkwood-cpufreq.c | 4 - drivers/gpu/drm/qxl/qxl_cmd.c | 29 ++-- drivers/gpu/drm/qxl/qxl_display.c | 17 +-- drivers/gpu/drm/qxl/qxl_drv.h | 7 - drivers/gpu/drm/qxl/qxl_ioctl.c | 1 + drivers/gpu/drm/radeon/r300_cmdbuf.c | 2 +- drivers/gpu/drm/radeon/radeon_drv.c | 12 +- drivers/net/ntb_netdev.c | 2 + drivers/ntb/ntb_hw.c | 10 +- drivers/ntb/ntb_transport.c | 175 ++++++++++++++++--------- drivers/target/iscsi/iscsi_target.c | 63 ++++----- drivers/target/iscsi/iscsi_target_erl1.c | 7 +- drivers/target/iscsi/iscsi_target_parameters.c | 8 +- drivers/target/iscsi/iscsi_target_parameters.h | 4 +- drivers/target/target_core_configfs.c | 11 +- drivers/target/target_core_device.c | 14 -- drivers/target/target_core_file.c | 9 +- drivers/target/target_core_iblock.c | 2 + drivers/target/target_core_internal.h | 1 - drivers/target/target_core_rd.c | 21 ++- drivers/target/target_core_rd.h | 1 + drivers/target/target_core_transport.c | 13 +- include/acpi/acpiosxf.h | 2 +- include/acpi/processor.h | 10 +- include/drm/drm_os_linux.h | 9 -- include/linux/kref.h | 33 +++++ include/target/target_core_base.h | 5 - kernel/kmod.c | 5 + kernel/rcutree_plugin.h | 4 +- kernel/workqueue.c | 10 +- 58 files changed, 493 insertions(+), 406 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + 8c9a4aa...f2614fe akpm -> linux-next/akpm (forced update) + c8f5f1d...ef14dfb akpm-base -> linux-next/akpm-base (forced update) + 952ac86...89710e8 master -> linux-next/master (forced update) c240a53..d5fe85a stable -> linux-next/stable * [new tag] next-20130517 -> next-20130517 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 c240a53..ec50f2a 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 89710e89b40d798ffd0aa27f26d0d645ef3b898e
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri May 17 14:16:24 2013 +1000
Add linux-next specific files for 20130517
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
make: microblaze-unknown-uclinux-uclibc-gcc: Command not found CLEAN scripts/basic CLEAN scripts/kconfig CLEAN include/config CLEAN .config
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 SHIPPED scripts/dtc/dtc-lexer.lex.c 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-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.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.... 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