--- /dev/null
+$ date
+Friday 3 August 10:50:51 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at d4fdc32 Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6
+Merging origin/master (0d7614f Linux 3.6-rc1)
+$ git merge origin/master
+Updating d4fdc32..0d7614f
+Fast-forward
+ .../devicetree/bindings/arm/mrvl/intc.txt | 20 +
+ Documentation/devicetree/bindings/ata/marvell.txt | 16 +
+ .../devicetree/bindings/gpio/mrvl-gpio.txt | 23 +
+ .../devicetree/bindings/watchdog/marvel.txt | 14 +
+ Documentation/feature-removal-schedule.txt | 11 +
+ MAINTAINERS | 1 +
+ Makefile | 4 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/dts/armada-xp.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood-dns320.dts | 62 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 68 +-
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 69 ++
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 50 ++
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 99 ++
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 38 +
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 42 +
+ arch/arm/boot/dts/kirkwood-lschlv2.dts | 20 +
+ arch/arm/boot/dts/kirkwood-lsxhl.dts | 20 +
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 95 ++
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 21 +
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 21 +
+ arch/arm/boot/dts/kirkwood-ts219.dtsi | 78 ++
+ arch/arm/boot/dts/kirkwood.dtsi | 60 ++
+ arch/arm/configs/omap2plus_defconfig | 2 +
+ arch/arm/include/asm/cacheflush.h | 8 +-
+ arch/arm/include/asm/mutex.h | 119 +--
+ arch/arm/include/asm/setup.h | 4 +-
+ arch/arm/kernel/entry-armv.S | 111 ++-
+ arch/arm/kernel/entry-common.S | 24 +-
+ arch/arm/kernel/ftrace.c | 17 +-
+ arch/arm/kernel/process.c | 2 +
+ arch/arm/kernel/ptrace.c | 1 +
+ arch/arm/kernel/setup.c | 6 +-
+ arch/arm/kernel/signal.c | 114 +--
+ arch/arm/kernel/signal.h | 2 -
+ arch/arm/kernel/smp.c | 3 +-
+ arch/arm/kernel/traps.c | 10 -
+ arch/arm/mach-dove/irq.c | 58 +-
+ arch/arm/mach-kirkwood/Kconfig | 29 +
+ arch/arm/mach-kirkwood/Makefile | 3 +
+ arch/arm/mach-kirkwood/Makefile.boot | 4 +
+ arch/arm/mach-kirkwood/board-dnskw.c | 143 ---
+ arch/arm/mach-kirkwood/board-dreamplug.c | 80 --
+ arch/arm/mach-kirkwood/board-dt.c | 29 +-
+ arch/arm/mach-kirkwood/board-goflexnet.c | 71 ++
+ arch/arm/mach-kirkwood/board-ib62x0.c | 72 --
+ arch/arm/mach-kirkwood/board-iconnect.c | 56 --
+ arch/arm/mach-kirkwood/board-lsxl.c | 135 +++
+ arch/arm/mach-kirkwood/board-ts219.c | 82 ++
+ arch/arm/mach-kirkwood/common.c | 2 +
+ arch/arm/mach-kirkwood/common.h | 17 +
+ arch/arm/mach-kirkwood/irq.c | 38 +-
+ arch/arm/mach-mmp/gplugd.c | 1 +
+ arch/arm/mach-mv78xx0/irq.c | 22 +-
+ arch/arm/mach-omap1/board-h2-mmc.c | 1 -
+ arch/arm/mach-omap1/board-h3-mmc.c | 1 -
+ arch/arm/mach-omap1/board-nokia770.c | 1 -
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/board-n8x0.c | 1 -
+ arch/arm/mach-omap2/cpuidle44xx.c | 145 ++-
+ arch/arm/mach-omap2/hsmmc.c | 1 -
+ arch/arm/mach-omap2/timer.c | 4 +-
+ arch/arm/mach-orion5x/irq.c | 22 +-
+ arch/arm/mach-prima2/timer.c | 6 +-
+ arch/arm/mach-spear3xx/spear300.c | 26 -
+ arch/arm/mach-spear3xx/spear310.c | 26 -
+ arch/arm/mach-spear3xx/spear320.c | 26 -
+ arch/arm/mach-spear3xx/spear3xx.c | 3 +-
+ arch/arm/mach-spear6xx/spear6xx.c | 51 +-
+ arch/arm/mm/tlb-v7.S | 12 +
+ arch/arm/plat-mxc/tzic.c | 1 +
+ arch/arm/plat-omap/include/plat/mmc.h | 2 -
+ arch/arm/plat-orion/common.c | 1 +
+ arch/arm/plat-orion/gpio.c | 166 +++-
+ arch/arm/plat-orion/include/plat/gpio.h | 16 +-
+ arch/arm/plat-orion/include/plat/irq.h | 3 +-
+ arch/arm/plat-orion/irq.c | 40 +
+ arch/arm/plat-spear/include/plat/pl080.h | 6 +-
+ arch/arm/plat-spear/pl080.c | 10 +-
+ arch/arm/vfp/entry.S | 16 +-
+ arch/arm/vfp/vfphw.S | 19 +-
+ arch/arm/vfp/vfpmodule.c | 8 +-
+ arch/mips/Kconfig | 2 +
+ arch/mips/include/asm/clock.h | 11 -
+ arch/mips/include/asm/mach-loongson/loongson.h | 1 -
+ arch/mips/kernel/cpufreq/Makefile | 2 +-
+ arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 21 +-
+ arch/mips/lantiq/clk.c | 5 +
+ arch/mips/lantiq/prom.c | 22 +
+ arch/mips/lantiq/xway/sysctrl.c | 49 +-
+ arch/mips/loongson/Kconfig | 1 +
+ arch/mips/loongson/lemote-2f/Makefile | 2 +-
+ .../lemote-2f/clock.c} | 46 +-
+ arch/mips/loongson1/Kconfig | 1 +
+ arch/mips/loongson1/common/clock.c | 16 +
+ arch/mips/txx9/Kconfig | 1 +
+ arch/sh/boards/Kconfig | 13 +
+ arch/sh/boards/board-apsh4a3a.c | 10 +
+ arch/sh/boards/board-apsh4ad0a.c | 10 +
+ arch/sh/boards/board-magicpanelr2.c | 10 +
+ arch/sh/boards/board-polaris.c | 10 +
+ arch/sh/boards/board-sh2007.c | 12 +
+ arch/sh/boards/board-sh7757lcr.c | 14 +
+ arch/sh/boards/mach-ap325rxa/setup.c | 21 +
+ arch/sh/boards/mach-ecovec24/setup.c | 125 ++-
+ arch/sh/boards/mach-kfr2r09/setup.c | 12 +
+ arch/sh/boards/mach-migor/setup.c | 13 +
+ arch/sh/boards/mach-rsk/setup.c | 10 +
+ arch/sh/boards/mach-sdk7786/setup.c | 10 +
+ arch/sh/boards/mach-se/7724/setup.c | 15 +
+ arch/sh/include/cpu-sh4/cpu/sh7757.h | 2 +
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 1 +
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 14 +
+ arch/sh/mm/fault.c | 8 +-
+ arch/um/defconfig | 2 +-
+ arch/um/drivers/chan_kern.c | 4 +-
+ arch/um/drivers/line.c | 218 ++---
+ arch/um/drivers/line.h | 12 +-
+ arch/um/drivers/ssl.c | 42 +-
+ arch/um/drivers/stdio_console.c | 21 +-
+ arch/um/drivers/ubd_kern.c | 2 +-
+ arch/um/include/asm/ptrace-generic.h | 2 +
+ arch/um/include/shared/as-layout.h | 3 +-
+ arch/um/include/shared/irq_user.h | 3 +-
+ arch/um/include/shared/kern_util.h | 13 +-
+ arch/um/kernel/irq.c | 2 +-
+ arch/um/kernel/process.c | 13 +-
+ arch/um/kernel/ptrace.c | 71 +-
+ arch/um/kernel/skas/syscall.c | 6 +-
+ arch/um/kernel/time.c | 2 +-
+ arch/um/kernel/trap.c | 39 +-
+ arch/um/os-Linux/internal.h | 2 +-
+ arch/um/os-Linux/signal.c | 26 +-
+ arch/um/os-Linux/skas/process.c | 16 +-
+ arch/um/os-Linux/time.c | 2 +-
+ arch/x86/include/asm/olpc.h | 19 -
+ arch/x86/platform/olpc/olpc-xo1-pm.c | 16 +-
+ arch/x86/platform/olpc/olpc-xo1-sci.c | 1 +
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 1 +
+ arch/x86/platform/olpc/olpc.c | 190 ++--
+ arch/x86/um/asm/ptrace.h | 6 +-
+ drivers/ata/sata_mv.c | 42 +-
+ drivers/dma/Kconfig | 11 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/amba-pl08x.c | 941 ++++++++++----------
+ drivers/dma/omap-dma.c | 669 ++++++++++++++
+ drivers/dma/sa11x0-dma.c | 388 ++++----
+ drivers/dma/sh/shdma-base.c | 9 +
+ drivers/dma/sh/shdma.c | 12 +
+ drivers/dma/virt-dma.c | 123 +++
+ drivers/dma/virt-dma.h | 152 ++++
+ drivers/md/Kconfig | 5 +-
+ drivers/md/bitmap.c | 2 +-
+ drivers/md/raid1.c | 57 +-
+ drivers/md/raid5.c | 107 ++-
+ drivers/md/raid5.h | 1 +
+ drivers/mmc/host/omap.c | 368 ++++----
+ drivers/mmc/host/omap_hsmmc.c | 204 ++---
+ drivers/mtd/nand/omap2.c | 106 +--
+ drivers/net/wireless/libertas/if_usb.c | 1 +
+ drivers/platform/Makefile | 1 +
+ drivers/platform/olpc/Makefile | 4 +
+ drivers/platform/olpc/olpc-ec.c | 336 +++++++
+ drivers/platform/x86/xo1-rfkill.c | 3 +-
+ drivers/power/olpc_battery.c | 1 +
+ drivers/sh/intc/Kconfig | 4 +
+ drivers/sh/intc/Makefile | 2 +-
+ drivers/sh/intc/core.c | 11 +-
+ drivers/sh/intc/internals.h | 5 +
+ drivers/sh/intc/irqdomain.c | 68 ++
+ drivers/sh/pfc/pinctrl.c | 34 +-
+ drivers/spi/spi-omap2-mcspi.c | 229 ++---
+ drivers/staging/olpc_dcon/olpc_dcon.c | 1 +
+ drivers/tty/serial/sh-sci.c | 5 +-
+ drivers/watchdog/orion_wdt.c | 8 +
+ fs/ceph/dir.c | 38 -
+ fs/ceph/file.c | 62 +-
+ fs/ceph/super.h | 6 +-
+ fs/cifs/cifsglob.h | 10 +
+ fs/cifs/cifsproto.h | 11 +-
+ fs/cifs/cifssmb.c | 31 +-
+ fs/cifs/inode.c | 302 ++++---
+ fs/cifs/smb1ops.c | 24 +
+ fs/cifs/smb2inode.c | 39 +
+ fs/cifs/smb2ops.c | 3 +
+ fs/cifs/smb2proto.h | 8 +
+ fs/ecryptfs/ecryptfs_kernel.h | 24 +-
+ fs/ecryptfs/file.c | 90 +-
+ fs/ecryptfs/inode.c | 65 +-
+ fs/ecryptfs/main.c | 22 +
+ fs/ecryptfs/messaging.c | 136 +--
+ fs/ecryptfs/miscdev.c | 98 +-
+ fs/ecryptfs/mmap.c | 39 +-
+ include/linux/amba/pl08x.h | 156 +---
+ include/linux/olpc-ec.h | 41 +
+ include/linux/omap-dma.h | 22 +
+ include/linux/shdma-base.h | 2 +
+ mm/page_alloc.c | 2 +-
+ net/ceph/crypto.c | 1 +
+ net/ceph/crypto.h | 3 +-
+ 201 files changed, 5625 insertions(+), 3465 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ata/marvell.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/marvel.txt
+ create mode 100644 arch/arm/boot/dts/kirkwood-dnskw.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-goflexnet.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-lschlv2.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-lsxhl.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-lsxl.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-ts219-6281.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ts219-6282.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-ts219.dtsi
+ create mode 100644 arch/arm/mach-kirkwood/board-goflexnet.c
+ create mode 100644 arch/arm/mach-kirkwood/board-lsxl.c
+ create mode 100644 arch/arm/mach-kirkwood/board-ts219.c
+ rename arch/mips/{kernel/cpufreq/loongson2_clock.c => loongson/lemote-2f/clock.c} (76%)
+ create mode 100644 drivers/dma/omap-dma.c
+ create mode 100644 drivers/dma/virt-dma.c
+ create mode 100644 drivers/dma/virt-dma.h
+ create mode 100644 drivers/platform/olpc/Makefile
+ create mode 100644 drivers/platform/olpc/olpc-ec.c
+ create mode 100644 drivers/sh/intc/irqdomain.c
+ create mode 100644 include/linux/olpc-ec.h
+ create mode 100644 include/linux/omap-dma.h
+Merging fixes/master (9023a40 Merge tag 'mmc-fixes-for-3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (f8f5701 Linux 3.5-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (b74253f ARM: 7479/1: mm: avoid NULL dereference when flushing gate_vma with VIVT caches)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k)
+$ git merge m68k-current/for-linus
+Auto-merging arch/m68k/platform/coldfire/head.S
+Removing arch/m68k/include/asm/xor.h
+Removing arch/m68k/include/asm/types.h
+Removing arch/m68k/include/asm/topology.h
+Removing arch/m68k/include/asm/statfs.h
+Removing arch/m68k/include/asm/siginfo.h
+Removing arch/m68k/include/asm/shm.h
+Removing arch/m68k/include/asm/sections.h
+Removing arch/m68k/include/asm/scatterlist.h
+Removing arch/m68k/include/asm/sbus.h
+Removing arch/m68k/include/asm/resource.h
+Removing arch/m68k/include/asm/percpu.h
+Removing arch/m68k/include/asm/mutex.h
+Removing arch/m68k/include/asm/mman.h
+Removing arch/m68k/include/asm/mcfmbus.h
+Removing arch/m68k/include/asm/mac_mouse.h
+Removing arch/m68k/include/asm/local64.h
+Removing arch/m68k/include/asm/local.h
+Removing arch/m68k/include/asm/kvm_para.h
+Removing arch/m68k/include/asm/kmap_types.h
+Removing arch/m68k/include/asm/kdebug.h
+Removing arch/m68k/include/asm/irq_regs.h
+Removing arch/m68k/include/asm/ipcbuf.h
+Removing arch/m68k/include/asm/ioctl.h
+Removing arch/m68k/include/asm/futex.h
+Removing arch/m68k/include/asm/errno.h
+Removing arch/m68k/include/asm/emergency-restart.h
+Removing arch/m68k/include/asm/device.h
+Removing arch/m68k/include/asm/cputime.h
+Removing arch/m68k/include/asm/bitsperlong.h
+Removing arch/m68k/include/asm/apollodma.h
+Removing arch/m68k/include/asm/MC68332.h
+Auto-merging arch/m68k/Kconfig.cpu
+Auto-merging arch/m68k/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/blackfin/kernel/setup.c | 1 -
+ arch/m68k/Kconfig | 12 --
+ arch/m68k/Kconfig.cpu | 14 ++
+ arch/m68k/apollo/config.c | 16 +-
+ arch/m68k/include/asm/Kbuild | 25 +++
+ arch/m68k/include/asm/MC68332.h | 152 ------------------
+ arch/m68k/include/asm/apollodma.h | 248 -----------------------------
+ arch/m68k/include/asm/apollohw.h | 2 +-
+ arch/m68k/include/asm/bitsperlong.h | 1 -
+ arch/m68k/include/asm/cputime.h | 6 -
+ arch/m68k/include/asm/delay.h | 2 +-
+ arch/m68k/include/asm/device.h | 7 -
+ arch/m68k/include/asm/emergency-restart.h | 6 -
+ arch/m68k/include/asm/errno.h | 6 -
+ arch/m68k/include/asm/futex.h | 6 -
+ arch/m68k/include/asm/ioctl.h | 1 -
+ arch/m68k/include/asm/ipcbuf.h | 1 -
+ arch/m68k/include/asm/irq_regs.h | 1 -
+ arch/m68k/include/asm/kdebug.h | 1 -
+ arch/m68k/include/asm/kmap_types.h | 6 -
+ arch/m68k/include/asm/kvm_para.h | 1 -
+ arch/m68k/include/asm/local.h | 6 -
+ arch/m68k/include/asm/local64.h | 1 -
+ arch/m68k/include/asm/mac_mouse.h | 23 ---
+ arch/m68k/include/asm/mcfmbus.h | 77 ---------
+ arch/m68k/include/asm/mman.h | 1 -
+ arch/m68k/include/asm/mutex.h | 9 --
+ arch/m68k/include/asm/percpu.h | 6 -
+ arch/m68k/include/asm/resource.h | 6 -
+ arch/m68k/include/asm/sbus.h | 45 ------
+ arch/m68k/include/asm/scatterlist.h | 6 -
+ arch/m68k/include/asm/sections.h | 8 -
+ arch/m68k/include/asm/shm.h | 31 ----
+ arch/m68k/include/asm/siginfo.h | 6 -
+ arch/m68k/include/asm/statfs.h | 6 -
+ arch/m68k/include/asm/topology.h | 6 -
+ arch/m68k/include/asm/types.h | 22 ---
+ arch/m68k/include/asm/unaligned.h | 4 +-
+ arch/m68k/include/asm/xor.h | 1 -
+ arch/m68k/kernel/setup_no.c | 11 +-
+ arch/m68k/kernel/sys_m68k.c | 8 +-
+ arch/m68k/kernel/vmlinux-nommu.lds | 2 -
+ arch/m68k/kernel/vmlinux-std.lds | 2 -
+ arch/m68k/kernel/vmlinux-sun3.lds | 2 -
+ arch/m68k/lib/muldi3.c | 2 +-
+ arch/m68k/mm/init_mm.c | 2 +-
+ arch/m68k/mm/init_no.c | 2 +-
+ arch/m68k/platform/68328/head-de2.S | 8 +-
+ arch/m68k/platform/68328/head-pilot.S | 10 +-
+ arch/m68k/platform/68328/head-ram.S | 4 +-
+ arch/m68k/platform/68328/head-rom.S | 6 +-
+ arch/m68k/platform/68360/head-ram.S | 6 +-
+ arch/m68k/platform/68360/head-rom.S | 8 +-
+ arch/m68k/platform/coldfire/head.S | 10 +-
+ arch/m68k/sun3/prom/init.c | 48 +-----
+ arch/microblaze/include/asm/sections.h | 4 -
+ arch/microblaze/kernel/microblaze_ksyms.c | 3 -
+ arch/microblaze/kernel/setup.c | 4 +-
+ arch/microblaze/kernel/vmlinux.lds.S | 1 -
+ arch/sh/include/asm/sections.h | 1 -
+ arch/sh/kernel/setup.c | 2 +-
+ arch/sh/kernel/sh_ksyms_32.c | 1 -
+ arch/sh/kernel/vmlinux.lds.S | 1 -
+ arch/sh/lib/mcount.S | 8 +-
+ drivers/mtd/maps/uclinux.c | 5 +-
+ drivers/zorro/zorro.c | 2 -
+ 66 files changed, 100 insertions(+), 842 deletions(-)
+ delete mode 100644 arch/m68k/include/asm/MC68332.h
+ delete mode 100644 arch/m68k/include/asm/apollodma.h
+ delete mode 100644 arch/m68k/include/asm/bitsperlong.h
+ delete mode 100644 arch/m68k/include/asm/cputime.h
+ delete mode 100644 arch/m68k/include/asm/device.h
+ delete mode 100644 arch/m68k/include/asm/emergency-restart.h
+ delete mode 100644 arch/m68k/include/asm/errno.h
+ delete mode 100644 arch/m68k/include/asm/futex.h
+ delete mode 100644 arch/m68k/include/asm/ioctl.h
+ delete mode 100644 arch/m68k/include/asm/ipcbuf.h
+ delete mode 100644 arch/m68k/include/asm/irq_regs.h
+ delete mode 100644 arch/m68k/include/asm/kdebug.h
+ delete mode 100644 arch/m68k/include/asm/kmap_types.h
+ delete mode 100644 arch/m68k/include/asm/kvm_para.h
+ delete mode 100644 arch/m68k/include/asm/local.h
+ delete mode 100644 arch/m68k/include/asm/local64.h
+ delete mode 100644 arch/m68k/include/asm/mac_mouse.h
+ delete mode 100644 arch/m68k/include/asm/mcfmbus.h
+ delete mode 100644 arch/m68k/include/asm/mman.h
+ delete mode 100644 arch/m68k/include/asm/mutex.h
+ delete mode 100644 arch/m68k/include/asm/percpu.h
+ delete mode 100644 arch/m68k/include/asm/resource.h
+ delete mode 100644 arch/m68k/include/asm/sbus.h
+ delete mode 100644 arch/m68k/include/asm/scatterlist.h
+ delete mode 100644 arch/m68k/include/asm/sections.h
+ delete mode 100644 arch/m68k/include/asm/shm.h
+ delete mode 100644 arch/m68k/include/asm/siginfo.h
+ delete mode 100644 arch/m68k/include/asm/statfs.h
+ delete mode 100644 arch/m68k/include/asm/topology.h
+ delete mode 100644 arch/m68k/include/asm/types.h
+ delete mode 100644 arch/m68k/include/asm/xor.h
+Merging powerpc-merge/merge (ad36cb0 powerpc/kvm/book3s_32: Fix MTMSR_EERI macro)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (1a9b499 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (e33cdac ipv4: route.c cleanup)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 1 +
+ drivers/net/ethernet/sfc/efx.c | 6 ++++++
+ drivers/net/ethernet/sfc/efx.h | 14 ++++++++++----
+ drivers/net/ethernet/sfc/ethtool.c | 16 +++++++++++-----
+ drivers/net/ethernet/sfc/tx.c | 19 +++++++++++++++++++
+ include/linux/netdevice.h | 2 ++
+ include/net/sock.h | 2 ++
+ include/net/xfrm.h | 4 ++++
+ net/core/dev.c | 4 ++++
+ net/core/sock.c | 1 +
+ net/ipv4/route.c | 4 ----
+ net/ipv4/tcp.c | 4 +++-
+ net/ipv4/tcp_cong.c | 3 ++-
+ net/ipv4/tcp_output.c | 21 ++++++++++++---------
+ net/xfrm/xfrm_state.c | 21 +++++++++++++++++----
+ 15 files changed, 94 insertions(+), 28 deletions(-)
+Merging sound-current/for-linus (ac190c7 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/patch_realtek.c | 1 +
+ sound/soc/codecs/ab8500-codec.c | 4 ++++
+ sound/soc/codecs/ad1980.c | 1 +
+ sound/soc/codecs/mc13783.c | 2 ++
+ sound/soc/codecs/sgtl5000.c | 3 +--
+ sound/soc/codecs/stac9766.c | 1 +
+ sound/soc/codecs/wm8962.c | 3 +++
+ sound/soc/codecs/wm8994.c | 15 ++++++++++++++-
+ sound/soc/codecs/wm9712.c | 1 +
+ sound/soc/codecs/wm9713.c | 1 +
+ sound/soc/mxs/mxs-saif.c | 24 ++++++++++++++++++++++++
+ sound/soc/omap/omap-mcbsp.c | 1 +
+ sound/soc/omap/omap-pcm.c | 1 +
+ sound/soc/soc-core.c | 2 +-
+ sound/soc/tegra/tegra_alc5632.c | 2 +-
+ sound/soc/tegra/tegra_wm8903.c | 10 +++++-----
+ sound/soc/ux500/ux500_msp_dai.c | 2 +-
+ sound/soc/ux500/ux500_msp_i2s.c | 2 +-
+ sound/soc/ux500/ux500_msp_i2s.h | 2 +-
+ 19 files changed, 65 insertions(+), 13 deletions(-)
+Merging pci-current/for-linus (314489b Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (ed4aaae ath9k: Add PID/VID support for AR1111)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/bcma/host_pci.c | 1 +
+ drivers/bcma/sprom.c | 4 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 1 +
+ drivers/net/wireless/ath/ath9k/hw.h | 1 +
+ drivers/net/wireless/ath/ath9k/pci.c | 1 +
+ drivers/net/wireless/b43/main.c | 21 +++---
+ drivers/net/wireless/brcm80211/brcmsmac/channel.c | 5 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 +-
+ drivers/net/wireless/libertas/cfg.c | 1 +
+ drivers/net/wireless/libertas/if_sdio.c | 1 +
+ drivers/net/wireless/libertas/main.c | 5 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 68 +++++++++++++++++++
+ drivers/net/wireless/rt2x00/rt2800pci.c | 71 --------------------
+ include/linux/bcma/bcma_driver_chipcommon.h | 6 ++
+ include/net/cfg80211.h | 2 +
+ net/mac80211/mesh.c | 3 +
+ net/mac80211/mlme.c | 2 +
+ net/mac80211/scan.c | 3 +-
+ net/wireless/reg.c | 19 +++++-
+ 19 files changed, 129 insertions(+), 89 deletions(-)
+Merging driver-core.current/driver-core-linus (0d7614f Linux 3.6-rc1)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (38bd2a1 pch_uart: Fix parity setting issue)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (84a1caf Linux 3.5-rc7)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (6887a41 Linux 3.5-rc5)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (84a1caf Linux 3.5-rc7)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (cf45b5a Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (58e94ae md/raid1: close some possible races on write errors during resync)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (76f16f8 crypto: hifn_795x - fix 64bit division and undefined __divdi3 on 32bit archs)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ drivers/crypto/hifn_795x.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging ide/master (39a50b4 Merge branch 'hfsplus')
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (244dc4e Merge git://git.infradead.org/users/dwmw2/random-2.6)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging irqdomain-current/irqdomain/merge (15e06bf irqdomain: Fix debugfs formatting)
+$ git merge irqdomain-current/irqdomain/merge
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4e8383b of: release node fix for of_parse_phandle_with_args)
+$ git merge devicetree-current/devicetree/merge
+Auto-merging drivers/of/base.c
+Merge made by the 'recursive' strategy.
+ drivers/of/base.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging spi-current/spi/merge (d1c185b of/spi: Fix SPI module loading by using proper "spi:" modalias prefixes.)
+$ git merge spi-current/spi/merge
+Auto-merging drivers/spi/spi.c
+Auto-merging drivers/spi/spi-s3c64xx.c
+Auto-merging drivers/spi/spi-bcm63xx.c
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm63xx.c | 16 ++++++----------
+ drivers/spi/spi-s3c64xx.c | 10 ++++------
+ drivers/spi/spi.c | 5 ++++-
+ 3 files changed, 14 insertions(+), 17 deletions(-)
+Merging gpio-current/gpio/merge (96b7064 gpio/tca6424: merge I2C transactions, remove cast)
+$ git merge gpio-current/gpio/merge
+Already up-to-date.
+Merging arm/for-next (1a9b499 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
+$ git merge arm/for-next
+Already up-to-date.
+Merging arm-perf/for-next/perf (dee8c1b ARM: perf: remove arm_perf_pmu_ids global enumeration)
+$ git merge arm-perf/for-next/perf
+Merge made by the 'recursive' strategy.
+Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6)
+$ git merge davinci/davinci-next
+Already up-to-date.
+Merging xilinx/arm-next (b85a3ef ARM: Xilinx: Adding Xilinx board support)
+$ git merge xilinx/arm-next
+Already up-to-date.
+Merging blackfin/for-linus (719154c bf60x: fix build warning)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (b9b8722 C6X: clean up compiler warning)
+$ git merge c6x/for-linux-next
+Already up-to-date.
+Merging cris/for-next (2608747 CRIS: Remove VCS simulator specific code)
+$ git merge cris/for-next
+Removing arch/cris/arch-v32/mach-fs/vcs_hook.h
+Removing arch/cris/arch-v32/mach-fs/vcs_hook.c
+Removing arch/cris/arch-v32/mach-a3/vcs_hook.h
+Removing arch/cris/arch-v32/mach-a3/vcs_hook.c
+Auto-merging arch/cris/arch-v32/drivers/pci/bios.c
+Auto-merging arch/cris/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/cris/Kconfig | 5 -
+ arch/cris/arch-v32/drivers/axisflashmap.c | 29 ------
+ arch/cris/arch-v32/drivers/pci/bios.c | 25 -----
+ arch/cris/arch-v32/kernel/head.S | 58 +----------
+ arch/cris/arch-v32/kernel/kgdb.c | 14 ---
+ arch/cris/arch-v32/mach-a3/Makefile | 2 -
+ arch/cris/arch-v32/mach-a3/vcs_hook.c | 103 --------------------
+ arch/cris/arch-v32/mach-a3/vcs_hook.h | 58 -----------
+ arch/cris/arch-v32/mach-fs/Makefile | 2 -
+ arch/cris/arch-v32/mach-fs/vcs_hook.c | 100 -------------------
+ arch/cris/arch-v32/mach-fs/vcs_hook.h | 42 --------
+ arch/cris/arch-v32/mm/init.c | 8 --
+ arch/cris/include/arch-v32/arch/page.h | 5 -
+ arch/cris/include/arch-v32/arch/processor.h | 6 +-
+ .../cris/include/arch-v32/mach-fs/mach/startup.inc | 6 --
+ arch/cris/include/asm/pci.h | 1 -
+ 16 files changed, 3 insertions(+), 461 deletions(-)
+ delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.c
+ delete mode 100644 arch/cris/arch-v32/mach-a3/vcs_hook.h
+ delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.c
+ delete mode 100644 arch/cris/arch-v32/mach-fs/vcs_hook.h
+Merging hexagon/linux-next (5042ab9 various Kconfig cleanup and old platform build code removal)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (a119365 [IA64] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (9e2760d m68k: Make sys_atomic_cmpxchg_32 work on classic m68k)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (b1f7735 m68k: allow PCI bus to be enabled for ColdFire m54xx CPUs)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (a01ee16 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (3a0b96c Merge branch 'next/lantiq' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Merge made by the 'recursive' strategy.
+ arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 +++
+ arch/mips/lantiq/xway/sysctrl.c | 14 ++++++++++++++
+ arch/mips/pci/pci-lantiq.c | 7 ++++++-
+ 3 files changed, 23 insertions(+), 1 deletion(-)
+Merging openrisc/for-upstream (207e715 openrisc: use scratch regs in atomic syscall)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (bba3d8c [PARISC] Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts)
+$ git merge parisc/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/atomic.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging powerpc/next (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next (2074b1d powerpc: Fix irq distribution)
+$ git merge 4xx/next
+Already up-to-date.
+Merging mpc5xxx/next (4d2f4e1 powerpc: Option FB_FSL_DIU is not really optional for mpc512x)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/platforms/512x/Kconfig | 1 +
+ arch/powerpc/platforms/512x/clock.c | 6 ++++--
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 6 ------
+ 3 files changed, 5 insertions(+), 8 deletions(-)
+Merging galak/next (0eec5a8 powerpc/85xx: add HOTPLUG_CPU support)
+$ git merge galak/next
+Removing arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+Removing arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+Removing arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
+Removing arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 6 +-
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 320 +++++++++++++++++++++++++
+ arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 111 +++++++++
+ arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi | 118 +++++++++
+ arch/powerpc/boot/dts/p1020rdb_camp_core0.dts | 63 -----
+ arch/powerpc/boot/dts/p1020rdb_camp_core1.dts | 141 -----------
+ arch/powerpc/boot/dts/p1022rdk.dts | 188 +++++++++++++++
+ arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 67 ------
+ arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 125 ----------
+ arch/powerpc/boot/dts/p5040ds.dts | 203 ++++++++++++++++
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 +
+ arch/powerpc/configs/corenet64_smp_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ arch/powerpc/include/asm/cacheflush.h | 2 +
+ arch/powerpc/include/asm/fsl_guts.h | 2 +
+ arch/powerpc/include/asm/mpic.h | 5 +
+ arch/powerpc/include/asm/smp.h | 2 +
+ arch/powerpc/kernel/head_fsl_booke.S | 28 +++
+ arch/powerpc/kernel/smp.c | 12 +-
+ arch/powerpc/platforms/85xx/Kconfig | 21 ++
+ arch/powerpc/platforms/85xx/Makefile | 2 +
+ arch/powerpc/platforms/85xx/corenet_ds.c | 10 +-
+ arch/powerpc/platforms/85xx/p1022_rdk.c | 195 +++++++++++++++
+ arch/powerpc/platforms/85xx/p5040_ds.c | 89 +++++++
+ arch/powerpc/platforms/85xx/smp.c | 220 ++++++++++++++---
+ arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 10 +
+ arch/powerpc/sysdev/fsl_pci.c | 1 +
+ arch/powerpc/sysdev/mpic.c | 58 +++--
+ 29 files changed, 1550 insertions(+), 453 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-sec5.2-0.dtsi
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p1020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p1022rdk.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts
+ delete mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts
+ create mode 100644 arch/powerpc/boot/dts/p5040ds.dts
+ create mode 100644 arch/powerpc/platforms/85xx/p1022_rdk.c
+ create mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
+Merging s390/features (7d25617 s390: make use of user_mode() macro where possible)
+$ git merge s390/features
+Already up-to-date.
+Merging sh/sh-latest (08298f0 sh: explicitly include sh_dma.h in setup-sh7722.c)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (31a6710 Fix blocking allocations called very early during bootup)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (e4baa56 UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler)
+$ git merge unicore32/unicore32
+Auto-merging arch/unicore32/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 3 +++
+ arch/unicore32/include/asm/bug.h | 5 -----
+ arch/unicore32/include/asm/cmpxchg.h | 2 +-
+ arch/unicore32/kernel/setup.h | 6 ++++++
+ arch/unicore32/mm/fault.c | 37 +++++++++++++++++++++++++---------
+ 5 files changed, 37 insertions(+), 16 deletions(-)
+Merging ceph/master (1fe5e99 rbd: create rbd_refresh_helper())
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (1a500f0 CIFS: Add SMB2 support for rmdir)
+$ git merge cifs/for-next
+Already up-to-date.
+Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next (5f5b331 eCryptfs: check for eCryptfs cipher support at mount)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (0143fc5 udf: avoid info leak on export)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (03179fe ext4: undo ext4_calc_metadata_amount if we fail to claim space)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (f3840dc fuse: add missing INIT flag descriptions)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/file.c
+Merge made by the 'recursive' strategy.
+ fs/fuse/file.c | 13 ++++++++-----
+ fs/fuse/fuse_i.h | 3 +++
+ fs/fuse/inode.c | 32 ++++++++++++++++++++++++++++----
+ include/linux/fuse.h | 19 ++++++++++++++++++-
+ 4 files changed, 57 insertions(+), 10 deletions(-)
+Merging gfs2/master (bdc0077 Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge gfs2/master
+Already up-to-date.
+Merging logfs/master (9f0bbd8 logfs: query block device for number of pages to send with bio)
+$ git merge logfs/master
+Auto-merging fs/logfs/readwrite.c
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_bdev.c | 15 +++++++--------
+ fs/logfs/inode.c | 18 +++++++++++++++++-
+ fs/logfs/journal.c | 2 +-
+ fs/logfs/readwrite.c | 1 -
+ fs/logfs/segment.c | 2 +-
+ 5 files changed, 26 insertions(+), 12 deletions(-)
+Merging nfs/linux-next (2d53492 Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (2c142ba NFSd: make boot_time variable per network namespace)
+$ git merge nfsd/nfsd-next
+Already up-to-date.
+Merging ocfs2/linux-next (2dfd060 aio: make kiocb->private NUll in init_sync_kiocb())
+$ git merge ocfs2/linux-next
+Already up-to-date.
+Merging omfs/for-next (976d167 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (5fcb08b 9p: BUG before corrupting memory)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (7074e5e UBIFS: remove invalid reference to list iterator variable)
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/for-next (9a57fa8 xfs: wait for the write the superblock on unmount)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (dbc6e02 delousing target_core_file a bit)
+$ git merge vfs/for-next
+Already up-to-date.
+Merging pci/next (63b96f7 Merge branch 'pci/yinghai-pciehp-unused' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (e8ff13b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
+$ git merge hid/for-next
+Already up-to-date.
+Merging quilt/i2c (7fc8c6c i2c-i801: Support SMBus multiplexing on Asus Z8 series)
+$ git merge quilt/i2c
+Merge made by the 'recursive' strategy.
+ drivers/i2c/busses/i2c-i801.c | 214 ++++++++++++++++++++++++++++++++++-
+ drivers/i2c/i2c-mux.c | 22 ++++
+ drivers/i2c/muxes/i2c-mux-gpio.c | 4 +-
+ drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-pca954x.c | 10 +-
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +-
+ include/linux/i2c-mux-gpio.h | 2 +
+ include/linux/i2c-mux.h | 1 +
+ include/linux/i2c/pca954x.h | 1 +
+ 9 files changed, 250 insertions(+), 8 deletions(-)
+Merging i2c-embedded/i2c-embedded/for-next (5db20c4 Revert "i2c: tegra: convert normal suspend/resume to *_noirq")
+$ git merge i2c-embedded/i2c-embedded/for-next
+Already up-to-date.
+Merging quilt/jdelvare-hwmon (2e3ee61 Merge tag 'writeback-proportions' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux)
+$ git merge quilt/jdelvare-hwmon
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (d4fdc32 Merge tag 'fbdev-updates-for-3.6' of git://github.com/schandinat/linux-2.6)
+$ git merge hwmon-staging/hwmon-next
+Already up-to-date.
+Merging v4l-dvb/master (add6e13 Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2392b46] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/media/dvb/dvb-usb/dib0700_core.c | 6 +++---
+ drivers/media/rc/ir-raw.c | 4 +++-
+ drivers/media/video/cx18/cx18-av-firmware.c | 2 ++
+ drivers/media/video/cx18/cx18-driver.c | 1 +
+ drivers/media/video/cx18/cx18-dvb.c | 6 +++++-
+ drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++--
+ drivers/media/video/cx231xx/cx231xx-417.c | 2 ++
+ drivers/media/video/cx23885/cx23885-417.c | 2 ++
+ drivers/media/video/cx23885/cx23885-cards.c | 4 ++++
+ drivers/media/video/cx23885/cx23885-input.c | 9 +++++++++
+ drivers/media/video/cx25840/cx25840-firmware.c | 15 ++++++++++++---
+ drivers/media/video/ivtv/ivtv-firmware.c | 4 ++++
+ drivers/media/video/pvrusb2/pvrusb2-devattr.c | 17 ++++++++++++-----
+ drivers/media/video/s5k6aa.c | 2 +-
+ include/linux/omap3isp.h | 1 +
+ include/linux/v4l2-common.h | 8 ++++----
+ 16 files changed, 73 insertions(+), 20 deletions(-)
+Merging kbuild/for-next (85b170e Merge branches 'kbuild/kconfig' and 'kbuild/misc' into kbuild/for-next)
+$ git merge kbuild/for-next
+Merge made by the 'recursive' strategy.
+Merging kconfig/for-next (4503379 localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG)
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (354b2ea libata-acpi: fix up for acpi_pm_device_sleep_state API)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (1da9b6b Merge branches 'cma', 'ipoib', 'ocrdma' and 'qib' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging acpi/next (a72551d Merge branch 'misc' into next)
+$ git merge acpi/next
+Merge made by the 'recursive' strategy.
+ arch/x86/kernel/acpi/sleep.c | 4 --
+ arch/x86/kernel/acpi/sleep.h | 2 -
+ arch/x86/kernel/acpi/wakeup_32.S | 4 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 4 +-
+ arch/x86/kernel/apic/es7000_32.c | 7 ++--
+ drivers/acpi/acpica/achware.h | 12 +++---
+ drivers/acpi/acpica/hwesleep.c | 19 ++--------
+ drivers/acpi/acpica/hwsleep.c | 20 ++--------
+ drivers/acpi/acpica/hwxfsleep.c | 22 +++++------
+ drivers/acpi/acpica/tbxface.c | 18 ++-------
+ drivers/acpi/pci_root.c | 11 +++++-
+ drivers/acpi/processor_driver.c | 2 +-
+ drivers/acpi/sleep.c | 75 +++++---------------------------------
+ drivers/acpi/sysfs.c | 4 +-
+ drivers/acpi/tables.c | 21 +++++------
+ drivers/iommu/dmar.c | 14 +++----
+ include/acpi/acpixf.h | 8 +---
+ include/acpi/actypes.h | 2 +-
+ 18 files changed, 75 insertions(+), 174 deletions(-)
+$ git revert 705d9245d714
+[master 2642bb1] Revert "ACPI: remove acpi_get_table_with_size() fucntion"
+ 2 files changed, 19 insertions(+), 3 deletions(-)
+Merging cpuidle/cpuidle-next (3cf7997 acpi: intel_idle : break dependency between modules)
+$ git merge cpuidle/cpuidle-next
+Resolved 'drivers/cpuidle/coupled.c' using previous resolution.
+Auto-merging drivers/cpuidle/coupled.c
+CONFLICT (add/add): Merge conflict in drivers/cpuidle/coupled.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8bde9da] Merge remote-tracking branch 'cpuidle/cpuidle-next'
+$ git diff -M --stat --summary HEAD^..
+Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging ieee1394/for-next (e3cbd92 firewire: core: document is_local sysfs attribute)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (87e773c UBI: harmonize the update of ubi->beb_rsvd_pebs)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (c572b7f dlm: fix deadlock between dlm_send and dlm_controld)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/config.c | 79 ++++-----------------
+ fs/dlm/config.h | 2 -
+ fs/dlm/lowcomms.c | 205 ++++++++++++++++++++++++++++++++++++++++++++++-------
+ fs/dlm/lowcomms.h | 2 +
+ fs/dlm/main.c | 2 +
+ 5 files changed, 200 insertions(+), 90 deletions(-)
+Merging scsi/for-next (641aa03 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Resolved 'drivers/ata/libata-core.c' using previous resolution.
+Auto-merging include/linux/libata.h
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging drivers/ata/libata-core.c
+CONFLICT (content): Merge conflict in drivers/ata/libata-core.c
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2e3aab4] Merge remote-tracking branch 'scsi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 3 +
+ Documentation/scsi/ChangeLog.megaraid_sas | 10 ++
+ drivers/ata/libata-core.c | 69 +++++++++----
+ drivers/ata/libata-eh.c | 2 +
+ drivers/scsi/ipr.c | 149 +++++++++++++++++++--------
+ drivers/scsi/ipr.h | 5 +-
+ drivers/scsi/isci/host.c | 4 +-
+ drivers/scsi/isci/host.h | 2 +-
+ drivers/scsi/isci/init.c | 59 ++++++++++-
+ drivers/scsi/isci/phy.c | 4 +-
+ drivers/scsi/isci/probe_roms.c | 1 -
+ drivers/scsi/isci/remote_node_context.h | 2 +-
+ drivers/scsi/libsas/sas_ata.c | 91 +++++++++++++++-
+ drivers/scsi/libsas/sas_discover.c | 69 +++++++++++--
+ drivers/scsi/libsas/sas_dump.c | 1 +
+ drivers/scsi/libsas/sas_event.c | 4 +-
+ drivers/scsi/libsas/sas_init.c | 90 +++++++++++++++-
+ drivers/scsi/libsas/sas_internal.h | 1 +
+ drivers/scsi/libsas/sas_phy.c | 21 ++++
+ drivers/scsi/libsas/sas_port.c | 52 +++++++++-
+ drivers/scsi/megaraid/megaraid_sas.h | 8 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 42 ++++++--
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 5 +-
+ drivers/scsi/mpt2sas/Kconfig | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2.h | 14 ++-
+ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 7 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 19 ++--
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +--
+ drivers/scsi/mpt2sas/mpt2sas_config.c | 38 ++++++-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 72 ++++++++++++-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 30 +++++-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 2 +-
+ drivers/scsi/scsi_lib.c | 5 +-
+ include/linux/libata.h | 15 ++-
+ include/scsi/libsas.h | 20 +++-
+ include/scsi/sas_ata.h | 10 ++
+ 40 files changed, 819 insertions(+), 144 deletions(-)
+Merging target-updates/for-next (bf6932f iscsi-target: Drop bogus struct file usage for iSCSI/SCTP)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (1247c37 tcm_vhost: Initial merge for vhost level target fabric driver)
+$ git merge target-merge/for-next-merge
+Merge made by the 'recursive' strategy.
+ drivers/vhost/Kconfig | 3 +
+ drivers/vhost/Kconfig.tcm | 6 +
+ drivers/vhost/Makefile | 2 +
+ drivers/vhost/tcm_vhost.c | 1628 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/vhost/tcm_vhost.h | 101 +++
+ 5 files changed, 1740 insertions(+)
+ create mode 100644 drivers/vhost/Kconfig.tcm
+ create mode 100644 drivers/vhost/tcm_vhost.c
+ create mode 100644 drivers/vhost/tcm_vhost.h
+Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI)
+$ git merge ibft/linux-next
+Already up-to-date.
+Merging isci/all (6734092 isci: add a couple __iomem annotations)
+$ git merge isci/all
+Already up-to-date.
+Merging slave-dma/next (6343325 dmaengine: Cleanup logging messages)
+$ git merge slave-dma/next
+Already up-to-date.
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (1a9b499 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (173f865 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (8bd38a6 Bluetooth: Added /proc/net/sco via bt_procfs_init())
+$ git merge bluetooth/master
+Merge made by the 'recursive' strategy.
+ include/net/bluetooth/bluetooth.h | 10 +++
+ include/net/bluetooth/hci.h | 9 +++
+ include/net/bluetooth/hci_core.h | 22 ++----
+ include/net/bluetooth/l2cap.h | 17 +----
+ include/net/bluetooth/smp.h | 8 +--
+ net/bluetooth/a2mp.c | 16 +++--
+ net/bluetooth/af_bluetooth.c | 141 +++++++++++++++++++++++++++++++++++++
+ net/bluetooth/bnep/sock.c | 22 +++++-
+ net/bluetooth/cmtp/sock.c | 23 +++++-
+ net/bluetooth/hci_core.c | 6 +-
+ net/bluetooth/hci_event.c | 20 +++---
+ net/bluetooth/hci_sock.c | 13 +++-
+ net/bluetooth/hidp/sock.c | 22 +++++-
+ net/bluetooth/l2cap_core.c | 32 +++++++--
+ net/bluetooth/l2cap_sock.c | 22 +++++-
+ net/bluetooth/mgmt.c | 34 ++++++---
+ net/bluetooth/rfcomm/sock.c | 14 +++-
+ net/bluetooth/sco.c | 16 +++--
+ 18 files changed, 361 insertions(+), 86 deletions(-)
+Merging mtd/master (4800399 mtd: m25p80: Add support for serial flash STM/Micron N25Q032)
+$ git merge mtd/master
+Auto-merging drivers/mtd/mtdoops.c
+Removing drivers/mtd/maps/wr_sbc82xx_flash.c
+Auto-merging arch/arm/mach-imx/clk-imx51-imx53.c
+Auto-merging arch/arm/boot/dts/imx53.dtsi
+Auto-merging arch/arm/boot/dts/imx51.dtsi
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/mtdnand.tmpl | 2 -
+ .../devicetree/bindings/mtd/atmel-nand.txt | 40 +-
+ .../devicetree/bindings/mtd/gpmi-nand.txt | 4 +
+ .../devicetree/bindings/mtd/lpc32xx-mlc.txt | 50 +
+ .../devicetree/bindings/mtd/lpc32xx-slc.txt | 52 +
+ arch/arm/boot/dts/imx51.dtsi | 7 +
+ arch/arm/boot/dts/imx53.dtsi | 7 +
+ arch/arm/mach-imx/clk-imx51-imx53.c | 2 +
+ arch/arm/plat-mxc/devices/platform-mxc_nand.c | 11 +-
+ drivers/mtd/chips/Kconfig | 11 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 67 ++
+ drivers/mtd/devices/Kconfig | 2 +-
+ drivers/mtd/devices/m25p80.c | 6 +
+ drivers/mtd/devices/spear_smi.c | 54 +-
+ drivers/mtd/maps/Kconfig | 12 -
+ drivers/mtd/maps/Makefile | 1 -
+ drivers/mtd/maps/wr_sbc82xx_flash.c | 174 ----
+ drivers/mtd/mtdcore.c | 9 +
+ drivers/mtd/mtdoops.c | 14 +-
+ drivers/mtd/nand/Kconfig | 62 +-
+ drivers/mtd/nand/Makefile | 2 +
+ drivers/mtd/nand/atmel_nand.c | 934 +++++++++++++++--
+ drivers/mtd/nand/atmel_nand_ecc.h | 114 ++-
+ drivers/mtd/nand/bcm_umi_bch.c | 6 +-
+ drivers/mtd/nand/bf5xx_nand.c | 6 +-
+ drivers/mtd/nand/cafe_nand.c | 13 +-
+ drivers/mtd/nand/denali.c | 12 +-
+ drivers/mtd/nand/docg4.c | 8 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 15 +-
+ drivers/mtd/nand/fsl_ifc_nand.c | 5 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 13 +-
+ drivers/mtd/nand/lpc32xx_mlc.c | 925 +++++++++++++++++
+ drivers/mtd/nand/lpc32xx_slc.c | 1059 ++++++++++++++++++++
+ drivers/mtd/nand/mxc_nand.c | 141 +--
+ drivers/mtd/nand/nand_base.c | 50 +-
+ drivers/mtd/nand/nand_bbt.c | 21 +-
+ drivers/mtd/nand/nand_ids.c | 7 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 5 +-
+ drivers/mtd/nand/sh_flctl.c | 302 +++---
+ drivers/mtd/tests/mtd_speedtest.c | 16 +-
+ drivers/mtd/tests/mtd_stresstest.c | 39 +-
+ include/linux/mtd/bbm.h | 7 +-
+ include/linux/mtd/mtd.h | 9 +-
+ include/linux/mtd/nand.h | 11 +-
+ include/linux/mtd/sh_flctl.h | 23 +-
+ 45 files changed, 3653 insertions(+), 677 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-mlc.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/lpc32xx-slc.txt
+ delete mode 100644 drivers/mtd/maps/wr_sbc82xx_flash.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_mlc.c
+ create mode 100644 drivers/mtd/nand/lpc32xx_slc.c
+Merging l2-mtd/master (cd0a30d mtd: m25p80: Fix the Spansion chip detection)
+$ git merge l2-mtd/master
+Resolved 'arch/arm/mach-imx/clk-imx6q.c' using previous resolution.
+Auto-merging arch/arm/mach-imx/clk-imx6q.c
+CONFLICT (content): Merge conflict in arch/arm/mach-imx/clk-imx6q.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b00fd57] Merge remote-tracking branch 'l2-mtd/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/mtd/devices/m25p80.c | 11 +++--
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 45 ++++++++++++++----
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 82 ++++++++++++++++++++++++++++----
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 3 +-
+ drivers/mtd/nand/sh_flctl.c | 30 +++++++-----
+ include/linux/mtd/sh_flctl.h | 2 +-
+ 6 files changed, 137 insertions(+), 36 deletions(-)
+Merging crypto/master (35a1fc1 powerpc/crypto: add 842 crypto driver)
+$ git merge crypto/master
+Auto-merging crypto/cast6_generic.c
+Auto-merging crypto/cast5_generic.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 +
+ arch/powerpc/configs/ppc64_defconfig | 3 +-
+ arch/powerpc/configs/pseries_defconfig | 3 +-
+ arch/powerpc/kernel/prom_init.c | 4 +-
+ arch/s390/crypto/aes_s390.c | 5 -
+ arch/s390/crypto/des_s390.c | 10 -
+ arch/s390/crypto/ghash_s390.c | 1 -
+ arch/x86/crypto/Makefile | 4 +
+ arch/x86/crypto/aes_glue.c | 1 -
+ arch/x86/crypto/aesni-intel_glue.c | 5 +-
+ arch/x86/crypto/blowfish_glue.c | 4 -
+ arch/x86/crypto/camellia_glue.c | 6 -
+ arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 322 ++++
+ arch/x86/crypto/cast5_avx_glue.c | 530 ++++++
+ arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 335 ++++
+ arch/x86/crypto/cast6_avx_glue.c | 648 +++++++
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 -
+ arch/x86/crypto/salsa20_glue.c | 1 -
+ arch/x86/crypto/serpent_avx_glue.c | 10 -
+ arch/x86/crypto/serpent_sse2_glue.c | 10 -
+ arch/x86/crypto/twofish_avx_glue.c | 10 -
+ arch/x86/crypto/twofish_glue.c | 1 -
+ arch/x86/crypto/twofish_glue_3way.c | 5 -
+ crypto/842.c | 183 ++
+ crypto/Kconfig | 40 +
+ crypto/Makefile | 5 +-
+ crypto/aes_generic.c | 1 -
+ crypto/ansi_cprng.c | 63 +-
+ crypto/anubis.c | 1 -
+ crypto/blowfish_generic.c | 1 -
+ crypto/camellia_generic.c | 1 -
+ crypto/{cast5.c => cast5_generic.c} | 80 +-
+ crypto/{cast6.c => cast6_generic.c} | 67 +-
+ crypto/crypto_null.c | 57 +-
+ crypto/deflate.c | 1 -
+ crypto/des_generic.c | 25 +-
+ crypto/fcrypt.c | 1 -
+ crypto/ghash-generic.c | 1 -
+ crypto/khazad.c | 1 -
+ crypto/krng.c | 1 -
+ crypto/lzo.c | 1 -
+ crypto/salsa20_generic.c | 1 -
+ crypto/seed.c | 1 -
+ crypto/serpent_generic.c | 53 +-
+ crypto/sha256_generic.c | 25 +-
+ crypto/sha512_generic.c | 20 +-
+ crypto/shash.c | 36 +
+ crypto/tcrypt.c | 82 +
+ crypto/tcrypt.h | 1 +
+ crypto/tea.c | 41 +-
+ crypto/testmgr.c | 210 +++
+ crypto/testmgr.h | 2538 ++++++++++++++++++++++++++--
+ crypto/tgr192.c | 38 +-
+ crypto/twofish_generic.c | 1 -
+ crypto/wp512.c | 39 +-
+ drivers/crypto/Kconfig | 20 +-
+ drivers/crypto/atmel-aes.c | 2 -
+ drivers/crypto/atmel-tdes.c | 1 -
+ drivers/crypto/caam/caamalg.c | 8 +-
+ drivers/crypto/caam/caamhash.c | 18 +-
+ drivers/crypto/caam/caamrng.c | 9 +-
+ drivers/crypto/caam/jr.c | 10 +-
+ drivers/crypto/geode-aes.c | 3 -
+ drivers/crypto/nx/Kconfig | 26 +
+ drivers/crypto/nx/Makefile | 5 +-
+ drivers/crypto/nx/nx-842.c | 1615 ++++++++++++++++++
+ drivers/crypto/nx/nx-aes-cbc.c | 1 -
+ drivers/crypto/nx/nx-aes-ccm.c | 2 -
+ drivers/crypto/nx/nx-aes-ctr.c | 2 -
+ drivers/crypto/nx/nx-aes-ecb.c | 1 -
+ drivers/crypto/nx/nx-aes-gcm.c | 2 -
+ drivers/crypto/omap-aes.c | 1 -
+ drivers/crypto/padlock-aes.c | 3 -
+ drivers/crypto/s5p-sss.c | 1 -
+ drivers/crypto/tegra-aes.c | 2 -
+ include/crypto/cast5.h | 22 +
+ include/crypto/cast6.h | 23 +
+ include/crypto/internal/hash.h | 2 +
+ include/linux/nx842.h | 11 +
+ 79 files changed, 6702 insertions(+), 630 deletions(-)
+ create mode 100644 arch/x86/crypto/cast5-avx-x86_64-asm_64.S
+ create mode 100644 arch/x86/crypto/cast5_avx_glue.c
+ create mode 100644 arch/x86/crypto/cast6-avx-x86_64-asm_64.S
+ create mode 100644 arch/x86/crypto/cast6_avx_glue.c
+ create mode 100644 crypto/842.c
+ rename crypto/{cast5.c => cast5_generic.c} (95%)
+ rename crypto/{cast6.c => cast6_generic.c} (94%)
+ create mode 100644 drivers/crypto/nx/Kconfig
+ create mode 100644 drivers/crypto/nx/nx-842.c
+ create mode 100644 include/crypto/cast5.h
+ create mode 100644 include/crypto/cast6.h
+ create mode 100644 include/linux/nx842.h
+Merging drm/drm-next (e2f895f Merge branch 'exynos-drm-next' of git://git.infradead.org/users/kmpark/linux-samsung into drm-next)
+$ git merge drm/drm-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging sound/for-next (ac190c7 Merge tag 'asoc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (d0e3cce ASoC: AC97 doesn't use regmap by default)
+$ git merge sound-asoc/for-next
+Already up-to-date.
+Merging quilt/rr (d673c23 Make most arch asm/module.h files use asm-generic/module.h)
+$ git merge quilt/rr
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Removing arch/sparc/include/asm/module.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/m68k/Kconfig
+Removing arch/m32r/include/asm/module.h
+Removing arch/h8300/include/asm/module.h
+Removing arch/cris/include/asm/module.h
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/Kconfig | 19 +++++++++++++++++
+ arch/alpha/Kconfig | 2 ++
+ arch/alpha/include/asm/module.h | 10 ++-------
+ arch/arm/Kconfig | 2 ++
+ arch/arm/include/asm/module.h | 8 ++------
+ arch/avr32/Kconfig | 2 ++
+ arch/avr32/include/asm/module.h | 6 ++----
+ arch/blackfin/Kconfig | 2 ++
+ arch/blackfin/include/asm/module.h | 4 +---
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/module.h | 12 +----------
+ arch/cris/Kconfig | 1 +
+ arch/cris/include/asm/Kbuild | 2 ++
+ arch/cris/include/asm/module.h | 9 --------
+ arch/frv/include/asm/module.h | 8 +-------
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 2 ++
+ arch/h8300/include/asm/module.h | 11 ----------
+ arch/hexagon/Kconfig | 1 +
+ arch/ia64/Kconfig | 2 ++
+ arch/ia64/include/asm/module.h | 6 ++----
+ arch/m32r/Kconfig | 1 +
+ arch/m32r/include/asm/Kbuild | 2 ++
+ arch/m32r/include/asm/module.h | 10 ---------
+ arch/m32r/kernel/module.c | 15 --------------
+ arch/m68k/Kconfig | 3 +++
+ arch/m68k/include/asm/module.h | 6 ++----
+ arch/microblaze/Kconfig | 1 +
+ arch/mips/Kconfig | 3 +++
+ arch/mips/include/asm/module.h | 10 +++++++--
+ arch/mips/kernel/module.c | 2 ++
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/module.h | 7 +------
+ arch/openrisc/Kconfig | 1 +
+ arch/parisc/Kconfig | 2 ++
+ arch/parisc/include/asm/module.h | 16 +++------------
+ arch/powerpc/Kconfig | 2 ++
+ arch/powerpc/include/asm/module.h | 7 +------
+ arch/s390/Kconfig | 2 ++
+ arch/s390/include/asm/module.h | 18 +++-------------
+ arch/score/Kconfig | 2 ++
+ arch/score/include/asm/module.h | 6 +-----
+ arch/score/kernel/module.c | 10 ---------
+ arch/sh/Kconfig | 2 ++
+ arch/sh/include/asm/module.h | 14 +++----------
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/module.h | 24 ----------------------
+ arch/tile/Kconfig | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/x86/Kconfig | 2 ++
+ arch/xtensa/Kconfig | 1 +
+ arch/xtensa/include/asm/module.h | 9 +-------
+ include/asm-generic/module.h | 40 +++++++++++++++++++++++++++++-------
+ include/linux/moduleloader.h | 36 ++++++++++++++++++++++++++++----
+ kernel/module.c | 24 ++++------------------
+ 56 files changed, 171 insertions(+), 223 deletions(-)
+ delete mode 100644 arch/cris/include/asm/module.h
+ delete mode 100644 arch/h8300/include/asm/module.h
+ delete mode 100644 arch/m32r/include/asm/module.h
+ delete mode 100644 arch/sparc/include/asm/module.h
+Merging input/next (2b94e25 Input: random formatting fixes)
+$ git merge input/next
+Merge made by the 'recursive' strategy.
+ drivers/input/apm-power.c | 2 +-
+ drivers/input/ff-core.c | 4 +-
+ drivers/input/ff-memless.c | 14 +--
+ drivers/input/joydev.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 168 ++++++++++++++++----------------
+ drivers/input/misc/twl4030-pwrbutton.c | 1 +
+ drivers/input/mousedev.c | 9 +-
+ drivers/input/sparse-keymap.c | 4 +-
+ 8 files changed, 105 insertions(+), 99 deletions(-)
+Merging input-mt/for-next (c45361a Revert "Input: atmel_mxt_ts - warn if sysfs could not be created")
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (4b2ebf0 Merge branch 'for-3.6' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging block/for-next (85b9f66 block: Add blk_bio_map_sg() helper)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+ block/blk-lib.c | 41 +++++++++++------
+ block/blk-merge.c | 117 +++++++++++++++++++++++++++++++++---------------
+ fs/block_dev.c | 3 ++
+ include/linux/blkdev.h | 12 +++++
+ 4 files changed, 125 insertions(+), 48 deletions(-)
+Merging quilt/device-mapper (37cd960 Merge tag 'for-linus-v3.6-rc1' of git://oss.sgi.com/xfs/xfs)
+$ git merge quilt/device-mapper
+Already up-to-date.
+Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (30b87c6 mmc: sdhci-dove: Prepare for common clock framework)
+$ git merge mmc/mmc-next
+Already up-to-date.
+Merging kgdb/kgdb-next (27c79c1 USB: echi-dbgp: increase the controller wait time to come out of halt.)
+$ git merge kgdb/kgdb-next
+Auto-merging drivers/usb/early/ehci-dbgp.c
+Merge made by the 'recursive' strategy.
+ drivers/usb/early/ehci-dbgp.c | 2 +-
+ include/linux/kdb.h | 2 --
+ kernel/debug/kdb/kdb_debugger.c | 4 ++++
+ kernel/debug/kdb/kdb_io.c | 11 -----------
+ kernel/debug/kdb/kdb_main.c | 15 +--------------
+ 5 files changed, 6 insertions(+), 28 deletions(-)
+Merging slab/for-next (73a1180 mm: Fix build warning in kmem_cache_create())
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (5e442a4 Revert "proc: fix races against execve() of /proc/PID/fd**")
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (63f33b8 DM RAID: Add support for MD RAID10)
+$ git merge md/for-next
+Already up-to-date.
+Merging mfd/for-next (3c1534c mfd: Ensure AB8500 platform data is passed through db8500-prcmu to MFD Core)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (ecc2edd olpc-battery: update CHARGE_FULL_DESIGN property for BYD LiFe batteries)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (a023907 da8xx-fb: fix compile issue due to missing include)
+$ git merge fbdev/fbdev-next
+Already up-to-date.
+Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (974a658 Merge "Apply LCD manager related parameters" from Archit)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (d06578b regulator: anatop: Fix wrong mask used in anatop_get_voltage_sel)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/regulator/tps6586x.txt | 12 +++++-----
+ drivers/regulator/anatop-regulator.c | 5 +++--
+ drivers/regulator/palmas-regulator.c | 23 +++++++++++++-------
+ drivers/regulator/tps6586x-regulator.c | 8 ++++---
+ 4 files changed, 29 insertions(+), 19 deletions(-)
+Merging security/next (6637284 Smack: Maintainer Record)
+$ git merge security/next
+Already up-to-date.
+Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409)
+$ git merge selinux/master
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging lblnet/master (7e27d6e Linux 2.6.35-rc3)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (06a3fa7 watchdog: fix watchdog-test.c build warning)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ Documentation/watchdog/src/watchdog-test.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (395e51f Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (a1706d8 vfio: Include vfio.h in installed headers)
+$ git merge vfio/next
+Merge made by the 'recursive' strategy.
+ include/linux/Kbuild | 1 +
+ 1 file changed, 1 insertion(+)
+Merging osd/linux-next (d8e8b68 pnfs: Don't BUG on info received from Server)
+$ git merge osd/linux-next
+Auto-merging include/linux/nfs_xdr.h
+Auto-merging include/linux/nfs_page.h
+Auto-merging fs/nfs/pagelist.c
+Auto-merging fs/nfs/nfs4proc.c
+Merge made by the 'recursive' strategy.
+ fs/exofs/inode.c | 27 ++++++++++++++-------
+ fs/exofs/ore.c | 14 +++++------
+ fs/exofs/super.c | 11 ---------
+ fs/nfs/nfs4proc.c | 2 +-
+ fs/nfs/objlayout/objio_osd.c | 55 +++++++++++++++++++++++++++++++++++++++---
+ fs/nfs/pagelist.c | 2 ++
+ include/linux/nfs_page.h | 1 +
+ include/linux/nfs_xdr.h | 1 +
+ 8 files changed, 82 insertions(+), 31 deletions(-)
+Merging jc_docs/docs-next (5c050fb docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (e1c9ac4 Revert "backlight: fix memory leak on obscure error path")
+$ git merge trivial/for-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/88pm860x_bl.c | 1 -
+ 1 file changed, 1 deletion(-)
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (26ba678 Merge branch 'master' into linux-next)
+$ git merge pm/linux-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging apm/for-next (f283d22 APM: fix deadlock in APM_IOC_SUSPEND ioctl)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Merge made by the 'recursive' strategy.
+ fs/notify/dnotify/dnotify.c | 4 +-
+ fs/notify/fanotify/fanotify.c | 6 +++
+ fs/notify/fanotify/fanotify_user.c | 37 +++++++++-----
+ fs/notify/group.c | 47 ++++++++++--------
+ fs/notify/inode_mark.c | 14 ++++--
+ fs/notify/inotify/inotify_fsnotify.c | 4 +-
+ fs/notify/inotify/inotify_user.c | 34 ++++++-------
+ fs/notify/mark.c | 91 +++++++++++++++++++---------------
+ fs/notify/notification.c | 1 +
+ fs/notify/vfsmount_mark.c | 14 ++++--
+ include/linux/fsnotify_backend.h | 31 ++++++++----
+ kernel/audit_tree.c | 10 ++--
+ kernel/audit_watch.c | 4 +-
+ 13 files changed, 178 insertions(+), 119 deletions(-)
+Merging edac/linux_next (a92cdec Merge branch 'devel' into next)
+$ git merge edac/linux_next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging edac-amd/for-next (305f1c3 Merge branch '3.3-pci_device_id' into edac-for-next)
+$ git merge edac-amd/for-next
+Resolved 'Documentation/edac.txt' using previous resolution.
+Resolved 'drivers/edac/amd64_edac.c' using previous resolution.
+Auto-merging drivers/edac/amd64_edac.c
+CONFLICT (content): Merge conflict in drivers/edac/amd64_edac.c
+Auto-merging Documentation/edac.txt
+CONFLICT (content): Merge conflict in Documentation/edac.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 2f712c7] Merge remote-tracking branch 'edac-amd/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging devicetree/devicetree/next (efd68e7 devicetree: add helper inline for retrieving a node's full name)
+$ git merge devicetree/devicetree/next
+Already up-to-date.
+Merging dt-rh/for-next (e95d8aa of: mtd: nuke useless const qualifier)
+$ git merge dt-rh/for-next
+Already up-to-date.
+Merging spi/spi/next (d8e328b spi: Add "spi:" prefix to modalias attribute of spi devices)
+$ git merge spi/spi/next
+Already up-to-date.
+Merging spi-mb/spi-next (8ceffa7 spi/orion: remove uneeded spi_info)
+$ git merge spi-mb/spi-next
+Already up-to-date.
+Merging tip/auto-latest (2a7d7ce Merge branch 'timers/urgent')
+$ git merge tip/auto-latest
+Auto-merging scripts/kconfig/Makefile
+Auto-merging kernel/irq/manage.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 8 +
+ arch/x86/Kconfig | 33 +-
+ arch/x86/include/asm/mce.h | 8 +
+ arch/x86/include/asm/perf_event.h | 11 +-
+ arch/x86/kernel/alternative.c | 2 +-
+ arch/x86/kernel/apic/io_apic.c | 4 +-
+ arch/x86/kernel/cpu/mcheck/mce-severity.c | 7 -
+ arch/x86/kernel/cpu/mcheck/mce.c | 43 +-
+ arch/x86/kernel/cpu/perf_event.c | 89 +-
+ arch/x86/kernel/cpu/perf_event.h | 20 +
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 7 +-
+ arch/x86/kernel/cpu/perf_event_intel_uncore.h | 2 +-
+ arch/x86/kernel/irq.c | 1 +
+ arch/x86/kernel/kdebugfs.c | 6 +-
+ include/linux/ftrace_event.h | 5 +-
+ include/linux/hardirq.h | 2 +-
+ include/linux/irq.h | 1 +
+ include/linux/jiffies.h | 29 +-
+ include/linux/perf_event.h | 3 +-
+ include/linux/timex.h | 2 +-
+ include/linux/topology.h | 1 +
+ include/trace/events/sched.h | 4 +
+ include/trace/ftrace.h | 6 +-
+ kernel/events/callchain.c | 9 +-
+ kernel/events/core.c | 30 +-
+ kernel/events/internal.h | 3 +-
+ kernel/futex.c | 17 +-
+ kernel/irq/manage.c | 15 +-
+ kernel/sched/core.c | 4 +-
+ kernel/sched/cpupri.c | 10 +-
+ kernel/sched/fair.c | 29 +-
+ kernel/time/jiffies.c | 2 +-
+ kernel/time/ntp.c | 2 +-
+ kernel/time/timekeeping.c | 376 +++---
+ kernel/trace/trace_event_perf.c | 2 +-
+ kernel/trace/trace_kprobe.c | 6 +-
+ kernel/trace/trace_syscalls.c | 4 +-
+ kernel/trace/trace_uprobe.c | 2 +-
+ scripts/kconfig/Makefile | 7 +-
+ tools/kvm/.gitignore | 12 +
+ tools/kvm/CREDITS-Git | 30 +
+ tools/kvm/Documentation/kernel-debugging.txt | 15 +
+ tools/kvm/Documentation/kvm-balloon.txt | 24 +
+ tools/kvm/Documentation/kvm-debug.txt | 16 +
+ tools/kvm/Documentation/kvm-list.txt | 16 +
+ tools/kvm/Documentation/kvm-pause.txt | 16 +
+ tools/kvm/Documentation/kvm-resume.txt | 16 +
+ tools/kvm/Documentation/kvm-run.txt | 62 +
+ tools/kvm/Documentation/kvm-sandbox.txt | 16 +
+ tools/kvm/Documentation/kvm-setup.txt | 15 +
+ tools/kvm/Documentation/kvm-stat.txt | 19 +
+ tools/kvm/Documentation/kvm-stop.txt | 16 +
+ tools/kvm/Documentation/kvm-version.txt | 21 +
+ tools/kvm/Documentation/virtio-console.txt | 41 +
+ tools/kvm/Makefile | 427 +++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 103 ++
+ tools/kvm/builtin-help.c | 63 +
+ tools/kvm/builtin-list.c | 149 +++
+ tools/kvm/builtin-pause.c | 88 ++
+ tools/kvm/builtin-resume.c | 88 ++
+ tools/kvm/builtin-run.c | 1382 ++++++++++++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 232 ++++
+ tools/kvm/builtin-stat.c | 127 ++
+ tools/kvm/builtin-stop.c | 70 ++
+ tools/kvm/builtin-version.c | 15 +
+ tools/kvm/code16gcc.h | 15 +
+ tools/kvm/command-list.txt | 15 +
+ tools/kvm/config/feature-tests.mak | 177 +++
+ tools/kvm/config/utilities.mak | 196 ++++
+ tools/kvm/disk/blk.c | 76 ++
+ tools/kvm/disk/core.c | 266 +++++
+ tools/kvm/disk/qcow.c | 1529 +++++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 +++
+ tools/kvm/framebuffer.c | 75 ++
+ tools/kvm/guest/init.c | 38 +
+ tools/kvm/guest/init_stage2.c | 55 +
+ tools/kvm/guest/passwd | 1 +
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 348 ++++++
+ tools/kvm/hw/pci-shmem.c | 268 +++++
+ tools/kvm/hw/rtc.c | 137 +++
+ tools/kvm/hw/serial.c | 447 ++++++++
+ tools/kvm/hw/vesa.c | 85 ++
+ tools/kvm/include/asm/hweight.h | 8 +
+ tools/kvm/include/bios/memcpy.h | 9 +
+ tools/kvm/include/kvm/8250-serial.h | 11 +
+ tools/kvm/include/kvm/apic.h | 17 +
+ tools/kvm/include/kvm/brlock.h | 41 +
+ tools/kvm/include/kvm/builtin-balloon.h | 9 +
+ tools/kvm/include/kvm/builtin-debug.h | 18 +
+ tools/kvm/include/kvm/builtin-help.h | 6 +
+ tools/kvm/include/kvm/builtin-list.h | 10 +
+ tools/kvm/include/kvm/builtin-pause.h | 9 +
+ tools/kvm/include/kvm/builtin-resume.h | 9 +
+ tools/kvm/include/kvm/builtin-run.h | 11 +
+ tools/kvm/include/kvm/builtin-sandbox.h | 6 +
+ tools/kvm/include/kvm/builtin-setup.h | 11 +
+ tools/kvm/include/kvm/builtin-stat.h | 9 +
+ tools/kvm/include/kvm/builtin-stop.h | 9 +
+ tools/kvm/include/kvm/builtin-version.h | 6 +
+ tools/kvm/include/kvm/compiler.h | 10 +
+ tools/kvm/include/kvm/disk-image.h | 86 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 35 +
+ tools/kvm/include/kvm/guest_compat.h | 9 +
+ tools/kvm/include/kvm/i8042.h | 12 +
+ tools/kvm/include/kvm/ioeventfd.h | 28 +
+ tools/kvm/include/kvm/ioport.h | 69 ++
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-cpu.h | 24 +
+ tools/kvm/include/kvm/kvm-ipc.h | 24 +
+ tools/kvm/include/kvm/kvm.h | 93 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 214 ++++
+ tools/kvm/include/kvm/pci-shmem.h | 28 +
+ tools/kvm/include/kvm/pci.h | 95 ++
+ tools/kvm/include/kvm/qcow.h | 133 +++
+ tools/kvm/include/kvm/rbtree-interval.h | 28 +
+ tools/kvm/include/kvm/read-write.h | 43 +
+ tools/kvm/include/kvm/rtc.h | 9 +
+ tools/kvm/include/kvm/rwsem.h | 39 +
+ tools/kvm/include/kvm/sdl.h | 22 +
+ tools/kvm/include/kvm/segment.h | 21 +
+ tools/kvm/include/kvm/strbuf.h | 20 +
+ tools/kvm/include/kvm/symbol.h | 30 +
+ tools/kvm/include/kvm/term.h | 20 +
+ tools/kvm/include/kvm/threadpool.h | 37 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 358 ++++++
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 73 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 8 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 9 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 26 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 37 +
+ tools/kvm/include/kvm/virtio-pci.h | 46 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio.h | 103 ++
+ tools/kvm/include/kvm/vnc.h | 20 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 19 +
+ tools/kvm/include/linux/kernel.h | 39 +
+ tools/kvm/include/linux/module.h | 6 +
+ tools/kvm/include/linux/prefetch.h | 6 +
+ tools/kvm/include/linux/stddef.h | 16 +
+ tools/kvm/include/linux/types.h | 51 +
+ tools/kvm/ioeventfd.c | 215 ++++
+ tools/kvm/ioport.c | 195 ++++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 175 +++
+ tools/kvm/kvm-ipc.c | 231 ++++
+ tools/kvm/kvm.c | 593 ++++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 140 +++
+ tools/kvm/net/uip/arp.c | 30 +
+ tools/kvm/net/uip/buf.c | 114 ++
+ tools/kvm/net/uip/core.c | 190 +++
+ tools/kvm/net/uip/csum.c | 92 ++
+ tools/kvm/net/uip/dhcp.c | 203 ++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 317 +++++
+ tools/kvm/net/uip/udp.c | 236 ++++
+ tools/kvm/pci.c | 213 ++++
+ tools/kvm/powerpc/boot.c | 8 +
+ tools/kvm/powerpc/cpu_info.c | 195 ++++
+ tools/kvm/powerpc/cpu_info.h | 42 +
+ tools/kvm/powerpc/include/kvm/barrier.h | 6 +
+ tools/kvm/powerpc/include/kvm/kvm-arch.h | 90 ++
+ tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h | 76 ++
+ tools/kvm/powerpc/ioport.c | 18 +
+ tools/kvm/powerpc/irq.c | 75 ++
+ tools/kvm/powerpc/kvm-cpu.c | 293 +++++
+ tools/kvm/powerpc/kvm.c | 529 +++++++++
+ tools/kvm/powerpc/spapr.h | 93 ++
+ tools/kvm/powerpc/spapr_hcall.c | 134 +++
+ tools/kvm/powerpc/spapr_hvcons.c | 102 ++
+ tools/kvm/powerpc/spapr_hvcons.h | 19 +
+ tools/kvm/powerpc/spapr_pci.c | 423 +++++++
+ tools/kvm/powerpc/spapr_pci.h | 57 +
+ tools/kvm/powerpc/spapr_rtas.c | 229 ++++
+ tools/kvm/powerpc/xics.c | 514 +++++++++
+ tools/kvm/powerpc/xics.h | 23 +
+ tools/kvm/symbol.c | 131 +++
+ tools/kvm/term.c | 166 +++
+ tools/kvm/tests/Makefile | 19 +
+ tools/kvm/tests/boot/Makefile | 13 +
+ tools/kvm/tests/boot/init.c | 11 +
+ tools/kvm/tests/kernel/.gitignore | 2 +
+ tools/kvm/tests/kernel/Makefile | 20 +
+ tools/kvm/tests/kernel/README | 16 +
+ tools/kvm/tests/kernel/kernel.S | 8 +
+ tools/kvm/tests/pit/.gitignore | 2 +
+ tools/kvm/tests/pit/Makefile | 20 +
+ tools/kvm/tests/pit/README | 16 +
+ tools/kvm/tests/pit/tick.S | 109 ++
+ tools/kvm/ui/sdl.c | 303 +++++
+ tools/kvm/ui/vnc.c | 230 ++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/kvm-ifup-vbr0 | 6 +
+ tools/kvm/util/parse-options.c | 577 ++++++++++
+ tools/kvm/util/rbtree-interval.c | 89 ++
+ tools/kvm/util/read-write.c | 354 ++++++
+ tools/kvm/util/set_private_br.sh | 51 +
+ tools/kvm/util/strbuf.c | 62 +
+ tools/kvm/util/threadpool.c | 145 +++
+ tools/kvm/util/util.c | 133 +++
+ tools/kvm/virtio/9p-pdu.c | 287 +++++
+ tools/kvm/virtio/9p.c | 1338 ++++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 267 +++++
+ tools/kvm/virtio/blk.c | 314 +++++
+ tools/kvm/virtio/console.c | 193 ++++
+ tools/kvm/virtio/core.c | 233 ++++
+ tools/kvm/virtio/mmio.c | 264 +++++
+ tools/kvm/virtio/net.c | 555 +++++++++
+ tools/kvm/virtio/pci.c | 377 ++++++
+ tools/kvm/virtio/rng.c | 194 ++++
+ tools/kvm/x86/bios.c | 174 +++
+ tools/kvm/x86/bios/.gitignore | 3 +
+ tools/kvm/x86/bios/bios-rom.S | 12 +
+ tools/kvm/x86/bios/e820.c | 72 ++
+ tools/kvm/x86/bios/entry.S | 92 ++
+ tools/kvm/x86/bios/gen-offsets.sh | 14 +
+ tools/kvm/x86/bios/int10.c | 110 ++
+ tools/kvm/x86/bios/int15.c | 18 +
+ tools/kvm/x86/bios/local.S | 7 +
+ tools/kvm/x86/bios/macro.S | 25 +
+ tools/kvm/x86/bios/memcpy.c | 23 +
+ tools/kvm/x86/bios/rom.ld.S | 16 +
+ tools/kvm/x86/boot.c | 41 +
+ tools/kvm/x86/cpuid.c | 60 +
+ tools/kvm/x86/include/kvm/assembly.h | 24 +
+ tools/kvm/x86/include/kvm/barrier.h | 20 +
+ tools/kvm/x86/include/kvm/bios-export.h | 13 +
+ tools/kvm/x86/include/kvm/bios.h | 93 ++
+ tools/kvm/x86/include/kvm/boot-protocol.h | 16 +
+ tools/kvm/x86/include/kvm/cpufeature.h | 41 +
+ tools/kvm/x86/include/kvm/interrupt.h | 26 +
+ tools/kvm/x86/include/kvm/kvm-arch.h | 67 ++
+ tools/kvm/x86/include/kvm/kvm-cpu-arch.h | 49 +
+ tools/kvm/x86/include/kvm/mptable.h | 9 +
+ tools/kvm/x86/interrupt.c | 28 +
+ tools/kvm/x86/ioport.c | 77 ++
+ tools/kvm/x86/irq.c | 222 ++++
+ tools/kvm/x86/kvm-cpu.c | 425 +++++++
+ tools/kvm/x86/kvm.c | 372 ++++++
+ tools/kvm/x86/mptable.c | 287 +++++
+ 258 files changed, 25333 insertions(+), 265 deletions(-)
+ create mode 100644 tools/kvm/.gitignore
+ create mode 100644 tools/kvm/CREDITS-Git
+ create mode 100644 tools/kvm/Documentation/kernel-debugging.txt
+ create mode 100644 tools/kvm/Documentation/kvm-balloon.txt
+ create mode 100644 tools/kvm/Documentation/kvm-debug.txt
+ create mode 100644 tools/kvm/Documentation/kvm-list.txt
+ create mode 100644 tools/kvm/Documentation/kvm-pause.txt
+ create mode 100644 tools/kvm/Documentation/kvm-resume.txt
+ create mode 100644 tools/kvm/Documentation/kvm-run.txt
+ create mode 100644 tools/kvm/Documentation/kvm-sandbox.txt
+ create mode 100644 tools/kvm/Documentation/kvm-setup.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stat.txt
+ create mode 100644 tools/kvm/Documentation/kvm-stop.txt
+ create mode 100644 tools/kvm/Documentation/kvm-version.txt
+ create mode 100644 tools/kvm/Documentation/virtio-console.txt
+ create mode 100644 tools/kvm/Makefile
+ create mode 100644 tools/kvm/README
+ create mode 100644 tools/kvm/builtin-balloon.c
+ create mode 100644 tools/kvm/builtin-debug.c
+ create mode 100644 tools/kvm/builtin-help.c
+ create mode 100644 tools/kvm/builtin-list.c
+ create mode 100644 tools/kvm/builtin-pause.c
+ create mode 100644 tools/kvm/builtin-resume.c
+ create mode 100644 tools/kvm/builtin-run.c
+ create mode 100644 tools/kvm/builtin-sandbox.c
+ create mode 100644 tools/kvm/builtin-setup.c
+ create mode 100644 tools/kvm/builtin-stat.c
+ create mode 100644 tools/kvm/builtin-stop.c
+ create mode 100644 tools/kvm/builtin-version.c
+ create mode 100644 tools/kvm/code16gcc.h
+ create mode 100644 tools/kvm/command-list.txt
+ create mode 100644 tools/kvm/config/feature-tests.mak
+ create mode 100644 tools/kvm/config/utilities.mak
+ create mode 100644 tools/kvm/disk/blk.c
+ create mode 100644 tools/kvm/disk/core.c
+ create mode 100644 tools/kvm/disk/qcow.c
+ create mode 100644 tools/kvm/disk/raw.c
+ create mode 100644 tools/kvm/framebuffer.c
+ create mode 100644 tools/kvm/guest/init.c
+ create mode 100644 tools/kvm/guest/init_stage2.c
+ create mode 100644 tools/kvm/guest/passwd
+ create mode 100644 tools/kvm/guest_compat.c
+ create mode 100644 tools/kvm/hw/i8042.c
+ create mode 100644 tools/kvm/hw/pci-shmem.c
+ create mode 100644 tools/kvm/hw/rtc.c
+ create mode 100644 tools/kvm/hw/serial.c
+ create mode 100644 tools/kvm/hw/vesa.c
+ create mode 100644 tools/kvm/include/asm/hweight.h
+ create mode 100644 tools/kvm/include/bios/memcpy.h
+ create mode 100644 tools/kvm/include/kvm/8250-serial.h
+ create mode 100644 tools/kvm/include/kvm/apic.h
+ create mode 100644 tools/kvm/include/kvm/brlock.h
+ create mode 100644 tools/kvm/include/kvm/builtin-balloon.h
+ create mode 100644 tools/kvm/include/kvm/builtin-debug.h
+ create mode 100644 tools/kvm/include/kvm/builtin-help.h
+ create mode 100644 tools/kvm/include/kvm/builtin-list.h
+ create mode 100644 tools/kvm/include/kvm/builtin-pause.h
+ create mode 100644 tools/kvm/include/kvm/builtin-resume.h
+ create mode 100644 tools/kvm/include/kvm/builtin-run.h
+ create mode 100644 tools/kvm/include/kvm/builtin-sandbox.h
+ create mode 100644 tools/kvm/include/kvm/builtin-setup.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stat.h
+ create mode 100644 tools/kvm/include/kvm/builtin-stop.h
+ create mode 100644 tools/kvm/include/kvm/builtin-version.h
+ create mode 100644 tools/kvm/include/kvm/compiler.h
+ create mode 100644 tools/kvm/include/kvm/disk-image.h
+ create mode 100644 tools/kvm/include/kvm/e820.h
+ create mode 100644 tools/kvm/include/kvm/framebuffer.h
+ create mode 100644 tools/kvm/include/kvm/guest_compat.h
+ create mode 100644 tools/kvm/include/kvm/i8042.h
+ create mode 100644 tools/kvm/include/kvm/ioeventfd.h
+ create mode 100644 tools/kvm/include/kvm/ioport.h
+ create mode 100644 tools/kvm/include/kvm/irq.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cmd.h
+ create mode 100644 tools/kvm/include/kvm/kvm-cpu.h
+ create mode 100644 tools/kvm/include/kvm/kvm-ipc.h
+ create mode 100644 tools/kvm/include/kvm/kvm.h
+ create mode 100644 tools/kvm/include/kvm/msi.h
+ create mode 100644 tools/kvm/include/kvm/mutex.h
+ create mode 100644 tools/kvm/include/kvm/parse-options.h
+ create mode 100644 tools/kvm/include/kvm/pci-shmem.h
+ create mode 100644 tools/kvm/include/kvm/pci.h
+ create mode 100644 tools/kvm/include/kvm/qcow.h
+ create mode 100644 tools/kvm/include/kvm/rbtree-interval.h
+ create mode 100644 tools/kvm/include/kvm/read-write.h
+ create mode 100644 tools/kvm/include/kvm/rtc.h
+ create mode 100644 tools/kvm/include/kvm/rwsem.h
+ create mode 100644 tools/kvm/include/kvm/sdl.h
+ create mode 100644 tools/kvm/include/kvm/segment.h
+ create mode 100644 tools/kvm/include/kvm/strbuf.h
+ create mode 100644 tools/kvm/include/kvm/symbol.h
+ create mode 100644 tools/kvm/include/kvm/term.h
+ create mode 100644 tools/kvm/include/kvm/threadpool.h
+ create mode 100644 tools/kvm/include/kvm/types.h
+ create mode 100644 tools/kvm/include/kvm/uip.h
+ create mode 100644 tools/kvm/include/kvm/util.h
+ create mode 100644 tools/kvm/include/kvm/vesa.h
+ create mode 100644 tools/kvm/include/kvm/virtio-9p.h
+ create mode 100644 tools/kvm/include/kvm/virtio-balloon.h
+ create mode 100644 tools/kvm/include/kvm/virtio-blk.h
+ create mode 100644 tools/kvm/include/kvm/virtio-console.h
+ create mode 100644 tools/kvm/include/kvm/virtio-mmio.h
+ create mode 100644 tools/kvm/include/kvm/virtio-net.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci-dev.h
+ create mode 100644 tools/kvm/include/kvm/virtio-pci.h
+ create mode 100644 tools/kvm/include/kvm/virtio-rng.h
+ create mode 100644 tools/kvm/include/kvm/virtio.h
+ create mode 100644 tools/kvm/include/kvm/vnc.h
+ create mode 100644 tools/kvm/include/linux/bitops.h
+ create mode 100644 tools/kvm/include/linux/byteorder.h
+ create mode 100644 tools/kvm/include/linux/compiler.h
+ create mode 100644 tools/kvm/include/linux/kernel.h
+ create mode 100644 tools/kvm/include/linux/module.h
+ create mode 100644 tools/kvm/include/linux/prefetch.h
+ create mode 100644 tools/kvm/include/linux/stddef.h
+ create mode 100644 tools/kvm/include/linux/types.h
+ create mode 100644 tools/kvm/ioeventfd.c
+ create mode 100644 tools/kvm/ioport.c
+ create mode 100644 tools/kvm/kvm-cmd.c
+ create mode 100644 tools/kvm/kvm-cpu.c
+ create mode 100644 tools/kvm/kvm-ipc.c
+ create mode 100644 tools/kvm/kvm.c
+ create mode 100644 tools/kvm/main.c
+ create mode 100644 tools/kvm/mmio.c
+ create mode 100644 tools/kvm/net/uip/arp.c
+ create mode 100644 tools/kvm/net/uip/buf.c
+ create mode 100644 tools/kvm/net/uip/core.c
+ create mode 100644 tools/kvm/net/uip/csum.c
+ create mode 100644 tools/kvm/net/uip/dhcp.c
+ create mode 100644 tools/kvm/net/uip/icmp.c
+ create mode 100644 tools/kvm/net/uip/ipv4.c
+ create mode 100644 tools/kvm/net/uip/tcp.c
+ create mode 100644 tools/kvm/net/uip/udp.c
+ create mode 100644 tools/kvm/pci.c
+ create mode 100644 tools/kvm/powerpc/boot.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.c
+ create mode 100644 tools/kvm/powerpc/cpu_info.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/barrier.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/powerpc/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/powerpc/ioport.c
+ create mode 100644 tools/kvm/powerpc/irq.c
+ create mode 100644 tools/kvm/powerpc/kvm-cpu.c
+ create mode 100644 tools/kvm/powerpc/kvm.c
+ create mode 100644 tools/kvm/powerpc/spapr.h
+ create mode 100644 tools/kvm/powerpc/spapr_hcall.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.c
+ create mode 100644 tools/kvm/powerpc/spapr_hvcons.h
+ create mode 100644 tools/kvm/powerpc/spapr_pci.c
+ create mode 100644 tools/kvm/powerpc/spapr_pci.h
+ create mode 100644 tools/kvm/powerpc/spapr_rtas.c
+ create mode 100644 tools/kvm/powerpc/xics.c
+ create mode 100644 tools/kvm/powerpc/xics.h
+ create mode 100644 tools/kvm/symbol.c
+ create mode 100644 tools/kvm/term.c
+ create mode 100644 tools/kvm/tests/Makefile
+ create mode 100644 tools/kvm/tests/boot/Makefile
+ create mode 100644 tools/kvm/tests/boot/init.c
+ create mode 100644 tools/kvm/tests/kernel/.gitignore
+ create mode 100644 tools/kvm/tests/kernel/Makefile
+ create mode 100644 tools/kvm/tests/kernel/README
+ create mode 100644 tools/kvm/tests/kernel/kernel.S
+ create mode 100644 tools/kvm/tests/pit/.gitignore
+ create mode 100644 tools/kvm/tests/pit/Makefile
+ create mode 100644 tools/kvm/tests/pit/README
+ create mode 100644 tools/kvm/tests/pit/tick.S
+ create mode 100644 tools/kvm/ui/sdl.c
+ create mode 100644 tools/kvm/ui/vnc.c
+ create mode 100755 tools/kvm/util/KVMTOOLS-VERSION-GEN
+ create mode 100755 tools/kvm/util/generate-cmdlist.sh
+ create mode 100755 tools/kvm/util/kvm-ifup-vbr0
+ create mode 100644 tools/kvm/util/parse-options.c
+ create mode 100644 tools/kvm/util/rbtree-interval.c
+ create mode 100644 tools/kvm/util/read-write.c
+ create mode 100755 tools/kvm/util/set_private_br.sh
+ create mode 100644 tools/kvm/util/strbuf.c
+ create mode 100644 tools/kvm/util/threadpool.c
+ create mode 100644 tools/kvm/util/util.c
+ create mode 100644 tools/kvm/virtio/9p-pdu.c
+ create mode 100644 tools/kvm/virtio/9p.c
+ create mode 100644 tools/kvm/virtio/balloon.c
+ create mode 100644 tools/kvm/virtio/blk.c
+ create mode 100644 tools/kvm/virtio/console.c
+ create mode 100644 tools/kvm/virtio/core.c
+ create mode 100644 tools/kvm/virtio/mmio.c
+ create mode 100644 tools/kvm/virtio/net.c
+ create mode 100644 tools/kvm/virtio/pci.c
+ create mode 100644 tools/kvm/virtio/rng.c
+ create mode 100644 tools/kvm/x86/bios.c
+ create mode 100644 tools/kvm/x86/bios/.gitignore
+ create mode 100644 tools/kvm/x86/bios/bios-rom.S
+ create mode 100644 tools/kvm/x86/bios/e820.c
+ create mode 100644 tools/kvm/x86/bios/entry.S
+ create mode 100644 tools/kvm/x86/bios/gen-offsets.sh
+ create mode 100644 tools/kvm/x86/bios/int10.c
+ create mode 100644 tools/kvm/x86/bios/int15.c
+ create mode 100644 tools/kvm/x86/bios/local.S
+ create mode 100644 tools/kvm/x86/bios/macro.S
+ create mode 100644 tools/kvm/x86/bios/memcpy.c
+ create mode 100644 tools/kvm/x86/bios/rom.ld.S
+ create mode 100644 tools/kvm/x86/boot.c
+ create mode 100644 tools/kvm/x86/cpuid.c
+ create mode 100644 tools/kvm/x86/include/kvm/assembly.h
+ create mode 100644 tools/kvm/x86/include/kvm/barrier.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios-export.h
+ create mode 100644 tools/kvm/x86/include/kvm/bios.h
+ create mode 100644 tools/kvm/x86/include/kvm/boot-protocol.h
+ create mode 100644 tools/kvm/x86/include/kvm/cpufeature.h
+ create mode 100644 tools/kvm/x86/include/kvm/interrupt.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/kvm-cpu-arch.h
+ create mode 100644 tools/kvm/x86/include/kvm/mptable.h
+ create mode 100644 tools/kvm/x86/interrupt.c
+ create mode 100644 tools/kvm/x86/ioport.c
+ create mode 100644 tools/kvm/x86/irq.c
+ create mode 100644 tools/kvm/x86/kvm-cpu.c
+ create mode 100644 tools/kvm/x86/kvm.c
+ create mode 100644 tools/kvm/x86/mptable.c
+Merging rcu/rcu/next (5cf05ad rcu: Fix broken strings in RCU's source code.)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show)
+$ git merge cputime/cputime
+Already up-to-date.
+Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kmemleak/kmemleak (4878677 kmemleak: do not leak object after tree insertion error)
+$ git merge kmemleak/kmemleak
+Merge made by the 'recursive' strategy.
+ mm/kmemleak.c | 1 +
+ 1 file changed, 1 insertion(+)
+Merging kvm/linux-next (ade38c3 KVM: s390: Add implementation-specific trace events)
+$ git merge kvm/linux-next
+Auto-merging arch/s390/kernel/dis.c
+Auto-merging arch/s390/include/asm/processor.h
+Merge made by the 'recursive' strategy.
+ arch/ia64/kvm/kvm-ia64.c | 33 +---
+ arch/powerpc/include/asm/kvm_host.h | 2 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 47 ++++-
+ arch/powerpc/kvm/e500_tlb.c | 2 +-
+ arch/s390/include/asm/processor.h | 1 +
+ arch/s390/kernel/dis.c | 27 +++
+ arch/s390/kvm/Kconfig | 1 +
+ arch/s390/kvm/diag.c | 4 +
+ arch/s390/kvm/intercept.c | 11 ++
+ arch/s390/kvm/interrupt.c | 23 +++
+ arch/s390/kvm/kvm-s390.c | 10 +
+ arch/s390/kvm/priv.c | 9 +-
+ arch/s390/kvm/sigp.c | 2 +
+ arch/s390/kvm/trace-s390.h | 210 +++++++++++++++++++++
+ arch/s390/kvm/trace.h | 341 +++++++++++++++++++++++++++++++++++
+ arch/x86/include/asm/kvm_host.h | 3 +-
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/cpuid.c | 2 +-
+ arch/x86/kvm/emulate.c | 48 +++--
+ arch/x86/kvm/irq.h | 2 +-
+ arch/x86/kvm/lapic.c | 4 +-
+ arch/x86/kvm/mmu.c | 119 ++++++++----
+ arch/x86/kvm/pmu.c | 2 +-
+ arch/x86/kvm/svm.c | 4 +-
+ arch/x86/kvm/vmx.c | 6 +-
+ arch/x86/kvm/x86.c | 59 +++---
+ include/linux/kvm_host.h | 66 +++++--
+ virt/kvm/Kconfig | 3 +
+ virt/kvm/async_pf.c | 7 +-
+ virt/kvm/iommu.c | 10 +-
+ virt/kvm/irq_comm.c | 4 +-
+ virt/kvm/kvm_main.c | 212 +++++++++++++---------
+ 32 files changed, 1021 insertions(+), 254 deletions(-)
+ create mode 100644 arch/s390/kvm/trace-s390.h
+ create mode 100644 arch/s390/kvm/trace.h
+Merging kvm-ppc/kvm-ppc-next (6ad0085 KVM: PPC: Book3S_32: Fix MTMSR_EERI macro)
+$ git merge kvm-ppc/kvm-ppc-next
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 7 ++++--
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/epapr_hcalls.h | 36 ++++++++++++++++---------------
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 +++++++++++++++----------------
+ arch/powerpc/include/asm/kvm_para.h | 21 +++++++++---------
+ arch/powerpc/kernel/epapr_hcalls.S | 28 ++++++++++++++++++++++++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +++++++++-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kvm/powerpc.c | 30 +++++++++++++++++++-------
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 ++++++--
+ arch/powerpc/sysdev/fsl_soc.c | 2 ++
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm.h | 2 ++
+ 15 files changed, 129 insertions(+), 59 deletions(-)
+Merging oprofile/for-next (c16fa4f Linux 3.3)
+$ git merge oprofile/for-next
+Already up-to-date.
+Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes)
+$ git merge xen/upstream/xen
+Already up-to-date.
+Merging xen-two/linux-next (64b0a47 Merge commit 'v3.5-rc7' into linux-next)
+$ git merge xen-two/linux-next
+Auto-merging arch/x86/xen/enlighten.c
+Merge made by the 'recursive' strategy.
+ arch/x86/xen/enlighten.c | 8 --------
+ drivers/xen/events.c | 2 --
+ 2 files changed, 10 deletions(-)
+Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend)
+$ git merge xen-pvhvm/linux-next
+Already up-to-date.
+Merging percpu/for-next (61011677 Merge tag 'dlm-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm)
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next (6fec10a workqueue: fix spurious CPU locality WARN from process_one_work())
+$ git merge workqueues/for-next
+Already up-to-date.
+Merging drivers-x86/linux-next (00d3959 thinkpad_acpi: Free hotkey_keycode_map after unregistering tpacpi_inputdev)
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison)
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (38e2319 Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next)
+$ git merge regmap/for-next
+Already up-to-date.
+Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (d92773c leds-clevo-mail: Fix Clevo M5x0V DMI strings)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/leds-clevo-mail.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging driver-core/driver-core-next (0d7614f Linux 3.6-rc1)
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (d155255 tty: Fix race in tty release)
+$ git merge tty/tty-next
+Recorded preimage for 'arch/um/drivers/line.c'
+Recorded preimage for 'arch/um/drivers/line.h'
+Auto-merging net/bluetooth/rfcomm/tty.c
+Removing include/linux/stallion.h
+Removing include/linux/serial167.h
+Removing include/linux/sc26198.h
+Removing include/linux/istallion.h
+Removing include/linux/generic_serial.h
+Removing include/linux/comstats.h
+Removing include/linux/cdk.h
+Removing include/linux/cd1400.h
+Auto-merging include/linux/Kbuild
+Auto-merging drivers/usb/serial/sierra.c
+Auto-merging drivers/usb/serial/quatech2.c
+Auto-merging drivers/usb/serial/keyspan.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/tty/tty_ldisc.c
+Auto-merging drivers/tty/serial/serial_core.c
+Auto-merging drivers/tty/serial/samsung.c
+Auto-merging drivers/tty/serial/of_serial.c
+Auto-merging drivers/tty/serial/imx.c
+Auto-merging drivers/tty/serial/amba-pl011.c
+Auto-merging drivers/tty/serial/8250/8250.c
+Auto-merging drivers/net/ethernet/sgi/ioc3-eth.c
+Auto-merging arch/um/drivers/line.h
+CONFLICT (content): Merge conflict in arch/um/drivers/line.h
+Auto-merging arch/um/drivers/line.c
+CONFLICT (content): Merge conflict in arch/um/drivers/line.c
+Auto-merging Documentation/devicetree/bindings/tty/serial/of-serial.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/um/drivers/line.c'.
+Recorded resolution for 'arch/um/drivers/line.h'.
+[master f8ffaa9] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/tty/serial/nxp-lpc32xx-hsuart.txt | 14 +
+ .../devicetree/bindings/tty/serial/of-serial.txt | 2 +
+ arch/ia64/hp/sim/simserial.c | 2 +-
+ drivers/bluetooth/hci_ath.c | 2 +-
+ drivers/char/mwave/mwavedd.c | 16 +-
+ drivers/char/pcmcia/synclink_cs.c | 24 +-
+ drivers/isdn/gigaset/interface.c | 4 +-
+ drivers/isdn/i4l/isdn_tty.c | 16 +-
+ drivers/misc/ibmasm/uart.c | 16 +-
+ drivers/mmc/card/sdio_uart.c | 20 +-
+ drivers/net/ethernet/sgi/ioc3-eth.c | 22 +-
+ drivers/net/irda/irtty-sir.c | 10 +-
+ drivers/net/usb/hso.c | 12 +-
+ drivers/tty/amiserial.c | 20 +-
+ drivers/tty/cyclades.c | 82 +-
+ drivers/tty/hvc/hvsi_lib.c | 2 +-
+ drivers/tty/isicom.c | 8 +-
+ drivers/tty/moxa.c | 10 +-
+ drivers/tty/mxser.c | 20 +-
+ drivers/tty/n_gsm.c | 8 +-
+ drivers/tty/n_tty.c | 8 +-
+ drivers/tty/pty.c | 169 ++--
+ drivers/tty/rocket.c | 18 +-
+ drivers/tty/serial/8250/8250.c | 80 +-
+ drivers/tty/serial/8250/8250.h | 31 +-
+ drivers/tty/serial/8250/8250_acorn.c | 22 +-
+ drivers/tty/serial/8250/8250_dw.c | 38 +-
+ drivers/tty/serial/8250/8250_gsc.c | 26 +-
+ drivers/tty/serial/8250/8250_hp300.c | 26 +-
+ drivers/tty/serial/8250/8250_pci.c | 126 +--
+ drivers/tty/serial/8250/8250_pnp.c | 28 +-
+ drivers/tty/serial/8250/serial_cs.c | 30 +-
+ drivers/tty/serial/Kconfig | 19 +
+ drivers/tty/serial/Makefile | 1 +
+ drivers/tty/serial/amba-pl011.c | 34 +-
+ drivers/tty/serial/bfin_uart.c | 2 +-
+ drivers/tty/serial/crisv10.c | 26 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/ioc4_serial.c | 2 +-
+ drivers/tty/serial/jsm/jsm_tty.c | 8 +-
+ drivers/tty/serial/lpc32xx_hs.c | 823 ++++++++++++++++++++
+ drivers/tty/serial/of_serial.c | 13 +-
+ drivers/tty/serial/pxa.c | 14 +
+ drivers/tty/serial/samsung.c | 26 +-
+ drivers/tty/serial/serial_core.c | 28 +-
+ drivers/tty/synclink.c | 36 +-
+ drivers/tty/synclink_gt.c | 24 +-
+ drivers/tty/synclinkmp.c | 24 +-
+ drivers/tty/tty_io.c | 122 +--
+ drivers/tty/tty_ioctl.c | 100 +--
+ drivers/tty/tty_ldisc.c | 13 +-
+ drivers/tty/tty_port.c | 23 +-
+ drivers/tty/vt/keyboard.c | 50 +-
+ drivers/tty/vt/vt.c | 63 +-
+ drivers/usb/class/cdc-acm.c | 2 +-
+ drivers/usb/serial/ark3116.c | 4 +-
+ drivers/usb/serial/belkin_sa.c | 2 +-
+ drivers/usb/serial/cp210x.c | 8 +-
+ drivers/usb/serial/cypress_m8.c | 40 +-
+ drivers/usb/serial/digi_acceleport.c | 14 +-
+ drivers/usb/serial/empeg.c | 2 +-
+ drivers/usb/serial/f81232.c | 3 +-
+ drivers/usb/serial/ftdi_sio.c | 2 +-
+ drivers/usb/serial/io_edgeport.c | 12 +-
+ drivers/usb/serial/io_ti.c | 12 +-
+ drivers/usb/serial/ir-usb.c | 2 +-
+ drivers/usb/serial/iuu_phoenix.c | 28 +-
+ drivers/usb/serial/keyspan.c | 6 +-
+ drivers/usb/serial/keyspan_pda.c | 4 +-
+ drivers/usb/serial/kl5kusb105.c | 18 +-
+ drivers/usb/serial/kobil_sct.c | 14 +-
+ drivers/usb/serial/mct_u232.c | 4 +-
+ drivers/usb/serial/metro-usb.c | 8 +-
+ drivers/usb/serial/mos7720.c | 14 +-
+ drivers/usb/serial/mos7840.c | 12 +-
+ drivers/usb/serial/oti6858.c | 10 +-
+ drivers/usb/serial/pl2303.c | 6 +-
+ drivers/usb/serial/quatech2.c | 4 +-
+ drivers/usb/serial/sierra.c | 2 +-
+ drivers/usb/serial/spcp8x5.c | 12 +-
+ drivers/usb/serial/ssu100.c | 4 +-
+ drivers/usb/serial/ti_usb_3410_5052.c | 10 +-
+ drivers/usb/serial/usb-serial.c | 7 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ drivers/usb/serial/whiteheat.c | 2 +-
+ include/linux/Kbuild | 3 -
+ include/linux/cd1400.h | 292 -------
+ include/linux/cdk.h | 486 ------------
+ include/linux/comstats.h | 119 ---
+ include/linux/generic_serial.h | 35 -
+ include/linux/istallion.h | 123 ---
+ include/linux/kbd_kern.h | 13 -
+ include/linux/sc26198.h | 533 -------------
+ include/linux/serial167.h | 157 ----
+ include/linux/serial_8250.h | 33 +-
+ include/linux/stallion.h | 147 ----
+ include/linux/tty.h | 52 +-
+ include/linux/tty_driver.h | 12 +-
+ include/net/irda/ircomm_tty.h | 17 +-
+ net/bluetooth/rfcomm/tty.c | 2 +-
+ net/irda/ircomm/ircomm_param.c | 5 -
+ net/irda/ircomm/ircomm_tty.c | 281 ++++---
+ net/irda/ircomm/ircomm_tty_attach.c | 40 +-
+ net/irda/ircomm/ircomm_tty_ioctl.c | 33 +-
+ 104 files changed, 1998 insertions(+), 3020 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/tty/serial/nxp-lpc32xx-hsuart.txt
+ create mode 100644 drivers/tty/serial/lpc32xx_hs.c
+ delete mode 100644 include/linux/cd1400.h
+ delete mode 100644 include/linux/cdk.h
+ delete mode 100644 include/linux/comstats.h
+ delete mode 100644 include/linux/generic_serial.h
+ delete mode 100644 include/linux/istallion.h
+ delete mode 100644 include/linux/sc26198.h
+ delete mode 100644 include/linux/serial167.h
+ delete mode 100644 include/linux/stallion.h
+$ git am -3 ../patches/0001-disable-SERIAL_IPOCTAL-broken-by-tty-updates.patch
+Applying: disable SERIAL_IPOCTAL broken by tty updates
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/ipack/devices/Kconfig
+$ git add .
+$ git commit -v -a --amend
+[master ed5d768] Merge remote-tracking branch 'tty/tty-next'
+$ git am -3 ../patches/0001-disable-USB_SERIAL_QUATECH2-broken-by-tty-update.patch
+Applying: disable USB_SERIAL_QUATECH2 broken by tty update
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/serqt_usb2/Kconfig
+$ git add .
+$ git commit -v -a --amend
+[master 672384d] Merge remote-tracking branch 'tty/tty-next'
+$ git am -3 ../patches/0001-tty-fix-up-usb-serial-console-for-termios-change.patch
+Applying: tty: fix up usb serial console for termios change.
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/usb/serial/console.c
+$ git add .
+$ git commit -v -a --amend
+[master 83b943b] Merge remote-tracking branch 'tty/tty-next'
+Merging usb/usb-next (e387ef5 usb: Add USB_QUIRK_RESET_RESUME for all Logitech UVC webcams)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (419e926 staging: csr: delete a bunch of unused library functions)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (6078188 mei: use module_pci_driver)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (78821b2 Merge branch 'stable/for-linus-3.6' into linux-next)
+$ git merge tmem/linux-next
+Merge made by the 'recursive' strategy.
+Merging writeback/writeback-for-next (331cbde writeback: Fix some comment errors)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface)
+$ git merge arm-dt/devicetree/arm-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (c9eebe7 pinctrl/pinctrl-u300: remove unneeded devm_kfree call)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pinctrl/pinctrl-imx23.c | 2 +-
+ drivers/pinctrl/pinctrl-imx28.c | 2 +-
+ drivers/pinctrl/pinctrl-u300.c | 8 ++------
+ 3 files changed, 4 insertions(+), 8 deletions(-)
+Merging vhost/linux-next (e0953c8 tun: experimental zero copy tx support)
+$ git merge vhost/linux-next
+Resolved 'drivers/net/tun.c' using previous resolution.
+Auto-merging drivers/net/tun.c
+CONFLICT (content): Merge conflict in drivers/net/tun.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c519772] Merge remote-tracking branch 'vhost/linux-next'
+$ git diff -M --stat --summary HEAD^..
+Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator)
+$ git merge memblock/memblock-kill-early_node_map
+Already up-to-date.
+Merging remoteproc/for-next (6bb697b MAINTAINERS: add remoteproc's git)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging irqdomain/irqdomain/next (f5a1ad0 irqdomain: Improve diagnostics when a domain mapping fails)
+$ git merge irqdomain/irqdomain/next
+Already up-to-date.
+Merging gpio/gpio/next (3e11f7b gpio/generic: initialize basic_mmio_gpio shadow variables properly)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (4fbb002 gpio: of_get_named_gpio_flags() return -EPROBE_DEFER if GPIO not yet available)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging arm-soc/for-next (deac1d4 ARM: arm-soc: add arm-soc-for-next-contents.txt)
+$ git merge arm-soc/for-next
+Auto-merging arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/ioremap.c
+Removing arch/arm/mach-versatile/include/mach/io.h
+Auto-merging arch/arm/mach-tegra/pcie.c
+Removing arch/arm/mach-tegra/include/mach/io.h
+Removing arch/arm/mach-shark/include/mach/io.h
+Removing arch/arm/mach-orion5x/include/mach/io.h
+Removing arch/arm/mach-mv78xx0/include/mach/io.h
+Removing arch/arm/mach-kirkwood/include/mach/io.h
+Removing arch/arm/mach-iop33x/include/mach/io.h
+Removing arch/arm/mach-iop32x/include/mach/io.h
+Removing arch/arm/mach-iop13xx/include/mach/io.h
+Auto-merging arch/arm/mach-integrator/integrator_ap.c
+Removing arch/arm/mach-integrator/include/mach/io.h
+Removing arch/arm/mach-dove/include/mach/io.h
+Auto-merging arch/arm/kernel/bios32.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/arm/memory.txt | 3 +
+ arch/arm/Kconfig | 13 +-
+ arch/arm/arm-soc-for-next-contents.txt | 294 ++++++++++++++++++++
+ arch/arm/include/asm/hardware/iop3xx.h | 12 +-
+ arch/arm/include/asm/io.h | 8 +
+ arch/arm/include/asm/mach/map.h | 8 +
+ arch/arm/include/asm/mach/pci.h | 13 +
+ arch/arm/kernel/bios32.c | 54 +++-
+ arch/arm/mach-dove/common.c | 10 -
+ arch/arm/mach-dove/include/mach/dove.h | 8 +-
+ arch/arm/mach-dove/include/mach/io.h | 19 --
+ arch/arm/mach-dove/pcie.c | 43 +--
+ arch/arm/mach-footbridge/common.c | 12 +-
+ arch/arm/mach-footbridge/dc21285.c | 16 +-
+ .../arm/mach-footbridge/include/mach/debug-macro.S | 3 +-
+ arch/arm/mach-footbridge/include/mach/io.h | 12 +-
+ arch/arm/mach-integrator/include/mach/io.h | 33 ---
+ arch/arm/mach-integrator/include/mach/platform.h | 4 +
+ arch/arm/mach-integrator/integrator_ap.c | 9 +-
+ arch/arm/mach-integrator/pci_v3.c | 50 ++--
+ arch/arm/mach-iop13xx/include/mach/io.h | 28 --
+ arch/arm/mach-iop13xx/include/mach/iop13xx.h | 28 +-
+ arch/arm/mach-iop13xx/io.c | 27 --
+ arch/arm/mach-iop13xx/pci.c | 37 +--
+ arch/arm/mach-iop13xx/setup.c | 10 -
+ arch/arm/mach-iop32x/include/mach/io.h | 19 --
+ arch/arm/mach-iop33x/include/mach/io.h | 19 --
+ arch/arm/mach-kirkwood/common.c | 10 -
+ arch/arm/mach-kirkwood/include/mach/io.h | 24 --
+ arch/arm/mach-kirkwood/include/mach/kirkwood.h | 8 +-
+ arch/arm/mach-kirkwood/pcie.c | 44 +--
+ arch/arm/mach-mv78xx0/addr-map.c | 3 +-
+ arch/arm/mach-mv78xx0/common.c | 5 -
+ arch/arm/mach-mv78xx0/include/mach/io.h | 24 --
+ arch/arm/mach-mv78xx0/include/mach/mv78xx0.h | 21 +-
+ arch/arm/mach-mv78xx0/pcie.c | 110 +++-----
+ arch/arm/mach-orion5x/common.c | 10 -
+ arch/arm/mach-orion5x/include/mach/io.h | 22 --
+ arch/arm/mach-orion5x/include/mach/orion5x.h | 20 +-
+ arch/arm/mach-orion5x/pci.c | 56 ++--
+ arch/arm/mach-shark/core.c | 18 --
+ arch/arm/mach-shark/include/mach/debug-macro.S | 7 +-
+ arch/arm/mach-shark/include/mach/entry-macro.S | 3 +-
+ arch/arm/mach-shark/include/mach/io.h | 18 --
+ arch/arm/mach-shark/pci.c | 5 +
+ arch/arm/mach-tegra/include/mach/io.h | 46 ---
+ arch/arm/mach-tegra/include/mach/iomap.h | 3 +
+ arch/arm/mach-tegra/pcie.c | 95 ++-----
+ arch/arm/mach-versatile/core.c | 5 -
+ arch/arm/mach-versatile/include/mach/hardware.h | 1 -
+ arch/arm/mach-versatile/include/mach/io.h | 27 --
+ arch/arm/mach-versatile/pci.c | 22 +-
+ arch/arm/mm/ioremap.c | 14 +
+ arch/arm/mm/mmu.c | 54 +++-
+ arch/arm/plat-iop/pci.c | 25 +-
+ arch/arm/plat-iop/setup.c | 5 -
+ drivers/i2c/busses/i2c-iop3xx.c | 121 ++++----
+ 57 files changed, 708 insertions(+), 910 deletions(-)
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/mach-dove/include/mach/io.h
+ delete mode 100644 arch/arm/mach-integrator/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-kirkwood/include/mach/io.h
+ delete mode 100644 arch/arm/mach-mv78xx0/include/mach/io.h
+ delete mode 100644 arch/arm/mach-orion5x/include/mach/io.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/io.h
+ delete mode 100644 arch/arm/mach-tegra/include/mach/io.h
+ delete mode 100644 arch/arm/mach-versatile/include/mach/io.h
+Merging ep93xx/ep93xx-for-next (9b6a359 Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (45c7a01 Merge branch 'renesas-marzen' into renesas-board)
+$ git merge renesas/next
+Already up-to-date.
+Merging s5p/for-next (6701bca Merge branch 'next/board-samsung-3' into for-next)
+$ git merge s5p/for-next
+Merge made by the 'recursive' strategy.
+Merging tegra/for-next (a04ef1f Merge branch 'for-3.6/defconfig' into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+Merging kvmtool/master (427dad4 kvm tools: use correct error value for virtio-9p RLERROR)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/builtin-debug.c | 7 ++
+ tools/kvm/builtin-run.c | 5 +-
+ tools/kvm/hw/serial.c | 7 +-
+ tools/kvm/include/kvm/8250-serial.h | 2 +-
+ tools/kvm/include/kvm/builtin-debug.h | 2 +
+ tools/kvm/include/kvm/virtio-9p.h | 5 +-
+ tools/kvm/virtio/9p.c | 151 +++++++++++++++++++++++----------
+ tools/kvm/virtio/blk.c | 1 -
+ 8 files changed, 128 insertions(+), 52 deletions(-)
+Merging dma-mapping/dma-mapping-next (97ef952 ARM: dma-mapping: add support for DMA_ATTR_SKIP_CPU_SYNC attribute)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (19891b2 pwm: pwm-tiehrpwm: PWM driver support for EHRPWM)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (ca24a14 Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm)
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (491fa9e userns: Allow the usernamespace support to build after the removal of usbfs)
+$ git merge userns/for-next
+Auto-merging init/Kconfig
+Merge made by the 'recursive' strategy.
+ init/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+Merging ktest/for-next (648a182 ktest: Allow a test to override REBOOT_ON_SUCCESS)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/from-sfr (2e117f2 Revert "arm: pull all work_pending logics into C function")
+$ git merge signal/from-sfr
+Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/powerpc/kernel/entry_64.S' using previous resolution.
+Auto-merging kernel/timer.c
+Auto-merging kernel/sched/core.c
+Auto-merging arch/xtensa/kernel/signal.c
+Auto-merging arch/x86/kernel/vm86_32.c
+Auto-merging arch/x86/kernel/signal.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/sh/kernel/cpu/sh5/entry.S
+Auto-merging arch/s390/include/asm/thread_info.h
+Auto-merging arch/powerpc/kernel/entry_64.S
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/include/asm/thread_info.h
+Auto-merging arch/mn10300/kernel/signal.c
+Auto-merging arch/mn10300/include/asm/thread_info.h
+Auto-merging arch/mips/include/asm/thread_info.h
+Auto-merging arch/m32r/kernel/signal.c
+Auto-merging arch/h8300/kernel/signal.c
+Auto-merging arch/frv/kernel/signal.c
+Auto-merging arch/avr32/kernel/signal.c
+Auto-merging arch/arm/kernel/signal.c
+Auto-merging arch/arm/include/asm/thread_info.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/thread_info.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 11ff69c] Merge branch 'signal/from-sfr'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/ptrace.h | 5 +-
+ arch/alpha/include/asm/thread_info.h | 3 +-
+ arch/alpha/kernel/alpha_ksyms.c | 1 -
+ arch/alpha/kernel/entry.S | 161 -----------------------------
+ arch/alpha/kernel/osf_sys.c | 49 +++++++++
+ arch/alpha/kernel/process.c | 29 ++++++
+ arch/alpha/kernel/systbls.S | 2 +-
+ arch/arm/include/asm/thread_info.h | 2 -
+ arch/arm/kernel/signal.c | 1 -
+ arch/avr32/include/asm/thread_info.h | 17 +--
+ arch/avr32/kernel/signal.c | 1 -
+ arch/blackfin/include/asm/thread_info.h | 4 -
+ arch/blackfin/kernel/signal.c | 1 -
+ arch/c6x/include/asm/thread_info.h | 1 -
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ arch/cris/include/asm/thread_info.h | 3 -
+ arch/frv/include/asm/thread_info.h | 3 -
+ arch/frv/kernel/signal.c | 9 --
+ arch/h8300/include/asm/thread_info.h | 7 +-
+ arch/h8300/kernel/signal.c | 1 -
+ arch/hexagon/include/asm/thread_info.h | 5 -
+ arch/hexagon/kernel/signal.c | 1 -
+ arch/ia64/include/asm/thread_info.h | 2 -
+ arch/ia64/kernel/signal.c | 8 --
+ arch/m32r/include/asm/thread_info.h | 9 +-
+ arch/m32r/kernel/signal.c | 3 -
+ arch/microblaze/include/asm/thread_info.h | 3 +-
+ arch/microblaze/kernel/entry-nommu.S | 21 +++-
+ arch/microblaze/kernel/entry.S | 62 ++++++-----
+ arch/microblaze/kernel/signal.c | 16 +--
+ arch/mips/include/asm/thread_info.h | 9 +-
+ arch/mips/kernel/entry.S | 15 ++-
+ arch/mips/kernel/scall32-o32.S | 13 +--
+ arch/mips/kernel/scall64-64.S | 13 +--
+ arch/mips/kernel/scall64-n32.S | 13 +--
+ arch/mips/kernel/scall64-o32.S | 13 +--
+ arch/mips/kernel/signal.c | 8 --
+ arch/mn10300/include/asm/thread_info.h | 3 +-
+ arch/mn10300/kernel/entry.S | 4 +
+ arch/mn10300/kernel/signal.c | 9 --
+ arch/openrisc/include/asm/thread_info.h | 3 +-
+ arch/parisc/hpux/gate.S | 2 +-
+ arch/parisc/include/asm/thread_info.h | 5 +-
+ arch/parisc/kernel/signal.c | 45 +++-----
+ arch/parisc/kernel/syscall.S | 9 +-
+ arch/powerpc/include/asm/thread_info.h | 2 +
+ arch/powerpc/kernel/signal_32.c | 1 -
+ arch/s390/include/asm/thread_info.h | 4 -
+ arch/score/include/asm/thread_info.h | 4 -
+ arch/score/kernel/signal.c | 1 +
+ arch/sh/include/asm/thread_info.h | 3 +
+ arch/sh/kernel/cpu/sh5/entry.S | 2 +-
+ arch/sh/kernel/entry-common.S | 2 +-
+ arch/sh/kernel/signal_32.c | 1 -
+ arch/sh/kernel/signal_64.c | 1 -
+ arch/sparc/include/asm/thread_info_32.h | 3 +-
+ arch/sparc/include/asm/thread_info_64.h | 3 +
+ arch/tile/kernel/compat_signal.c | 9 --
+ arch/tile/kernel/signal.c | 12 +--
+ arch/um/include/asm/thread_info.h | 3 -
+ arch/unicore32/include/asm/thread_info.h | 4 +-
+ arch/unicore32/kernel/entry.S | 2 -
+ arch/unicore32/kernel/signal.c | 1 -
+ arch/x86/include/asm/thread_info.h | 2 -
+ arch/x86/kernel/entry_32.S | 17 ++-
+ arch/x86/kernel/process.c | 2 +-
+ arch/x86/kernel/signal.c | 4 -
+ arch/x86/kernel/vm86_32.c | 2 +-
+ arch/xtensa/include/asm/thread_info.h | 5 -
+ arch/xtensa/kernel/signal.c | 4 -
+ kernel/sched/core.c | 2 +-
+ kernel/timer.c | 9 --
+ 72 files changed, 227 insertions(+), 473 deletions(-)
+Merging clk/clk-next (137f8a7 clk: fix compile for OF && !COMMON_CLK)
+$ git merge clk/clk-next
+Already up-to-date.
+Merging random/dev (d2e7c96 random: mix in architectural randomness in extract_buf())
+$ git merge random/dev
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master ()
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/heads/quilt/akpm:akpm
+From ../next
+ * [new branch] quilt/akpm -> akpm
+$ git fetch --no-tags ../next refs/heads/quilt/akpm-base:akpm-base
+From ../next
+ * [new branch] quilt/akpm-base -> akpm-base
+$ git checkout akpm
+Switched to branch 'akpm'
+$ git rebase --onto master akpm-base
+First, rewinding head to replay your work on top of it...
+Applying: cciss: fix incorrect scsi status reporting
+Applying: acpi_memhotplug.c: fix memory leak when memory device is unbound from the module acpi_memhotplug
+Applying: acpi_memhotplug.c: free memory device if acpi_memory_enable_device() failed
+Applying: acpi_memhotplug.c: remove memory info from list before freeing it
+Applying: acpi_memhotplug.c: don't allow to eject the memory device if it is being used
+Applying: acpi_memhotplug.c: bind the memory device when the driver is being loaded
+Applying: acpi_memhotplug.c: auto bind the memory device which is hotplugged before the driver is loaded
+Applying: arch/x86/platform/iris/iris.c: register a platform device and a platform driver
+Applying: arch/x86/include/asm/spinlock.h: fix comment
+Applying: mn10300: only add -mmem-funcs to KBUILD_CFLAGS if gcc supports it
+Applying: drivers/dma/dmaengine.c: lower the priority of 'failed to get' dma channel message
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: thermal: fix potential out-of-bounds memory access
+Applying: thermal: add Renesas R-Car thermal sensor support
+Applying: thermal: add generic cpufreq cooling implementation
+Applying: hwmon: exynos4: move thermal sensor driver to driver/thermal directory
+Applying: thermal: exynos5: add exynos5 thermal sensor driver support
+Applying: thermal: exynos: register the tmu sensor with the kernel thermal layer
+Applying: ARM: exynos: add thermal sensor driver platform data support
+Applying: ocfs2: use find_last_bit()
+Applying: ocfs2: use bitmap_weight()
+Applying: drivers/scsi/atp870u.c: fix bad use of udelay
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: push rcu_barrier() from deactivate_locked_super() to filesystems
+Applying: mm/slab: remove duplicate check
+Applying: slab: do not call compound_head() in page_get_cache()
+Applying: hugetlb: avoid taking i_mmap_mutex in unmap_single_vma() for hugetlb
+Applying: shmem: provide vm_ops when also providing a mem policy
+Applying: tmpfs: interleave the starting node of /dev/shmem
+Applying: frv: kill used but uninitialized variable
+Applying: ipc/mqueue: remove unnecessary rb_init_node() calls
+Applying: rbtree: reference Documentation/rbtree.txt for usage instructions
+Applying: rbtree: empty nodes have no color
+Applying: rbtree: fix incorrect rbtree node insertion in fs/proc/proc_sysctl.c
+Applying: rbtree: move some implementation details from rbtree.h to rbtree.c
+Applying: rbtree: fix jffs2 build issue due to renamed __rb_parent_color field
+Applying: rbtree: performance and correctness test
+Applying: rbtree: break out of rb_insert_color loop after tree rotation
+Applying: rbtree: adjust root color in rb_insert_color() only when necessary
+Applying: rbtree: low level optimizations in rb_insert_color()
+Applying: rbtree: adjust node color in __rb_erase_color() only when necessary
+Applying: rbtree: optimize case selection logic in __rb_erase_color()
+Applying: rbtree: low level optimizations in __rb_erase_color()
+Applying: rbtree: coding style adjustments
+Applying: rbtree: rb_erase updates and comments
+Applying: rbtree: optimize fetching of sibling node
+Applying: nsproxy: move free_nsproxy() out of do_exit() path
+Applying: fat (exportfs): move NFS support code
+Applying: fat (exportfs): fix dentry reconnection
+Applying: ipc/sem.c: alternatives to preempt_disable()
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:quilt/akpm
+From ../rebase-tmp
+ + 88aa69e...6a01508 akpm -> quilt/akpm (forced update)
+$ rm -rf ../rebase-tmp
+Merging quilt/akpm (6a01508 ipc/sem.c: alternatives to preempt_disable())
+$ git merge --no-ff quilt/akpm
+Auto-merging include/linux/platform_data/exynos_thermal.h
+Removing drivers/hwmon/exynos4_tmu.c
+Auto-merging Documentation/thermal/exynos_thermal
+Merge made by the 'recursive' strategy.
+ Documentation/thermal/cpu-cooling-api.txt | 60 ++
+ .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
+ arch/frv/kernel/pm.c | 19 +-
+ arch/mn10300/Makefile | 2 +-
+ arch/x86/include/asm/spinlock.h | 3 +-
+ arch/x86/platform/iris/iris.c | 67 +-
+ drivers/acpi/acpi_memhotplug.c | 123 ++-
+ drivers/block/cciss_scsi.c | 11 +-
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/exynos4_tmu.c | 518 -----------
+ drivers/scsi/atp870u.c | 11 +-
+ drivers/thermal/Kconfig | 28 +
+ drivers/thermal/Makefile | 5 +-
+ drivers/thermal/cpu_cooling.c | 483 ++++++++++
+ drivers/thermal/exynos_thermal.c | 960 ++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 260 ++++++
+ drivers/thermal/thermal_sys.c | 5 +-
+ fs/9p/v9fs.c | 5 +
+ fs/adfs/super.c | 5 +
+ fs/affs/super.c | 5 +
+ fs/afs/super.c | 5 +
+ fs/attr.c | 5 +
+ fs/befs/linuxvfs.c | 5 +
+ fs/bfs/inode.c | 5 +
+ fs/btrfs/extent_io.c | 6 +
+ fs/btrfs/inode.c | 5 +
+ fs/ceph/super.c | 5 +
+ fs/cifs/cifsfs.c | 5 +
+ fs/coda/inode.c | 5 +
+ fs/ecryptfs/main.c | 6 +
+ fs/efs/super.c | 5 +
+ fs/exofs/super.c | 5 +
+ fs/ext2/super.c | 5 +
+ fs/ext3/super.c | 5 +
+ fs/ext4/super.c | 5 +
+ fs/fat/Makefile | 2 +-
+ fs/fat/dir.c | 20 +-
+ fs/fat/fat.h | 23 +-
+ fs/fat/inode.c | 178 ++--
+ fs/fat/namei_msdos.c | 5 +-
+ fs/fat/namei_vfat.c | 5 +-
+ fs/fat/nfs.c | 101 ++
+ fs/freevxfs/vxfs_super.c | 5 +
+ fs/fuse/inode.c | 6 +
+ fs/hfs/super.c | 6 +
+ fs/hfsplus/super.c | 6 +
+ fs/hpfs/super.c | 5 +
+ fs/hugetlbfs/inode.c | 5 +
+ fs/isofs/inode.c | 5 +
+ fs/jffs2/readinode.c | 13 +-
+ fs/jffs2/super.c | 6 +
+ fs/jfs/super.c | 6 +
+ fs/logfs/inode.c | 5 +
+ fs/minix/inode.c | 5 +
+ fs/ncpfs/inode.c | 5 +
+ fs/nfs/inode.c | 5 +
+ fs/nilfs2/super.c | 6 +
+ fs/ntfs/super.c | 6 +
+ fs/ocfs2/cluster/heartbeat.c | 40 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 5 +
+ fs/ocfs2/super.c | 5 +
+ fs/openpromfs/inode.c | 5 +
+ fs/proc/proc_sysctl.c | 5 +-
+ fs/qnx4/inode.c | 5 +
+ fs/qnx6/inode.c | 5 +
+ fs/reiserfs/super.c | 5 +
+ fs/romfs/super.c | 5 +
+ fs/squashfs/super.c | 5 +
+ fs/super.c | 6 -
+ fs/sysv/inode.c | 5 +
+ fs/ubifs/super.c | 6 +
+ fs/udf/super.c | 5 +
+ fs/ufs/super.c | 5 +
+ fs/xfs/xfs_super.c | 5 +
+ include/linux/cpu_cooling.h | 99 ++
+ include/linux/mm.h | 7 +
+ include/linux/nsproxy.h | 1 +
+ .../{exynos4_tmu.h => exynos_thermal.h} | 31 +-
+ include/linux/rbtree.h | 112 +--
+ include/linux/shmem_fs.h | 3 +
+ include/linux/timerqueue.h | 2 +-
+ ipc/mqueue.c | 3 -
+ ipc/sem.c | 250 +++--
+ kernel/nsproxy.c | 34 +-
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ lib/Kconfig.debug | 7 +
+ lib/Makefile | 2 +
+ lib/rbtree.c | 597 +++++++-----
+ lib/rbtree_test.c | 135 +++
+ mm/memory.c | 5 +-
+ mm/mempolicy.c | 4 +
+ mm/page_alloc.c | 3 +-
+ mm/shmem.c | 35 +-
+ mm/slab.c | 1 -
+ 97 files changed, 3339 insertions(+), 1239 deletions(-)
+ create mode 100644 Documentation/thermal/cpu-cooling-api.txt
+ rename Documentation/{hwmon/exynos4_tmu => thermal/exynos_thermal} (71%)
+ delete mode 100644 drivers/hwmon/exynos4_tmu.c
+ create mode 100644 drivers/thermal/cpu_cooling.c
+ create mode 100644 drivers/thermal/exynos_thermal.c
+ create mode 100644 drivers/thermal/rcar_thermal.c
+ create mode 100644 fs/fat/nfs.c
+ create mode 100644 include/linux/cpu_cooling.h
+ rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (74%)
+ create mode 100644 lib/rbtree_test.c
+$ git am -3 ../patches/0001-libceph-remove-rb_node-initialisation.patch
+Applying: libceph: remove rb_node initialisation
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/ceph/osd_client.c
+$ git add .
+$ git commit -v -a --amend
+[master 36ad66d] Merge branch 'quilt/akpm'
projects / karo-tx-linux.git / commitdiff