--- /dev/null
+$ date
+Friday 12 October 09:54:44 EST 2012
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 2474542 Merge tag 'for-3.7-rc1' of git://gitorious.org/linux-pwm/linux-pwm
+Merging origin/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge origin/master
+Updating 2474542..12250d8
+Fast-forward
+ Documentation/ABI/testing/sysfs-block | 14 +
+ Documentation/block/biodoc.txt | 5 -
+ .../devicetree/bindings/i2c/atmel-i2c.txt | 30 +
+ Documentation/devicetree/bindings/i2c/davinci.txt | 28 +
+ Documentation/devicetree/bindings/i2c/i2c-mxs.txt | 2 +
+ Documentation/devicetree/bindings/i2c/nomadik.txt | 23 +
+ .../brcm,bcm2835-armctrl-ic.txt | 2 +-
+ .../bindings/timer/brcm,bcm2835-system-timer.txt | 2 +-
+ Documentation/filesystems/nfs/nfs.txt | 44 +-
+ Documentation/hwmon/da9052 | 2 +-
+ Documentation/hwmon/max1619 | 2 +-
+ Documentation/hwmon/twl4030-madc-hwmon | 2 +-
+ Documentation/kernel-parameters.txt | 5 +
+ Documentation/percpu-rw-semaphore.txt | 27 +
+ arch/arm/Kconfig | 3 +-
+ arch/arm/boot/dts/Makefile | 15 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9g20.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 12 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 20 +
+ arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 30 +
+ arch/arm/boot/dts/imx28.dtsi | 2 +
+ arch/arm/boot/dts/omap4-panda.dts | 47 ++
+ arch/arm/boot/dts/omap4-sdp.dts | 57 ++
+ arch/arm/boot/dts/omap5-evm.dts | 58 ++
+ arch/arm/boot/dts/omap5.dtsi | 17 +
+ arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
+ arch/arm/boot/dts/tegra20.dtsi | 4 +-
+ arch/arm/common/it8152.c | 12 +-
+ arch/arm/mach-at91/at91rm9200.c | 1 +
+ arch/arm/mach-at91/at91rm9200_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9260.c | 3 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 8 +-
+ arch/arm/mach-at91/at91sam9261.c | 2 +
+ arch/arm/mach-at91/at91sam9261_devices.c | 14 +-
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9263_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45.c | 4 +
+ arch/arm/mach-at91/at91sam9g45_devices.c | 10 +-
+ arch/arm/mach-at91/at91sam9n12.c | 2 +
+ arch/arm/mach-at91/at91sam9rl.c | 2 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9x5.c | 3 +
+ arch/arm/mach-at91/include/mach/at91_twi.h | 68 --
+ arch/arm/mach-at91/pm.c | 5 +-
+ arch/arm/mach-at91/setup.c | 2 +-
+ arch/arm/mach-davinci/da850.c | 2 +-
+ arch/arm/mach-footbridge/include/mach/irqs.h | 2 -
+ arch/arm/mach-integrator/include/mach/cm.h | 2 +-
+ arch/arm/mach-integrator/include/mach/platform.h | 6 +-
+ arch/arm/mach-integrator/integrator_ap.c | 2 +-
+ arch/arm/mach-integrator/integrator_cp.c | 4 +-
+ arch/arm/mach-iop13xx/iq81340sc.c | 2 +-
+ arch/arm/mach-iop13xx/pci.c | 2 +-
+ arch/arm/mach-ks8695/include/mach/memory.h | 3 +-
+ arch/arm/mach-mv78xx0/addr-map.c | 2 +-
+ arch/arm/mach-mv78xx0/common.c | 2 +-
+ arch/arm/mach-omap1/devices.c | 2 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 26 +
+ arch/arm/mach-omap2/board-flash.c | 2 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 2 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 3 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 5 -
+ arch/arm/mach-omap2/board-omap4panda.c | 18 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +-
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 3 +-
+ arch/arm/mach-omap2/clkt_clksel.c | 2 +-
+ arch/arm/mach-omap2/clock33xx_data.c | 2 +
+ arch/arm/mach-omap2/clockdomain2xxx_3xxx.c | 44 +-
+ arch/arm/mach-omap2/display.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 4 +-
+ arch/arm/mach-omap2/hsmmc.c | 2 +-
+ arch/arm/mach-omap2/mux.c | 2 +-
+ arch/arm/mach-omap2/omap-secure.c | 4 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 31 +-
+ arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 2 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 9 +-
+ arch/arm/mach-omap2/opp.c | 23 +-
+ arch/arm/mach-omap2/pm-debug.c | 2 +-
+ arch/arm/mach-omap2/pm.c | 13 +-
+ arch/arm/mach-omap2/sr_device.c | 2 +-
+ arch/arm/mach-omap2/timer.c | 2 +-
+ arch/arm/mach-omap2/twl-common.c | 2 +-
+ arch/arm/mach-pxa/cm-x2xx.c | 1 +
+ arch/arm/mach-pxa/palmte2.c | 2 +
+ arch/arm/mach-pxa/sharpsl_pm.c | 48 --
+ arch/arm/mach-pxa/viper.c | 3 +-
+ arch/arm/mach-rpc/ecard.c | 4 +-
+ arch/arm/mach-s3c24xx/irq-s3c2416.c | 6 +-
+ arch/arm/mach-s3c24xx/irq-s3c2443.c | 4 +-
+ arch/arm/mach-s3c24xx/simtec-usb.c | 2 +-
+ arch/arm/mach-sa1100/assabet.c | 2 +-
+ arch/arm/mach-shark/pci.c | 2 +-
+ arch/arm/mach-shmobile/include/mach/common.h | 2 +-
+ arch/arm/mach-tegra/Kconfig | 6 +-
+ arch/arm/mach-ux500/Kconfig | 4 +-
+ arch/arm/mach-vt8500/include/mach/uncompress.h | 8 +-
+ arch/arm/mach-vt8500/vt8500.c | 5 +-
+ arch/arm/plat-omap/Kconfig | 2 +
+ arch/arm/plat-omap/counter_32k.c | 21 +-
+ arch/arm/plat-omap/i2c.c | 21 -
+ arch/arm/plat-omap/omap-pm-noop.c | 8 +-
+ arch/arm/plat-omap/omap_device.c | 2 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 11 +-
+ block/blk-core.c | 51 +-
+ block/blk-lib.c | 104 ++-
+ block/blk-merge.c | 53 +-
+ block/blk-settings.c | 16 +
+ block/blk-sysfs.c | 44 +-
+ block/blk-tag.c | 6 +-
+ block/blk.h | 5 +-
+ block/elevator.c | 6 +-
+ block/ioctl.c | 27 +
+ drivers/block/drbd/drbd_main.c | 13 +-
+ drivers/block/osdblk.c | 3 +-
+ drivers/block/pktcdvd.c | 52 +-
+ drivers/char/ds1620.c | 8 +-
+ drivers/char/nwflash.c | 4 +-
+ drivers/char/raw.c | 2 +-
+ drivers/cpufreq/omap-cpufreq.c | 36 +-
+ drivers/firewire/core-cdev.c | 4 +-
+ drivers/hwmon/acpi_power_meter.c | 1 +
+ drivers/hwmon/adm9240.c | 1 +
+ drivers/hwmon/adt7411.c | 1 -
+ drivers/hwmon/adt7462.c | 1 -
+ drivers/hwmon/adt7475.c | 1 +
+ drivers/hwmon/applesmc.c | 1 +
+ drivers/hwmon/asus_atk0110.c | 2 +
+ drivers/hwmon/da9052-hwmon.c | 1 -
+ drivers/hwmon/emc1403.c | 1 +
+ drivers/hwmon/emc6w201.c | 1 -
+ drivers/hwmon/hih6130.c | 1 +
+ drivers/hwmon/i5k_amb.c | 2 -
+ drivers/hwmon/ibmaem.c | 1 +
+ drivers/hwmon/ibmpex.c | 1 +
+ drivers/hwmon/ina2xx.c | 1 +
+ drivers/hwmon/k8temp.c | 1 -
+ drivers/hwmon/lineage-pem.c | 1 +
+ drivers/hwmon/lm92.c | 1 +
+ drivers/hwmon/lm93.c | 1 +
+ drivers/hwmon/ltc4151.c | 1 +
+ drivers/hwmon/ltc4215.c | 1 +
+ drivers/hwmon/ltc4245.c | 1 +
+ drivers/hwmon/ltc4261.c | 1 +
+ drivers/hwmon/max16065.c | 1 -
+ drivers/hwmon/max1619.c | 4 +-
+ drivers/hwmon/max6642.c | 2 +-
+ drivers/hwmon/pmbus/pmbus_core.c | 2 +-
+ drivers/hwmon/s3c-hwmon.c | 1 -
+ drivers/hwmon/sht21.c | 1 +
+ drivers/hwmon/smm665.c | 1 +
+ drivers/hwmon/thmc50.c | 1 +
+ drivers/hwmon/tmp102.c | 1 +
+ drivers/hwmon/ultra45_env.c | 1 +
+ drivers/hwmon/w83791d.c | 1 +
+ drivers/hwmon/w83792d.c | 1 +
+ drivers/hwmon/w83793.c | 1 +
+ drivers/hwmon/w83795.c | 2 +-
+ drivers/hwmon/w83l786ng.c | 1 +
+ drivers/i2c/algos/i2c-algo-pca.c | 27 +-
+ drivers/i2c/busses/Kconfig | 27 +-
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-at91.c | 667 ++++++++++++------
+ drivers/i2c/busses/i2c-davinci.c | 58 +-
+ drivers/i2c/busses/i2c-imx.c | 6 +-
+ drivers/i2c/busses/i2c-mpc.c | 18 +-
+ drivers/i2c/busses/i2c-mxs.c | 269 +++++++-
+ drivers/i2c/busses/i2c-nomadik.c | 52 +-
+ drivers/i2c/busses/i2c-omap.c | 474 ++++++++-----
+ drivers/i2c/busses/i2c-rcar.c | 709 ++++++++++++++++++++
+ drivers/i2c/busses/i2c-s3c2410.c | 18 +-
+ drivers/md/dm-crypt.c | 16 +-
+ drivers/md/dm-io.c | 11 -
+ drivers/md/dm.c | 74 +-
+ drivers/md/md.c | 44 +-
+ drivers/md/raid0.c | 1 +
+ drivers/mmc/host/sdhci-tegra.c | 1 -
+ drivers/power/avs/smartreflex.c | 8 +-
+ drivers/rapidio/rio-scan.c | 40 +-
+ drivers/rapidio/rio.c | 75 ++-
+ drivers/rtc/Kconfig | 3 +
+ drivers/target/target_core_iblock.c | 9 -
+ drivers/vfio/pci/vfio_pci.c | 7 +-
+ drivers/vfio/pci/vfio_pci_intrs.c | 18 +-
+ fs/autofs4/root.c | 6 +-
+ fs/bio-integrity.c | 44 +-
+ fs/bio.c | 231 +++----
+ fs/block_dev.c | 68 +-
+ fs/exofs/ore.c | 5 +-
+ fs/lockd/mon.c | 86 ++-
+ fs/lockd/netns.h | 4 +
+ fs/lockd/svc.c | 1 +
+ fs/nfs/Kconfig | 4 +-
+ fs/nfs/blocklayout/blocklayout.c | 306 +++++++--
+ fs/nfs/blocklayout/blocklayout.h | 2 +-
+ fs/nfs/blocklayout/blocklayoutdev.c | 25 +-
+ fs/nfs/blocklayout/extents.c | 3 +-
+ fs/nfs/callback.c | 321 ++++++---
+ fs/nfs/callback.h | 3 +-
+ fs/nfs/callback_proc.c | 31 +-
+ fs/nfs/client.c | 23 +-
+ fs/nfs/dir.c | 16 +-
+ fs/nfs/direct.c | 32 +-
+ fs/nfs/file.c | 41 +-
+ fs/nfs/getroot.c | 2 +
+ fs/nfs/idmap.c | 114 ++--
+ fs/nfs/inode.c | 10 +-
+ fs/nfs/internal.h | 15 +-
+ fs/nfs/netns.h | 4 +
+ fs/nfs/nfs4_fs.h | 19 +-
+ fs/nfs/nfs4client.c | 256 ++++++-
+ fs/nfs/nfs4file.c | 29 +-
+ fs/nfs/nfs4filelayout.c | 41 +-
+ fs/nfs/nfs4filelayout.h | 16 +-
+ fs/nfs/nfs4filelayoutdev.c | 17 +-
+ fs/nfs/nfs4namespace.c | 16 +-
+ fs/nfs/nfs4proc.c | 342 +++++++---
+ fs/nfs/nfs4state.c | 228 ++++++-
+ fs/nfs/nfs4sysctl.c | 1 +
+ fs/nfs/nfs4xdr.c | 31 +-
+ fs/nfs/objlayout/objio_osd.c | 9 +-
+ fs/nfs/pagelist.c | 12 +-
+ fs/nfs/pnfs.c | 417 +++++++-----
+ fs/nfs/pnfs.h | 57 +-
+ fs/nfs/pnfs_dev.c | 27 +
+ fs/nfs/super.c | 31 +-
+ fs/nfs/write.c | 11 +-
+ include/linux/bio.h | 70 +-
+ include/linux/blk_types.h | 36 +-
+ include/linux/blkdev.h | 82 ++-
+ include/linux/fs.h | 6 +
+ include/linux/i2c-algo-pca.h | 1 +
+ include/linux/i2c-omap.h | 1 -
+ include/linux/i2c/i2c-rcar.h | 10 +
+ include/linux/memcontrol.h | 4 +-
+ include/linux/nfs_fs.h | 11 +-
+ include/linux/nfs_fs_sb.h | 3 +
+ include/linux/nfs_xdr.h | 5 +-
+ include/linux/pageblock-flags.h | 6 +-
+ include/linux/percpu-rwsem.h | 89 +++
+ include/linux/platform_data/i2c-nomadik.h | 2 +-
+ include/linux/rio.h | 3 +-
+ include/linux/scatterlist.h | 1 +
+ include/linux/sunrpc/clnt.h | 2 +
+ include/linux/sunrpc/xprt.h | 3 +-
+ lib/kasprintf.c | 2 +-
+ lib/scatterlist.c | 19 +
+ net/sunrpc/auth_gss/auth_gss.c | 58 +-
+ net/sunrpc/clnt.c | 105 +--
+ net/sunrpc/rpc_pipe.c | 8 +-
+ net/sunrpc/sched.c | 2 +-
+ net/sunrpc/xdr.c | 21 +-
+ net/sunrpc/xprt.c | 8 +-
+ net/sunrpc/xprtrdma/transport.c | 22 +-
+ net/sunrpc/xprtsock.c | 40 +-
+ sound/oss/waveartist.c | 4 +-
+ tools/perf/util/include/linux/rbtree.h | 1 -
+ 261 files changed, 5567 insertions(+), 2191 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/atmel-i2c.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/davinci.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/nomadik.txt
+ create mode 100644 Documentation/percpu-rw-semaphore.txt
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_twi.h
+ create mode 100644 drivers/i2c/busses/i2c-rcar.c
+ create mode 100644 include/linux/i2c/i2c-rcar.h
+ create mode 100644 include/linux/percpu-rwsem.h
+Merging fixes/master (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (b1e0d8b kbuild: Fix gcc -x syntax)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arm-current/fixes (846a136 ARM: vfp: fix saving d16-d31 vfp registers on v6+ kernels)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/vfpmacros.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging m68k-current/for-linus (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge (fd3bc66 Merge tag 'disintegrate-powerpc-20121009' into merge)
+$ git merge powerpc-merge/merge
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/Kbuild | 35 --
+ arch/powerpc/include/asm/bootx.h | 123 +------
+ arch/powerpc/include/asm/cputable.h | 35 +-
+ arch/powerpc/include/asm/elf.h | 311 +----------------
+ arch/powerpc/include/asm/kvm_para.h | 70 +---
+ arch/powerpc/include/asm/mman.h | 27 +-
+ arch/powerpc/include/asm/nvram.h | 55 +--
+ arch/powerpc/include/asm/ptrace.h | 242 +------------
+ arch/powerpc/include/asm/signal.h | 143 +-------
+ arch/powerpc/include/asm/spu_info.h | 29 +-
+ arch/powerpc/include/asm/swab.h | 15 +-
+ arch/powerpc/include/asm/termios.h | 69 +---
+ arch/powerpc/include/asm/types.h | 30 +-
+ arch/powerpc/include/asm/unistd.h | 374 +-------------------
+ arch/powerpc/include/uapi/asm/Kbuild | 41 +++
+ arch/powerpc/include/{ => uapi}/asm/auxvec.h | 0
+ arch/powerpc/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/powerpc/include/uapi/asm/bootx.h | 132 +++++++
+ arch/powerpc/include/{ => uapi}/asm/byteorder.h | 0
+ arch/powerpc/include/uapi/asm/cputable.h | 36 ++
+ arch/powerpc/include/uapi/asm/elf.h | 307 +++++++++++++++++
+ arch/powerpc/include/{ => uapi}/asm/errno.h | 0
+ arch/powerpc/include/{ => uapi}/asm/fcntl.h | 0
+ arch/powerpc/include/{ => uapi}/asm/ioctl.h | 0
+ arch/powerpc/include/{ => uapi}/asm/ioctls.h | 0
+ arch/powerpc/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/powerpc/include/{ => uapi}/asm/kvm.h | 0
+ arch/powerpc/include/uapi/asm/kvm_para.h | 90 +++++
+ arch/powerpc/include/{ => uapi}/asm/linkage.h | 0
+ arch/powerpc/include/uapi/asm/mman.h | 31 ++
+ arch/powerpc/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/powerpc/include/uapi/asm/nvram.h | 62 ++++
+ arch/powerpc/include/{ => uapi}/asm/param.h | 0
+ arch/powerpc/include/{ => uapi}/asm/poll.h | 0
+ arch/powerpc/include/{ => uapi}/asm/posix_types.h | 0
+ arch/powerpc/include/{ => uapi}/asm/ps3fb.h | 0
+ arch/powerpc/include/uapi/asm/ptrace.h | 259 ++++++++++++++
+ arch/powerpc/include/{ => uapi}/asm/resource.h | 0
+ arch/powerpc/include/{ => uapi}/asm/seccomp.h | 0
+ arch/powerpc/include/{ => uapi}/asm/sembuf.h | 0
+ arch/powerpc/include/{ => uapi}/asm/setup.h | 0
+ arch/powerpc/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/powerpc/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/powerpc/include/{ => uapi}/asm/siginfo.h | 0
+ arch/powerpc/include/uapi/asm/signal.h | 145 ++++++++
+ arch/powerpc/include/{ => uapi}/asm/socket.h | 0
+ arch/powerpc/include/{ => uapi}/asm/sockios.h | 0
+ arch/powerpc/include/uapi/asm/spu_info.h | 53 +++
+ arch/powerpc/include/{ => uapi}/asm/stat.h | 0
+ arch/powerpc/include/{ => uapi}/asm/statfs.h | 0
+ arch/powerpc/include/uapi/asm/swab.h | 23 ++
+ arch/powerpc/include/{ => uapi}/asm/termbits.h | 0
+ arch/powerpc/include/uapi/asm/termios.h | 76 +++++
+ arch/powerpc/include/uapi/asm/types.h | 40 +++
+ arch/powerpc/include/{ => uapi}/asm/ucontext.h | 0
+ arch/powerpc/include/uapi/asm/unistd.h | 380 +++++++++++++++++++++
+ 56 files changed, 1705 insertions(+), 1528 deletions(-)
+ rename arch/powerpc/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/bitsperlong.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/bootx.h
+ rename arch/powerpc/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/cputable.h
+ create mode 100644 arch/powerpc/include/uapi/asm/elf.h
+ rename arch/powerpc/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/kvm.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/kvm_para.h
+ rename arch/powerpc/include/{ => uapi}/asm/linkage.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/mman.h
+ rename arch/powerpc/include/{ => uapi}/asm/msgbuf.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/nvram.h
+ rename arch/powerpc/include/{ => uapi}/asm/param.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/posix_types.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/ps3fb.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/ptrace.h
+ rename arch/powerpc/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/seccomp.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/siginfo.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/signal.h
+ rename arch/powerpc/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/sockios.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/spu_info.h
+ rename arch/powerpc/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/powerpc/include/{ => uapi}/asm/statfs.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/swab.h
+ rename arch/powerpc/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/termios.h
+ create mode 100644 arch/powerpc/include/uapi/asm/types.h
+ rename arch/powerpc/include/{ => uapi}/asm/ucontext.h (100%)
+ create mode 100644 arch/powerpc/include/uapi/asm/unistd.h
+Merging sparc/master (55c2770 sparc64: fix ptrace interaction with force_successful_syscall_return())
+$ git merge sparc/master
+Merge made by the 'recursive' strategy.
+ arch/sparc/include/asm/uaccess_64.h | 5 +
+ arch/sparc/kernel/syscalls.S | 32 ++---
+ arch/sparc/kernel/traps_64.c | 263 +++++++++++++++++++++++++++--------
+ arch/sparc/mm/fault_64.c | 2 -
+ 4 files changed, 221 insertions(+), 81 deletions(-)
+Merging net/master (5d9d01a usbnet: Support devices reporting idleness)
+$ git merge net/master
+Merge made by the 'recursive' strategy.
+ drivers/isdn/i4l/isdn_ppp.c | 2 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 6 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 2 +-
+ drivers/net/ethernet/jme.c | 4 +
+ drivers/net/usb/cdc_eem.c | 4 +
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/usbnet.c | 17 +++
+ drivers/net/vxlan.c | 148 ++++++++++++++++++++------
+ drivers/net/wireless/ath/ath5k/base.c | 3 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 5 +
+ drivers/net/wireless/ath/ath9k/hw.h | 1 +
+ drivers/net/wireless/ath/ath9k/main.c | 15 +--
+ drivers/net/wireless/ath/ath9k/pci.c | 7 ++
+ drivers/net/wireless/ath/ath9k/xmit.c | 53 ++++-----
+ drivers/net/wireless/ath/carl9170/carl9170.h | 1 +
+ drivers/net/wireless/ath/carl9170/main.c | 29 +++--
+ drivers/net/wireless/mwifiex/cfg80211.c | 27 +++--
+ drivers/net/wireless/mwifiex/join.c | 6 +-
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/scan.c | 38 ++++---
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 4 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 31 ++++--
+ drivers/net/wireless/rt2x00/rt2800lib.c | 4 +-
+ drivers/net/xen-netback/netback.c | 40 ++++++-
+ drivers/usb/class/cdc-acm.c | 3 +
+ include/linux/can/Kbuild | 5 -
+ include/linux/if_link.h | 6 ++
+ include/linux/of_mdio.h | 20 ++--
+ include/linux/usb/usbnet.h | 2 +
+ include/linux/wimax/Kbuild | 1 -
+ include/uapi/linux/can/Kbuild | 5 +
+ include/{ => uapi}/linux/can/bcm.h | 0
+ include/{ => uapi}/linux/can/error.h | 0
+ include/{ => uapi}/linux/can/gw.h | 0
+ include/{ => uapi}/linux/can/netlink.h | 0
+ include/{ => uapi}/linux/can/raw.h | 0
+ include/uapi/linux/wimax/Kbuild | 1 +
+ include/{ => uapi}/linux/wimax/i2400m.h | 0
+ net/bridge/br_netfilter.c | 3 +
+ net/core/pktgen.c | 146 +++++--------------------
+ net/ipv4/route.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 2 +
+ net/mac80211/mesh_sync.c | 3 +-
+ net/mac80211/status.c | 4 +-
+ net/mac80211/tx.c | 22 ++--
+ 46 files changed, 397 insertions(+), 281 deletions(-)
+ rename include/{ => uapi}/linux/can/bcm.h (100%)
+ rename include/{ => uapi}/linux/can/error.h (100%)
+ rename include/{ => uapi}/linux/can/gw.h (100%)
+ rename include/{ => uapi}/linux/can/netlink.h (100%)
+ rename include/{ => uapi}/linux/can/raw.h (100%)
+ rename include/{ => uapi}/linux/wimax/i2400m.h (100%)
+Merging sound-current/for-linus (5d037f9 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
+Already up-to-date.
+Merging pci-current/for-linus (0ff9514 PCI: Don't print anything while decoding is disabled)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (c3e7724 mac80211: use ieee80211_free_txskb to fix possible skb leaks)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (5698bd7 Linux 3.6-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (b70936d tty: serial: sccnxp: Fix bug with unterminated platform_id list)
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/dgrp/dgrp_mon_ops.c | 1 +
+ drivers/staging/dgrp/dgrp_specproc.c | 1 +
+ drivers/staging/dgrp/dgrp_tty.c | 1 +
+ drivers/tty/serial/Kconfig | 4 ++--
+ drivers/tty/serial/sccnxp.c | 1 +
+ include/linux/ratelimit.h | 27 +++++++++------------------
+ net/irda/ircomm/ircomm_tty.c | 2 ++
+ 7 files changed, 17 insertions(+), 20 deletions(-)
+Merging usb.current/usb-linus (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (5698bd7 Linux 3.6-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (fea7a08 Linux 3.6-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (0cc8d6a Merge branch 'next' into for-linus)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/evdev.c | 99 +++++--------
+ drivers/input/input.c | 114 +++++++--------
+ drivers/input/joydev.c | 88 +++++-------
+ drivers/input/keyboard/samsung-keypad.c | 11 +-
+ drivers/input/mousedev.c | 224 +++++++++++++++---------------
+ drivers/input/tablet/wacom_sys.c | 145 +++++++++++++------
+ drivers/input/tablet/wacom_wac.c | 30 +++-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 6 +-
+ include/linux/input.h | 10 +-
+ 9 files changed, 382 insertions(+), 345 deletions(-)
+Merging md-current/for-linus (80b4812 md/raid10: fix "enough" function for detecting if array is failed.)
+$ 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 (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (9974e43 ide: fix generic_ide_suspend/resume Oops)
+$ 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 asm-generic/master (c37d615 Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arm/for-next (4231a1e Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Auto-merging arch/arm/include/asm/ptrace.h
+Merge made by the 'recursive' strategy.
+ Documentation/arm/Booting | 22 +++-
+ arch/arm/boot/compressed/.gitignore | 1 +
+ arch/arm/boot/compressed/Makefile | 9 +-
+ arch/arm/boot/compressed/head.S | 71 +++++++++--
+ arch/arm/include/asm/assembler.h | 29 +++++
+ arch/arm/include/asm/cacheflush.h | 15 +++
+ arch/arm/include/asm/glue-cache.h | 1 +
+ arch/arm/include/asm/opcodes-virt.h | 10 ++
+ arch/arm/include/asm/ptrace.h | 1 +
+ arch/arm/include/asm/virt.h | 69 +++++++++++
+ arch/arm/kernel/Makefile | 2 +
+ arch/arm/kernel/head.S | 14 ++-
+ arch/arm/kernel/hyp-stub.S | 223 +++++++++++++++++++++++++++++++++++
+ arch/arm/kernel/setup.c | 20 ++++
+ arch/arm/kernel/smp.c | 8 +-
+ arch/arm/kernel/suspend.c | 17 ++-
+ arch/arm/mm/Kconfig | 17 +++
+ arch/arm/mm/cache-fa.S | 3 +
+ arch/arm/mm/cache-v3.S | 3 +
+ arch/arm/mm/cache-v4.S | 3 +
+ arch/arm/mm/cache-v4wb.S | 3 +
+ arch/arm/mm/cache-v4wt.S | 3 +
+ arch/arm/mm/cache-v6.S | 3 +
+ arch/arm/mm/cache-v7.S | 48 +++++++-
+ arch/arm/mm/proc-arm1020.S | 3 +
+ arch/arm/mm/proc-arm1020e.S | 3 +
+ arch/arm/mm/proc-arm1022.S | 3 +
+ arch/arm/mm/proc-arm1026.S | 3 +
+ arch/arm/mm/proc-arm920.S | 3 +
+ arch/arm/mm/proc-arm922.S | 3 +
+ arch/arm/mm/proc-arm925.S | 3 +
+ arch/arm/mm/proc-arm926.S | 3 +
+ arch/arm/mm/proc-arm940.S | 3 +
+ arch/arm/mm/proc-arm946.S | 3 +
+ arch/arm/mm/proc-feroceon.S | 4 +
+ arch/arm/mm/proc-macros.S | 1 +
+ arch/arm/mm/proc-mohawk.S | 3 +
+ arch/arm/mm/proc-v7.S | 2 +-
+ arch/arm/mm/proc-xsc3.S | 3 +
+ arch/arm/mm/proc-xscale.S | 4 +
+ 40 files changed, 621 insertions(+), 21 deletions(-)
+ create mode 100644 arch/arm/include/asm/virt.h
+ create mode 100644 arch/arm/kernel/hyp-stub.S
+Merging arm-perf/for-next/perf (a0d271c Linux 3.6)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+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 arm64/upstream (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge arm64/upstream
+Already up-to-date.
+Merging blackfin/for-linus (9f57151 Merge tag 'disintegrate-blackfin-20121009' into for-linus)
+$ git merge blackfin/for-linus
+Merge made by the 'recursive' strategy.
+ arch/blackfin/include/asm/Kbuild | 5 -
+ arch/blackfin/include/asm/bfin_sport.h | 128 +-----
+ arch/blackfin/include/asm/fixed_code.h | 30 +-
+ arch/blackfin/include/asm/ptrace.h | 161 +-------
+ arch/blackfin/include/asm/unistd.h | 430 +------------------
+ arch/blackfin/include/uapi/asm/Kbuild | 16 +
+ arch/blackfin/include/uapi/asm/bfin_sport.h | 136 ++++++
+ arch/blackfin/include/{ => uapi}/asm/byteorder.h | 0
+ arch/blackfin/include/{ => uapi}/asm/cachectl.h | 0
+ arch/blackfin/include/{ => uapi}/asm/fcntl.h | 0
+ arch/blackfin/include/uapi/asm/fixed_code.h | 38 ++
+ arch/blackfin/include/{ => uapi}/asm/ioctls.h | 0
+ arch/blackfin/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/blackfin/include/{ => uapi}/asm/poll.h | 0
+ arch/blackfin/include/{ => uapi}/asm/posix_types.h | 0
+ arch/blackfin/include/uapi/asm/ptrace.h | 170 ++++++++
+ arch/blackfin/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/blackfin/include/{ => uapi}/asm/siginfo.h | 0
+ arch/blackfin/include/{ => uapi}/asm/signal.h | 0
+ arch/blackfin/include/{ => uapi}/asm/stat.h | 0
+ arch/blackfin/include/{ => uapi}/asm/swab.h | 0
+ arch/blackfin/include/uapi/asm/unistd.h | 437 ++++++++++++++++++++
+ 22 files changed, 802 insertions(+), 749 deletions(-)
+ create mode 100644 arch/blackfin/include/uapi/asm/bfin_sport.h
+ rename arch/blackfin/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/cachectl.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/fcntl.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/fixed_code.h
+ rename arch/blackfin/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/ptrace.h
+ rename arch/blackfin/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/blackfin/include/{ => uapi}/asm/swab.h (100%)
+ create mode 100644 arch/blackfin/include/uapi/asm/unistd.h
+Merging c6x/for-linux-next (fbdd63d UAPI: (Scripted) Disintegrate arch/c6x/include/asm)
+$ git merge c6x/for-linux-next
+Auto-merging arch/c6x/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/c6x/include/asm/Kbuild | 1 -
+ arch/c6x/include/asm/ptrace.h | 146 +----------------------
+ arch/c6x/include/uapi/asm/Kbuild | 7 ++
+ arch/c6x/include/{ => uapi}/asm/byteorder.h | 0
+ arch/c6x/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/c6x/include/uapi/asm/ptrace.h | 163 ++++++++++++++++++++++++++
+ arch/c6x/include/{ => uapi}/asm/setup.h | 0
+ arch/c6x/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/c6x/include/{ => uapi}/asm/swab.h | 0
+ arch/c6x/include/{ => uapi}/asm/unistd.h | 0
+ 10 files changed, 171 insertions(+), 146 deletions(-)
+ rename arch/c6x/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/kvm_para.h (100%)
+ create mode 100644 arch/c6x/include/uapi/asm/ptrace.h
+ rename arch/c6x/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/c6x/include/{ => uapi}/asm/unistd.h (100%)
+Merging cris/for-next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge cris/for-next
+Already up-to-date.
+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 (d536e0d Merge tag 'disintegrate-ia64-20121009' of git://git.infradead.org/users/dhowells/linux-headers into next)
+$ git merge ia64/next
+Auto-merging arch/ia64/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/ia64/include/asm/Kbuild | 14 -
+ arch/ia64/include/asm/gcc_intrin.h | 615 +------------------
+ arch/ia64/include/asm/intrinsics.h | 120 +---
+ arch/ia64/include/asm/kvm_para.h | 10 +-
+ arch/ia64/include/asm/mman.h | 12 +-
+ arch/ia64/include/asm/param.h | 22 +-
+ arch/ia64/include/asm/perfmon.h | 171 +-----
+ arch/ia64/include/asm/ptrace.h | 236 +-------
+ arch/ia64/include/asm/siginfo.h | 118 +---
+ arch/ia64/include/asm/signal.h | 122 +---
+ arch/ia64/include/asm/termios.h | 46 +-
+ arch/ia64/include/asm/types.h | 19 +-
+ arch/ia64/include/asm/unistd.h | 324 +---------
+ arch/ia64/include/asm/ustack.h | 11 +-
+ arch/ia64/include/uapi/asm/Kbuild | 45 ++
+ arch/ia64/include/{ => uapi}/asm/auxvec.h | 0
+ arch/ia64/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/ia64/include/{ => uapi}/asm/break.h | 0
+ arch/ia64/include/{ => uapi}/asm/byteorder.h | 0
+ arch/ia64/include/{ => uapi}/asm/cmpxchg.h | 0
+ arch/ia64/include/{ => uapi}/asm/errno.h | 0
+ arch/ia64/include/{ => uapi}/asm/fcntl.h | 0
+ arch/ia64/include/{ => uapi}/asm/fpu.h | 0
+ arch/ia64/include/uapi/asm/gcc_intrin.h | 618 ++++++++++++++++++++
+ arch/ia64/include/{ => uapi}/asm/ia64regs.h | 0
+ arch/ia64/include/{ => uapi}/asm/intel_intrin.h | 0
+ arch/ia64/include/uapi/asm/intrinsics.h | 124 ++++
+ arch/ia64/include/{ => uapi}/asm/ioctl.h | 0
+ arch/ia64/include/{ => uapi}/asm/ioctls.h | 0
+ arch/ia64/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/kvm.h | 0
+ arch/ia64/include/uapi/asm/mman.h | 16 +
+ arch/ia64/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/ia64/include/uapi/asm/param.h | 29 +
+ arch/ia64/include/uapi/asm/perfmon.h | 177 ++++++
+ .../include/{ => uapi}/asm/perfmon_default_smpl.h | 0
+ arch/ia64/include/{ => uapi}/asm/poll.h | 0
+ arch/ia64/include/{ => uapi}/asm/posix_types.h | 0
+ arch/ia64/include/uapi/asm/ptrace.h | 247 ++++++++
+ arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h | 0
+ arch/ia64/include/{ => uapi}/asm/resource.h | 0
+ arch/ia64/include/{ => uapi}/asm/rse.h | 0
+ arch/ia64/include/{ => uapi}/asm/sembuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/setup.h | 0
+ arch/ia64/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/ia64/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/ia64/include/uapi/asm/siginfo.h | 121 ++++
+ arch/ia64/include/uapi/asm/signal.h | 127 ++++
+ arch/ia64/include/{ => uapi}/asm/socket.h | 0
+ arch/ia64/include/{ => uapi}/asm/sockios.h | 0
+ arch/ia64/include/{ => uapi}/asm/stat.h | 0
+ arch/ia64/include/{ => uapi}/asm/statfs.h | 0
+ arch/ia64/include/{ => uapi}/asm/swab.h | 0
+ arch/ia64/include/{ => uapi}/asm/termbits.h | 0
+ arch/ia64/include/uapi/asm/termios.h | 50 ++
+ arch/ia64/include/uapi/asm/types.h | 31 +
+ arch/ia64/include/{ => uapi}/asm/ucontext.h | 0
+ arch/ia64/include/uapi/asm/unistd.h | 328 +++++++++++
+ arch/ia64/include/uapi/asm/ustack.h | 12 +
+ 59 files changed, 1961 insertions(+), 1804 deletions(-)
+ rename arch/ia64/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/break.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/cmpxchg.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/fpu.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/gcc_intrin.h
+ rename arch/ia64/include/{ => uapi}/asm/ia64regs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/intel_intrin.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/intrinsics.h
+ rename arch/ia64/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/kvm.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/kvm_para.h
+ create mode 100644 arch/ia64/include/uapi/asm/mman.h
+ rename arch/ia64/include/{ => uapi}/asm/msgbuf.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/param.h
+ create mode 100644 arch/ia64/include/uapi/asm/perfmon.h
+ rename arch/ia64/include/{ => uapi}/asm/perfmon_default_smpl.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/ptrace.h
+ rename arch/ia64/include/{ => uapi}/asm/ptrace_offsets.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/rse.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sembuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/setup.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sigcontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/siginfo.h
+ create mode 100644 arch/ia64/include/uapi/asm/signal.h
+ rename arch/ia64/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/ia64/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/termios.h
+ create mode 100644 arch/ia64/include/uapi/asm/types.h
+ rename arch/ia64/include/{ => uapi}/asm/ucontext.h (100%)
+ create mode 100644 arch/ia64/include/uapi/asm/unistd.h
+ create mode 100644 arch/ia64/include/uapi/asm/ustack.h
+Merging m68k/for-next (f82735d m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR)
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next (a255172 m68knommu: fix inconsistent formating in ColdFire 5407 definitions)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging microblaze/next (1883baa UAPI: (Scripted) Disintegrate arch/microblaze/include/asm)
+$ git merge microblaze/next
+Auto-merging arch/microblaze/include/asm/Kbuild
+Merge made by the 'recursive' strategy.
+ arch/microblaze/include/asm/Kbuild | 2 -
+ arch/microblaze/include/asm/elf.h | 97 +----
+ arch/microblaze/include/asm/ptrace.h | 62 +--
+ arch/microblaze/include/asm/setup.h | 6 +-
+ arch/microblaze/include/asm/unistd.h | 390 +------------------
+ arch/microblaze/include/uapi/asm/Kbuild | 32 ++
+ arch/microblaze/include/{ => uapi}/asm/auxvec.h | 0
+ .../include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/microblaze/include/{ => uapi}/asm/byteorder.h | 0
+ arch/microblaze/include/uapi/asm/elf.h | 121 ++++++
+ arch/microblaze/include/{ => uapi}/asm/errno.h | 0
+ arch/microblaze/include/{ => uapi}/asm/fcntl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctl.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ioctls.h | 0
+ arch/microblaze/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/microblaze/include/{ => uapi}/asm/mman.h | 0
+ arch/microblaze/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/microblaze/include/{ => uapi}/asm/param.h | 0
+ arch/microblaze/include/{ => uapi}/asm/poll.h | 0
+ .../include/{ => uapi}/asm/posix_types.h | 0
+ arch/microblaze/include/uapi/asm/ptrace.h | 72 ++++
+ arch/microblaze/include/{ => uapi}/asm/resource.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sembuf.h | 0
+ arch/microblaze/include/uapi/asm/setup.h | 19 +
+ arch/microblaze/include/{ => uapi}/asm/shmbuf.h | 0
+ .../microblaze/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/microblaze/include/{ => uapi}/asm/siginfo.h | 0
+ arch/microblaze/include/{ => uapi}/asm/signal.h | 0
+ arch/microblaze/include/{ => uapi}/asm/socket.h | 0
+ arch/microblaze/include/{ => uapi}/asm/sockios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/stat.h | 0
+ arch/microblaze/include/{ => uapi}/asm/statfs.h | 0
+ arch/microblaze/include/{ => uapi}/asm/swab.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termbits.h | 0
+ arch/microblaze/include/{ => uapi}/asm/termios.h | 0
+ arch/microblaze/include/{ => uapi}/asm/types.h | 0
+ arch/microblaze/include/uapi/asm/unistd.h | 400 ++++++++++++++++++++
+ 38 files changed, 649 insertions(+), 552 deletions(-)
+ rename arch/microblaze/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/byteorder.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/elf.h
+ rename arch/microblaze/include/{ => uapi}/asm/errno.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/param.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/ptrace.h
+ rename arch/microblaze/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/setup.h
+ rename arch/microblaze/include/{ => uapi}/asm/shmbuf.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/siginfo.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/signal.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/socket.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termbits.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/termios.h (100%)
+ rename arch/microblaze/include/{ => uapi}/asm/types.h (100%)
+ create mode 100644 arch/microblaze/include/uapi/asm/unistd.h
+Merging mips/mips-for-linux-next (35bafbe Merge tag 'disintegrate-mips-20121009' of git://git.infradead.org/users/dhowells/linux-headers into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/kernel/kspd.c
+Removing arch/mips/configs/pb1550_defconfig
+Removing arch/mips/configs/pb1500_defconfig
+Removing arch/mips/configs/pb1100_defconfig
+Removing arch/mips/configs/db1550_defconfig
+Removing arch/mips/configs/db1300_defconfig
+Removing arch/mips/configs/db1200_defconfig
+Removing arch/mips/alchemy/devboards/pb1550.c
+Removing arch/mips/alchemy/devboards/pb1500.c
+Removing arch/mips/alchemy/devboards/pb1100.c
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 14 +-
+ arch/mips/alchemy/Kconfig | 50 +-
+ arch/mips/alchemy/Platform | 22 +-
+ arch/mips/alchemy/devboards/Makefile | 7 +-
+ arch/mips/alchemy/devboards/db1000.c | 120 ++-
+ arch/mips/alchemy/devboards/db1200.c | 37 +-
+ arch/mips/alchemy/devboards/db1235.c | 94 ++
+ arch/mips/alchemy/devboards/db1300.c | 12 +-
+ arch/mips/alchemy/devboards/db1550.c | 192 +++-
+ arch/mips/alchemy/devboards/pb1100.c | 167 ----
+ arch/mips/alchemy/devboards/pb1500.c | 198 ----
+ arch/mips/alchemy/devboards/pb1550.c | 244 -----
+ arch/mips/alchemy/devboards/platform.c | 9 +-
+ arch/mips/boot/compressed/uart-alchemy.c | 4 -
+ arch/mips/configs/db1200_defconfig | 170 ----
+ arch/mips/configs/db1235_defconfig | 434 ++++++++
+ arch/mips/configs/db1300_defconfig | 391 --------
+ arch/mips/configs/db1550_defconfig | 285 ------
+ arch/mips/configs/pb1100_defconfig | 124 ---
+ arch/mips/configs/pb1500_defconfig | 141 ---
+ arch/mips/configs/pb1550_defconfig | 145 ---
+ arch/mips/include/asm/Kbuild | 5 -
+ arch/mips/include/asm/atomic.h | 64 +-
+ arch/mips/include/asm/cpu-features.h | 8 +
+ arch/mips/include/asm/cpu.h | 4 +-
+ arch/mips/include/asm/errno.h | 120 +--
+ arch/mips/include/asm/kspd.h | 4 -
+ .../include/asm/mach-ath79/cpu-feature-overrides.h | 2 +
+ .../asm/mach-au1x00/cpu-feature-overrides.h | 1 +
+ .../asm/mach-bcm63xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 1 +
+ .../asm/mach-cobalt/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mach-db1x00/bcsr.h | 2 +
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip27/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip28/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-ip32/cpu-feature-overrides.h | 1 +
+ .../asm/mach-jz4740/cpu-feature-overrides.h | 1 +
+ .../asm/mach-loongson/cpu-feature-overrides.h | 1 +
+ .../asm/mach-netlogic/cpu-feature-overrides.h | 1 +
+ .../asm/mach-powertv/cpu-feature-overrides.h | 1 +
+ .../asm/mach-rc32434/cpu-feature-overrides.h | 1 +
+ .../include/asm/mach-rm/cpu-feature-overrides.h | 1 +
+ .../asm/mach-sibyte/cpu-feature-overrides.h | 1 +
+ .../asm/mach-tx49xx/cpu-feature-overrides.h | 1 +
+ .../asm/mach-yosemite/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/mipsregs.h | 3 +
+ arch/mips/include/asm/pgtable-64.h | 1 -
+ .../asm/pmc-sierra/msp71xx/cpu-feature-overrides.h | 1 +
+ arch/mips/include/asm/ptrace.h | 107 +-
+ arch/mips/include/asm/setup.h | 5 +-
+ arch/mips/include/asm/sigcontext.h | 66 +-
+ arch/mips/include/asm/siginfo.h | 104 +-
+ arch/mips/include/asm/signal.h | 115 +--
+ arch/mips/include/asm/socket.h | 83 +-
+ arch/mips/include/asm/termios.h | 73 +-
+ arch/mips/include/asm/types.h | 16 +-
+ arch/mips/include/asm/unistd.h | 1022 +------------------
+ arch/mips/include/uapi/asm/Kbuild | 34 +
+ arch/mips/include/{ => uapi}/asm/auxvec.h | 0
+ arch/mips/include/{ => uapi}/asm/bitsperlong.h | 0
+ arch/mips/include/{ => uapi}/asm/byteorder.h | 0
+ arch/mips/include/{ => uapi}/asm/cachectl.h | 0
+ arch/mips/include/uapi/asm/errno.h | 129 +++
+ arch/mips/include/{ => uapi}/asm/fcntl.h | 0
+ arch/mips/include/{ => uapi}/asm/ioctl.h | 0
+ arch/mips/include/{ => uapi}/asm/ioctls.h | 0
+ arch/mips/include/{ => uapi}/asm/ipcbuf.h | 0
+ arch/mips/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/mips/include/{ => uapi}/asm/mman.h | 0
+ arch/mips/include/{ => uapi}/asm/msgbuf.h | 0
+ arch/mips/include/{ => uapi}/asm/param.h | 0
+ arch/mips/include/{ => uapi}/asm/poll.h | 0
+ arch/mips/include/{ => uapi}/asm/posix_types.h | 0
+ arch/mips/include/uapi/asm/ptrace.h | 116 +++
+ arch/mips/include/{ => uapi}/asm/resource.h | 0
+ arch/mips/include/{ => uapi}/asm/sembuf.h | 0
+ arch/mips/include/uapi/asm/setup.h | 7 +
+ arch/mips/include/{ => uapi}/asm/sgidefs.h | 0
+ arch/mips/include/{ => uapi}/asm/shmbuf.h | 0
+ arch/mips/include/uapi/asm/sigcontext.h | 78 ++
+ arch/mips/include/uapi/asm/siginfo.h | 114 +++
+ arch/mips/include/uapi/asm/signal.h | 123 +++
+ arch/mips/include/uapi/asm/socket.h | 93 ++
+ arch/mips/include/{ => uapi}/asm/sockios.h | 0
+ arch/mips/include/{ => uapi}/asm/stat.h | 0
+ arch/mips/include/{ => uapi}/asm/statfs.h | 0
+ arch/mips/include/{ => uapi}/asm/swab.h | 0
+ arch/mips/include/{ => uapi}/asm/sysmips.h | 0
+ arch/mips/include/{ => uapi}/asm/termbits.h | 0
+ arch/mips/include/uapi/asm/termios.h | 80 ++
+ arch/mips/include/uapi/asm/types.h | 27 +
+ arch/mips/include/uapi/asm/unistd.h | 1035 ++++++++++++++++++++
+ arch/mips/kernel/Makefile | 1 -
+ arch/mips/kernel/asm-offsets.c | 10 -
+ arch/mips/kernel/cpu-probe.c | 11 +-
+ arch/mips/kernel/kspd.c | 423 --------
+ arch/mips/kernel/perf_event_mipsxx.c | 262 ++---
+ arch/mips/kernel/proc.c | 19 +-
+ arch/mips/kernel/vmlinux.lds.S | 21 +-
+ arch/mips/kernel/vpe.c | 24 -
+ arch/mips/mm/init.c | 17 +-
+ arch/mips/mm/pgtable-64.c | 20 +-
+ arch/mips/mm/tlbex.c | 23 +-
+ arch/mips/pci/fixup-malta.c | 3 +-
+ arch/mips/sni/a20r.c | 27 +-
+ include/asm-generic/vmlinux.lds.h | 9 +
+ 107 files changed, 2895 insertions(+), 4493 deletions(-)
+ create mode 100644 arch/mips/alchemy/devboards/db1235.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1100.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1500.c
+ delete mode 100644 arch/mips/alchemy/devboards/pb1550.c
+ delete mode 100644 arch/mips/configs/db1200_defconfig
+ create mode 100644 arch/mips/configs/db1235_defconfig
+ delete mode 100644 arch/mips/configs/db1300_defconfig
+ delete mode 100644 arch/mips/configs/db1550_defconfig
+ delete mode 100644 arch/mips/configs/pb1100_defconfig
+ delete mode 100644 arch/mips/configs/pb1500_defconfig
+ delete mode 100644 arch/mips/configs/pb1550_defconfig
+ rename arch/mips/include/{ => uapi}/asm/auxvec.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/bitsperlong.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/cachectl.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/errno.h
+ rename arch/mips/include/{ => uapi}/asm/fcntl.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ioctl.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ioctls.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/ipcbuf.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/kvm_para.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/mman.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/msgbuf.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/param.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/poll.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/posix_types.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/ptrace.h
+ rename arch/mips/include/{ => uapi}/asm/resource.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/sembuf.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/setup.h
+ rename arch/mips/include/{ => uapi}/asm/sgidefs.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/shmbuf.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/sigcontext.h
+ create mode 100644 arch/mips/include/uapi/asm/siginfo.h
+ create mode 100644 arch/mips/include/uapi/asm/signal.h
+ create mode 100644 arch/mips/include/uapi/asm/socket.h
+ rename arch/mips/include/{ => uapi}/asm/sockios.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/stat.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/statfs.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/swab.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/sysmips.h (100%)
+ rename arch/mips/include/{ => uapi}/asm/termbits.h (100%)
+ create mode 100644 arch/mips/include/uapi/asm/termios.h
+ create mode 100644 arch/mips/include/uapi/asm/types.h
+ create mode 100644 arch/mips/include/uapi/asm/unistd.h
+ delete mode 100644 arch/mips/kernel/kspd.c
+Merging openrisc/for-upstream (4c8faa4 openrisc: mask interrupts in irq_mask_ack function)
+$ git merge openrisc/for-upstream
+Auto-merging include/linux/audit.h
+Merge made by the 'recursive' strategy.
+ arch/openrisc/include/asm/processor.h | 2 +-
+ arch/openrisc/kernel/irq.c | 20 +++++++++++---------
+ arch/openrisc/kernel/ptrace.c | 2 +-
+ arch/openrisc/lib/delay.c | 6 +++---
+ include/linux/audit.h | 1 +
+ 5 files changed, 17 insertions(+), 14 deletions(-)
+Merging parisc/for-next (5b24c42 [PARISC] fix personality flag check in copy_thread())
+$ git merge parisc/for-next
+Already up-to-date.
+Merging powerpc/next (d900bd7 powerpc/iommu: Fix multiple issues with IOMMU pools code)
+$ 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 (f3ac712 powerpc/pcm030: add pcm030-audio-fabric to dts)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/dts/pcm030.dts | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+Merging galak/next (10bfa76 driver/mtd:IFC NAND:Initialise internal SRAM before any write)
+$ git merge galak/next
+Already up-to-date.
+Merging s390/features (86d7c60 s390/chpid: make headers usable (again))
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/include/uapi/asm/chpid.h | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging sh/sh-latest (16d74eb sh: pfc: Fix up GPIO mux type reconfig case.)
+$ git merge sh/sh-latest
+Already up-to-date.
+Merging sparc-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge sparc-next/master
+Already up-to-date.
+Merging tile/master (e70cf54 tile: gxio iorpc numbering change for TRIO interface)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (935ce97 UAPI: (Scripted) Disintegrate arch/unicore32/include/asm)
+$ git merge unicore32/unicore32
+Merge made by the 'recursive' strategy.
+ arch/unicore32/Kconfig | 3 +
+ arch/unicore32/include/asm/Kbuild | 1 -
+ arch/unicore32/include/asm/bug.h | 5 --
+ arch/unicore32/include/asm/cmpxchg.h | 2 +-
+ arch/unicore32/include/asm/ptrace.h | 76 +----------------
+ arch/unicore32/include/uapi/asm/Kbuild | 5 ++
+ arch/unicore32/include/{ => uapi}/asm/byteorder.h | 0
+ arch/unicore32/include/{ => uapi}/asm/kvm_para.h | 0
+ arch/unicore32/include/uapi/asm/ptrace.h | 90 ++++++++++++++++++++
+ arch/unicore32/include/{ => uapi}/asm/sigcontext.h | 0
+ arch/unicore32/include/{ => uapi}/asm/unistd.h | 0
+ arch/unicore32/kernel/setup.h | 6 ++
+ arch/unicore32/mm/fault.c | 37 +++++---
+ 13 files changed, 133 insertions(+), 92 deletions(-)
+ rename arch/unicore32/include/{ => uapi}/asm/byteorder.h (100%)
+ rename arch/unicore32/include/{ => uapi}/asm/kvm_para.h (100%)
+ create mode 100644 arch/unicore32/include/uapi/asm/ptrace.h
+ rename arch/unicore32/include/{ => uapi}/asm/sigcontext.h (100%)
+ rename arch/unicore32/include/{ => uapi}/asm/unistd.h (100%)
+Merging xtensa/for_next (70cefe7 xtensa: Setup CROSS_COMPILE at the top)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (f46dbe3 btrfs: init ref_index to zero in add_inode_ref)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (6285bc2 ceph: avoid 32-bit page index overflow)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (72bd481 cifs: reinstate the forcegid option)
+$ 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 (0d7614f Linux 3.6-rc1)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (6c29c50 quota: Silence warning about PRJQUOTA not being handled in need_print_warning())
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext2/super.c | 4 ++--
+ fs/ext3/namei.c | 40 +++++++++++++++++++++-------------------
+ fs/ext3/namei.h | 19 +++++++++++++++++++
+ fs/ext3/super.c | 4 ++--
+ fs/quota/dquot.c | 2 ++
+ 5 files changed, 46 insertions(+), 23 deletions(-)
+Merging ext4/dev (c278531 ext4: fix ext4_flush_completed_IO wait semantics)
+$ git merge ext4/dev
+Already up-to-date.
+Merging fuse/for-next (c7a3f5e fuse: Move CUSE Kconfig entry from fs/Kconfig into fs/fuse/Kconfig)
+$ git merge fuse/for-next
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/dev.c
+Merge made by the 'recursive' strategy.
+ fs/Kconfig | 10 ----
+ fs/fuse/Kconfig | 16 ++++-
+ fs/fuse/dev.c | 19 ++++++
+ fs/fuse/dir.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/fuse_i.h | 6 ++
+ fs/fuse/inode.c | 5 +-
+ include/linux/fuse.h | 12 ++++
+ 7 files changed, 211 insertions(+), 17 deletions(-)
+Merging gfs2/master (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/jfs-next (84f4141 jfs: Fix do_div precision in commit b40c2e66)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (ab2ec19 logfs: fix possible memory leak in logfs_mtd_can_write_buf())
+$ git merge logfs/master
+Merge made by the 'recursive' strategy.
+ fs/logfs/dev_mtd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (af28388 pnfsblock: cleanup nfs4_blkdev_get)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (a9ca404 Merge Trond's bugfixes)
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfs/callback.c
+Auto-merging fs/lockd/svc.c
+Merge made by the 'recursive' strategy.
+ .../filesystems/nfs/nfsd-admin-interfaces.txt | 41 +++
+ fs/lockd/svc.c | 17 +-
+ fs/locks.c | 6 +-
+ fs/nfs/callback.c | 16 +-
+ fs/nfsd/nfs2acl.c | 3 +-
+ fs/nfsd/nfs3proc.c | 2 +-
+ fs/nfsd/nfs4callback.c | 1 -
+ fs/nfsd/nfs4idmap.c | 4 +-
+ fs/nfsd/nfs4proc.c | 6 +-
+ fs/nfsd/nfs4state.c | 351 +++++++++++---------
+ fs/nfsd/nfs4xdr.c | 2 +-
+ fs/nfsd/nfsctl.c | 84 +----
+ fs/nfsd/nfsd.h | 4 +-
+ fs/nfsd/nfssvc.c | 26 +-
+ fs/nfsd/state.h | 8 +-
+ fs/nfsd/vfs.c | 2 +-
+ include/linux/nfsd/Kbuild | 5 -
+ include/linux/nfsd/debug.h | 31 +-
+ include/linux/nfsd/export.h | 52 +--
+ include/linux/nfsd/nfsfh.h | 111 +------
+ include/linux/nfsd/stats.h | 8 +-
+ include/linux/sunrpc/Kbuild | 1 -
+ include/linux/sunrpc/debug.h | 39 +--
+ include/linux/sunrpc/svc_xprt.h | 5 +-
+ include/linux/sunrpc/svcsock.h | 3 -
+ include/uapi/linux/nfsd/Kbuild | 5 +
+ include/{ => uapi}/linux/nfsd/cld.h | 0
+ include/uapi/linux/nfsd/debug.h | 40 +++
+ include/uapi/linux/nfsd/export.h | 58 ++++
+ include/uapi/linux/nfsd/nfsfh.h | 122 +++++++
+ include/uapi/linux/nfsd/stats.h | 17 +
+ include/uapi/linux/sunrpc/Kbuild | 1 +
+ include/uapi/linux/sunrpc/debug.h | 48 +++
+ net/sunrpc/svc_xprt.c | 233 +++++++------
+ net/sunrpc/svcsock.c | 157 +++------
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 -
+ 36 files changed, 756 insertions(+), 757 deletions(-)
+ create mode 100644 Documentation/filesystems/nfs/nfsd-admin-interfaces.txt
+ rename include/{ => uapi}/linux/nfsd/cld.h (100%)
+ create mode 100644 include/uapi/linux/nfsd/debug.h
+ create mode 100644 include/uapi/linux/nfsd/export.h
+ create mode 100644 include/uapi/linux/nfsd/nfsfh.h
+ create mode 100644 include/uapi/linux/nfsd/stats.h
+ create mode 100644 include/uapi/linux/sunrpc/debug.h
+Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.)
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Merge made by the 'recursive' strategy.
+ fs/ocfs2/cluster/heartbeat.c | 40 +++++++++-------------------------------
+ fs/ocfs2/cluster/masklog.h | 3 ++-
+ fs/ocfs2/dlm/dlmmaster.c | 10 ++++++++--
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++
+ fs/ocfs2/symlink.c | 2 +-
+ 5 files changed, 27 insertions(+), 35 deletions(-)
+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 (552aad0 9P: Fix race between p9_write_work() and p9_fd_request())
+$ git merge v9fs/for-next
+Auto-merging net/9p/trans_fd.c
+Auto-merging fs/9p/v9fs.c
+Merge made by the 'recursive' strategy.
+ fs/9p/v9fs.c | 30 +++++++++++++++++++-----------
+ fs/9p/vfs_inode.c | 8 ++++----
+ net/9p/client.c | 18 ++++++++++++++++--
+ net/9p/trans_fd.c | 38 ++++++++++++++++++++------------------
+ 4 files changed, 59 insertions(+), 35 deletions(-)
+Merging ubifs/linux-next (a74b6e4 UBIFS: fix mounting problems after power cuts)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/find.c | 5 +++--
+ fs/ubifs/lprops.c | 6 ++++++
+ fs/ubifs/ubifs.h | 3 +++
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+Merging xfs/for-next (2ea0392 xfs: Make inode32 a remountable option)
+$ git merge xfs/for-next
+Already up-to-date.
+Merging vfs/for-next (83f84f0 procfs: don't need a PATH_MAX allocation to hold a string representation of an int)
+$ git merge vfs/for-next
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/audit.h
+Auto-merging fs/ext3/super.c
+Merge made by the 'recursive' strategy.
+ arch/alpha/kernel/osf_sys.c | 16 +--
+ arch/arm64/kernel/sys.c | 4 +-
+ arch/arm64/kernel/sys_compat.c | 6 +-
+ arch/avr32/kernel/process.c | 4 +-
+ arch/blackfin/kernel/process.c | 4 +-
+ arch/c6x/kernel/process.c | 4 +-
+ arch/cris/arch-v10/kernel/process.c | 4 +-
+ arch/cris/arch-v32/kernel/process.c | 4 +-
+ arch/frv/kernel/process.c | 4 +-
+ arch/h8300/kernel/process.c | 4 +-
+ arch/hexagon/kernel/syscall.c | 4 +-
+ arch/ia64/kernel/process.c | 4 +-
+ arch/m32r/kernel/process.c | 4 +-
+ arch/m68k/kernel/process.c | 4 +-
+ arch/microblaze/kernel/sys_microblaze.c | 4 +-
+ arch/mips/kernel/linux32.c | 4 +-
+ arch/mips/kernel/syscall.c | 4 +-
+ arch/mn10300/kernel/process.c | 4 +-
+ arch/openrisc/kernel/process.c | 4 +-
+ arch/parisc/hpux/fs.c | 4 +-
+ arch/parisc/kernel/process.c | 4 +-
+ arch/parisc/kernel/sys_parisc32.c | 4 +-
+ arch/powerpc/kernel/process.c | 4 +-
+ arch/powerpc/kernel/sys_ppc32.c | 5 +-
+ arch/score/kernel/sys_score.c | 4 +-
+ arch/sh/kernel/process_32.c | 4 +-
+ arch/sh/kernel/process_64.c | 4 +-
+ arch/sparc/kernel/process_32.c | 4 +-
+ arch/sparc/kernel/process_64.c | 4 +-
+ arch/sparc/kernel/sys_sparc32.c | 4 +-
+ arch/tile/kernel/process.c | 8 +-
+ arch/unicore32/kernel/sys.c | 4 +-
+ arch/xtensa/kernel/process.c | 4 +-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/ceph/export.c | 18 ++-
+ fs/compat.c | 12 +-
+ fs/exec.c | 14 +-
+ fs/exofs/super.c | 4 -
+ fs/ext3/super.c | 6 -
+ fs/fat/dir.c | 4 +-
+ fs/fat/fat.h | 5 +-
+ fs/fat/inode.c | 5 +-
+ fs/fat/namei_msdos.c | 26 ++--
+ fs/fat/namei_vfat.c | 30 ++---
+ fs/file.c | 3 +
+ fs/file_table.c | 2 +-
+ fs/filesystems.c | 4 +-
+ fs/gfs2/export.c | 4 +
+ fs/hpfs/super.c | 3 -
+ fs/internal.h | 4 +-
+ fs/isofs/export.c | 2 +-
+ fs/namei.c | 216 +++++++++++++++++++-----------
+ fs/namespace.c | 16 +--
+ fs/open.c | 29 ++++-
+ fs/proc/base.c | 5 +-
+ fs/quota/quota.c | 4 +-
+ fs/reiserfs/inode.c | 6 +-
+ fs/super.c | 23 ----
+ fs/sysv/balloc.c | 18 +--
+ fs/sysv/ialloc.c | 14 +-
+ fs/sysv/inode.c | 4 +-
+ fs/sysv/super.c | 1 +
+ fs/sysv/sysv.h | 1 +
+ fs/ufs/balloc.c | 30 ++---
+ fs/ufs/ialloc.c | 16 +--
+ fs/ufs/super.c | 21 +--
+ fs/ufs/ufs.h | 1 +
+ fs/xattr.c | 8 +-
+ fs/xfs/xfs_export.c | 3 +
+ include/linux/audit.h | 69 +++++++---
+ include/linux/fs.h | 26 ++--
+ include/linux/fsnotify.h | 8 +-
+ include/linux/lglock.h | 19 ++-
+ include/linux/security.h | 10 +-
+ init/do_mounts.c | 7 +-
+ ipc/mqueue.c | 17 +--
+ kernel/acct.c | 6 +-
+ kernel/audit.c | 2 +
+ kernel/audit.h | 7 +-
+ kernel/audit_watch.c | 3 +-
+ kernel/auditfilter.c | 65 +++++----
+ kernel/auditsc.c | 217 +++++++++++++++++++++----------
+ mm/shmem.c | 6 +-
+ mm/swapfile.c | 11 +-
+ security/capability.c | 4 +-
+ security/security.c | 4 +-
+ security/selinux/hooks.c | 4 +-
+ security/smack/smack_lsm.c | 4 +-
+ security/tomoyo/common.h | 2 +-
+ security/tomoyo/mount.c | 5 +-
+ security/tomoyo/tomoyo.c | 4 +-
+ 91 files changed, 722 insertions(+), 493 deletions(-)
+Merging pci/next (78c8f84 Merge branch 'pci/yinghai-misc' into next)
+$ git merge pci/next
+Already up-to-date.
+Merging hid/for-next (0b82411 Merge branch 'hidraw' into for-next)
+$ git merge hid/for-next
+Resolved 'drivers/hid/hid-multitouch.c' using previous resolution.
+Auto-merging drivers/hid/hid-multitouch.c
+CONFLICT (content): Merge conflict in drivers/hid/hid-multitouch.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 21eb861] Merge remote-tracking branch 'hid/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/i2c (e4b1076 i2c-stub: Move to drivers/i2c)
+$ git merge quilt/i2c
+Auto-merging drivers/i2c/i2c-stub.c
+Merge made by the 'recursive' strategy.
+ drivers/i2c/Makefile | 1 +
+ drivers/i2c/busses/Makefile | 1 -
+ drivers/i2c/{busses => }/i2c-stub.c | 65 +++++++++++++++++------------------
+ 3 files changed, 33 insertions(+), 34 deletions(-)
+ rename drivers/i2c/{busses => }/i2c-stub.c (75%)
+Merging i2c-embedded/i2c-embedded/for-next (62885f5 MXS: Implement DMA support into mxs-i2c)
+$ git merge i2c-embedded/i2c-embedded/for-next
+Already up-to-date.
+Merging quilt/jdelvare-hwmon (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge quilt/jdelvare-hwmon
+Already up-to-date.
+Merging hwmon-staging/hwmon-next (967d7fe hwmon: (ads7828) driver cleanup)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ drivers/hwmon/ads7828.c | 91 ++++++++++++++++++++++-------------------------
+ 1 file changed, 43 insertions(+), 48 deletions(-)
+Merging v4l-dvb/master (c3c0b61 Merge /home/v4l/v4l/patchwork)
+$ git merge v4l-dvb/master
+Resolved 'arch/arm/mach-davinci/include/mach/da8xx.h' using previous resolution.
+Auto-merging drivers/media/usb/em28xx/em28xx-cards.c
+Removing drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.h
+Auto-merging drivers/media/platform/s5p-fimc/fimc-capture.c
+Auto-merging drivers/media/pci/cx88/cx88-mpeg.c
+Auto-merging drivers/media/pci/bt8xx/bttv-driver.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Auto-merging arch/arm/mach-davinci/include/mach/da8xx.h
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/include/mach/da8xx.h
+Auto-merging arch/arm/mach-davinci/dm644x.c
+Auto-merging arch/arm/mach-davinci/da850.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 90fc1a3] Merge remote-tracking branch 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/media/v4l/compat.xml | 4 +
+ Documentation/DocBook/media/v4l/controls.xml | 278 ++-
+ Documentation/DocBook/media/v4l/io.xml | 6 +-
+ Documentation/DocBook/media/v4l/pixfmt-nv12m.xml | 17 +-
+ Documentation/DocBook/media/v4l/pixfmt.xml | 38 +
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 44 +
+ Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 3 +-
+ .../DocBook/media/v4l/vidioc-querybuf.xml | 11 +-
+ Documentation/video4linux/v4l2-controls.txt | 24 +
+ arch/arm/mach-davinci/Kconfig | 7 +
+ arch/arm/mach-davinci/board-da850-evm.c | 179 ++
+ arch/arm/mach-davinci/board-dm644x-evm.c | 15 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 80 +-
+ arch/arm/mach-davinci/da850.c | 152 ++
+ arch/arm/mach-davinci/dm644x.c | 17 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 11 +
+ arch/arm/mach-davinci/include/mach/mux.h | 42 +
+ arch/arm/mach-davinci/include/mach/psc.h | 1 +
+ arch/arm/mach-exynos/mach-nuri.c | 7 +-
+ arch/arm/mach-exynos/mach-origen.c | 4 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 7 +-
+ arch/arm/plat-samsung/setup-mipiphy.c | 20 +-
+ drivers/media/dvb-core/dvb_frontend.c | 20 +-
+ drivers/media/dvb-core/dvb_frontend.h | 4 +-
+ drivers/media/dvb-frontends/a8293.c | 2 +-
+ drivers/media/dvb-frontends/af9013.c | 6 +-
+ drivers/media/dvb-frontends/af9033.c | 16 +-
+ drivers/media/dvb-frontends/bcm3510.c | 2 +-
+ drivers/media/dvb-frontends/cx24110.c | 6 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 3 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 2 +-
+ drivers/media/dvb-frontends/ds3000.c | 12 +-
+ drivers/media/dvb-frontends/dvb_dummy_fe.c | 21 +-
+ drivers/media/dvb-frontends/isl6405.c | 2 +-
+ drivers/media/dvb-frontends/isl6421.c | 2 +-
+ drivers/media/dvb-frontends/itd1000.c | 2 +-
+ drivers/media/dvb-frontends/lg2160.c | 8 +-
+ drivers/media/dvb-frontends/lnbp21.c | 4 +-
+ drivers/media/dvb-frontends/lnbp22.c | 2 +-
+ drivers/media/dvb-frontends/s5h1432.c | 8 +-
+ drivers/media/dvb-frontends/s921.c | 9 +-
+ drivers/media/dvb-frontends/si21xx.c | 4 +-
+ drivers/media/dvb-frontends/sp8870.c | 6 +-
+ drivers/media/dvb-frontends/sp887x.c | 6 +-
+ drivers/media/dvb-frontends/stb6100.c | 8 +-
+ drivers/media/dvb-frontends/stv0299.c | 6 +-
+ drivers/media/dvb-frontends/stv0900_core.c | 4 +-
+ drivers/media/dvb-frontends/tda665x.c | 8 +-
+ drivers/media/dvb-frontends/tda8083.c | 4 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
+ drivers/media/i2c/m5mols/m5mols.h | 9 +
+ drivers/media/i2c/m5mols/m5mols_capture.c | 3 +
+ drivers/media/i2c/m5mols/m5mols_core.c | 47 +
+ drivers/media/i2c/m5mols/m5mols_reg.h | 1 +
+ drivers/media/i2c/mt9p031.c | 19 +-
+ drivers/media/i2c/mt9t001.c | 22 +-
+ drivers/media/i2c/mt9v032.c | 54 +-
+ drivers/media/i2c/soc_camera/ov2640.c | 5 +
+ drivers/media/i2c/ths7303.c | 106 +-
+ drivers/media/i2c/tvp514x.c | 77 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 30 +-
+ drivers/media/pci/bt8xx/bttvp.h | 1 +
+ drivers/media/pci/bt8xx/dst_ca.c | 2 +-
+ drivers/media/pci/cx23885/altera-ci.c | 4 +-
+ drivers/media/pci/cx23885/cimax2.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-cards.c | 3 +
+ drivers/media/pci/cx23885/cx23885-video.c | 3 +-
+ .../media/pci/cx25821/cx25821-video-upstream-ch2.c | 2 +-
+ drivers/media/pci/cx25821/cx25821-video-upstream.c | 2 +-
+ drivers/media/pci/cx88/cx88-blackbird.c | 6 +-
+ drivers/media/pci/cx88/cx88-dvb.c | 2 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 2 +-
+ drivers/media/pci/cx88/cx88-tvaudio.c | 4 +-
+ drivers/media/pci/cx88/cx88-video.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 2 +-
+ drivers/media/platform/Kconfig | 4 +-
+ drivers/media/platform/davinci/vpbe.c | 136 +-
+ drivers/media/platform/davinci/vpbe_display.c | 80 +-
+ drivers/media/platform/davinci/vpbe_venc.c | 25 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 17 +-
+ drivers/media/platform/davinci/vpif_capture.c | 370 ++--
+ drivers/media/platform/davinci/vpif_capture.h | 16 +-
+ drivers/media/platform/davinci/vpif_display.c | 275 ++-
+ drivers/media/platform/davinci/vpif_display.h | 18 +-
+ drivers/media/platform/exynos-gsc/gsc-regs.c | 4 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/mem2mem_testdev.c | 14 +-
+ drivers/media/platform/omap3isp/ispreg.h | 6 +-
+ drivers/media/platform/s5p-fimc/fimc-capture.c | 135 +-
+ drivers/media/platform/s5p-fimc/fimc-core.c | 19 +-
+ drivers/media/platform/s5p-fimc/fimc-core.h | 28 +-
+ drivers/media/platform/s5p-fimc/fimc-m2m.c | 25 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.c | 23 +-
+ drivers/media/platform/s5p-fimc/fimc-reg.h | 3 +-
+ drivers/media/platform/s5p-fimc/mipi-csis.c | 75 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 2 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +-
+ drivers/media/platform/s5p-mfc/Makefile | 7 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 408 ++++
+ drivers/media/platform/s5p-mfc/regs-mfc.h | 41 +
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 294 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.c | 111 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd.h | 17 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 166 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 156 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h | 20 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 191 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 202 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 258 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 236 ++-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.h | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_intr.c | 11 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 1418 +-------------
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 137 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 1794 ++++++++++++++++++
+ .../s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} | 41 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 1956 ++++++++++++++++++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 50 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_pm.c | 3 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_shm.c | 47 -
+ drivers/media/platform/soc_camera/mx2_camera.c | 7 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 40 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x-usb.c | 2 +-
+ drivers/media/radio/si4713-i2c.c | 12 +-
+ drivers/media/rc/ene_ir.c | 5 +-
+ drivers/media/rc/iguanair.c | 147 +-
+ drivers/media/rc/ir-lirc-codec.c | 4 +-
+ drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 36 +-
+ drivers/media/rc/nuvoton-cir.c | 3 +
+ drivers/media/rc/redrat3.c | 3 +
+ drivers/media/rc/winbond-cir.c | 2 +-
+ drivers/media/tuners/mt2063.c | 44 +-
+ drivers/media/tuners/mt2063.h | 4 -
+ drivers/media/tuners/tda18271-common.c | 104 +-
+ drivers/media/usb/dvb-usb-v2/af9015.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/af9035.c | 2 +-
+ drivers/media/usb/dvb-usb/a800.c | 2 +-
+ drivers/media/usb/dvb-usb/cinergyT2-core.c | 3 +-
+ drivers/media/usb/dvb-usb/dibusb-common.c | 2 +-
+ drivers/media/usb/dvb-usb/digitv.c | 2 +-
+ drivers/media/usb/dvb-usb/dtt200u.c | 2 +-
+ drivers/media/usb/dvb-usb/m920x.c | 2 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 1 +
+ drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 13 +-
+ drivers/media/usb/stk1160/stk1160-core.c | 15 +-
+ drivers/media/usb/stk1160/stk1160-v4l.c | 7 +-
+ drivers/media/usb/stk1160/stk1160.h | 3 +-
+ drivers/media/usb/uvc/uvc_queue.c | 10 +-
+ drivers/media/usb/uvc/uvc_video.c | 4 +-
+ drivers/media/usb/uvc/uvcvideo.h | 2 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 74 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 8 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 79 +-
+ include/linux/dvb/version.h | 2 +-
+ include/linux/platform_data/mipi-csis.h | 30 +-
+ include/linux/v4l2-controls.h | 42 +
+ include/linux/v4l2-mediabus.h | 5 +
+ include/linux/videodev2.h | 5 +
+ include/media/davinci/vpbe.h | 14 +-
+ include/media/davinci/vpbe_types.h | 8 +-
+ include/media/davinci/vpbe_venc.h | 2 +-
+ include/media/davinci/vpif_types.h | 26 +-
+ include/media/s5p_fimc.h | 2 -
+ include/media/v4l2-ctrls.h | 23 +
+ include/media/v4l2-subdev.h | 48 +
+ 170 files changed, 8073 insertions(+), 3212 deletions(-)
+ create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.h
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+ rename drivers/media/platform/s5p-mfc/{s5p_mfc_shm.h => s5p_mfc_opr_v5.h} (76%)
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+ create mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h
+ delete mode 100644 drivers/media/platform/s5p-mfc/s5p_mfc_shm.c
+Merging kbuild/for-next (b974d36 Merge branch 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging tools/testing/ktest/ktest.pl
+Auto-merging scripts/mod/modpost.c
+Auto-merging scripts/kernel-doc
+Auto-merging include/linux/compiler-gcc4.h
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 11 +-
+ Makefile | 19 +-
+ include/linux/compiler-gcc4.h | 2 +-
+ scripts/Makefile.modinst | 2 +-
+ scripts/Makefile.modpost | 2 +-
+ scripts/coccicheck | 3 +
+ scripts/coccinelle/api/ptr_ret.cocci | 26 +++
+ scripts/coccinelle/tests/odd_ptr_err.cocci | 65 +++++++
+ scripts/kconfig/Makefile | 12 +-
+ scripts/kconfig/conf.c | 25 ++-
+ scripts/kconfig/expr.h | 11 ++
+ scripts/kconfig/lkc_proto.h | 6 +-
+ scripts/kconfig/lxdialog/dialog.h | 9 +-
+ scripts/kconfig/lxdialog/textbox.c | 171 +++++++++--------
+ scripts/kconfig/lxdialog/util.c | 7 +
+ scripts/kconfig/mconf.c | 123 ++++++++++---
+ scripts/kconfig/menu.c | 53 +++++-
+ scripts/kconfig/nconf.c | 2 +-
+ scripts/kernel-doc | 273 +++++++++++++++++++++++++++-
+ scripts/mod/modpost.c | 1 +
+ scripts/package/buildtar | 6 +-
+ scripts/tags.sh | 8 +-
+ tools/testing/ktest/ktest.pl | 15 +-
+ 23 files changed, 675 insertions(+), 177 deletions(-)
+ create mode 100644 scripts/coccinelle/tests/odd_ptr_err.cocci
+Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/NEXT (13b7408 sata_mv: Fix warnings when no PCI)
+$ git merge libata/NEXT
+Already up-to-date.
+Merging infiniband/for-next (56040f0 Merge branches 'cma', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next)
+$ git merge infiniband/for-next
+Already up-to-date.
+Merging pstore/master (80c9d03 pstore: Avoid recursive spinlocks in the oops_in_progress case)
+$ git merge pstore/master
+Already up-to-date.
+Merging acpi/next (d1d4a81 Merge branches 'fixes-for-37', 'ec' and 'thermal' into release)
+$ git merge acpi/next
+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 | 32 +
+ .../{hwmon/exynos4_tmu => thermal/exynos_thermal} | 35 +-
+ Documentation/thermal/sysfs-api.txt | 9 +-
+ drivers/acpi/ec.c | 30 +-
+ drivers/acpi/processor_idle.c | 3 +-
+ drivers/acpi/thermal.c | 93 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/hwmon/Kconfig | 10 -
+ drivers/hwmon/Makefile | 1 -
+ drivers/hwmon/exynos4_tmu.c | 518 ----------
+ drivers/platform/x86/acerhdf.c | 5 +-
+ drivers/platform/x86/intel_mid_thermal.c | 2 +-
+ drivers/power/power_supply_core.c | 2 +-
+ drivers/staging/omap-thermal/omap-thermal-common.c | 5 +-
+ drivers/thermal/Kconfig | 26 +
+ drivers/thermal/Makefile | 5 +-
+ drivers/thermal/cpu_cooling.c | 449 +++++++++
+ drivers/thermal/exynos_thermal.c | 997 ++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 260 +++++
+ drivers/thermal/spear_thermal.c | 2 +-
+ drivers/thermal/thermal_sys.c | 321 ++++---
+ include/linux/cpu_cooling.h | 58 ++
+ .../{exynos4_tmu.h => exynos_thermal.h} | 47 +-
+ include/linux/thermal.h | 28 +-
+ tools/power/acpi/acpidump.c | 1 -
+ 25 files changed, 2205 insertions(+), 736 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 include/linux/cpu_cooling.h
+ rename include/linux/platform_data/{exynos4_tmu.h => exynos_thermal.h} (64%)
+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.
+Resolved 'include/linux/cpuidle.h' using previous resolution.
+Auto-merging include/linux/cpuidle.h
+CONFLICT (content): Merge conflict in include/linux/cpuidle.h
+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 10541d0] 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 thermal/next (f5a246e Merge tag 'sound-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound)
+$ git merge thermal/next
+Already up-to-date.
+Merging ieee1394/for-next (790198f firewire: cdev: fix user memory corruption (i386 userland on amd64 kernel))
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (76ac66e UBI: Wire-up fastmap)
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging dlm/next (2b75bc9 dlm: check the maximum size of a request from user)
+$ git merge dlm/next
+Already up-to-date.
+Merging scsi/for-next (5c1b10a [SCSI] storvsc: Account for in-transit packets in the RESET path)
+$ git merge scsi/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-fcoe | 12 +-
+ Documentation/scsi/ChangeLog.megaraid_sas | 13 +
+ drivers/scsi/bfa/bfa_core.c | 85 ++-
+ drivers/scsi/bfa/bfa_defs.h | 61 +-
+ drivers/scsi/bfa/bfa_defs_svc.h | 119 ++-
+ drivers/scsi/bfa/bfa_fc.h | 5 +
+ drivers/scsi/bfa/bfa_fcbuild.c | 4 +
+ drivers/scsi/bfa/bfa_fcpim.c | 123 ++-
+ drivers/scsi/bfa/bfa_fcpim.h | 13 +-
+ drivers/scsi/bfa/bfa_fcs.c | 64 +-
+ drivers/scsi/bfa/bfa_fcs.h | 23 +-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 155 +++-
+ drivers/scsi/bfa/bfa_fcs_rport.c | 288 ++++++-
+ drivers/scsi/bfa/bfa_ioc.c | 494 +++++++++++-
+ drivers/scsi/bfa/bfa_ioc.h | 63 +-
+ drivers/scsi/bfa/bfa_ioc_ct.c | 236 +++---
+ drivers/scsi/bfa/bfa_modules.h | 1 +
+ drivers/scsi/bfa/bfa_port.c | 32 +
+ drivers/scsi/bfa/bfa_port.h | 3 +
+ drivers/scsi/bfa/bfa_svc.c | 732 +++++++++++++++++-
+ drivers/scsi/bfa/bfa_svc.h | 30 +-
+ drivers/scsi/bfa/bfad.c | 6 +-
+ drivers/scsi/bfa/bfad_bsg.c | 375 +++++++--
+ drivers/scsi/bfa/bfad_bsg.h | 63 +-
+ drivers/scsi/bfa/bfad_drv.h | 2 +-
+ drivers/scsi/bfa/bfi.h | 72 +-
+ drivers/scsi/bfa/bfi_ms.h | 14 +
+ drivers/scsi/bfa/bfi_reg.h | 3 +
+ drivers/scsi/fcoe/fcoe.c | 14 +-
+ drivers/scsi/fcoe/fcoe.h | 2 +
+ drivers/scsi/libfc/fc_fcp.c | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 2 +
+ drivers/scsi/lpfc/lpfc_attr.c | 8 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 1 +
+ drivers/scsi/lpfc/lpfc_els.c | 7 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 20 +-
+ drivers/scsi/lpfc/lpfc_init.c | 256 +++++--
+ drivers/scsi/lpfc/lpfc_scsi.c | 39 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 96 ++-
+ drivers/scsi/lpfc/lpfc_sli4.h | 8 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 8 +-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 13 +-
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 2 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 27 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 2 +-
+ drivers/scsi/mvumi.c | 1093 ++++++++++++++++++++++-----
+ drivers/scsi/mvumi.h | 235 ++++--
+ drivers/scsi/qla2xxx/qla_init.c | 5 +-
+ drivers/scsi/scsi_debug.c | 2 +-
+ drivers/scsi/scsi_error.c | 8 +-
+ drivers/scsi/storvsc_drv.c | 5 +
+ drivers/scsi/virtio_scsi.c | 39 +-
+ include/linux/virtio_scsi.h | 2 +
+ include/scsi/fc/fc_fcp.h | 6 +
+ include/scsi/libfcoe.h | 2 -
+ include/scsi/scsi_cmnd.h | 12 +-
+ 58 files changed, 4274 insertions(+), 747 deletions(-)
+Merging target-updates/for-next (cf0eb28 iscsi-target: Bump defaults for nopin_timeout + nopin_response_timeout values)
+$ git merge target-updates/for-next
+Already up-to-date.
+Merging target-merge/for-next-merge (d987569 Linux 3.6-rc2)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+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 (d0fc905 dma: tegra: fix interrupt name issue with apb dma.)
+$ git merge slave-dma/next
+Already up-to-date.
+$ git am -3 ../patches/DMA__PL330__Fix_build_error_on_linux-next-20120924.patch
+Applying: DMA: PL330: Fix build error (on linux-next-20120924)
+Using index info to reconstruct a base tree...
+M drivers/dma/pl330.c
+Falling back to patching base and 3-way merge...
+No changes -- Patch already applied.
+Merging dmaengine/next (a2bd114 netdma: adding alignment check for NETDMA ops)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (7fe0b14 Merge tag 'spi-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc)
+$ git merge net-next/master
+Already up-to-date.
+Merging wireless-next/master (5160b46 ath9k: Fix BTCOEX weight initialization)
+$ git merge wireless-next/master
+Already up-to-date.
+Merging bluetooth/master (716e4ab Bluetooth: AMP: Hanlde AMP_LINK case in conn_put)
+$ git merge bluetooth/master
+Auto-merging net/bluetooth/rfcomm/tty.c
+Auto-merging net/bluetooth/rfcomm/sock.c
+Auto-merging net/bluetooth/mgmt.c
+Auto-merging net/bluetooth/l2cap_sock.c
+Auto-merging net/bluetooth/l2cap_core.c
+Auto-merging net/bluetooth/hci_core.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_sdio.c | 28 ++-
+ include/net/bluetooth/a2mp.h | 22 ++
+ include/net/bluetooth/amp.h | 50 ++++
+ include/net/bluetooth/bluetooth.h | 1 -
+ include/net/bluetooth/hci.h | 39 +++-
+ include/net/bluetooth/hci_core.h | 48 +++-
+ include/net/bluetooth/l2cap.h | 9 +-
+ net/bluetooth/Kconfig | 1 +
+ net/bluetooth/Makefile | 2 +-
+ net/bluetooth/a2mp.c | 454 ++++++++++++++++++++++++++++++++++---
+ net/bluetooth/af_bluetooth.c | 10 +-
+ net/bluetooth/amp.c | 374 ++++++++++++++++++++++++++++++
+ net/bluetooth/bnep/core.c | 3 +-
+ net/bluetooth/cmtp/core.c | 2 +-
+ net/bluetooth/hci_conn.c | 70 +++++-
+ net/bluetooth/hci_core.c | 52 +++--
+ net/bluetooth/hci_event.c | 167 +++++++++++++-
+ net/bluetooth/hci_sysfs.c | 10 +-
+ net/bluetooth/hidp/core.c | 8 +-
+ net/bluetooth/l2cap_core.c | 108 ++++++---
+ net/bluetooth/l2cap_sock.c | 15 +-
+ net/bluetooth/lib.c | 14 --
+ net/bluetooth/mgmt.c | 5 +-
+ net/bluetooth/rfcomm/core.c | 19 +-
+ net/bluetooth/rfcomm/sock.c | 9 +-
+ net/bluetooth/rfcomm/tty.c | 6 +-
+ net/bluetooth/sco.c | 12 +-
+ net/bluetooth/smp.c | 2 +-
+ 28 files changed, 1357 insertions(+), 183 deletions(-)
+ create mode 100644 include/net/bluetooth/amp.h
+ create mode 100644 net/bluetooth/amp.c
+Merging mtd/master (5a6ea4a mtd: ofpart: Fix incorrect NULL check in parse_ofoldpart_partitions())
+$ git merge mtd/master
+Merge made by the 'recursive' strategy.
+ drivers/mtd/nand/nand_base.c | 9 +++++----
+ drivers/mtd/ofpart.c | 2 +-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+Merging l2-mtd/master (0b72b90 mtd: fsmc_nand: pass the ale and cmd resource via resource)
+$ git merge l2-mtd/master
+Removing include/linux/platform_data/mtd-nomadik-nand.h
+Removing drivers/mtd/nand/nomadik_nand.c
+Removing arch/arm/mach-nomadik/include/mach/fsmc.h
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/denali-nand.txt | 23 ++
+ .../devicetree/bindings/mtd/fsmc-nand.txt | 12 +-
+ Documentation/devicetree/bindings/mtd/m25p80.txt | 29 +++
+ arch/arm/boot/dts/spear13xx.dtsi | 10 +-
+ arch/arm/boot/dts/spear300.dtsi | 8 +-
+ arch/arm/boot/dts/spear310.dtsi | 8 +-
+ arch/arm/boot/dts/spear320.dtsi | 8 +-
+ arch/arm/boot/dts/spear600.dtsi | 8 +-
+ arch/arm/configs/nhk8815_defconfig | 2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 64 +++---
+ arch/arm/mach-nomadik/include/mach/fsmc.h | 29 ---
+ arch/arm/mach-u300/core.c | 14 +-
+ drivers/clk/clk-nomadik.c | 1 +
+ drivers/mtd/cmdlinepart.c | 80 +++----
+ drivers/mtd/devices/m25p80.c | 36 +--
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/nand/Kconfig | 26 ++-
+ drivers/mtd/nand/Makefile | 3 +-
+ drivers/mtd/nand/denali.c | 160 +++----------
+ drivers/mtd/nand/denali.h | 5 +
+ drivers/mtd/nand/denali_dt.c | 167 ++++++++++++++
+ drivers/mtd/nand/denali_pci.c | 144 ++++++++++++
+ drivers/mtd/nand/fsl_elbc_nand.c | 15 --
+ drivers/mtd/nand/fsmc_nand.c | 44 +---
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 +-
+ drivers/mtd/nand/nomadik_nand.c | 235 --------------------
+ drivers/mtd/onenand/onenand_base.c | 2 +-
+ include/linux/mtd/fsmc.h | 3 -
+ include/linux/platform_data/mtd-nomadik-nand.h | 16 --
+ 29 files changed, 569 insertions(+), 599 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/denali-nand.txt
+ create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
+ delete mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h
+ create mode 100644 drivers/mtd/nand/denali_dt.c
+ create mode 100644 drivers/mtd/nand/denali_pci.c
+ delete mode 100644 drivers/mtd/nand/nomadik_nand.c
+ delete mode 100644 include/linux/platform_data/mtd-nomadik-nand.h
+$ git reset --hard HEAD^
+HEAD is now at 57a4b65 Merge remote-tracking branch 'mtd/master'
+Merging refs/next/20121011/l2-mtd
+$ git merge refs/next/20121011/l2-mtd
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mtd/m25p80.txt | 29 ++++++++
+ drivers/mtd/cmdlinepart.c | 80 ++++++++++++----------
+ drivers/mtd/devices/m25p80.c | 36 ++++++----
+ drivers/mtd/devices/slram.c | 2 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 15 ----
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 14 ++--
+ drivers/mtd/onenand/onenand_base.c | 2 +-
+ 7 files changed, 104 insertions(+), 74 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/m25p80.txt
+Merging crypto/master (c9f97a2 crypto: x86/glue_helper - fix storing of new IV in CBC encryption)
+$ git merge crypto/master
+Already up-to-date.
+Merging drm/drm-next (1f31c69 Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next)
+$ git merge drm/drm-next
+Already up-to-date.
+Merging sound/for-next (f7f4b23 ALSA: hda - do not detect jack on internal speakers for Realtek)
+$ git merge sound/for-next
+Merge made by the 'recursive' strategy.
+ sound/pci/hda/hda_codec.c | 2 +
+ sound/pci/hda/hda_intel.c | 5 --
+ sound/pci/hda/patch_cirrus.c | 58 +++++++-----------------
+ sound/pci/hda/patch_realtek.c | 3 ++
+ sound/pci/hda/patch_sigmatel.c | 27 +++++++++++
+ sound/pci/hda/patch_via.c | 98 +++++++++++-----------------------------
+ sound/usb/quirks-table.h | 46 +++++++++++++++++++
+ 7 files changed, 122 insertions(+), 117 deletions(-)
+Merging sound-asoc/for-next (c7c0f2c ASoC: codecs: da9055: Minor improvement in ALC calibration process)
+$ git merge sound-asoc/for-next
+Auto-merging sound/soc/omap/omap-mcpdm.c
+Auto-merging sound/soc/omap/omap-abe-twl6040.c
+Auto-merging sound/soc/omap/ams-delta.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap1/board-ams-delta.c | 12 +++++++
+ sound/soc/Makefile | 5 +--
+ sound/soc/codecs/da9055.c | 22 +++++++++++-
+ sound/soc/codecs/twl6040.c | 8 ++---
+ sound/soc/codecs/wm2200.c | 3 +-
+ sound/soc/omap/ams-delta.c | 63 ++++++++++++++++-----------------
+ sound/soc/omap/omap-abe-twl6040.c | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 9 ++---
+ sound/soc/pxa/mmp-pcm.c | 2 +-
+ sound/soc/samsung/bells.c | 2 +-
+ sound/soc/sh/fsi.c | 15 ++++----
+ sound/soc/soc-jack.c | 7 ++--
+ 12 files changed, 89 insertions(+), 61 deletions(-)
+Merging modules/modules-next (dbadc17 X.509: Fix indefinite length element skip error handling)
+$ git merge modules/modules-next
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/Kconfig' using previous resolution.
+Resolved 'arch/alpha/Kconfig' using previous resolution.
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/cris/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/h8300/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/m32r/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'arch/x86/um/Kconfig' using previous resolution.
+Resolved 'arch/xtensa/Kconfig' using previous resolution.
+Resolved 'init/Kconfig' using previous resolution.
+Resolved 'lib/Makefile' using previous resolution.
+Auto-merging security/keys/trusted.c
+Auto-merging security/keys/keyring.c
+Auto-merging security/keys/keyctl.c
+Auto-merging security/keys/key.c
+Auto-merging scripts/Makefile.modpost
+Auto-merging net/rxrpc/ar-key.c
+Auto-merging net/dns_resolver/dns_key.c
+Auto-merging lib/Makefile
+CONFLICT (content): Merge conflict in lib/Makefile
+Auto-merging kernel/Makefile
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging fs/cifs/cifsacl.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging arch/xtensa/Kconfig
+CONFLICT (content): Merge conflict in arch/xtensa/Kconfig
+Auto-merging arch/x86/um/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/um/Kconfig
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/unicore32/Kconfig
+Auto-merging arch/tile/Kconfig
+Removing arch/sparc/include/asm/module.h
+Auto-merging arch/sparc/include/asm/Kbuild
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/score/Kconfig
+Auto-merging arch/s390/Kconfig
+CONFLICT (content): Merge conflict in arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/mips/kernel/Makefile
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/microblaze/Kconfig
+Auto-merging arch/m68k/Kconfig
+Removing arch/m32r/include/asm/module.h
+Auto-merging arch/m32r/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/m32r/include/asm/Kbuild
+Auto-merging arch/m32r/Kconfig
+Auto-merging arch/ia64/Kconfig
+Removing arch/h8300/include/asm/module.h
+Auto-merging arch/h8300/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/h8300/include/asm/Kbuild
+Auto-merging arch/h8300/Kconfig
+Removing arch/cris/include/asm/module.h
+Auto-merging arch/cris/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/cris/include/asm/Kbuild
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/alpha/Kconfig
+CONFLICT (content): Merge conflict in arch/alpha/Kconfig
+Auto-merging arch/Kconfig
+CONFLICT (content): Merge conflict in arch/Kconfig
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/s390/Kconfig'.
+[master 186754c] Merge remote-tracking branch 'modules/modules-next'
+$ git diff -M --stat --summary HEAD^..
+ .gitignore | 14 +
+ Documentation/crypto/asymmetric-keys.txt | 312 ++++++
+ Documentation/kernel-parameters.txt | 6 +
+ Documentation/security/keys.txt | 50 +-
+ Makefile | 6 +-
+ 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 | 1 +
+ arch/cris/include/asm/module.h | 9 -
+ arch/frv/include/asm/module.h | 8 +-
+ arch/h8300/Kconfig | 1 +
+ arch/h8300/include/asm/Kbuild | 1 +
+ 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 | 1 +
+ 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/Makefile | 1 +
+ arch/mips/kernel/module-rela.c | 145 +++
+ arch/mips/kernel/module.c | 121 +--
+ 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/x86/um/Kconfig | 2 +
+ arch/xtensa/include/asm/module.h | 9 +-
+ crypto/Kconfig | 1 +
+ crypto/Makefile | 1 +
+ crypto/asymmetric_keys/.gitignore | 1 +
+ crypto/asymmetric_keys/Kconfig | 38 +
+ crypto/asymmetric_keys/Makefile | 27 +
+ crypto/asymmetric_keys/asymmetric_keys.h | 15 +
+ crypto/asymmetric_keys/asymmetric_type.c | 274 +++++
+ crypto/asymmetric_keys/public_key.c | 108 ++
+ crypto/asymmetric_keys/public_key.h | 30 +
+ crypto/asymmetric_keys/rsa.c | 277 ++++++
+ crypto/asymmetric_keys/signature.c | 49 +
+ crypto/asymmetric_keys/x509.asn1 | 60 ++
+ crypto/asymmetric_keys/x509_cert_parser.c | 496 +++++++++
+ crypto/asymmetric_keys/x509_parser.h | 36 +
+ crypto/asymmetric_keys/x509_public_key.c | 239 +++++
+ crypto/asymmetric_keys/x509_rsakey.asn1 | 4 +
+ fs/cifs/cifs_spnego.c | 6 +-
+ fs/cifs/cifsacl.c | 8 +-
+ include/asm-generic/bitops/count_zeros.h | 57 ++
+ include/asm-generic/module.h | 40 +-
+ include/crypto/public_key.h | 108 ++
+ include/keys/asymmetric-parser.h | 37 +
+ include/keys/asymmetric-subtype.h | 55 +
+ include/keys/asymmetric-type.h | 25 +
+ include/keys/user-type.h | 6 +-
+ include/linux/asn1.h | 67 ++
+ include/linux/asn1_ber_bytecode.h | 87 ++
+ include/linux/asn1_decoder.h | 24 +
+ include/linux/key-type.h | 35 +-
+ include/linux/module.h | 8 +
+ include/linux/moduleloader.h | 36 +-
+ include/linux/mpi.h | 1 +
+ include/linux/oid_registry.h | 92 ++
+ init/Kconfig | 68 ++
+ kernel/Makefile | 77 ++
+ kernel/modsign_pubkey.c | 113 +++
+ kernel/module-internal.h | 15 +
+ kernel/module.c | 157 ++-
+ kernel/module_signing.c | 243 +++++
+ lib/.gitignore | 2 +-
+ lib/Kconfig | 5 +
+ lib/Makefile | 18 +
+ lib/asn1_decoder.c | 487 +++++++++
+ lib/build_OID_registry | 209 ++++
+ lib/mpi/Makefile | 1 +
+ lib/mpi/longlong.h | 138 +--
+ lib/mpi/mpi-bit.c | 2 +-
+ lib/mpi/mpi-cmp.c | 70 ++
+ lib/mpi/mpi-pow.c | 4 +-
+ lib/mpi/mpicoder.c | 55 +
+ lib/oid_registry.c | 170 ++++
+ net/ceph/crypto.c | 9 +-
+ net/dns_resolver/dns_key.c | 6 +-
+ net/rxrpc/ar-key.c | 40 +-
+ scripts/.gitignore | 1 +
+ scripts/Makefile | 2 +
+ scripts/Makefile.build | 11 +
+ scripts/Makefile.modpost | 77 +-
+ scripts/asn1_compiler.c | 1545 +++++++++++++++++++++++++++++
+ scripts/sign-file | 115 +++
+ scripts/x509keyid | 268 +++++
+ security/keys/encrypted-keys/encrypted.c | 16 +-
+ security/keys/key.c | 114 ++-
+ security/keys/keyctl.c | 18 +-
+ security/keys/keyring.c | 6 +-
+ security/keys/request_key_auth.c | 8 +-
+ security/keys/trusted.c | 16 +-
+ security/keys/user_defined.c | 14 +-
+ 128 files changed, 6799 insertions(+), 594 deletions(-)
+ create mode 100644 Documentation/crypto/asymmetric-keys.txt
+ 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
+ create mode 100644 arch/mips/kernel/module-rela.c
+ delete mode 100644 arch/sparc/include/asm/module.h
+ create mode 100644 crypto/asymmetric_keys/.gitignore
+ create mode 100644 crypto/asymmetric_keys/Kconfig
+ create mode 100644 crypto/asymmetric_keys/Makefile
+ create mode 100644 crypto/asymmetric_keys/asymmetric_keys.h
+ create mode 100644 crypto/asymmetric_keys/asymmetric_type.c
+ create mode 100644 crypto/asymmetric_keys/public_key.c
+ create mode 100644 crypto/asymmetric_keys/public_key.h
+ create mode 100644 crypto/asymmetric_keys/rsa.c
+ create mode 100644 crypto/asymmetric_keys/signature.c
+ create mode 100644 crypto/asymmetric_keys/x509.asn1
+ create mode 100644 crypto/asymmetric_keys/x509_cert_parser.c
+ create mode 100644 crypto/asymmetric_keys/x509_parser.h
+ create mode 100644 crypto/asymmetric_keys/x509_public_key.c
+ create mode 100644 crypto/asymmetric_keys/x509_rsakey.asn1
+ create mode 100644 include/asm-generic/bitops/count_zeros.h
+ create mode 100644 include/crypto/public_key.h
+ create mode 100644 include/keys/asymmetric-parser.h
+ create mode 100644 include/keys/asymmetric-subtype.h
+ create mode 100644 include/keys/asymmetric-type.h
+ create mode 100644 include/linux/asn1.h
+ create mode 100644 include/linux/asn1_ber_bytecode.h
+ create mode 100644 include/linux/asn1_decoder.h
+ create mode 100644 include/linux/oid_registry.h
+ create mode 100644 kernel/modsign_pubkey.c
+ create mode 100644 kernel/module-internal.h
+ create mode 100644 kernel/module_signing.c
+ create mode 100644 lib/asn1_decoder.c
+ create mode 100755 lib/build_OID_registry
+ create mode 100644 lib/mpi/mpi-cmp.c
+ create mode 100644 lib/oid_registry.c
+ create mode 100644 scripts/asn1_compiler.c
+ create mode 100644 scripts/sign-file
+ create mode 100755 scripts/x509keyid
+Merging virtio/virtio-next (d43b716 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild)
+$ git merge virtio/virtio-next
+Already up-to-date.
+Merging input/next (ad5396e Input: mms114 - add device tree bindings)
+$ git merge input/next
+Auto-merging drivers/input/touchscreen/wm831x-ts.c
+Merge made by the 'recursive' strategy.
+ .../bindings/input/touchscreen/mms114.txt | 34 +++++++++++
+ drivers/input/joystick/as5011.c | 19 +++++-
+ drivers/input/misc/wm831x-on.c | 5 +-
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 13 +++-
+ drivers/input/touchscreen/mms114.c | 62 +++++++++++++++++++-
+ drivers/input/touchscreen/wm831x-ts.c | 6 +-
+ 6 files changed, 125 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/mms114.txt
+Merging input-mt/for-next (51c80b7 Input: bcm5974 - Convert to MT-B)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (c0a93e2 Merge branch 'for-3.7-hierarchy' into for-next)
+$ git merge cgroup/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging block/for-next (454832b Merge branch 'for-3.7/drivers' into for-next)
+$ git merge block/for-next
+Resolved 'init/Kconfig' using previous resolution.
+Auto-merging init/Kconfig
+CONFLICT (content): Merge conflict in init/Kconfig
+Auto-merging drivers/block/mtip32xx/mtip32xx.h
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/block/floppy.c
+Auto-merging drivers/block/Kconfig
+Auto-merging block/genhd.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c722559] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 7 +-
+ block/genhd.c | 6 +-
+ drivers/block/Kconfig | 1 +
+ drivers/block/cciss.c | 1 -
+ drivers/block/floppy.c | 97 +-
+ drivers/block/loop.c | 17 +-
+ drivers/block/mtip32xx/mtip32xx.c | 19 +-
+ drivers/block/mtip32xx/mtip32xx.h | 3 +
+ drivers/block/xen-blkback/common.h | 4 +-
+ drivers/block/xen-blkback/xenbus.c | 9 +-
+ drivers/memstick/core/Kconfig | 12 +
+ drivers/memstick/core/Makefile | 2 +-
+ drivers/memstick/core/ms_block.c | 2395 ++++++++++++++++++++++++++++++++++++
+ drivers/memstick/core/ms_block.h | 293 +++++
+ 14 files changed, 2797 insertions(+), 69 deletions(-)
+ create mode 100644 drivers/memstick/core/ms_block.c
+ create mode 100644 drivers/memstick/core/ms_block.h
+Merging quilt/device-mapper (c9ccbf4 Use the recently-added bio front_pad field to allocate struct dm_target_io.)
+$ git merge quilt/device-mapper
+Resolved 'drivers/md/dm-thin.c' using previous resolution.
+Resolved 'drivers/md/dm.c' using previous resolution.
+Auto-merging drivers/md/dm.c
+CONFLICT (content): Merge conflict in drivers/md/dm.c
+Auto-merging drivers/md/dm-verity.c
+Auto-merging drivers/md/dm-thin.c
+CONFLICT (content): Merge conflict in drivers/md/dm-thin.c
+Auto-merging drivers/md/dm-mpath.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 474452e] Merge branch 'quilt/device-mapper'
+$ git diff -M --stat --summary HEAD^..
+ drivers/md/Kconfig | 7 +
+ drivers/md/Makefile | 1 +
+ drivers/md/dm-bio-prison.c | 415 +++++++++++++++++
+ drivers/md/dm-bio-prison.h | 72 +++
+ drivers/md/dm-bufio.c | 13 +-
+ drivers/md/dm-mpath.c | 3 +-
+ drivers/md/dm-thin.c | 520 ++++------------------
+ drivers/md/dm-verity.c | 2 +-
+ drivers/md/dm.c | 81 ++--
+ drivers/md/persistent-data/dm-space-map-common.c | 4 +-
+ 10 files changed, 625 insertions(+), 493 deletions(-)
+ create mode 100644 drivers/md/dm-bio-prison.c
+ create mode 100644 drivers/md/dm-bio-prison.h
+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 (ecc6260 mmc: rtsx_pci_sdmmc: Add realtek pcie sdmmc host driver)
+$ git merge mmc/mmc-next
+Merge made by the 'recursive' strategy.
+ drivers/mmc/host/Kconfig | 7 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/mxs-mmc.c | 2 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 1332 ++++++++++++++++++++++++++++++++++
+ include/linux/mmc/Kbuild | 1 -
+ include/uapi/linux/mmc/Kbuild | 1 +
+ include/{ => uapi}/linux/mmc/ioctl.h | 0
+ 7 files changed, 1342 insertions(+), 2 deletions(-)
+ create mode 100644 drivers/mmc/host/rtsx_pci_sdmmc.c
+ rename include/{ => uapi}/linux/mmc/ioctl.h (100%)
+Merging kgdb/kgdb-next (08f9553 tty/console: fix warnings in drivers/tty/serial/kgdboc.c)
+$ git merge kgdb/kgdb-next
+Auto-merging drivers/tty/serial/kgdboc.c
+Merge made by the 'recursive' strategy.
+ arch/mips/kernel/kgdb.c | 9 +++++++++
+ arch/x86/kernel/kgdb.c | 2 ++
+ drivers/tty/serial/kgdboc.c | 3 ++-
+ include/linux/console.h | 10 ++++++++--
+ 4 files changed, 21 insertions(+), 3 deletions(-)
+Merging slab/for-next (e2087be Merge branch 'slab/tracing' into slab/for-linus)
+$ git merge slab/for-next
+Already up-to-date.
+Merging uclinux/for-next (a0d271c Linux 3.6)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (72f36d5 md: refine reporting of resync/reshape delays.)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/dm-raid.txt | 9 ++
+ crypto/xor.c | 4 +-
+ drivers/md/bitmap.c | 17 +--
+ drivers/md/dm-raid.c | 124 +++++++++++++----
+ drivers/md/linear.c | 25 +++-
+ drivers/md/md.c | 145 ++++++++++++++------
+ drivers/md/md.h | 9 +-
+ drivers/md/multipath.c | 3 +-
+ drivers/md/raid0.c | 19 ++-
+ drivers/md/raid1.c | 37 ++++--
+ drivers/md/raid10.c | 95 ++++++++++++--
+ drivers/md/raid5.c | 219 +++++++++++++++++++++++++++----
+ drivers/md/raid5.h | 1 +
+ 13 files changed, 578 insertions(+), 129 deletions(-)
+Merging mfd/for-next (74d8378 ARM: dts: Enable 88pm860x pmic)
+$ git merge mfd/for-next
+Already up-to-date.
+Merging battery/master (18766f0 Merge with upstream to accommodate with MFD changes)
+$ git merge battery/master
+Already up-to-date.
+Merging fbdev/fbdev-next (cd9d6f1 gbefb: fix compile error)
+$ git merge fbdev/fbdev-next
+Resolved 'arch/arm/mach-s3c64xx/mach-mini6410.c' using previous resolution.
+Resolved 'arch/arm/mach-s3c64xx/mach-real6410.c' using previous resolution.
+Resolved 'drivers/video/msm/mddi.c' using previous resolution.
+Resolved 'drivers/video/msm/mdp.c' using previous resolution.
+Resolved 'drivers/video/omap/lcd_ams_delta.c' using previous resolution.
+Resolved 'drivers/video/omap2/displays/panel-taal.c' using previous resolution.
+Resolved 'drivers/video/omap2/dss/dispc.c' using previous resolution.
+Auto-merging include/video/samsung_fimd.h
+Auto-merging drivers/video/vermilion/vermilion.c
+Auto-merging drivers/video/udlfb.c
+Auto-merging drivers/video/ps3fb.c
+Removing drivers/video/pnx4008/sdum.h
+Removing drivers/video/pnx4008/sdum.c
+Removing drivers/video/pnx4008/pnxrgbfb.c
+Removing drivers/video/pnx4008/fbcommon.h
+Removing drivers/video/pnx4008/dum.h
+Removing drivers/video/pnx4008/Makefile
+Auto-merging drivers/video/omap2/omapfb/omapfb-main.c
+Auto-merging drivers/video/omap2/dss/dsi.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/displays/panel-taal.c
+CONFLICT (content): Merge conflict in drivers/video/omap2/displays/panel-taal.c
+Auto-merging drivers/video/omap/lcd_ams_delta.c
+CONFLICT (content): Merge conflict in drivers/video/omap/lcd_ams_delta.c
+Auto-merging drivers/video/nuc900fb.c
+Auto-merging drivers/video/mx3fb.c
+Auto-merging drivers/video/msm/mdp_hw.h
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp_hw.h
+Auto-merging drivers/video/msm/mdp.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mdp.c
+Auto-merging drivers/video/msm/mddi_client_nt35399.c
+Auto-merging drivers/video/msm/mddi.c
+CONFLICT (content): Merge conflict in drivers/video/msm/mddi.c
+Auto-merging drivers/video/jz4740_fb.c
+Auto-merging drivers/video/imxfb.c
+Auto-merging drivers/video/gbefb.c
+Auto-merging drivers/video/exynos/exynos_mipi_dsi.c
+CONFLICT (modify/delete): drivers/video/epson1355fb.c deleted in HEAD and modified in fbdev/fbdev-next. Version fbdev/fbdev-next of drivers/video/epson1355fb.c left in tree.
+Auto-merging drivers/video/ep93xx-fb.c
+Auto-merging drivers/video/da8xx-fb.c
+Auto-merging drivers/video/Makefile
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/staging/omapdrm/omap_drv.c
+Auto-merging drivers/media/platform/omap/omap_vout.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_fimd.c
+Removing arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+Auto-merging arch/arm/mach-s5pv210/mach-smdkv210.c
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Auto-merging arch/arm/mach-s5pc100/mach-smdkc100.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6450.c
+Auto-merging arch/arm/mach-s5p64x0/mach-smdk6440.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-real6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-real6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-ncp.c
+Auto-merging arch/arm/mach-s3c64xx/mach-mini6410.c
+CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-mini6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-anw6410.c
+Auto-merging arch/arm/mach-s3c24xx/mach-smdk2416.c
+Auto-merging arch/arm/mach-omap2/twl-common.c
+Auto-merging arch/arm/mach-omap2/display.c
+Auto-merging arch/arm/mach-omap2/board-omap4panda.c
+Auto-merging arch/arm/mach-omap2/board-4430sdp.c
+Auto-merging arch/arm/mach-exynos/mach-universal_c210.c
+Auto-merging arch/arm/mach-exynos/mach-smdkv310.c
+Auto-merging arch/arm/mach-exynos/mach-smdk4x12.c
+Auto-merging arch/arm/mach-exynos/mach-origen.c
+Auto-merging arch/arm/mach-exynos/mach-nuri.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/video/epson1355fb.c
+drivers/video/epson1355fb.c: needs merge
+rm 'drivers/video/epson1355fb.c'
+$ git commit -v -a
+Recorded resolution for 'drivers/video/msm/mdp_hw.h'.
+[master 2d04b3e] Merge remote-tracking branch 'fbdev/fbdev-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-exynos/mach-nuri.c | 2 +-
+ arch/arm/mach-exynos/mach-origen.c | 2 +-
+ arch/arm/mach-exynos/mach-smdk4x12.c | 2 +-
+ arch/arm/mach-exynos/mach-smdkv310.c | 2 +-
+ arch/arm/mach-exynos/mach-universal_c210.c | 2 +-
+ arch/arm/mach-exynos/setup-fimd0.c | 2 +-
+ arch/arm/mach-omap2/board-4430sdp.c | 73 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 27 +-
+ arch/arm/mach-omap2/display.c | 1 -
+ arch/arm/mach-omap2/twl-common.c | 6 +
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-real6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq5.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smartq7.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 2 +-
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 2 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 2 +-
+ arch/arm/mach-s5pv210/mach-aquila.c | 2 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 2 +-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 2 +-
+ arch/arm/plat-samsung/include/plat/regs-fb-v4.h | 159 ---
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 2 +-
+ drivers/media/platform/omap/omap_vout.c | 75 +-
+ drivers/staging/omapdrm/omap_drv.c | 5 +-
+ drivers/video/Kconfig | 15 -
+ drivers/video/Makefile | 2 -
+ drivers/video/amifb.c | 2 -
+ drivers/video/arcfb.c | 1 +
+ drivers/video/atmel_lcdfb.c | 5 +-
+ drivers/video/bf537-lq035.c | 12 +-
+ drivers/video/bf54x-lq043fb.c | 9 +-
+ drivers/video/bfin-lq035q1-fb.c | 13 +-
+ drivers/video/bfin-t350mcqb-fb.c | 1 +
+ drivers/video/bw2.c | 4 +-
+ drivers/video/cg3.c | 3 +-
+ drivers/video/cobalt_lcdfb.c | 5 +-
+ drivers/video/console/font_mini_4x6.c | 2 +-
+ drivers/video/console/font_sun8x16.c | 2 +-
+ drivers/video/cyber2000fb.c | 4 +-
+ drivers/video/da8xx-fb.c | 283 ++++--
+ drivers/video/ep93xx-fb.c | 17 +-
+ drivers/video/exynos/exynos_dp_core.c | 322 +++----
+ drivers/video/exynos/exynos_dp_core.h | 6 +-
+ drivers/video/exynos/exynos_dp_reg.c | 58 +-
+ drivers/video/exynos/exynos_dp_reg.h | 3 +-
+ drivers/video/exynos/exynos_mipi_dsi.c | 9 +-
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 8 -
+ drivers/video/fsl-diu-fb.c | 10 +-
+ drivers/video/gbefb.c | 17 +-
+ drivers/video/hpfb.c | 28 +-
+ drivers/video/imxfb.c | 1 +
+ drivers/video/jz4740_fb.c | 44 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 10 +-
+ drivers/video/mbx/mbxfb.c | 25 +-
+ drivers/video/msm/mddi.c | 3 -
+ drivers/video/msm/mddi_client_nt35399.c | 6 +-
+ drivers/video/msm/mdp.c | 1 -
+ drivers/video/msm/mdp_hw.h | 1 -
+ drivers/video/mx3fb.c | 3 +-
+ drivers/video/nuc900fb.c | 2 +-
+ drivers/video/omap/hwa742.c | 1 -
+ drivers/video/omap/lcd_palmte.c | 1 -
+ drivers/video/omap/omapfb_main.c | 9 -
+ drivers/video/omap2/displays/panel-acx565akm.c | 14 +-
+ drivers/video/omap2/displays/panel-generic-dpi.c | 76 +-
+ .../omap2/displays/panel-lgphilips-lb035q02.c | 3 +
+ drivers/video/omap2/displays/panel-n8x0.c | 31 +-
+ .../omap2/displays/panel-nec-nl8048hl11-01b.c | 3 +
+ drivers/video/omap2/displays/panel-picodlp.c | 4 +
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 3 +
+ drivers/video/omap2/displays/panel-taal.c | 239 ++---
+ drivers/video/omap2/displays/panel-tfp410.c | 20 +-
+ .../video/omap2/displays/panel-tpo-td043mtea1.c | 7 +-
+ drivers/video/omap2/dss/Kconfig | 2 +-
+ drivers/video/omap2/dss/Makefile | 4 +-
+ drivers/video/omap2/dss/apply.c | 330 ++-----
+ drivers/video/omap2/dss/core.c | 91 +-
+ drivers/video/omap2/dss/dispc.c | 1018 ++++++++++++++------
+ drivers/video/omap2/dss/dispc.h | 37 +
+ drivers/video/omap2/dss/display.c | 108 ++-
+ drivers/video/omap2/dss/dpi.c | 181 +++-
+ drivers/video/omap2/dss/dsi.c | 675 ++++++++++---
+ drivers/video/omap2/dss/dss.c | 257 +++--
+ drivers/video/omap2/dss/dss.h | 79 +-
+ drivers/video/omap2/dss/dss_features.c | 278 +++++-
+ drivers/video/omap2/dss/dss_features.h | 7 +
+ drivers/video/omap2/dss/hdmi.c | 247 +++--
+ drivers/video/omap2/dss/hdmi_panel.c | 31 +-
+ drivers/video/omap2/dss/manager-sysfs.c | 512 ++++++++++
+ drivers/video/omap2/dss/manager.c | 473 +--------
+ drivers/video/omap2/dss/output.c | 148 +++
+ drivers/video/omap2/dss/overlay-sysfs.c | 456 +++++++++
+ drivers/video/omap2/dss/overlay.c | 492 +---------
+ drivers/video/omap2/dss/rfbi.c | 222 +++--
+ drivers/video/omap2/dss/sdi.c | 126 ++-
+ drivers/video/omap2/dss/venc.c | 337 +++----
+ drivers/video/omap2/dss/venc_panel.c | 251 +++++
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 7 +-
+ drivers/video/omap2/omapfb/omapfb-main.c | 32 +-
+ drivers/video/omap2/omapfb/omapfb.h | 5 +-
+ drivers/video/omap2/vram.c | 56 --
+ drivers/video/pnx4008/Makefile | 7 -
+ drivers/video/pnx4008/dum.h | 211 ----
+ drivers/video/pnx4008/fbcommon.h | 43 -
+ drivers/video/pnx4008/pnxrgbfb.c | 198 ----
+ drivers/video/pnx4008/sdum.c | 861 -----------------
+ drivers/video/pnx4008/sdum.h | 136 ---
+ drivers/video/ps3fb.c | 7 +-
+ drivers/video/s3c-fb.c | 54 +-
+ drivers/video/s3c2410fb.c | 34 +-
+ drivers/video/savage/savagefb_driver.c | 4 +-
+ drivers/video/sis/initextlfb.c | 2 +-
+ drivers/video/sunxvr1000.c | 4 +-
+ drivers/video/sunxvr2500.c | 4 +-
+ drivers/video/sunxvr500.c | 8 +-
+ drivers/video/udlfb.c | 2 +-
+ drivers/video/uvesafb.c | 2 +
+ drivers/video/vermilion/vermilion.c | 3 +-
+ drivers/video/via/via_clock.c | 19 +
+ include/video/omapdss.h | 112 ++-
+ .../plat/regs-fb.h => include/video/samsung_fimd.h | 152 ++-
+ 127 files changed, 5347 insertions(+), 4718 deletions(-)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/regs-fb-v4.h
+ create mode 100644 drivers/video/omap2/dss/manager-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/output.c
+ create mode 100644 drivers/video/omap2/dss/overlay-sysfs.c
+ create mode 100644 drivers/video/omap2/dss/venc_panel.c
+ delete mode 100644 drivers/video/pnx4008/Makefile
+ delete mode 100644 drivers/video/pnx4008/dum.h
+ delete mode 100644 drivers/video/pnx4008/fbcommon.h
+ delete mode 100644 drivers/video/pnx4008/pnxrgbfb.c
+ delete mode 100644 drivers/video/pnx4008/sdum.c
+ delete mode 100644 drivers/video/pnx4008/sdum.h
+ rename arch/arm/plat-samsung/include/plat/regs-fb.h => include/video/samsung_fimd.h (73%)
+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 (13b1ba7 OMAPDSS: add missing include for string.h)
+$ git merge omap_dss2/for-next
+Already up-to-date.
+Merging regulator/for-next (6a2027a Merge remote-tracking branches 'regulator/topic/core', 'regulator/topic/bypass', 'regulator/topic/tol', 'regulator/topic/drivers' and 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Already up-to-date.
+Merging security/next (bf53083 Merge tag 'v3.6-rc7' into next)
+$ 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 (58ddfed Merge branch 'master' of ../linux-watchdog)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/davinci_wdt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+Merging dwmw2-iommu/master (c3b92c8 Linux 3.1)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (0094872 Merge branches 'dma-debug', 'iommu/fixes', 'arm/tegra', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'x86/amd-irq-remapping' into next)
+$ git merge iommu/next
+Already up-to-date.
+Merging vfio/next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (7f8d145 pnfs_osd_xdr: Remove unused #include from pnfs_osd_xdr.h)
+$ git merge osd/linux-next
+Already up-to-date.
+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 (9c33c51 doc: fix old config name of kprobetrace)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next (dcd6c92 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging pm/linux-next (df5a2a1 Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394)
+$ git merge pm/linux-next
+Already up-to-date.
+Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm)
+$ git merge apm/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1aec9c0 inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Resolved 'kernel/audit_tree.c' using previous resolution.
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_tree.c
+CONFLICT (content): Merge conflict in kernel/audit_tree.c
+Auto-merging include/linux/fsnotify_backend.h
+Auto-merging fs/notify/notification.c
+Auto-merging fs/notify/inotify/inotify_user.c
+Auto-merging fs/notify/fanotify/fanotify_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d9914f1] Merge remote-tracking branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ 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 (cfe5031 edac: edac_mc no longer deals with kobjects directly)
+$ git merge edac/linux_next
+Auto-merging drivers/edac/edac_mc.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 7 -------
+ include/linux/edac.h | 1 -
+ 2 files changed, 8 deletions(-)
+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 95381f3] 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 (36165f5 MAINTAINERS: add scripts/dtc under Devicetree maintainers)
+$ 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 (43e37b0 spi: tsc2005: delete soon-obsolete e-mail address)
+$ git merge spi-mb/spi-next
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-rspi.c | 56 ++++++++++++++++++++++++++-----------------
+ include/linux/spi/tsc2005.h | 2 --
+ 2 files changed, 34 insertions(+), 24 deletions(-)
+Merging tip/auto-latest (6b90cb2 Merge branch 'sched/urgent')
+$ git merge tip/auto-latest
+Resolved 'mm/huge_memory.c' using previous resolution.
+Resolved 'mm/mempolicy.c' using previous resolution.
+Auto-merging tools/perf/Makefile
+Auto-merging scripts/kconfig/Makefile
+Auto-merging mm/vmstat.c
+Auto-merging mm/mempolicy.c
+CONFLICT (content): Merge conflict in mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/huge_memory.c
+CONFLICT (content): Merge conflict in mm/huge_memory.c
+Auto-merging lib/Makefile
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/events/core.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/mmzone.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/mempolicy.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/linux/huge_mm.h
+Auto-merging include/linux/acpi.h
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/include/asm/pgtable.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c11ab55] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/acpi/initrd_table_override.txt | 94 ++
+ MAINTAINERS | 8 +
+ arch/sh/mm/Kconfig | 1 +
+ arch/x86/Kconfig | 31 +
+ arch/x86/include/asm/msr-index.h | 5 +
+ arch/x86/include/asm/pgtable.h | 1 +
+ arch/x86/kernel/acpi/boot.c | 6 +
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/kernel/cpu/perf_event.h | 2 +
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 61 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 2 +
+ arch/x86/kernel/cpu/perf_event_knc.c | 248 +++++
+ arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +
+ arch/x86/kernel/reboot.c | 8 -
+ arch/x86/kernel/setup.c | 4 +
+ arch/x86/realmode/rm/wakeup_asm.S | 15 +-
+ drivers/acpi/Kconfig | 9 +
+ drivers/acpi/osl.c | 202 +++-
+ drivers/base/node.c | 2 +-
+ include/linux/acpi.h | 16 +
+ include/linux/earlycpio.h | 17 +
+ include/linux/huge_mm.h | 19 +
+ include/linux/init_task.h | 9 +
+ include/linux/mempolicy.h | 30 +-
+ include/linux/migrate.h | 7 +
+ include/linux/migrate_mode.h | 3 +
+ include/linux/mm.h | 115 +-
+ include/linux/mm_types.h | 34 +
+ include/linux/mmzone.h | 15 +-
+ include/linux/page-flags-layout.h | 83 ++
+ include/linux/perf_event.h | 2 +-
+ include/linux/sched.h | 27 +-
+ init/Kconfig | 11 +
+ kernel/events/core.c | 21 +-
+ kernel/sched/core.c | 142 ++-
+ kernel/sched/debug.c | 3 +
+ kernel/sched/fair.c | 545 ++++++++-
+ kernel/sched/features.h | 10 +
+ kernel/sched/sched.h | 37 +
+ kernel/sysctl.c | 13 +-
+ kernel/time/tick-sched.c | 2 +-
+ lib/Makefile | 2 +-
+ lib/earlycpio.c | 145 +++
+ mm/huge_memory.c | 172 ++-
+ mm/memory.c | 105 +-
+ mm/mempolicy.c | 298 +++--
+ mm/migrate.c | 85 +-
+ mm/mprotect.c | 31 +-
+ mm/vmstat.c | 1 -
+ 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 | 457 ++++++++
+ tools/kvm/README | 112 ++
+ tools/kvm/builtin-balloon.c | 80 ++
+ tools/kvm/builtin-debug.c | 110 ++
+ 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 | 697 ++++++++++++
+ tools/kvm/builtin-sandbox.c | 9 +
+ tools/kvm/builtin-setup.c | 262 +++++
+ 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 | 354 ++++++
+ tools/kvm/disk/qcow.c | 1529 ++++++++++++++++++++++++++
+ tools/kvm/disk/raw.c | 141 +++
+ tools/kvm/framebuffer.c | 80 ++
+ tools/kvm/guest/init.c | 72 ++
+ tools/kvm/guest_compat.c | 99 ++
+ tools/kvm/hw/i8042.c | 355 ++++++
+ tools/kvm/hw/pci-shmem.c | 405 +++++++
+ tools/kvm/hw/rtc.c | 139 +++
+ tools/kvm/hw/serial.c | 452 ++++++++
+ tools/kvm/hw/vesa.c | 89 ++
+ 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 | 20 +
+ 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 | 96 ++
+ tools/kvm/include/kvm/e820.h | 13 +
+ tools/kvm/include/kvm/framebuffer.h | 36 +
+ 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 | 70 ++
+ tools/kvm/include/kvm/irq.h | 33 +
+ tools/kvm/include/kvm/kvm-cmd.h | 17 +
+ tools/kvm/include/kvm/kvm-config.h | 60 +
+ tools/kvm/include/kvm/kvm-cpu.h | 26 +
+ tools/kvm/include/kvm/kvm-ipc.h | 26 +
+ tools/kvm/include/kvm/kvm.h | 121 ++
+ tools/kvm/include/kvm/msi.h | 10 +
+ tools/kvm/include/kvm/mutex.h | 33 +
+ tools/kvm/include/kvm/parse-options.h | 218 ++++
+ tools/kvm/include/kvm/pci-shmem.h | 32 +
+ 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 | 28 +
+ 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 | 24 +
+ tools/kvm/include/kvm/threadpool.h | 38 +
+ tools/kvm/include/kvm/types.h | 7 +
+ tools/kvm/include/kvm/uip.h | 360 ++++++
+ tools/kvm/include/kvm/util-init.h | 51 +
+ tools/kvm/include/kvm/util.h | 97 ++
+ tools/kvm/include/kvm/vesa.h | 18 +
+ tools/kvm/include/kvm/virtio-9p.h | 76 ++
+ tools/kvm/include/kvm/virtio-balloon.h | 9 +
+ tools/kvm/include/kvm/virtio-blk.h | 12 +
+ tools/kvm/include/kvm/virtio-console.h | 10 +
+ tools/kvm/include/kvm/virtio-mmio.h | 58 +
+ tools/kvm/include/kvm/virtio-net.h | 30 +
+ tools/kvm/include/kvm/virtio-pci-dev.h | 38 +
+ tools/kvm/include/kvm/virtio-pci.h | 49 +
+ tools/kvm/include/kvm/virtio-rng.h | 9 +
+ tools/kvm/include/kvm/virtio-scsi.h | 26 +
+ tools/kvm/include/kvm/virtio.h | 102 ++
+ tools/kvm/include/kvm/vnc.h | 22 +
+ tools/kvm/include/linux/bitops.h | 33 +
+ tools/kvm/include/linux/byteorder.h | 7 +
+ tools/kvm/include/linux/compiler.h | 20 +
+ 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 | 216 ++++
+ tools/kvm/ioport.c | 198 ++++
+ tools/kvm/kvm-cmd.c | 91 ++
+ tools/kvm/kvm-cpu.c | 242 ++++
+ tools/kvm/kvm-ipc.c | 498 +++++++++
+ tools/kvm/kvm.c | 458 ++++++++
+ tools/kvm/main.c | 19 +
+ tools/kvm/mmio.c | 139 +++
+ 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 | 202 ++++
+ tools/kvm/net/uip/icmp.c | 29 +
+ tools/kvm/net/uip/ipv4.c | 29 +
+ tools/kvm/net/uip/tcp.c | 345 ++++++
+ tools/kvm/net/uip/udp.c | 236 ++++
+ tools/kvm/pci.c | 215 ++++
+ 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 | 68 ++
+ 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 | 108 ++
+ 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 | 133 +++
+ tools/kvm/term.c | 171 +++
+ 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 | 101 ++
+ tools/kvm/ui/sdl.c | 321 ++++++
+ tools/kvm/ui/vnc.c | 248 +++++
+ tools/kvm/util/KVMTOOLS-VERSION-GEN | 40 +
+ tools/kvm/util/generate-cmdlist.sh | 23 +
+ tools/kvm/util/init.c | 69 ++
+ 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 | 173 +++
+ tools/kvm/util/util.c | 133 +++
+ tools/kvm/virtio/9p-pdu.c | 287 +++++
+ tools/kvm/virtio/9p.c | 1448 ++++++++++++++++++++++++
+ tools/kvm/virtio/balloon.c | 270 +++++
+ tools/kvm/virtio/blk.c | 315 ++++++
+ tools/kvm/virtio/console.c | 203 ++++
+ tools/kvm/virtio/core.c | 233 ++++
+ tools/kvm/virtio/mmio.c | 264 +++++
+ tools/kvm/virtio/net.c | 670 +++++++++++
+ tools/kvm/virtio/pci.c | 398 +++++++
+ tools/kvm/virtio/rng.c | 193 ++++
+ tools/kvm/virtio/scsi.c | 309 ++++++
+ 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 | 43 +
+ 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 | 224 ++++
+ tools/kvm/x86/kvm-cpu.c | 425 +++++++
+ tools/kvm/x86/kvm.c | 362 ++++++
+ tools/kvm/x86/mptable.c | 289 +++++
+ tools/perf/Makefile | 83 +-
+ tools/perf/bash_completion | 50 +-
+ tools/perf/builtin-buildid-cache.c | 58 +-
+ tools/perf/builtin-buildid-list.c | 55 +-
+ tools/perf/builtin-diff.c | 68 +-
+ tools/perf/builtin-evlist.c | 21 +-
+ tools/perf/builtin-help.c | 40 +-
+ tools/perf/builtin-inject.c | 88 +-
+ tools/perf/builtin-kmem.c | 66 +-
+ tools/perf/builtin-kvm.c | 460 ++++----
+ tools/perf/builtin-lock.c | 90 +-
+ tools/perf/builtin-probe.c | 26 +-
+ tools/perf/builtin-record.c | 27 +-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 2 +-
+ tools/perf/builtin-script.c | 90 +-
+ tools/perf/builtin-stat.c | 328 +++---
+ tools/perf/builtin-timechart.c | 100 +-
+ tools/perf/builtin-top.c | 11 +-
+ tools/perf/builtin-trace.c | 134 ++-
+ tools/perf/perf.c | 4 +-
+ tools/perf/ui/browsers/hists.c | 12 +-
+ tools/perf/ui/gtk/browser.c | 6 +-
+ tools/perf/ui/gtk/util.c | 2 +-
+ tools/perf/ui/helpline.h | 18 +-
+ tools/perf/ui/hist.c | 145 ++-
+ tools/perf/ui/setup.c | 2 +-
+ tools/perf/ui/stdio/hist.c | 45 +-
+ tools/perf/util/annotate.h | 8 +-
+ tools/perf/util/cache.h | 38 +-
+ tools/perf/util/debug.c | 2 +-
+ tools/perf/util/debug.h | 17 +-
+ tools/perf/util/evlist.c | 88 +-
+ tools/perf/util/evlist.h | 18 +-
+ tools/perf/util/generate-cmdlist.sh | 4 +-
+ tools/perf/util/hist.c | 66 +-
+ tools/perf/util/hist.h | 38 +-
+ tools/perf/util/map.c | 2 +-
+ tools/perf/util/parse-options.c | 8 +
+ tools/perf/util/parse-options.h | 1 +
+ tools/perf/util/path.c | 2 +-
+ tools/perf/util/perf_regs.h | 4 +-
+ tools/perf/util/sort.h | 19 +-
+ tools/perf/util/symbol.h | 10 +-
+ tools/perf/util/unwind.h | 4 +-
+ tools/perf/util/util.c | 4 +-
+ 318 files changed, 29097 insertions(+), 1479 deletions(-)
+ create mode 100644 Documentation/acpi/initrd_table_override.txt
+ create mode 100644 arch/x86/kernel/cpu/perf_event_knc.c
+ create mode 100644 include/linux/earlycpio.h
+ create mode 100644 include/linux/page-flags-layout.h
+ create mode 100644 lib/earlycpio.c
+ 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_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-config.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-init.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-scsi.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 100644 tools/kvm/util/init.c
+ 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/virtio/scsi.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 (d677124 rcu: Advise most users not to enable RCU user mode)
+$ git merge rcu/rcu/next
+Auto-merging init/Kconfig
+Merge made by the 'recursive' strategy.
+ init/Kconfig | 12 ++++++++++++
+ kernel/rcutree.c | 21 ++++++++++-----------
+ kernel/rcutree.h | 6 ++++++
+ 3 files changed, 28 insertions(+), 11 deletions(-)
+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
+Resolved 'mm/kmemleak.c' using previous resolution.
+Auto-merging mm/kmemleak.c
+CONFLICT (content): Merge conflict in mm/kmemleak.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7b79d66] Merge remote-tracking branch 'kmemleak/kmemleak'
+$ git diff -M --stat --summary HEAD^..
+Merging kvm/linux-next (03604b3 Merge branch 'for-upstream' of http://github.com/agraf/linux-2.6 into queue)
+$ git merge kvm/linux-next
+Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
+Resolved 'arch/powerpc/include/asm/kvm_para.h' using previous resolution.
+Auto-merging arch/powerpc/kvm/trace.h
+Auto-merging arch/powerpc/kvm/book3s_hv.c
+Auto-merging arch/powerpc/kvm/book3s_64_mmu_host.c
+Auto-merging arch/powerpc/kvm/book3s_32_mmu_host.c
+Auto-merging arch/powerpc/include/uapi/asm/kvm.h
+Auto-merging arch/powerpc/include/asm/kvm_para.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h
+Auto-merging arch/powerpc/include/asm/kvm_book3s.h
+Auto-merging arch/powerpc/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 80c5099] Merge remote-tracking branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 82 ++++++-
+ arch/powerpc/include/asm/epapr_hcalls.h | 36 +--
+ arch/powerpc/include/asm/fsl_hcalls.h | 36 +--
+ arch/powerpc/include/asm/kvm_book3s.h | 2 +-
+ arch/powerpc/include/asm/kvm_booke_hv_asm.h | 4 +-
+ arch/powerpc/include/asm/kvm_host.h | 38 ++-
+ arch/powerpc/include/asm/kvm_para.h | 15 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 64 ++++-
+ arch/powerpc/include/asm/reg_booke.h | 7 +
+ arch/powerpc/include/uapi/asm/kvm.h | 59 +++++
+ arch/powerpc/kernel/epapr_hcalls.S | 28 +++
+ arch/powerpc/kernel/epapr_paravirt.c | 11 +-
+ arch/powerpc/kernel/kvm.c | 2 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 5 +
+ arch/powerpc/kvm/44x.c | 1 +
+ arch/powerpc/kvm/44x_emulate.c | 110 +++++----
+ arch/powerpc/kvm/Kconfig | 3 +
+ arch/powerpc/kvm/book3s.c | 125 ++++++++++
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 1 +
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 65 ++++--
+ arch/powerpc/kvm/book3s_hv.c | 337 +++++++++++++++++++++------
+ arch/powerpc/kvm/book3s_hv_builtin.c | 4 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 4 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 5 -
+ arch/powerpc/kvm/book3s_pr.c | 180 ++++++++++----
+ arch/powerpc/kvm/book3s_rmhandlers.S | 15 +-
+ arch/powerpc/kvm/booke.c | 310 ++++++++++++++++++++----
+ arch/powerpc/kvm/booke_emulate.c | 22 +-
+ arch/powerpc/kvm/e500.h | 3 +-
+ arch/powerpc/kvm/e500_tlb.c | 92 ++++++--
+ arch/powerpc/kvm/powerpc.c | 150 ++++++++++--
+ arch/powerpc/kvm/trace.h | 200 +++++++++++++---
+ arch/powerpc/platforms/Kconfig | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 9 +-
+ arch/powerpc/sysdev/fsl_soc.c | 2 +
+ arch/s390/kvm/interrupt.c | 19 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/x86/kvm/x86.c | 12 +-
+ drivers/tty/Kconfig | 1 +
+ drivers/virt/Kconfig | 1 +
+ include/linux/kvm.h | 10 +-
+ include/linux/kvm_host.h | 2 +-
+ virt/kvm/iommu.c | 6 +-
+ 44 files changed, 1690 insertions(+), 392 deletions(-)
+$ git am -3 ../patches/0001-KVM-PPC-fix-fallout-from-UAPI-changes.patch
+Applying: KVM: PPC: fix fallout from UAPI changes
+$ git reset HEAD^
+Unstaged changes after reset:
+D arch/powerpc/include/asm/epapr_hcalls.h
+M arch/powerpc/include/uapi/asm/Kbuild
+M arch/powerpc/include/uapi/asm/kvm_para.h
+$ git add .
+$ git commit -v -a --amend
+[master 2d620b8] Merge remote-tracking branch 'kvm/linux-next'
+Merging kvm-ppc/kvm-ppc-next (2c4eb8b KVM: PPC: Move mtspr/mfspr emulation into own functions)
+$ git merge kvm-ppc/kvm-ppc-next
+Recorded preimage for 'arch/powerpc/include/asm/kvm_para.h'
+Recorded preimage for 'arch/powerpc/kvm/44x_emulate.c'
+Resolved 'arch/powerpc/include/asm/Kbuild' using previous resolution.
+Auto-merging arch/powerpc/kvm/44x_emulate.c
+CONFLICT (content): Merge conflict in arch/powerpc/kvm/44x_emulate.c
+Auto-merging arch/powerpc/include/asm/kvm_para.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/kvm_para.h
+Auto-merging arch/powerpc/include/asm/Kbuild
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/Kbuild
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/powerpc/include/asm/kvm_para.h'.
+Recorded resolution for 'arch/powerpc/kvm/44x_emulate.c'.
+[master 9ce2b91] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 3 +-
+ arch/powerpc/kvm/44x_emulate.c | 2 +
+ arch/powerpc/kvm/emulate.c | 221 ++++++++++++++++++++-----------------
+ 3 files changed, 125 insertions(+), 101 deletions(-)
+Merging oprofile/for-next (61bccf1 oprofile: Remove 'WQ on CPUx, prefer CPUy' warning)
+$ 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 (38480dc Merge branch 'stable/for-linus-3.7-uapi' into linux-next)
+$ git merge xen-two/linux-next
+Auto-merging drivers/net/xen-netback/netback.c
+Merge made by the 'recursive' strategy.
+ arch/x86/xen/mmu.c | 41 ++++++++++++++++++++++++++++
+ drivers/net/xen-netback/netback.c | 11 ++++++--
+ drivers/tty/hvc/hvc_xen.c | 5 +++-
+ drivers/xen/grant-table.c | 53 ------------------------------------
+ drivers/xen/xenbus/xenbus_client.c | 6 ++--
+ include/uapi/xen/Kbuild | 2 ++
+ include/{ => uapi}/xen/evtchn.h | 0
+ include/{ => uapi}/xen/privcmd.h | 0
+ include/xen/Kbuild | 2 --
+ include/xen/grant_table.h | 12 --------
+ include/xen/interface/hvm/hvm_op.h | 19 +++++++++++++
+ 11 files changed, 78 insertions(+), 73 deletions(-)
+ rename include/{ => uapi}/xen/evtchn.h (100%)
+ rename include/{ => uapi}/xen/privcmd.h (100%)
+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 (2b0f620 Merge branch 'for-3.7' into for-next)
+$ git merge workqueues/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging drivers-x86/linux-next (455f38c eeepc-laptop: fix device reference count leakage in eeepc_rfkill_hotplug())
+$ git merge drivers-x86/linux-next
+Auto-merging drivers/platform/x86/asus-wmi.c
+Merge made by the 'recursive' strategy.
+ drivers/platform/x86/asus-wmi.c | 76 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 76 insertions(+)
+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 (613dac3 Merge remote-tracking branches 'regmap/topic/cache' and 'regmap/topic/irq' 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 (2f73c39 leds: add output driver configuration for pca9633 led driver)
+$ git merge leds/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (e0f21e6 memory: tegra{20,30}-mc: Fix reading incorrect register in mc_readl())
+$ git merge driver-core/driver-core-next
+Already up-to-date.
+Merging tty/tty-next (ecefbd9 Merge tag 'kvm-3.7-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge tty/tty-next
+Already up-to-date.
+Merging usb/usb-next (12250d8 Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux)
+$ git merge usb/usb-next
+Already up-to-date.
+Merging staging/staging-next (e187895 staging: comedi: jr3_pci: fix iomem dereference)
+$ git merge staging/staging-next
+Already up-to-date.
+Merging char-misc/char-misc-next (5dc2db0 drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init)
+$ git merge char-misc/char-misc-next
+Already up-to-date.
+Merging tmem/linux-next (a728d5e Merge commit 'v3.6-rc6' into linux-next)
+$ git merge tmem/linux-next
+Auto-merging include/xen/xen.h
+Auto-merging include/xen/interface/xen.h
+Auto-merging arch/x86/xen/smp.c
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/include/asm/xen/page.h
+Auto-merging arch/x86/include/asm/xen/interface.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/xen/interface.h | 3 ++-
+ arch/x86/include/asm/xen/page.h | 3 +++
+ arch/x86/xen/setup.c | 13 +++++++++---
+ arch/x86/xen/smp.c | 39 ++++++++++++++++++----------------
+ drivers/xen/cpu_hotplug.c | 3 ++-
+ include/xen/interface/xen.h | 1 +
+ include/xen/xen.h | 4 ++++
+ 7 files changed, 43 insertions(+), 23 deletions(-)
+Merging writeback/writeback-for-next (2f60d62 CPU hotplug, writeback: Don't call writeback_set_ratelimit() too often during hotplug)
+$ git merge writeback/writeback-for-next
+Auto-merging fs/fs-writeback.c
+Merge made by the 'recursive' strategy.
+ fs/fs-writeback.c | 2 +-
+ mm/backing-dev.c | 50 ++++++++++++++++++++++++++------------------------
+ mm/page-writeback.c | 14 +++++++++++---
+ 3 files changed, 38 insertions(+), 28 deletions(-)
+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 (e85037d Merge branch 'samsung' into for-next)
+$ git merge pinctrl/for-next
+Recorded preimage for 'arch/arm/boot/dts/at91sam9g25ek.dts'
+Recorded preimage for 'arch/arm/mach-at91/at91sam9263.c'
+Recorded preimage for 'arch/arm/mach-at91/at91sam9n12.c'
+Recorded preimage for 'arch/arm/mach-at91/at91sam9x5.c'
+Recorded preimage for 'drivers/mtd/nand/atmel_nand.c'
+Auto-merging include/linux/platform_data/pinctrl-nomadik.h
+Auto-merging drivers/mtd/nand/atmel_nand.c
+CONFLICT (content): Merge conflict in drivers/mtd/nand/atmel_nand.c
+Removing arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+Removing arch/arm/mach-prima2/include/mach/gpio.h
+Auto-merging arch/arm/mach-at91/setup.c
+Auto-merging arch/arm/mach-at91/at91sam9x5.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9x5.c
+Auto-merging arch/arm/mach-at91/at91sam9rl.c
+Auto-merging arch/arm/mach-at91/at91sam9n12.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9n12.c
+Auto-merging arch/arm/mach-at91/at91sam9g45.c
+Auto-merging arch/arm/mach-at91/at91sam9263.c
+CONFLICT (content): Merge conflict in arch/arm/mach-at91/at91sam9263.c
+Auto-merging arch/arm/mach-at91/at91sam9261.c
+Auto-merging arch/arm/mach-at91/at91sam9260.c
+Auto-merging arch/arm/mach-at91/at91rm9200.c
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9m10g45ek.dts
+Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9g25ek.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/at91sam9g25ek.dts
+Auto-merging arch/arm/boot/dts/at91sam9263.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9260.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/boot/dts/at91sam9g25ek.dts'.
+Recorded resolution for 'arch/arm/mach-at91/at91sam9263.c'.
+Recorded resolution for 'arch/arm/mach-at91/at91sam9n12.c'.
+Recorded resolution for 'arch/arm/mach-at91/at91sam9x5.c'.
+Recorded resolution for 'drivers/mtd/nand/atmel_nand.c'.
+[master a512d81] Merge remote-tracking branch 'pinctrl/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio_atmel.txt | 5 +
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt | 136 ++
+ .../bindings/pinctrl/samsung-pinctrl.txt | 118 +-
+ arch/arm/Kconfig | 2 +
+ arch/arm/boot/dts/Makefile | 44 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 187 ++-
+ arch/arm/boot/dts/at91sam9263.dtsi | 173 ++-
+ arch/arm/boot/dts/at91sam9263ek.dts | 1 +
+ arch/arm/boot/dts/at91sam9g15.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g15ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 6 +
+ arch/arm/boot/dts/at91sam9g25.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 33 +-
+ arch/arm/boot/dts/at91sam9g35.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9g35ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 189 ++-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 1 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 180 ++-
+ arch/arm/boot/dts/at91sam9x25.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9x25ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9x35.dtsi | 28 +
+ arch/arm/boot/dts/at91sam9x35ek.dts | 16 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 178 ++-
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 47 +
+ arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 278 ++++
+ arch/arm/boot/dts/exynos4210.dtsi | 241 +---
+ arch/arm/configs/at91_dt_defconfig | 1 +
+ arch/arm/mach-at91/at91rm9200.c | 4 +-
+ arch/arm/mach-at91/at91sam9260.c | 7 +-
+ arch/arm/mach-at91/at91sam9261.c | 4 +-
+ arch/arm/mach-at91/at91sam9263.c | 9 +-
+ arch/arm/mach-at91/at91sam9g45.c | 10 +-
+ arch/arm/mach-at91/at91sam9n12.c | 15 +-
+ arch/arm/mach-at91/at91sam9rl.c | 4 +-
+ arch/arm/mach-at91/at91sam9x5.c | 19 +-
+ arch/arm/mach-at91/board-dt.c | 2 -
+ arch/arm/mach-at91/gpio.c | 190 +--
+ arch/arm/mach-at91/setup.c | 6 +-
+ arch/arm/mach-at91/soc.h | 12 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 3 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 2 +-
+ arch/arm/mach-nomadik/i2c-8815nhk.c | 3 +-
+ arch/arm/mach-prima2/include/mach/gpio.h | 13 -
+ arch/arm/mach-ux500/board-mop500-audio.c | 3 +-
+ arch/arm/mach-ux500/board-mop500-pins.c | 3 +-
+ arch/arm/mach-ux500/board-mop500.c | 2 +-
+ arch/arm/mach-ux500/cpu-db8500.c | 4 +-
+ arch/arm/mach-ux500/devices-common.c | 3 +-
+ arch/arm/plat-nomadik/include/plat/gpio-nomadik.h | 96 --
+ drivers/mtd/nand/atmel_nand.c | 21 +-
+ drivers/pinctrl/Kconfig | 9 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/pinctrl-at91.c | 1490 ++++++++++++++++++++
+ drivers/pinctrl/pinctrl-bcm2835.c | 5 +-
+ drivers/pinctrl/pinctrl-exynos.c | 367 +++--
+ drivers/pinctrl/pinctrl-exynos.h | 170 +--
+ drivers/pinctrl/pinctrl-nomadik-db8500.c | 289 +++-
+ drivers/pinctrl/pinctrl-nomadik-db8540.c | 344 ++++-
+ drivers/pinctrl/pinctrl-nomadik.c | 142 +-
+ drivers/pinctrl/pinctrl-nomadik.h | 80 +-
+ drivers/pinctrl/pinctrl-samsung.c | 213 ++-
+ drivers/pinctrl/pinctrl-samsung.h | 29 +-
+ drivers/pinctrl/pinctrl-sirf.c | 35 -
+ drivers/tty/serial/atmel_serial.c | 8 +
+ .../linux/platform_data/pinctrl-nomadik.h | 113 +-
+ kernel/irq/irqdomain.c | 33 +-
+ 66 files changed, 4448 insertions(+), 1339 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt
+ create mode 100644 arch/arm/boot/dts/at91sam9g15.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g15ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9g25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9g35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x25.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x25ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x35.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x35ek.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x5ek.dtsi
+ delete mode 100644 arch/arm/mach-prima2/include/mach/gpio.h
+ delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio-nomadik.h
+ create mode 100644 drivers/pinctrl/pinctrl-at91.c
+ rename arch/arm/plat-nomadik/include/plat/pincfg.h => include/linux/platform_data/pinctrl-nomadik.h (65%)
+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 4902ff3] 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 (ed26d19 remoteproc: fix (again) the virtio-related build breakage)
+$ git merge remoteproc/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+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 (ddf343f Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ git merge gpio/gpio/next
+Already up-to-date.
+Merging gpio-lw/for-next (901acf5 gpio: pcf857x: select IRQ_DOMAIN)
+$ git merge gpio-lw/for-next
+Already up-to-date.
+Merging arm-soc/for-next (ab3ee84 Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging ep93xx/ep93xx-for-next (70f0f7c 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 ixp4xx/next (2346020 IXP4xx: map CPU config registers within VMALLOC region.)
+$ git merge ixp4xx/next
+Resolved 'arch/arm/mach-ixp4xx/common.c' using previous resolution.
+Resolved 'arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h' using previous resolution.
+Auto-merging drivers/crypto/Kconfig
+Auto-merging drivers/char/hw_random/Kconfig
+Auto-merging arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h
+Auto-merging arch/arm/mach-ixp4xx/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ixp4xx/common.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5a7dc73] Merge remote-tracking branch 'ixp4xx/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/common/dmabounce.c | 4 +-
+ arch/arm/mach-ixp4xx/common-pci.c | 1 +
+ arch/arm/mach-ixp4xx/common.c | 13 +++----
+ arch/arm/mach-ixp4xx/goramo_mlr.c | 3 +-
+ arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 4 +-
+ arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 46 ++++++++++-------------
+ arch/arm/mach-ixp4xx/include/mach/qmgr.h | 12 +++---
+ arch/arm/mach-ixp4xx/ixp4xx_npe.c | 9 ++++-
+ arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 14 +------
+ drivers/char/hw_random/Kconfig | 6 +--
+ drivers/char/hw_random/ixp4xx-rng.c | 5 ++-
+ drivers/crypto/Kconfig | 2 +-
+ drivers/crypto/ixp4xx_crypto.c | 12 +++---
+ drivers/net/wan/ixp4xx_hss.c | 2 +-
+ 14 files changed, 62 insertions(+), 71 deletions(-)
+Merging msm/for-next (a0d271c Linux 3.6)
+$ git merge msm/for-next
+Already up-to-date.
+Merging renesas/next (b681273 Merge branch 'heads/boards' into next)
+$ git merge renesas/next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging arch/arm/mach-shmobile/setup-sh7372.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c
+Auto-merging arch/arm/mach-shmobile/include/mach/sh7372.h
+Auto-merging arch/arm/mach-shmobile/board-kzm9g.c
+Auto-merging arch/arm/configs/kzm9g_defconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f990515] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 9 +++++++++
+ arch/arm/configs/armadillo800eva_defconfig | 1 +
+ arch/arm/configs/kzm9g_defconfig | 4 ++++
+ arch/arm/configs/mackerel_defconfig | 18 ++++++++++++++++--
+ arch/arm/mach-shmobile/board-kzm9g.c | 14 +++++++++++++-
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
+ arch/arm/mach-shmobile/setup-r8a7740.c | 16 ++++++++++++++++
+ arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
+ arch/arm/mm/proc-v7-2level.S | 8 ++++++++
+ 9 files changed, 91 insertions(+), 3 deletions(-)
+Merging samsung/for-next (59e65fd Merge branch 'next/dt-samsung-new' into for-next)
+$ git merge samsung/for-next
+Resolved 'arch/arm/mach-exynos/clock-exynos5.c' using previous resolution.
+Auto-merging arch/arm/mach-exynos/clock-exynos5.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/clock-exynos5.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7270ea7] Merge remote-tracking branch 'samsung/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging tegra/for-next (979570e Linux 3.6-rc7)
+$ git merge tegra/for-next
+Already up-to-date.
+Merging kvmtool/master (5fd2a45 kvm tools: Drop lchown() calls from 9p)
+$ git merge kvmtool/master
+Merge made by the 'recursive' strategy.
+ tools/kvm/powerpc/ioport.c | 2 +-
+ tools/kvm/powerpc/irq.c | 19 -------------------
+ tools/kvm/powerpc/kvm-cpu.c | 3 ---
+ tools/kvm/powerpc/kvm.c | 8 ++++----
+ tools/kvm/powerpc/spapr_hvcons.c | 6 +++---
+ tools/kvm/powerpc/spapr_rtas.c | 14 +++++++++-----
+ tools/kvm/powerpc/xics.c | 38 +++++++++++++++++++++++---------------
+ tools/kvm/powerpc/xics.h | 5 -----
+ tools/kvm/virtio/9p.c | 16 ----------------
+ 9 files changed, 40 insertions(+), 71 deletions(-)
+Merging dma-mapping/dma-mapping-next (461b6f0 Merge branch 'next-cleanup' into for-v3.7)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (85f8879 pwm: dt: Fix description of second PWM cell)
+$ git merge pwm/for-next
+Already up-to-date.
+Merging dma-buf/for-next (ba42051 dma-buf: might_sleep() in dma_buf_unmap_attachment())
+$ git merge dma-buf/for-next
+Auto-merging drivers/base/dma-buf.c
+Merge made by the 'recursive' strategy.
+ drivers/base/dma-buf.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging userns/for-next (f3d94c2 userns: Fix posix_acl_file_xattr_userns gid conversion)
+$ git merge userns/for-next
+Auto-merging net/bluetooth/af_bluetooth.c
+Merge made by the 'recursive' strategy.
+ fs/xattr_acl.c | 2 +-
+ net/bluetooth/af_bluetooth.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+Merging ktest/for-next (95f5783 ktest: Fix ELSE IF statements)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (12f79be alpha: don't open-code trace_report_syscall_{enter,exit})
+$ git merge signal/for-next
+Recorded preimage for 'arch/c6x/kernel/process.c'
+Recorded preimage for 'arch/frv/kernel/process.c'
+Recorded preimage for 'arch/m68k/kernel/process.c'
+Recorded preimage for 'arch/mn10300/kernel/process.c'
+Recorded preimage for 'arch/powerpc/kernel/process.c'
+Recorded preimage for 'arch/powerpc/kernel/sys_ppc32.c'
+Resolved 'arch/arm/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/c6x/Kconfig' using previous resolution.
+Resolved 'arch/m68k/Kconfig' using previous resolution.
+Resolved 'arch/mn10300/Kconfig' using previous resolution.
+Auto-merging kernel/sched/core.c
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/tile/kernel/compat_signal.c
+Auto-merging arch/powerpc/kernel/sys_ppc32.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/sys_ppc32.c
+Auto-merging arch/powerpc/kernel/process.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/ppc_ksyms.c
+Auto-merging arch/powerpc/kernel/entry_64.S
+Auto-merging arch/powerpc/kernel/entry_32.S
+Auto-merging arch/powerpc/include/asm/unistd.h
+Auto-merging arch/powerpc/include/asm/thread_info.h
+Auto-merging arch/powerpc/include/asm/ptrace.h
+Auto-merging arch/powerpc/include/asm/processor.h
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
+Auto-merging arch/mn10300/kernel/process.c
+CONFLICT (content): Merge conflict in arch/mn10300/kernel/process.c
+Removing arch/mn10300/kernel/kthread.S
+Removing arch/mn10300/kernel/kernel_execve.S
+Auto-merging arch/mn10300/Kconfig
+CONFLICT (content): Merge conflict in arch/mn10300/Kconfig
+Auto-merging arch/mips/include/asm/thread_info.h
+Auto-merging arch/microblaze/kernel/signal.c
+Auto-merging arch/m68k/kernel/process.c
+CONFLICT (content): Merge conflict in arch/m68k/kernel/process.c
+Auto-merging arch/m68k/Kconfig
+CONFLICT (content): Merge conflict in arch/m68k/Kconfig
+Auto-merging arch/ia64/kernel/signal.c
+Auto-merging arch/frv/kernel/process.c
+CONFLICT (content): Merge conflict in arch/frv/kernel/process.c
+Removing arch/frv/kernel/kernel_thread.S
+Removing arch/frv/kernel/kernel_execve.S
+Auto-merging arch/frv/Kconfig
+Auto-merging arch/c6x/kernel/process.c
+CONFLICT (content): Merge conflict in arch/c6x/kernel/process.c
+Auto-merging arch/c6x/include/uapi/asm/unistd.h
+Auto-merging arch/c6x/Kconfig
+CONFLICT (content): Merge conflict in arch/c6x/Kconfig
+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
+Recorded resolution for 'arch/c6x/kernel/process.c'.
+Recorded resolution for 'arch/frv/kernel/process.c'.
+Recorded resolution for 'arch/m68k/kernel/process.c'.
+Recorded resolution for 'arch/mn10300/kernel/process.c'.
+Recorded resolution for 'arch/powerpc/Kconfig'.
+Recorded resolution for 'arch/powerpc/kernel/process.c'.
+Recorded resolution for 'arch/powerpc/kernel/sys_ppc32.c'.
+[master 09b2d22] Merge remote-tracking branch 'signal/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/thread_info.h | 3 +-
+ arch/alpha/kernel/entry.S | 13 ++--
+ arch/alpha/kernel/ptrace.c | 32 ++++-----
+ arch/arm/include/asm/thread_info.h | 2 -
+ arch/arm/kernel/signal.c | 1 -
+ arch/avr32/include/asm/thread_info.h | 18 ++---
+ arch/avr32/kernel/signal.c | 1 -
+ arch/blackfin/include/asm/thread_info.h | 4 --
+ arch/blackfin/kernel/signal.c | 1 -
+ arch/c6x/Kconfig | 1 +
+ arch/c6x/include/asm/processor.h | 2 -
+ arch/c6x/include/asm/syscalls.h | 5 --
+ arch/c6x/include/asm/thread_info.h | 1 -
+ arch/c6x/include/uapi/asm/unistd.h | 3 +
+ arch/c6x/kernel/asm-offsets.c | 1 -
+ arch/c6x/kernel/entry.S | 56 ++++++++--------
+ arch/c6x/kernel/process.c | 72 +++-----------------
+ arch/cris/include/asm/thread_info.h | 3 -
+ arch/frv/Kconfig | 1 +
+ arch/frv/include/asm/processor.h | 9 +--
+ arch/frv/include/asm/ptrace.h | 1 +
+ arch/frv/include/asm/thread_info.h | 3 -
+ arch/frv/include/asm/unistd.h | 2 +
+ arch/frv/kernel/Makefile | 4 +-
+ arch/frv/kernel/entry.S | 13 ++++
+ arch/frv/kernel/frv_ksyms.c | 1 -
+ arch/frv/kernel/kernel_execve.S | 33 ---------
+ arch/frv/kernel/kernel_thread.S | 77 ---------------------
+ arch/frv/kernel/process.c | 66 +++++++-----------
+ 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/m68k/Kconfig | 1 +
+ arch/m68k/include/asm/processor.h | 25 ++++---
+ arch/m68k/include/asm/ptrace.h | 2 +
+ arch/m68k/include/asm/unistd.h | 2 +
+ arch/m68k/kernel/entry.S | 16 +++++
+ arch/m68k/kernel/process.c | 104 +++++++----------------------
+ arch/m68k/kernel/sys_m68k.c | 17 -----
+ arch/microblaze/include/asm/thread_info.h | 3 +-
+ arch/microblaze/kernel/signal.c | 7 +-
+ arch/mips/include/asm/thread_info.h | 3 -
+ arch/mn10300/Kconfig | 1 +
+ arch/mn10300/include/asm/frame.inc | 2 +-
+ arch/mn10300/include/asm/processor.h | 18 +----
+ arch/mn10300/include/asm/ptrace.h | 1 +
+ arch/mn10300/include/asm/thread_info.h | 3 +-
+ arch/mn10300/include/asm/unistd.h | 2 +
+ arch/mn10300/kernel/Makefile | 4 +-
+ arch/mn10300/kernel/entry.S | 18 +++++
+ arch/mn10300/kernel/internal.h | 6 +-
+ arch/mn10300/kernel/kernel_execve.S | 37 ----------
+ arch/mn10300/kernel/kthread.S | 31 ---------
+ arch/mn10300/kernel/process.c | 91 +++++++------------------
+ arch/mn10300/kernel/signal.c | 13 ----
+ 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/Kconfig | 1 +
+ arch/powerpc/include/asm/processor.h | 3 -
+ arch/powerpc/include/asm/ptrace.h | 2 +
+ arch/powerpc/include/asm/syscalls.h | 3 -
+ arch/powerpc/include/asm/thread_info.h | 2 +
+ arch/powerpc/include/asm/unistd.h | 2 +
+ arch/powerpc/kernel/entry_32.S | 16 +++++
+ arch/powerpc/kernel/entry_64.S | 16 +++++
+ arch/powerpc/kernel/misc.S | 7 --
+ arch/powerpc/kernel/misc_32.S | 33 ---------
+ arch/powerpc/kernel/misc_64.S | 34 ----------
+ arch/powerpc/kernel/ppc_ksyms.c | 1 -
+ arch/powerpc/kernel/process.c | 59 ++++++++--------
+ arch/powerpc/kernel/signal_32.c | 1 -
+ arch/powerpc/kernel/sys_ppc32.c | 23 -------
+ 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/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/kernel/entry_32.S | 17 ++---
+ arch/xtensa/include/asm/thread_info.h | 5 --
+ arch/xtensa/kernel/signal.c | 4 --
+ kernel/sched/core.c | 2 +-
+ 99 files changed, 344 insertions(+), 883 deletions(-)
+ delete mode 100644 arch/frv/kernel/kernel_execve.S
+ delete mode 100644 arch/frv/kernel/kernel_thread.S
+ delete mode 100644 arch/mn10300/kernel/kernel_execve.S
+ delete mode 100644 arch/mn10300/kernel/kthread.S
+Merging clk/clk-next (494bfec clk: add of_clk_src_onecell_get() support)
+$ 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 lzo-update/lzo-update (5f70278 lib/lzo: Optimize code for CPUs with inefficient unaligned access)
+$ git merge lzo-update/lzo-update
+Removing lib/lzo/lzo1x_decompress.c
+Merge made by the 'recursive' strategy.
+ include/linux/lzo.h | 15 +-
+ lib/lzo/Makefile | 2 +-
+ lib/lzo/lzo1x_compress.c | 309 +++++++++++++++++++++------------------
+ lib/lzo/lzo1x_decompress.c | 255 --------------------------------
+ lib/lzo/lzo1x_decompress_safe.c | 237 ++++++++++++++++++++++++++++++
+ lib/lzo/lzodefs.h | 34 ++++-
+ 6 files changed, 441 insertions(+), 411 deletions(-)
+ delete mode 100644 lib/lzo/lzo1x_decompress.c
+ create mode 100644 lib/lzo/lzo1x_decompress_safe.c
+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/akpm/master:akpm
+From ../next
+ * [new branch] akpm/master -> akpm
+$ git fetch --no-tags ../next refs/heads/akpm/base:akpm-base
+From ../next
+ * [new branch] 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: linux/coredump.h needs asm/siginfo.h
+Applying: memstick: remove unused field from state struct
+Applying: memstick: ms_block: fix compile issue
+Applying: memstick: use after free in msb_disk_release()
+Applying: memstick: memory leak on error in msb_ftl_scan()
+Applying: kernel/sys.c: fix stack memory content leak via UNAME26
+Applying: drivers/video/backlight/lm3639_bl.c: return proper error in lm3639_bled_mode_store() error paths
+Applying: pidns: remove recursion from free_pid_ns()
+Applying: pidns-remove-recursion-from-free_pid_ns-v5-fix
+Applying: CRIS: Fix I/O macros
+Applying: selinux: fix sel_netnode_insert() suspicious rcu dereference
+Applying: mm, slab: release slab_mutex earlier in kmem_cache_destroy()
+Applying: nohz: fix idle ticks in cpu summary line of /proc/stat
+Applying: vfs: d_obtain_alias() needs to use "/" as default name.
+Applying: x86 cpu_hotplug: unmap cpu2node when the cpu is hotremoved
+Applying: cpu_hotplug-unmap-cpu2node-when-the-cpu-is-hotremoved-fix
+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: x86 numa: don't check if node is NUMA_NO_NODE
+Applying: arch/x86/tools/insn_sanity.c: identify source of messages
+Applying: arch/x86/platform/uv: fix incorrect tlb flush all issue
+Applying: olpc: fix olpc-xo1-sci.c build errors
+Applying: fs/debugsfs: remove unnecessary inode->i_private initialization
+Applying: pcmcia: move unbind/rebind into dev_pm_ops.complete
+Applying: drm/i915: optimize DIV_ROUND_CLOSEST() call
+Applying: drm: fix radeon printk format warnings
+Applying: timeconst.pl: remove deprecated defined(@array)
+Applying: time: don't inline EXPORT_SYMBOL functions
+Applying: h8300: select generic atomic64_t support
+Applying: cciss: cleanup bitops usage
+Applying: cciss: use check_signature()
+Applying: block: store partition_meta_info.uuid as a string
+Applying: init: reduce PARTUUID min length to 1 from 36
+Applying: block: partition: msdos: provide UUIDs for partitions
+Applying: drbd: use copy_highpage
+Applying: vfs: increment iversion when a file is truncated
+Applying: fs: change return values from -EACCES to -EPERM
+Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget()
+Applying: mm/page_alloc.c: remove duplicate check
+Applying: writeback: remove nr_pages_dirtied arg from balance_dirty_pages_ratelimited_nr()
+Applying: mm: show migration types in show_mem
+Applying: memory hotplug: suppress "Device memoryX does not have a release() function" warning
+Applying: memory hotplug: suppress "Device nodeX does not have a release() function" warning
+Applying: mm, memcg: make mem_cgroup_out_of_memory() static
+Applying: swap: add a simple detector for inappropriate swapin readahead
+Applying: swap-add-a-simple-detector-for-inappropriate-swapin-readahead-fix
+Applying: mm/memblock: reduce overhead in binary search
+Applying: compat: generic compat_sys_sched_rr_get_interval implementation
+Applying: drivers/firmware/dmi_scan.c: check dmi version when get system uuid
+Applying: drivers-firmware-dmi_scanc-check-dmi-version-when-get-system-uuid-fix
+Applying: drivers/firmware/dmi_scan.c: fetch dmi version from SMBIOS if it exists
+Applying: drivers-firmware-dmi_scanc-fetch-dmi-version-from-smbios-if-it-exists-checkpatch-fixes
+Applying: hfsplus: add on-disk layout declarations related to attributes tree
+Applying: hfsplus: add functionality of manipulating by records in attributes tree
+Applying: hfsplus: rework functionality of getting, setting and deleting of extended attributes
+Applying: hfsplus: add support of manipulation by attributes file
+Applying: hfsplus-add-support-of-manipulation-by-attributes-file-checkpatch-fixes
+Applying: hfsplus: code style fixes - reworked support of extended attributes
+Applying: fat: modify nfs mount option
+Applying: fat (exportfs): rebuild inode if ilookup() fails
+Applying: fat-exportfs-rebuild-inode-if-ilookup-fails-fix
+Applying: fat (exportfs): rebuild directory-inode if fat_dget() fails
+Applying: Documentation: update nfs option in filesystem/vfat.txt
+Applying: kstrto*: add documentation
+Applying: simple_strto*: annotate function as obsolete
+Applying: proc: don't show nonexistent capabilities
+Applying: ipc/sem.c: alternatives to preempt_disable()
+Applying: dma-debug: new interfaces to debug dma mapping errors
+Applying: linux/compiler.h: add __must_hold macro for functions called with a lock held
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + b8e296a...04b956f akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (04b956f linux/compiler.h: add __must_hold macro for functions called with a lock held)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API.txt | 12 +
+ Documentation/DocBook/kernel-api.tmpl | 3 +
+ Documentation/filesystems/vfat.txt | 23 +-
+ arch/arm64/include/asm/unistd32.h | 1 +
+ arch/arm64/kernel/sys_compat.c | 15 -
+ arch/cris/include/asm/io.h | 39 +-
+ arch/h8300/Kconfig | 1 +
+ arch/powerpc/include/asm/systbl.h | 2 +-
+ arch/powerpc/include/asm/unistd.h | 1 +
+ arch/powerpc/kernel/sys_ppc32.c | 17 +-
+ arch/sparc/include/asm/unistd.h | 1 +
+ arch/sparc/kernel/sys_sparc32.c | 14 -
+ arch/tile/include/asm/compat.h | 2 -
+ arch/tile/include/asm/unistd.h | 1 +
+ arch/tile/kernel/compat.c | 18 -
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/dma-mapping.h | 1 +
+ arch/x86/include/asm/uv/uv.h | 2 +-
+ arch/x86/kernel/acpi/boot.c | 7 +-
+ arch/x86/mm/numa.c | 3 +-
+ arch/x86/platform/iris/iris.c | 67 +++-
+ arch/x86/platform/uv/tlb_uv.c | 10 +-
+ arch/x86/tools/insn_sanity.c | 10 +-
+ block/genhd.c | 8 +-
+ block/partitions/efi.c | 7 +-
+ block/partitions/msdos.c | 21 +-
+ drivers/acpi/acpi_memhotplug.c | 123 ++++--
+ drivers/base/memory.c | 9 +-
+ drivers/base/node.c | 11 +
+ drivers/block/cciss.c | 21 +-
+ drivers/block/drbd/drbd_bitmap.c | 7 +-
+ drivers/firmware/dmi_scan.c | 78 +++-
+ drivers/gpu/drm/i915/intel_pm.c | 3 +-
+ drivers/gpu/drm/radeon/radeon_acpi.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_atpx_handler.c | 2 +-
+ drivers/memstick/core/ms_block.c | 8 +-
+ drivers/memstick/core/ms_block.h | 5 +-
+ drivers/pcmcia/cs.c | 37 +-
+ drivers/video/backlight/lm3639_bl.c | 4 +-
+ fs/attr.c | 5 +
+ fs/autofs4/root.c | 2 +-
+ fs/block_dev.c | 8 +-
+ fs/btrfs/disk-io.c | 8 +-
+ fs/btrfs/file.c | 3 +-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/dcache.c | 2 +-
+ fs/debugfs/inode.c | 1 -
+ fs/dlm/config.c | 2 +-
+ fs/fat/fat.h | 17 +-
+ fs/fat/file.c | 4 +
+ fs/fat/inode.c | 36 +-
+ fs/fat/nfs.c | 233 ++++++++++-
+ fs/gfs2/sys.c | 18 +-
+ fs/hfsplus/Makefile | 3 +-
+ fs/hfsplus/attributes.c | 399 +++++++++++++++++++
+ fs/hfsplus/bfind.c | 79 +++-
+ fs/hfsplus/bnode.c | 6 +-
+ fs/hfsplus/brec.c | 23 +-
+ fs/hfsplus/btree.c | 8 +
+ fs/hfsplus/catalog.c | 36 +-
+ fs/hfsplus/dir.c | 6 +-
+ fs/hfsplus/extents.c | 4 +-
+ fs/hfsplus/hfsplus_fs.h | 41 +-
+ fs/hfsplus/hfsplus_raw.h | 68 +++-
+ fs/hfsplus/inode.c | 13 +
+ fs/hfsplus/ioctl.c | 542 ++++++++++++++++++++++----
+ fs/hfsplus/super.c | 33 +-
+ fs/hfsplus/unicode.c | 7 +-
+ fs/ncpfs/ioctl.c | 2 +-
+ fs/ocfs2/file.c | 5 +-
+ fs/proc/array.c | 9 +
+ fs/proc/base.c | 6 +-
+ fs/proc/stat.c | 14 +-
+ fs/splice.c | 5 +-
+ fs/udf/file.c | 2 +-
+ include/linux/compat.h | 3 +
+ include/linux/compiler.h | 2 +
+ include/linux/coredump.h | 1 +
+ include/linux/dma-debug.h | 7 +
+ include/linux/genhd.h | 8 +-
+ include/linux/kernel.h | 33 ++
+ include/linux/oom.h | 2 -
+ include/linux/pid_namespace.h | 8 +-
+ include/linux/rmap.h | 3 +
+ include/linux/writeback.h | 9 +-
+ init/do_mounts.c | 61 ++-
+ ipc/sem.c | 250 ++++++++----
+ kernel/compat.c | 17 +
+ kernel/pid_namespace.c | 21 +-
+ kernel/sys.c | 12 +-
+ kernel/time.c | 4 +-
+ kernel/timeconst.pl | 2 +-
+ lib/dma-debug.c | 71 +++-
+ lib/kstrtox.c | 64 +++
+ lib/vsprintf.c | 8 +
+ mm/internal.h | 48 +++
+ mm/memblock.c | 5 +
+ mm/memcontrol.c | 4 +-
+ mm/memory.c | 3 +-
+ mm/page-writeback.c | 11 +-
+ mm/page_alloc.c | 45 ++-
+ mm/rmap.c | 3 +
+ mm/shmem.c | 1 +
+ mm/slab_common.c | 5 +-
+ mm/swap_state.c | 6 +
+ security/selinux/netnode.c | 3 +-
+ 106 files changed, 2433 insertions(+), 538 deletions(-)
+ create mode 100644 fs/hfsplus/attributes.c