From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 * branch master -> FETCH_HEAD Updating 9f22578..47b3bc9 Fast-forward Documentation/hwmon/adm1275 | 2 +- Documentation/hwmon/adt7410 | 11 +- Documentation/hwmon/jc42 | 2 +- Documentation/hwmon/lineage-pem | 2 +- Documentation/hwmon/lm25066 | 2 +- Documentation/hwmon/ltc2978 | 6 +- Documentation/hwmon/ltc4261 | 2 +- Documentation/hwmon/max16064 | 2 +- Documentation/hwmon/max16065 | 2 +- Documentation/hwmon/max34440 | 2 +- Documentation/hwmon/max8688 | 2 +- Documentation/hwmon/pmbus | 2 +- Documentation/hwmon/smm665 | 2 +- Documentation/hwmon/ucd9000 | 2 +- Documentation/hwmon/ucd9200 | 2 +- Documentation/hwmon/zl6100 | 2 +- Documentation/power/opp.txt | 25 ++- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/include/asm/mmu.h | 8 +- arch/arm/include/asm/mmu_context.h | 2 +- arch/arm/include/asm/tlbflush.h | 34 +++- arch/arm/include/uapi/asm/unistd.h | 2 +- arch/arm/kernel/asm-offsets.c | 2 +- arch/arm/kernel/calls.S | 2 +- arch/arm/kernel/head.S | 26 +++- arch/arm/kernel/hw_breakpoint.c | 2 +- arch/arm/kernel/perf_event.c | 4 +- arch/arm/kernel/perf_event_v7.c | 2 +- arch/arm/kernel/smp.c | 1 + arch/arm/kernel/smp_tlb.c | 12 ++ arch/arm/kernel/smp_twd.c | 4 + arch/arm/kernel/suspend.c | 1 + arch/arm/lib/memset.S | 85 +++++---- arch/arm/mach-netx/generic.c | 2 +- arch/arm/mach-netx/include/mach/irqs.h | 64 ++++---- arch/arm/mm/context.c | 29 ++- arch/arm/mm/idmap.c | 1 + arch/arm/mm/proc-v7-3level.S | 2 +- arch/x86/include/asm/bootparam_utils.h | 20 ++- arch/x86/kernel/setup.c | 10 +- arch/x86/kernel/smpboot.c | 3 +- arch/x86/mm/init.c | 5 +- arch/x86/mm/pat.c | 7 + drivers/acpi/glue.c | 55 +----- drivers/acpi/processor_core.c | 3 +- drivers/acpi/processor_driver.c | 2 +- drivers/acpi/sleep.c | 16 +- drivers/ata/libata-acpi.c | 7 +- drivers/base/power/main.c | 2 - drivers/base/power/power.h | 8 +- drivers/base/power/qos.c | 217 ++++++++++++---------- drivers/base/power/sysfs.c | 1 + drivers/base/regmap/regmap-irq.c | 1 + drivers/cpufreq/cpufreq_governor.h | 2 +- drivers/cpufreq/highbank-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 42 ++--- drivers/firmware/efivars.c | 130 ++++++++++---- drivers/gpu/drm/i915/i915_drv.c | 25 ++- drivers/gpu/drm/i915/i915_irq.c | 26 +++- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 37 +++- drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 27 +++ drivers/gpu/drm/nouveau/core/engine/graph/nve0.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 1 + drivers/gpu/drm/nouveau/nouveau_agp.c | 12 ++ drivers/gpu/drm/nouveau/nv50_display.c | 173 ++++++++++------- drivers/gpu/drm/radeon/evergreen.c | 6 + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/ni.c | 6 + drivers/gpu/drm/radeon/r600.c | 6 + drivers/gpu/drm/radeon/radeon_combios.c | 9 + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++ drivers/gpu/drm/radeon/si.c | 6 + drivers/gpu/drm/tegra/Kconfig | 1 - drivers/hwmon/pmbus/ltc2978.c | 30 ++-- drivers/hwmon/sht15.c | 8 +- drivers/iommu/dmar.c | 1 + drivers/mailbox/pl320-ipc.c | 3 +- drivers/pci/pci-acpi.c | 8 +- drivers/pnp/pnpacpi/core.c | 8 +- drivers/regulator/core.c | 12 +- drivers/regulator/db8500-prcmu.c | 4 +- drivers/regulator/palmas-regulator.c | 3 +- drivers/regulator/twl-regulator.c | 9 +- drivers/scsi/scsi_lib.c | 7 +- drivers/usb/core/usb-acpi.c | 9 +- fs/ecryptfs/Kconfig | 8 + fs/ecryptfs/Makefile | 7 +- fs/ecryptfs/crypto.c | 9 +- fs/ecryptfs/dentry.c | 2 - fs/ecryptfs/ecryptfs_kernel.h | 40 ++++- fs/ecryptfs/file.c | 2 - fs/ecryptfs/inode.c | 8 +- fs/ecryptfs/keystore.c | 9 +- fs/ecryptfs/messaging.c | 5 +- include/acpi/acpi_bus.h | 6 +- include/drm/drm_crtc.h | 6 +- include/linux/ecryptfs.h | 12 +- include/linux/regulator/driver.h | 2 + tools/testing/selftests/efivarfs/efivarfs.sh | 59 ++++++ 108 files changed, 995 insertions(+), 549 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 9f22578..47b3bc9 master -> origin/master
commit 47b3bc907328db968bc9b43c41f48f8d1e140750
Merge: af2841c cc67708
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu Mar 7 15:57:38 2013 -0800
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Peter Anvin:
"Several boot fixes (MacBook, legacy EFI bootloaders), another
please-don't-brick fix, and some minor stuff."
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Do not try to sync identity map for non-mapped pages
x86, doc: Be explicit about what the x86 struct boot_params requires
x86: Don't clear efi_info even if the sentinel hits
x86, mm: Make sure to find a 2M free block for the first mapped area
x86: Fix 32-bit *_cpu_data initializers
efivarfs: return accurate error code in efivarfs_fill_super()
efivars: efivarfs_valid_name() should handle pstore syntax
efi: be more paranoid about available space when creating variables
iommu, x86: Add DMA remap fault reason
x86, smpboot: Remove unused variable
CLEAN . CLEAN arch/microblaze/kernel CLEAN kernel CLEAN usr CLEAN .tmp_versions CLEAN scripts/basic CLEAN scripts/dtc CLEAN scripts/kconfig CLEAN scripts/mod CLEAN scripts CLEAN include/config include/generated arch/microblaze/include/generated CLEAN .config .version 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 #
scripts/kconfig/conf --silentoldconfig Kconfig
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
HOSTCC scripts/dtc/checks.o
HOSTCC scripts/dtc/data.o
SHIPPED scripts/dtc/dtc-lexer.lex.c
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
CC scripts/mod/empty.o
HOSTCC scripts/mod/mk_elfconfig
CC scripts/mod/devicetable-offsets.s
HOSTCC scripts/dtc/livetree.o
MKELF scripts/mod/elfconfig.h
GEN scripts/mod/devicetable-offsets.h
HOSTCC scripts/mod/modpost.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/mod/sumversion.o
HOSTCC scripts/mod/file2alias.o
HOSTCC scripts/dtc/dtc-parser.tab.o
HOSTLD scripts/dtc/dtc
HOSTCC scripts/kallsyms
CHK include/generated/utsrelease.h
UPD include/generated/utsrelease.h
HOSTCC scripts/bin2c
HOSTLD scripts/mod/modpost
CC kernel/bounds.s
GEN include/generated/bounds.h
CC arch/microblaze/kernel/asm-offsets.s
GEN include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CC init/main.o
HOSTCC usr/gen_init_cpio
GEN usr/initramfs_data.cpio.gz
AS usr/initramfs_data.o
LD usr/built-in.o
CHK include/generated/compile.h
UPD include/generated/compile.h
CC arch/microblaze/kernel/dma.o
CC arch/microblaze/kernel/exceptions.o
CC init/do_mounts.o
AS arch/microblaze/kernel/hw_exception_handler.o
CC arch/microblaze/kernel/intc.o
CC arch/microblaze/kernel/irq.o
CC arch/microblaze/kernel/process.o
CC arch/microblaze/kernel/prom.o
CC arch/microblaze/kernel/prom_parse.o
CC init/do_mounts_rd.o
CC arch/microblaze/kernel/ptrace.o
CC arch/microblaze/kernel/reset.o
CC init/do_mounts_initrd.o
CC arch/microblaze/kernel/setup.o
CC init/initramfs.o
CC arch/microblaze/kernel/signal.o
CC init/calibrate.o
CC arch/microblaze/kernel/sys_microblaze.o
CC init/init_task.o
CC arch/microblaze/kernel/timer.o
CC init/version.o
CC arch/microblaze/kernel/traps.o
LD init/mounts.o
LD init/built-in.o
CC arch/microblaze/mm/consistent.o
CC arch/microblaze/kernel/unwind.o
CC arch/microblaze/kernel/cpu/cache.o
CC arch/microblaze/mm/init.o
CC arch/microblaze/kernel/cpu/cpuinfo.o
CC arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
LD arch/microblaze/mm/built-in.o
CC arch/microblaze/kernel/cpu/cpuinfo-static.o
CC arch/microblaze/platform/platform.o
CC arch/microblaze/kernel/cpu/mb.o
LD arch/microblaze/platform/built-in.o
CC arch/microblaze/kernel/cpu/pvr.o
CC arch/microblaze/kernel/early_printk.o
LD arch/microblaze/kernel/cpu/built-in.o
CC arch/microblaze/kernel/microblaze_ksyms.o
CC kernel/fork.o
CC arch/microblaze/kernel/module.o
AS arch/microblaze/kernel/entry-nommu.o
AS arch/microblaze/kernel/head.o
LDS arch/microblaze/kernel/vmlinux.lds
LD arch/microblaze/kernel/built-in.o
CC kernel/exec_domain.o
CC kernel/panic.o
CC mm/filemap.o
CC kernel/printk.o
CC mm/mempool.o
CC kernel/cpu.o
CC mm/oom_kill.o
CC kernel/exit.o
CC mm/fadvise.o
CC mm/maccess.o
CC mm/page_alloc.o
CC kernel/itimer.o
HZFILE kernel/hz.bc
CC kernel/softirq.o
CC kernel/resource.o
CC kernel/sysctl.o
CC mm/page-writeback.o
CC kernel/sysctl_binary.o
CC mm/readahead.o
CC kernel/capability.o
CC mm/swap.o
CC kernel/ptrace.o
CC mm/truncate.o
CC kernel/timer.o
CC mm/vmscan.o
CC kernel/user.o
CC kernel/signal.o
CC mm/shmem.o
CC mm/util.o
CC mm/mmzone.o
CC kernel/sys.o
CC mm/vmstat.o
CC mm/backing-dev.o
CC mm/mm_init.o
CC kernel/kmod.o
CC mm/mmu_context.o
CC mm/percpu.o
CC kernel/workqueue.o
CC mm/slab_common.o
CC mm/compaction.o
CC kernel/pid.o
CC mm/balloon_compaction.o
CC kernel/task_work.o
CC mm/interval_tree.o
CC kernel/rcupdate.o
CC kernel/extable.o
CC mm/nommu.o
CC kernel/params.o
mm/nommu.c: In function '__access_remote_vm':
mm/nommu.c:2001: warning: 'addr' is used uninitialized in this function
CC kernel/posix-timers.o
CC mm/init-mm.o
CC mm/bootmem.o
CC kernel/kthread.o
CC mm/memblock.o
CC kernel/wait.o
CC mm/dmapool.o
CC kernel/sys_ni.o
CC kernel/posix-cpu-timers.o
CC mm/slab.o
CC kernel/mutex.o
CC kernel/hrtimer.o
LD mm/built-in.o
CC kernel/rwsem.o
CC kernel/nsproxy.o
CC fs/open.o
CC kernel/srcu.o
CC kernel/semaphore.o
CC fs/read_write.o
CC kernel/notifier.o
CC kernel/ksysfs.o
CC kernel/cred.o
CC fs/file_table.o
CC kernel/async.o
CC fs/super.o
CC kernel/range.o
CC kernel/groups.o
CC fs/char_dev.o
CC kernel/lglock.o
CC kernel/smpboot.o
CC kernel/irq/irqdesc.o
CC fs/stat.o
CC fs/exec.o
CC kernel/irq/manage.o
CC fs/pipe.o
CC kernel/irq/spurious.o
CC kernel/irq/resend.o
CC kernel/irq/chip.o
CC fs/namei.o
CC kernel/irq/dummychip.o
CC kernel/irq/devres.o
CC kernel/irq/autoprobe.o
CC kernel/irq/irqdomain.o
CC kernel/irq/proc.o
LD kernel/irq/built-in.o
CC kernel/power/qos.o
CC fs/fcntl.o
LD kernel/power/built-in.o
CC kernel/sched/core.o
CC fs/ioctl.o
CC fs/readdir.o
CC fs/select.o
CC kernel/sched/clock.o
CC kernel/sched/cputime.o
CC fs/fifo.o
CC kernel/sched/idle_task.o
CC kernel/sched/fair.o
CC fs/dcache.o
CC kernel/sched/rt.o
CC kernel/sched/stop_task.o
CC fs/inode.o
CC kernel/sched/stats.o
CC kernel/sched/debug.o
CC fs/attr.o
LD kernel/sched/built-in.o
CC kernel/time/timekeeping.o
CC fs/bad_inode.o
CC fs/file.o
CC kernel/time/ntp.o
CC fs/filesystems.o
CC kernel/time/clocksource.o
CC fs/namespace.o
CC kernel/time/jiffies.o
CC kernel/time/timer_list.o
CC kernel/time/timeconv.o
CC fs/seq_file.o
CC kernel/time/posix-clock.o
CC kernel/time/alarmtimer.o
CC fs/xattr.o
CC kernel/time/clockevents.o
CC kernel/time/tick-common.o
CC fs/libfs.o
CC kernel/time/tick-oneshot.o
CC kernel/time/tick-sched.o
CC fs/fs-writeback.o
CC kernel/time/timer_stats.o
LD kernel/time/built-in.o
CC kernel/futex.o
CC fs/pnode.o
CC fs/drop_caches.o
CC fs/splice.o
CC kernel/rtmutex.o
CC kernel/up.o
CC kernel/module.o
CC fs/sync.o
CC fs/utimes.o
CC fs/stack.o
CC fs/fs_struct.o
CC kernel/kallsyms.o
CC fs/statfs.o
CC kernel/acct.o
CC fs/buffer.o
GZIP kernel/config_data.gz
CC kernel/hung_task.o
CC kernel/seccomp.o
CC kernel/rcutiny.o
CC kernel/utsname_sysctl.o
CC kernel/irq_work.o
In file included from include/linux/irq_work.h:4,
from kernel/irq_work.c:11:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:160: error: implicit declaration of function 'cmpxchg_local'
include/linux/llist.h:160: warning: assignment makes pointer from integer without a cast
make[1]: *** [kernel/irq_work.o] Error 1
make: *** [kernel] Error 2
make: *** Waiting for unfinished jobs....
CC fs/bio.o
CC fs/block_dev.o
CC fs/direct-io.o
CC fs/mpage.o
CC fs/ioprio.o
CC fs/proc_namespace.o
CC fs/cramfs/inode.o
CC fs/cramfs/uncompress.o
CC fs/debugfs/inode.o
LD fs/cramfs/cramfs.o
LD fs/cramfs/built-in.o
CC fs/debugfs/file.o
CC fs/devpts/inode.o
LD fs/debugfs/debugfs.o
LD fs/debugfs/built-in.o
LD fs/devpts/devpts.o
LD fs/exofs/built-in.o
LD fs/devpts/built-in.o
CC fs/ext2/balloc.o
CC fs/lockd/clntlock.o
CC fs/lockd/clntproc.o
CC fs/ext2/dir.o
CC fs/ext2/file.o
CC fs/lockd/clntxdr.o
CC fs/ext2/ialloc.o
CC fs/lockd/host.o
CC fs/ext2/inode.o
CC fs/lockd/svc.o
CC fs/ext2/ioctl.o
CC fs/ext2/namei.o
CC fs/lockd/svclock.o
CC fs/ext2/super.o
CC fs/lockd/svcshare.o
CC fs/lockd/svcproc.o
LD fs/ext2/ext2.o
LD fs/ext2/built-in.o
CC fs/nfs/client.o
CC fs/lockd/svcsubs.o
CC fs/lockd/mon.o
CC fs/nfs/dir.o
CC fs/lockd/xdr.o
CC fs/lockd/grace.o
CC fs/nfs/file.o
CC fs/lockd/clnt4xdr.o
CC fs/nfs/getroot.o
CC fs/lockd/xdr4.o
CC fs/nfs/inode.o
CC fs/lockd/svc4proc.o
LD fs/lockd/lockd.o
LD fs/lockd/built-in.o
CC fs/nfs_common/nfsacl.o
LD fs/nfs_common/nfs_acl.o
LD fs/nfs_common/built-in.o
CC fs/notify/fsnotify.o
CC fs/nfs/super.o
CC fs/notify/notification.o
CC fs/notify/group.o
CC fs/notify/inode_mark.o
CC fs/nfs/direct.o
CC fs/notify/mark.o
CC fs/notify/vfsmount_mark.o
CC fs/notify/fdinfo.o
CC fs/nfs/pagelist.o
LD fs/notify/dnotify/built-in.o
LD fs/notify/fanotify/built-in.o
CC fs/notify/inotify/inotify_fsnotify.o
CC fs/notify/inotify/inotify_user.o
CC fs/nfs/read.o
LD fs/notify/inotify/built-in.o
LD fs/notify/built-in.o
CC fs/proc/nommu.o
CC fs/proc/task_nommu.o
CC fs/nfs/symlink.o
CC fs/proc/inode.o
CC fs/nfs/unlink.o
CC fs/proc/root.o
CC fs/proc/base.o
CC fs/nfs/write.o
CC fs/proc/generic.o
CC fs/proc/array.o
CC fs/nfs/namespace.o
CC fs/proc/fd.o
CC fs/nfs/mount_clnt.o
CC fs/proc/proc_tty.o
CC fs/proc/cmdline.o
CC fs/nfs/dns_resolve.o
CC fs/proc/consoles.o
CC fs/proc/cpuinfo.o
CC fs/proc/devices.o
CC fs/nfs/cache_lib.o
CC fs/proc/interrupts.o
CC fs/proc/loadavg.o
CC fs/nfs/sysctl.o
CC fs/proc/meminfo.o
CC fs/proc/stat.o
CC fs/nfs/nfs2super.o
CC fs/proc/uptime.o
CC fs/proc/version.o
CC fs/nfs/proc.o
CC fs/proc/softirqs.o
CC fs/proc/namespaces.o
CC fs/nfs/nfs2xdr.o
CC fs/proc/self.o
CC fs/proc/proc_sysctl.o
CC fs/nfs/nfs3super.o
CC fs/proc/proc_net.o
CC fs/nfs/nfs3client.o
CC fs/proc/proc_devtree.o
CC fs/nfs/nfs3proc.o
CC fs/proc/kmsg.o
LD fs/proc/proc.o
LD fs/proc/built-in.o
LD fs/quota/built-in.o
CC fs/ramfs/inode.o
CC fs/ramfs/file-nommu.o
CC fs/nfs/nfs3xdr.o
LD fs/ramfs/ramfs.o
LD fs/ramfs/built-in.o
CC fs/romfs/storage.o
CC fs/romfs/super.o
CC fs/nfs/nfs3acl.o
LD fs/romfs/romfs.o
LD fs/romfs/built-in.o
CC fs/sysfs/inode.o
CC fs/sysfs/file.o
LD fs/nfs/nfs.o
LD fs/nfs/nfsv2.o
LD fs/nfs/nfsv3.o
LD fs/nfs/built-in.o
CC fs/eventpoll.o
CC fs/sysfs/dir.o
CC fs/sysfs/mount.o
CC fs/sysfs/bin.o
CC fs/anon_inodes.o
CC fs/sysfs/group.o
CC fs/signalfd.o
LD fs/sysfs/built-in.o
CC fs/timerfd.o
CC fs/eventfd.o
CC fs/aio.o
CC fs/locks.o
CC fs/binfmt_script.o
CC fs/binfmt_flat.o
CC fs/posix_acl.o
CC fs/xattr_acl.o
CC fs/coredump.o
LD fs/built-in.o
Checking out files: 45% (463/1007) Checking out files: 46% (464/1007) Checking out files: 47% (474/1007) Checking out files: 48% (484/1007) Checking out files: 49% (494/1007) Checking out files: 50% (504/1007) Checking out files: 51% (514/1007) Checking out files: 52% (524/1007) Checking out files: 53% (534/1007) Checking out files: 54% (544/1007) Checking out files: 55% (554/1007) Checking out files: 56% (564/1007) Checking out files: 57% (574/1007) Checking out files: 58% (585/1007) Checking out files: 59% (595/1007) Checking out files: 60% (605/1007) Checking out files: 61% (615/1007) Checking out files: 62% (625/1007) Checking out files: 63% (635/1007) Checking out files: 64% (645/1007) Checking out files: 65% (655/1007) Checking out files: 66% (665/1007) Checking out files: 67% (675/1007) Checking out files: 68% (685/1007) Checking out files: 69% (695/1007) Checking out files: 70% (705/1007) Checking out files: 71% (715/1007) Checking out files: 72% (726/1007) Checking out files: 73% (736/1007) Checking out files: 74% (746/1007) Checking out files: 75% (756/1007) Checking out files: 76% (766/1007) Checking out files: 77% (776/1007) Checking out files: 78% (786/1007) Checking out files: 79% (796/1007) Checking out files: 79% (799/1007) Checking out files: 80% (806/1007) Checking out files: 81% (816/1007) Checking out files: 82% (826/1007) Checking out files: 83% (836/1007) Checking out files: 84% (846/1007) Checking out files: 85% (856/1007) Checking out files: 86% (867/1007) Checking out files: 87% (877/1007) Checking out files: 88% (887/1007) Checking out files: 89% (897/1007) Checking out files: 90% (907/1007) Checking out files: 91% (917/1007) Checking out files: 92% (927/1007) Checking out files: 93% (937/1007) Checking out files: 94% (947/1007) Checking out files: 95% (957/1007) Checking out files: 96% (967/1007) Checking out files: 97% (977/1007) Checking out files: 98% (987/1007) Checking out files: 99% (997/1007) Checking out files: 100% (1007/1007) Checking out files: 100% (1007/1007), done. Switched to branch 'master' Deleted branch next (was 53f4d2c). 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 Merge made by recursive. Documentation/hwmon/adm1275 | 2 +- Documentation/hwmon/adt7410 | 11 +- Documentation/hwmon/jc42 | 2 +- Documentation/hwmon/lineage-pem | 2 +- Documentation/hwmon/lm25066 | 2 +- Documentation/hwmon/ltc2978 | 6 +- Documentation/hwmon/ltc4261 | 2 +- Documentation/hwmon/max16064 | 2 +- Documentation/hwmon/max16065 | 2 +- Documentation/hwmon/max34440 | 2 +- Documentation/hwmon/max8688 | 2 +- Documentation/hwmon/pmbus | 2 +- Documentation/hwmon/smm665 | 2 +- Documentation/hwmon/ucd9000 | 2 +- Documentation/hwmon/ucd9200 | 2 +- Documentation/hwmon/zl6100 | 2 +- Documentation/power/opp.txt | 25 ++- arch/arm/boot/compressed/Makefile | 2 +- arch/arm/include/asm/mmu.h | 8 +- arch/arm/include/asm/mmu_context.h | 2 +- arch/arm/include/asm/tlbflush.h | 34 +++- arch/arm/include/uapi/asm/unistd.h | 2 +- arch/arm/kernel/asm-offsets.c | 2 +- arch/arm/kernel/calls.S | 2 +- arch/arm/kernel/head.S | 26 +++- arch/arm/kernel/hw_breakpoint.c | 2 +- arch/arm/kernel/perf_event.c | 4 +- arch/arm/kernel/perf_event_v7.c | 2 +- arch/arm/kernel/smp.c | 1 + arch/arm/kernel/smp_tlb.c | 12 ++ arch/arm/kernel/smp_twd.c | 4 + arch/arm/kernel/suspend.c | 1 + arch/arm/lib/memset.S | 85 +++++---- arch/arm/mach-netx/generic.c | 2 +- arch/arm/mach-netx/include/mach/irqs.h | 64 ++++---- arch/arm/mm/context.c | 29 ++- arch/arm/mm/idmap.c | 1 + arch/arm/mm/proc-v7-3level.S | 2 +- arch/x86/include/asm/bootparam_utils.h | 20 ++- arch/x86/kernel/setup.c | 10 +- arch/x86/kernel/smpboot.c | 3 +- arch/x86/mm/init.c | 5 +- arch/x86/mm/pat.c | 7 + drivers/acpi/glue.c | 55 +----- drivers/acpi/processor_core.c | 3 +- drivers/acpi/processor_driver.c | 2 +- drivers/acpi/sleep.c | 16 +- drivers/ata/libata-acpi.c | 7 +- drivers/base/power/main.c | 2 - drivers/base/power/power.h | 8 +- drivers/base/power/qos.c | 217 ++++++++++++---------- drivers/base/power/sysfs.c | 1 + drivers/base/regmap/regmap-irq.c | 1 + drivers/cpufreq/cpufreq_governor.h | 2 +- drivers/cpufreq/highbank-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 42 ++--- drivers/firmware/efivars.c | 130 ++++++++++---- drivers/gpu/drm/i915/i915_drv.c | 25 ++- drivers/gpu/drm/i915/i915_irq.c | 26 +++- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 37 +++- drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 27 +++ drivers/gpu/drm/nouveau/core/engine/graph/nve0.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 1 + drivers/gpu/drm/nouveau/nouveau_agp.c | 12 ++ drivers/gpu/drm/nouveau/nv50_display.c | 173 ++++++++++------- drivers/gpu/drm/radeon/evergreen.c | 6 + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/ni.c | 6 + drivers/gpu/drm/radeon/r600.c | 6 + drivers/gpu/drm/radeon/radeon_combios.c | 9 + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++ drivers/gpu/drm/radeon/si.c | 6 + drivers/gpu/drm/tegra/Kconfig | 1 - drivers/hwmon/pmbus/ltc2978.c | 30 ++-- drivers/hwmon/sht15.c | 8 +- drivers/iommu/dmar.c | 1 + drivers/mailbox/pl320-ipc.c | 3 +- drivers/pci/pci-acpi.c | 8 +- drivers/pnp/pnpacpi/core.c | 8 +- drivers/regulator/core.c | 12 +- drivers/regulator/db8500-prcmu.c | 4 +- drivers/regulator/palmas-regulator.c | 3 +- drivers/regulator/twl-regulator.c | 9 +- drivers/scsi/scsi_lib.c | 7 +- drivers/usb/core/usb-acpi.c | 9 +- fs/ecryptfs/Kconfig | 8 + fs/ecryptfs/Makefile | 7 +- fs/ecryptfs/crypto.c | 9 +- fs/ecryptfs/dentry.c | 2 - fs/ecryptfs/ecryptfs_kernel.h | 40 ++++- fs/ecryptfs/file.c | 2 - fs/ecryptfs/inode.c | 8 +- fs/ecryptfs/keystore.c | 9 +- fs/ecryptfs/messaging.c | 5 +- include/acpi/acpi_bus.h | 6 +- include/drm/drm_crtc.h | 6 +- include/linux/ecryptfs.h | 12 +- include/linux/regulator/driver.h | 2 + tools/testing/selftests/efivarfs/efivarfs.sh | 59 ++++++ 108 files changed, 995 insertions(+), 549 deletions(-) From git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next + 34ef098...df2363d akpm -> linux-next/akpm (forced update) + bca8c95...725a7c3 akpm-base -> linux-next/akpm-base (forced update) + 53f4d2c...9edbffb master -> linux-next/master (forced update) 6dbe51c..9f22578 stable -> linux-next/stable * [new tag] next-20130307 -> next-20130307 Fetching origin From git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 9f22578..47b3bc9 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 9edbffb58ae00067e264ef70d5141c1d85049029
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu Mar 7 14:47:48 2013 +1100
Add linux-next specific files for 20130307
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
CLEAN . CLEAN arch/microblaze/kernel CLEAN kernel CLEAN usr CLEAN .tmp_versions CLEAN scripts/basic CLEAN scripts/dtc CLEAN scripts/kconfig CLEAN scripts/mod CLEAN scripts CLEAN include/config include/generated arch/microblaze/include/generated CLEAN .config .version 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
scripts/kconfig/conf --silentoldconfig Kconfig
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
HOSTCC scripts/dtc/checks.o
HOSTCC scripts/dtc/data.o
CC scripts/mod/empty.o
SHIPPED scripts/dtc/dtc-lexer.lex.c
SHIPPED scripts/dtc/dtc-parser.tab.h
SHIPPED scripts/dtc/dtc-parser.tab.c
HOSTCC scripts/mod/mk_elfconfig
HOSTCC scripts/dtc/dtc.o
CC scripts/mod/devicetable-offsets.s
HOSTCC scripts/dtc/flattree.o
MKELF scripts/mod/elfconfig.h
GEN scripts/mod/devicetable-offsets.h
HOSTCC scripts/mod/modpost.o
HOSTCC scripts/dtc/fstree.o
HOSTCC scripts/dtc/livetree.o
HOSTCC scripts/dtc/srcpos.o
HOSTCC scripts/mod/sumversion.o
HOSTCC scripts/dtc/treesource.o
HOSTCC scripts/dtc/util.o
HOSTCC scripts/mod/file2alias.o
HOSTCC scripts/dtc/dtc-lexer.lex.o
HOSTCC scripts/dtc/dtc-parser.tab.o
HOSTLD scripts/dtc/dtc
HOSTLD scripts/mod/modpost
HOSTCC scripts/kallsyms
HOSTCC scripts/bin2c
CHK include/generated/utsrelease.h
UPD include/generated/utsrelease.h
CC kernel/bounds.s
GEN include/generated/bounds.h
CC arch/microblaze/kernel/asm-offsets.s
GEN include/generated/asm-offsets.h
CALL scripts/checksyscalls.sh
CC init/main.o
HOSTCC usr/gen_init_cpio
GEN usr/initramfs_data.cpio.gz
AS usr/initramfs_data.o
LD usr/built-in.o
CC arch/microblaze/kernel/dma.o
CC arch/microblaze/kernel/exceptions.o
CHK include/generated/compile.h
UPD include/generated/compile.h
CC init/do_mounts.o
AS arch/microblaze/kernel/hw_exception_handler.o
CC arch/microblaze/kernel/intc.o
CC arch/microblaze/kernel/irq.o
CC arch/microblaze/kernel/process.o
CC arch/microblaze/kernel/prom.o
CC arch/microblaze/kernel/prom_parse.o
CC init/do_mounts_rd.o
CC arch/microblaze/kernel/ptrace.o
CC init/do_mounts_initrd.o
CC arch/microblaze/kernel/reset.o
CC arch/microblaze/kernel/setup.o
CC init/initramfs.o
CC arch/microblaze/kernel/signal.o
CC init/calibrate.o
CC arch/microblaze/kernel/sys_microblaze.o
CC init/init_task.o
CC arch/microblaze/kernel/timer.o
CC init/version.o
CC arch/microblaze/kernel/traps.o
LD init/mounts.o
LD init/built-in.o
CC arch/microblaze/mm/consistent.o
CC arch/microblaze/kernel/unwind.o
CC arch/microblaze/kernel/cpu/cache.o
CC arch/microblaze/mm/init.o
CC arch/microblaze/kernel/cpu/cpuinfo.o
CC arch/microblaze/kernel/cpu/cpuinfo-pvr-full.o
LD arch/microblaze/mm/built-in.o
CC arch/microblaze/kernel/cpu/cpuinfo-static.o
CC arch/microblaze/platform/platform.o
LD arch/microblaze/platform/built-in.o
CC arch/microblaze/kernel/early_printk.o
CC arch/microblaze/kernel/cpu/mb.o
CC arch/microblaze/kernel/cpu/pvr.o
LD arch/microblaze/kernel/cpu/built-in.o
CC kernel/fork.o
CC arch/microblaze/kernel/microblaze_ksyms.o
CC arch/microblaze/kernel/module.o
AS arch/microblaze/kernel/entry-nommu.o
AS arch/microblaze/kernel/head.o
LDS arch/microblaze/kernel/vmlinux.lds
LD arch/microblaze/kernel/built-in.o
CC kernel/exec_domain.o
CC mm/filemap.o
CC kernel/panic.o
CC kernel/printk.o
CC mm/mempool.o
CC kernel/cpu.o
CC mm/oom_kill.o
CC kernel/exit.o
CC mm/fadvise.o
CC kernel/itimer.o
CC mm/maccess.o
CC mm/page_alloc.o
HZFILE kernel/hz.bc
CC kernel/softirq.o
CC kernel/resource.o
CC kernel/sysctl.o
CC mm/page-writeback.o
CC kernel/sysctl_binary.o
CC mm/readahead.o
CC kernel/capability.o
CC mm/swap.o
CC kernel/ptrace.o
CC mm/truncate.o
CC kernel/timer.o
CC mm/vmscan.o
CC kernel/user.o
CC kernel/signal.o
CC mm/shmem.o
CC mm/util.o
CC mm/mmzone.o
CC kernel/sys.o
CC mm/vmstat.o
CC mm/backing-dev.o
CC mm/mm_init.o
CC kernel/kmod.o
CC mm/mmu_context.o
CC mm/percpu.o
CC kernel/workqueue.o
CC mm/slab_common.o
CC mm/compaction.o
CC kernel/pid.o
CC mm/balloon_compaction.o
CC mm/interval_tree.o
CC mm/nommu.o
CC kernel/task_work.o
CC kernel/rcupdate.o
mm/nommu.c: In function '__access_remote_vm':
mm/nommu.c:1996: warning: 'addr' is used uninitialized in this function
CC kernel/extable.o
CC kernel/params.o
CC mm/init-mm.o
CC mm/bootmem.o
CC kernel/posix-timers.o
CC mm/memblock.o
CC kernel/kthread.o
CC mm/dmapool.o
CC kernel/wait.o
CC mm/slab.o
CC kernel/sys_ni.o
CC kernel/posix-cpu-timers.o
CC kernel/mutex.o
CC kernel/hrtimer.o
LD mm/built-in.o
CC fs/open.o
CC kernel/rwsem.o
CC kernel/nsproxy.o
CC fs/read_write.o
CC kernel/srcu.o
CC kernel/semaphore.o
CC fs/file_table.o
CC kernel/notifier.o
CC fs/super.o
CC kernel/ksysfs.o
CC kernel/cred.o
CC fs/char_dev.o
CC kernel/async.o
CC kernel/range.o
CC fs/stat.o
CC kernel/groups.o
CC fs/exec.o
CC kernel/lglock.o
CC kernel/smpboot.o
CC kernel/irq/irqdesc.o
CC kernel/irq/handle.o
CC fs/pipe.o
CC kernel/irq/manage.o
CC fs/namei.o
CC kernel/irq/spurious.o
CC kernel/irq/resend.o
CC kernel/irq/chip.o
CC kernel/irq/dummychip.o
CC kernel/irq/devres.o
CC kernel/irq/autoprobe.o
CC kernel/irq/irqdomain.o
CC fs/fcntl.o
CC kernel/irq/proc.o
LD kernel/irq/built-in.o
CC kernel/power/qos.o
CC fs/ioctl.o
LD kernel/power/built-in.o
CC kernel/sched/core.o
CC fs/readdir.o
CC fs/select.o
CC fs/fifo.o
CC kernel/sched/clock.o
CC fs/dcache.o
CC kernel/sched/cputime.o
CC kernel/sched/idle_task.o
CC kernel/sched/fair.o
CC fs/inode.o
CC kernel/sched/rt.o
CC kernel/sched/stop_task.o
CC kernel/sched/stats.o
CC fs/attr.o
CC kernel/sched/debug.o
CC fs/bad_inode.o
CC fs/file.o
LD kernel/sched/built-in.o
CC kernel/time/timekeeping.o
CC fs/filesystems.o
CC kernel/time/ntp.o
CC fs/namespace.o
CC kernel/time/clocksource.o
CC kernel/time/jiffies.o
CC kernel/time/timer_list.o
CC fs/seq_file.o
CC kernel/time/timeconv.o
CC kernel/time/posix-clock.o
CC fs/xattr.o
CC kernel/time/alarmtimer.o
CC kernel/time/clockevents.o
CC fs/libfs.o
CC kernel/time/tick-common.o
CC fs/fs-writeback.o
CC kernel/time/tick-oneshot.o
CC kernel/time/tick-sched.o
CC kernel/time/timer_stats.o
CC fs/pnode.o
LD kernel/time/built-in.o
CC kernel/futex.o
CC fs/drop_caches.o
CC fs/splice.o
CC kernel/rtmutex.o
CC fs/sync.o
CC kernel/up.o
CC kernel/module.o
CC fs/utimes.o
CC fs/stack.o
CC fs/fs_struct.o
CC fs/statfs.o
CC fs/buffer.o
CC kernel/kallsyms.o
CC kernel/acct.o
GZIP kernel/config_data.gz
CC kernel/hung_task.o
CC kernel/seccomp.o
CC kernel/rcutiny.o
CC kernel/utsname_sysctl.o
CC fs/bio.o
CC kernel/irq_work.o
In file included from include/linux/irq_work.h:4,
from kernel/irq_work.c:11:
include/linux/llist.h: In function 'llist_add':
include/linux/llist.h:160: error: implicit declaration of function 'cmpxchg_local'
include/linux/llist.h:160: warning: assignment makes pointer from integer without a cast
make[1]: *** [kernel/irq_work.o] Error 1
make: *** [kernel] Error 2
make: *** Waiting for unfinished jobs....
CC fs/block_dev.o
CC fs/direct-io.o
CC fs/mpage.o
CC fs/ioprio.o
CC fs/proc_namespace.o
CC fs/cramfs/inode.o
CC fs/cramfs/uncompress.o
CC fs/debugfs/inode.o
LD fs/cramfs/cramfs.o
LD fs/cramfs/built-in.o
CC fs/devpts/inode.o
CC fs/debugfs/file.o
LD fs/devpts/devpts.o
LD fs/devpts/built-in.o
LD fs/exofs/built-in.o
CC fs/ext2/balloc.o
LD fs/debugfs/debugfs.o
LD fs/debugfs/built-in.o
CC fs/lockd/clntlock.o
CC fs/ext2/dir.o
CC fs/lockd/clntproc.o
CC fs/ext2/file.o
CC fs/lockd/clntxdr.o
CC fs/ext2/ialloc.o
CC fs/lockd/host.o
CC fs/ext2/inode.o
CC fs/lockd/svc.o
CC fs/ext2/ioctl.o
CC fs/ext2/namei.o
CC fs/lockd/svclock.o
CC fs/ext2/super.o
CC fs/lockd/svcshare.o
CC fs/ext2/symlink.o
CC fs/lockd/svcproc.o
LD fs/ext2/ext2.o
LD fs/ext2/built-in.o
CC fs/lockd/svcsubs.o
CC fs/nfs/client.o
CC fs/lockd/mon.o
CC fs/lockd/xdr.o
CC fs/nfs/dir.o
CC fs/lockd/grace.o
CC fs/lockd/clnt4xdr.o
CC fs/nfs/file.o
CC fs/lockd/xdr4.o
CC fs/nfs/getroot.o
CC fs/lockd/svc4proc.o
CC fs/nfs/inode.o
LD fs/lockd/lockd.o
LD fs/lockd/built-in.o
CC fs/nfs/super.o
CC fs/nfs_common/nfsacl.o
CC fs/nfs/direct.o
LD fs/nfs_common/nfs_acl.o
LD fs/nfs_common/built-in.o
CC fs/nfs/pagelist.o
CC fs/notify/fsnotify.o
CC fs/nfs/read.o
CC fs/notify/notification.o
CC fs/notify/group.o
CC fs/nfs/symlink.o
CC fs/notify/inode_mark.o
CC fs/notify/mark.o
CC fs/nfs/unlink.o
CC fs/notify/vfsmount_mark.o
CC fs/notify/fdinfo.o
CC fs/nfs/write.o
LD fs/notify/dnotify/built-in.o
LD fs/notify/fanotify/built-in.o
CC fs/notify/inotify/inotify_fsnotify.o
CC fs/notify/inotify/inotify_user.o
LD fs/notify/inotify/built-in.o
LD fs/notify/built-in.o
CC fs/nfs/namespace.o
CC fs/nfs/mount_clnt.o
CC fs/proc/nommu.o
CC fs/nfs/dns_resolve.o
CC fs/proc/task_nommu.o
CC fs/proc/inode.o
CC fs/nfs/cache_lib.o
CC fs/proc/root.o
CC fs/proc/base.o
CC fs/nfs/nfs2super.o
CC fs/proc/generic.o
CC fs/nfs/proc.o
CC fs/proc/array.o
CC fs/nfs/nfs2xdr.o
CC fs/proc/fd.o
CC fs/proc/proc_tty.o
CC fs/nfs/nfs3super.o
CC fs/proc/cmdline.o
CC fs/proc/consoles.o
CC fs/nfs/nfs3client.o
CC fs/proc/cpuinfo.o
CC fs/proc/devices.o
CC fs/proc/interrupts.o
CC fs/nfs/nfs3proc.o
CC fs/proc/loadavg.o
CC fs/proc/meminfo.o
CC fs/proc/stat.o
CC fs/nfs/nfs3xdr.o
CC fs/proc/uptime.o
CC fs/proc/version.o
CC fs/proc/softirqs.o
CC fs/proc/namespaces.o
CC fs/nfs/nfs3acl.o
CC fs/proc/self.o
CC fs/proc/proc_sysctl.o
LD fs/nfs/nfs.o
LD fs/nfs/nfsv2.o
LD fs/nfs/nfsv3.o
LD fs/nfs/built-in.o
CC fs/proc/proc_net.o
LD fs/quota/built-in.o
CC fs/proc/proc_devtree.o
CC fs/proc/kmsg.o
CC fs/ramfs/inode.o
LD fs/proc/proc.o
LD fs/proc/built-in.o
CC fs/romfs/storage.o
CC fs/ramfs/file-nommu.o
CC fs/romfs/super.o
LD fs/ramfs/ramfs.o
LD fs/ramfs/built-in.o
CC fs/sysfs/inode.o
LD fs/romfs/romfs.o
LD fs/romfs/built-in.o
CC fs/sysfs/file.o
CC fs/sysfs/dir.o
CC fs/eventpoll.o
CC fs/sysfs/symlink.o
CC fs/sysfs/mount.o
CC fs/sysfs/bin.o
CC fs/anon_inodes.o
CC fs/sysfs/group.o
CC fs/signalfd.o
LD fs/sysfs/built-in.o
CC fs/timerfd.o
CC fs/eventfd.o
CC fs/locks.o
CC fs/binfmt_script.o
CC fs/binfmt_flat.o
CC fs/posix_acl.o
CC fs/xattr_acl.o
CC fs/coredump.o
LD fs/built-in.o