$ date Tuesday 14 May 10:39:46 EST 2013 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at f722406 Linux 3.10-rc1 Merging origin/master (dbbffe6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge origin/master Updating f722406..dbbffe6 Fast-forward drivers/gpu/drm/drm_crtc.c | 5 + drivers/gpu/drm/drm_crtc_helper.c | 27 ++-- drivers/gpu/drm/drm_drv.c | 20 +-- drivers/gpu/drm/drm_encoder_slave.c | 6 +- drivers/gpu/drm/drm_mm.c | 34 ++--- drivers/gpu/drm/drm_modes.c | 1 + drivers/gpu/drm/i915/i915_gem.c | 8 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 15 +-- drivers/gpu/drm/i915/i915_reg.h | 2 - drivers/gpu/drm/i915/intel_ddi.c | 5 + drivers/gpu/drm/i915/intel_dp.c | 77 +++++++----- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_fb.c | 16 ++- drivers/gpu/drm/i915/intel_pm.c | 44 +++---- drivers/gpu/drm/mgag200/mgag200_mode.c | 90 ++++++++------ drivers/lguest/page_tables.c | 1 + drivers/net/caif/Kconfig | 2 +- drivers/net/ethernet/3com/3c59x.c | 25 ++-- drivers/net/ethernet/brocade/bna/bnad.c | 5 +- drivers/net/ethernet/cadence/Kconfig | 3 +- drivers/net/ethernet/calxeda/Kconfig | 2 +- drivers/net/ethernet/freescale/fec_main.c | 20 +-- drivers/net/ethernet/ibm/emac/core.c | 36 ++++-- drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +- drivers/net/ethernet/mellanox/mlx4/fw.c | 4 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 29 +++-- drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 95 ++++++++++++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 4 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 22 ++-- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 54 ++++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 2 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 46 +++++-- .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 8 +- .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 3 - drivers/net/ethernet/qlogic/qlge/qlge_main.c | 7 ++ drivers/net/ethernet/stmicro/stmmac/Kconfig | 2 +- drivers/net/macvlan.c | 7 +- drivers/net/virtio_net.c | 2 +- drivers/net/wireless/ath/ath5k/base.c | 5 + drivers/net/wireless/ath/ath9k/Kconfig | 2 +- .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 138 +++++++++++---------- drivers/net/wireless/ath/ath9k/main.c | 10 +- drivers/net/wireless/b43/dma.c | 19 +++ drivers/net/wireless/b43/dma.h | 4 +- drivers/net/wireless/b43/main.c | 43 +++---- drivers/net/wireless/iwlegacy/4965-mac.c | 3 +- drivers/net/wireless/mwifiex/cfg80211.c | 3 - drivers/net/wireless/mwifiex/cmdevt.c | 1 + drivers/net/wireless/mwifiex/main.c | 1 + drivers/net/wireless/mwifiex/sta_ioctl.c | 21 +--- drivers/spi/spi-atmel.c | 51 ++++++-- drivers/spi/spi-davinci.c | 2 +- drivers/spi/spi.c | 9 +- drivers/vhost/vringh.c | 3 + include/drm/drmP.h | 3 +- include/drm/drm_fb_helper.h | 15 +-- include/linux/mlx4/qp.h | 29 ++++- include/linux/spi/spi.h | 4 +- include/net/sock.h | 12 ++ net/batman-adv/distributed-arp-table.c | 13 ++ net/batman-adv/main.c | 18 ++- net/batman-adv/network-coding.c | 8 +- net/core/sock.c | 12 -- net/ipv4/ip_output.c | 2 +- net/ipv6/ip6_gre.c | 2 + net/ipv6/tcp_ipv6.c | 12 ++ net/ipv6/udp.c | 13 +- net/ipv6/udp_impl.h | 2 + net/ipv6/udplite.c | 2 +- net/ipv6/xfrm6_policy.c | 4 +- 71 files changed, 764 insertions(+), 436 deletions(-) Merging fixes/master (0279b3c Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (a54292f kbuild: generate generic headers before recursing into scripts) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (85a53d1 ARC: [TB10x] Remove redundant abilis,simple-pinctrl mechanism) $ git merge arc-current/for-curr Merge made by the 'recursive' strategy. arch/arc/boot/dts/abilis_tb100_dvk.dts | 2 +- arch/arc/boot/dts/abilis_tb101_dvk.dts | 2 +- arch/arc/boot/dts/abilis_tb10x.dtsi | 6 ++---- arch/arc/plat-tb10x/tb10x.c | 26 -------------------------- 4 files changed, 4 insertions(+), 32 deletions(-) Merging arm-current/fixes (6eabb33 ARM: 7720/1: ARM v6/v7 cmpxchg64 shouldn't clear upper 32 bits of the old/new value) $ git merge arm-current/fixes Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 3 ++- arch/arm/Makefile | 2 +- arch/arm/common/mcpm_platsmp.c | 3 --- arch/arm/include/asm/cmpxchg.h | 8 ++++---- drivers/mmc/host/mmci.c | 9 +++++++-- 5 files changed, 14 insertions(+), 11 deletions(-) Merging m68k-current/for-linus (f722406 Linux 3.10-rc1) $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge (5737789 powerpc: Make hard_irq_disable() do the right thing vs. irq tracing) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) $ git merge sparc/master Already up-to-date. Merging net/master (dbbffe6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge net/master Already up-to-date. Merging ipsec/master (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge ipsec/master Already up-to-date. Merging sound-current/for-linus (f722406 Linux 3.10-rc1) $ git merge sound-current/for-linus Already up-to-date. Merging pci-current/for-linus (e253aaf PCI: Delay final fixups until resources are assigned) $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (ccd384b mwifiex: fix setting of multicast filter) $ git merge wireless/master Already up-to-date. Merging driver-core.current/driver-core-linus (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (f722406 Linux 3.10-rc1) $ git merge tty.current/tty-linus Already up-to-date. Merging usb.current/usb-linus (f722406 Linux 3.10-rc1) $ git merge usb.current/usb-linus Already up-to-date. Merging staging.current/staging-linus (705a421 staging: nvec: remove inline marking of EXPORT_SYMBOL functions) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/staging/comedi/Kconfig | 9 +++++++++ drivers/staging/comedi/comedi_buf.c | 12 ++++++++++++ drivers/staging/comedi/comedi_fops.c | 3 --- drivers/staging/comedi/drivers/ni_labpc.c | 8 +++++--- drivers/staging/comedi/drivers/ni_labpc.h | 1 + drivers/staging/comedi/drivers/ni_mio_common.c | 20 ++++++++++---------- drivers/staging/nvec/nvec.c | 2 +- drivers/staging/vt6656/hostap.c | 2 +- 8 files changed, 39 insertions(+), 18 deletions(-) Merging char-misc.current/char-misc-linus (f722406 Linux 3.10-rc1) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (f0aacea Input: wacom - add a few new styli for Cintiq series) $ git merge input-current/for-linus Merge made by the 'recursive' strategy. drivers/input/tablet/wacom_wac.c | 72 ++++++++++++++++++++++++++--------- drivers/input/tablet/wacom_wac.h | 1 + drivers/input/touchscreen/egalax_ts.c | 2 +- 3 files changed, 55 insertions(+), 20 deletions(-) Merging md-current/for-linus (32f9f57 MD: ignore discard request for hard disks of hybid raid1/raid10 array) $ 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 (3862de1 crypto: caam - fix job ring cleanup code) $ git merge crypto-current/master Already up-to-date. Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/gayle.c | 15 +-------------- drivers/ide/tx4938ide.c | 13 +------------ drivers/ide/tx4939ide.c | 13 +------------ 3 files changed, 3 insertions(+), 38 deletions(-) Merging dwmw2/master (5950f08 pcmcia: remove RPX board stuff) $ 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 (a0d271c Linux 3.6) $ git merge irqdomain-current/irqdomain/merge Already up-to-date. Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge (0d2d0cc spi/davinci: fix module build error) $ git merge spi-current/spi/merge Already up-to-date. Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) $ git merge gpio-current/gpio/merge Already up-to-date. Merging rr-fixes/fixes (c1be5a5 Linux 3.9) $ git merge rr-fixes/fixes Already up-to-date. Merging mfd-fixes/master (51a26ae Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge mfd-fixes/master Already up-to-date. Merging vfio-fixes/for-linus (904c680 vfio-pci: Fix possible integer overflow) $ git merge vfio-fixes/for-linus Already up-to-date. Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (f722406 Linux 3.10-rc1) $ git merge arc/for-next Already up-to-date. Merging arm/for-next (d3db3f7 Merge branch 'fixes' into for-next) $ git merge arm/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging arm-perf/for-next/perf (ab87304 Merge branches 'perf/fixes' and 'hw-breakpoint' into for-next/perf) $ git merge arm-perf/for-next/perf Merge made by the 'recursive' strategy. Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) $ git merge davinci/davinci-next Already up-to-date. Merging xilinx/arm-next (64e3fd3 arm: zynq: Add support for pmu) $ git merge xilinx/arm-next Resolved 'arch/arm/mach-highbank/highbank.c' using previous resolution. Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution. Resolved 'arch/arm/mach-spear/spear13xx.c' using previous resolution. Resolved 'arch/arm/mach-vexpress/v2m.c' using previous resolution. Resolved 'arch/arm/mach-zynq/platsmp.c' using previous resolution. Resolved 'drivers/clocksource/Makefile' using previous resolution. Resolved 'drivers/clocksource/tegra20_timer.c' using previous resolution. Auto-merging drivers/clocksource/tegra20_timer.c CONFLICT (content): Merge conflict in drivers/clocksource/tegra20_timer.c Auto-merging drivers/clocksource/Makefile CONFLICT (content): Merge conflict in drivers/clocksource/Makefile Auto-merging arch/arm/mach-zynq/platsmp.c CONFLICT (add/add): Merge conflict in arch/arm/mach-zynq/platsmp.c Auto-merging arch/arm/mach-vexpress/v2m.c CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c Auto-merging arch/arm/mach-spear/spear13xx.c CONFLICT (content): Merge conflict in arch/arm/mach-spear/spear13xx.c Auto-merging arch/arm/mach-imx/mach-imx6q.c CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-imx6q.c Auto-merging arch/arm/mach-highbank/highbank.c CONFLICT (content): Merge conflict in arch/arm/mach-highbank/highbank.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 94f9bce] Merge remote-tracking branch 'xilinx/arm-next' $ git diff -M --stat --summary HEAD^.. Merging arm64/upstream (9c413e2 arm64: debug: clear mdscr_el1 instead of taking the OS lock) $ git merge arm64/upstream Merge made by the 'recursive' strategy. arch/arm64/kernel/debug-monitors.c | 2 -- arch/arm64/kernel/early_printk.c | 5 +++-- arch/arm64/mm/proc.S | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) Merging blackfin/blackfin-linus (5ae89ee bfin cache: dcplb map: add 16M dcplb map for BF60x) $ git merge blackfin/blackfin-linus Already up-to-date. Merging c6x/for-linux-next (f934af0 add memory barrier to arch_local_irq_restore) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (32ade6a CRIS: Add kvm_para.h which includes generic file) $ git merge cris/for-next Auto-merging arch/cris/include/asm/processor.h Auto-merging arch/cris/arch-v32/drivers/Kconfig Auto-merging arch/cris/Kconfig Merge made by the 'recursive' strategy. arch/cris/Kconfig | 81 ------- arch/cris/arch-v10/drivers/Kconfig | 70 ------ arch/cris/arch-v10/drivers/Makefile | 2 - arch/cris/arch-v32/drivers/Kconfig | 394 ---------------------------------- arch/cris/arch-v32/mach-a3/Kconfig | 4 - arch/cris/include/asm/processor.h | 1 - arch/cris/include/uapi/asm/kvm_para.h | 1 + 7 files changed, 1 insertion(+), 552 deletions(-) create mode 100644 arch/cris/include/uapi/asm/kvm_para.h Merging hexagon/linux-next (de44443 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (797f6a6 Add size restriction to the kdump documentation) $ git merge ia64/next Already up-to-date. Merging m68k/for-next (f722406 Linux 3.10-rc1) $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next (2842e5b0 m68knommu: enable Timer on coldfire 532x) $ git merge m68knommu/for-next Already up-to-date. Merging metag/for-next (164c013 metag: defconfigs: increase log buffer 8KiB => 128KiB) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (a047775 microblaze: Enable IRQ in arch_cpu_idle) $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next (b22d1b6 Merge branch 'mti-next' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into mips-for-linux-next) $ git merge mips/mips-for-linux-next Already up-to-date. Merging openrisc/for-upstream (6af6095 openrisc: remove HAVE_VIRT_TO_BUS) $ git merge openrisc/for-upstream Already up-to-date. Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging parisc-hd/for-next (c1be5a5 Linux 3.9) $ git merge parisc-hd/for-next Already up-to-date. Merging powerpc/next (5737789 powerpc: Make hard_irq_disable() do the right thing vs. irq tracing) $ 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 (fdeaf0e powerpc/512x: add ifm ac14xx board) $ git merge mpc5xxx/next Already up-to-date. Merging galak/next (9e2ecdb powerpc/fsl-booke: add the reg prop for pci bridge device node for T4/B4) $ git merge galak/next Already up-to-date. Merging s390/features (617e164 s390: disable pfmf for clear page instruction) $ git merge s390/features Merge made by the 'recursive' strategy. arch/s390/Kconfig | 1 - arch/s390/include/asm/page.h | 20 ++++++++------------ arch/s390/kernel/dis.c | 2 ++ 3 files changed, 10 insertions(+), 13 deletions(-) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) $ git merge sh/sh-latest Resolved 'arch/sh/kernel/cpu/sh2a/Makefile' using previous resolution. Auto-merging arch/sh/kernel/cpu/sh2a/Makefile CONFLICT (content): Merge conflict in arch/sh/kernel/cpu/sh2a/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b7eba57] Merge remote-tracking branch 'sh/sh-latest' $ git diff -M --stat --summary HEAD^.. .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ arch/sh/include/asm/hw_breakpoint.h | 12 +- arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ arch/sh/kernel/cpu/sh2a/Makefile | 1 + arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ arch/sh/kernel/hw_breakpoint.c | 8 ++ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- include/linux/serial_sci.h | 4 + 9 files changed, 375 insertions(+), 15 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c Merging sparc-next/master (f8ce1fa Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux) $ git merge sparc-next/master Already up-to-date. Merging tile/master (9fc1894 arch/tile: Fix syscall return value passed to tracepoint) $ git merge tile/master Already up-to-date. Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (b341d84 xtensa: Switch to asm-generic/linkage.h) $ git merge xtensa/for_next Already up-to-date. Merging btrfs/next (667e7d9 Btrfs: allow superblock mismatch from older mkfs) $ git merge btrfs/next Already up-to-date. Merging ceph/testing (b5b09be rbd: fix image request leak on parent read) $ git merge ceph/testing Already up-to-date. Merging cifs/for-next (c2b93e0 cifs: only set ops for inodes in I_NEW state) $ git merge cifs/for-next Merge made by the 'recursive' strategy. fs/cifs/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 (f6161aa Linux 3.9-rc2) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (e162b2f jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset) $ git merge ext3/for_next Already up-to-date. Merging ext4/dev (e2555fd jbd,jbd2: fix oops in jbd2_journal_put_journal_head()) $ git merge ext4/dev Auto-merging fs/ext4/page-io.c Auto-merging fs/ext4/mballoc.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/file.c Merge made by the 'recursive' strategy. fs/ext4/ext4.h | 8 +-- fs/ext4/extents.c | 9 ++-- fs/ext4/extents_status.c | 17 ++++-- fs/ext4/extents_status.h | 3 +- fs/ext4/file.c | 4 +- fs/ext4/inode.c | 85 ++++++++++++++---------------- fs/ext4/mballoc.c | 6 ++- fs/ext4/page-io.c | 121 ++++++++++++++++--------------------------- include/linux/journal-head.h | 8 ++- include/trace/events/ext4.h | 4 +- 10 files changed, 119 insertions(+), 146 deletions(-) Merging f2fs/dev (f722406 Linux 3.10-rc1) $ git merge f2fs/dev Already up-to-date. Merging fuse/for-next (60b9df7 fuse: add flag to turn on async direct IO) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (4d61eb6 GFS2: Sort buffer lists by inplace block number) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/lops.c | 16 ++++++++++++++++ fs/gfs2/quota.c | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-) Merging jfs/jfs-next (73aaa22 jfs: fix a couple races) $ git merge jfs/jfs-next Already up-to-date. Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) $ git merge logfs/master Auto-merging fs/logfs/super.c Merge made by the 'recursive' strategy. fs/logfs/dev_mtd.c | 2 +- fs/logfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (f722406 Linux 3.10-rc1) $ git merge nfs/linux-next Already up-to-date. Merging nfsd/nfsd-next (4bdc33e NFSDv4.2: Add NFS v4.2 support to the NFS server) $ git merge nfsd/nfsd-next Merge made by the 'recursive' strategy. fs/nfsd/nfs4state.c | 2 +- fs/nfsd/nfs4xdr.c | 1 + fs/nfsd/nfsd.h | 8 +++++++- fs/nfsd/vfs.h | 5 ----- include/linux/nfs4.h | 9 +++++++++ security/capability.c | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/dlm/dlmrecovery.c Auto-merging fs/ocfs2/dlm/dlmmaster.c 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 | 8 +++++++- fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ 4 files changed, 25 insertions(+), 33 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 (c1be5a5 Linux 3.9) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (c1be5a5 Linux 3.9) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (7dfbcbe xfs: fallback to vmalloc for large buffers in xfs_compat_attrlist_by_handle) $ git merge xfs/for-next Already up-to-date. Merging vfs/for-next (ac3e3c5 don't bother with deferred freeing of fdtables) $ git merge vfs/for-next Already up-to-date. Merging pci/next (d4f09c5 Merge branch 'pci/gavin-msi-cleanup' into next) $ git merge pci/next Already up-to-date. Merging hid/for-next (46b1897 Merge branch 'for-3.10/hid-debug' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. Merging i2c/i2c/for-next (f722406 Linux 3.10-rc1) $ git merge i2c/i2c/for-next Already up-to-date. Merging jdelvare-hwmon/master (1aaf6d3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (4fd72d8 hwmon: w83627ehf: Remove redundant platform_set_drvdata()) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. drivers/hwmon/abituguru3.c | 1 - drivers/hwmon/coretemp.c | 2 -- drivers/hwmon/i5k_amb.c | 2 -- drivers/hwmon/iio_hwmon.c | 6 ++++-- drivers/hwmon/nct6775.c | 6 ++++-- drivers/hwmon/ntc_thermistor.c | 1 - drivers/hwmon/w83627ehf.c | 2 -- 7 files changed, 8 insertions(+), 12 deletions(-) Merging v4l-dvb/master (1d62caa Merge /home/v4l/v4l/patchwork) $ git merge v4l-dvb/master Already up-to-date! Merge made by the 'recursive' strategy. Merging kbuild/for-next (abc88a2 Merge branch 'kbuild/kbuild' into kbuild/for-next) $ git merge kbuild/for-next Already up-to-date! Merge made by the 'recursive' strategy. 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/for-next (3d9b935 libata: change maintainer) $ git merge libata/for-next Already up-to-date. Merging infiniband/for-next (f1258ea Merge branches 'misc' and 'mlx4' into for-next) $ git merge infiniband/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging pstore/master (bd08ec3 pstore/ram: Restore ecc information block) $ git merge pstore/master Already up-to-date. Merging pm/linux-next (990422b Merge branch 'pm-fixes-next' into linux-next) $ git merge pm/linux-next Merge made by the 'recursive' strategy. Documentation/power/devices.txt | 15 ++--- Documentation/power/interface.txt | 4 +- Documentation/power/notifiers.txt | 6 +- Documentation/power/states.txt | 30 +++++---- drivers/acpi/ac.c | 33 ++++++++++ drivers/acpi/ec.c | 4 +- drivers/acpi/processor_driver.c | 8 +-- drivers/acpi/processor_idle.c | 29 ++++++--- drivers/acpi/video.c | 8 +++ drivers/base/power/common.c | 12 ++-- drivers/cpufreq/Kconfig | 2 +- drivers/cpufreq/Kconfig.arm | 15 ++--- drivers/cpufreq/arm_big_little.c | 7 +-- drivers/cpufreq/arm_big_little.h | 5 ++ drivers/cpufreq/arm_big_little_dt.c | 9 +-- drivers/cpufreq/cpufreq-cpu0.c | 27 +++++--- drivers/cpufreq/cpufreq.c | 6 +- drivers/cpufreq/cpufreq_governor.c | 11 ++-- drivers/cpufreq/cpufreq_governor.h | 1 + drivers/cpufreq/cpufreq_ondemand.c | 1 - drivers/cpufreq/intel_pstate.c | 122 +++++++----------------------------- drivers/cpufreq/kirkwood-cpufreq.c | 4 -- include/acpi/acpiosxf.h | 2 +- include/acpi/processor.h | 10 ++- 24 files changed, 183 insertions(+), 188 deletions(-) Merging idle/next (5c99726b Merge branch 'fspin' into next) $ git merge idle/next Merge made by the 'recursive' strategy. tools/power/fspin/Makefile | 21 +++ tools/power/fspin/fspin.1 | 68 +++++++ tools/power/fspin/fspin.c | 443 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 532 insertions(+) create mode 100644 tools/power/fspin/Makefile create mode 100644 tools/power/fspin/fspin.1 create mode 100644 tools/power/fspin/fspin.c 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 cpuidle/cpuidle-next (817c876 Merge branch 'pm-fixes-next' into fixes-next) $ git merge cpuidle/cpuidle-next Resolved 'drivers/base/power/qos.c' using previous resolution. Auto-merging drivers/base/power/qos.c CONFLICT (content): Merge conflict in drivers/base/power/qos.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 2628622] 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 (de6558d Merge branch 'MAINTAINERS-update' of .git into next) $ git merge thermal/next Already up-to-date. Merging ieee1394/for-next (6fe9efb firewire: ohci: dump_stack() for PHY regs read/write failures) $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next (f6161aa Linux 3.9-rc2) $ git merge ubi/linux-next Already up-to-date. Merging dlm/next (9000831 dlm: avoid unnecessary posix unlock) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) $ git merge swiotlb/linux-next Already up-to-date. Merging scsi/for-next (222ab59 [SCSI] ipr: Avoid target_destroy accessing memory after it was freed) $ git merge scsi/for-next Merge made by the 'recursive' strategy. drivers/scsi/ipr.c | 16 ---------------- drivers/scsi/ipr.h | 6 +++--- drivers/scsi/qla2xxx/qla_inline.h | 11 +++++++++++ drivers/scsi/qla2xxx/qla_isr.c | 27 ++++----------------------- drivers/scsi/qla2xxx/qla_mbx.c | 2 -- drivers/scsi/qla2xxx/qla_mr.c | 10 ++-------- drivers/scsi/qla2xxx/qla_nx.c | 26 ++++++++++---------------- 7 files changed, 30 insertions(+), 68 deletions(-) Merging target-updates/for-next (04b59ba tcm_vhost: Enable VIRTIO_SCSI_F_HOTPLUG) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (b8d26b3 iser-target: Add iSCSI Extensions for RDMA (iSER) target driver) $ 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 (f722406 Linux 3.10-rc1) $ git merge slave-dma/next Already up-to-date. Merging dmaengine/next (41ef2d5 Linux 3.9-rc7) $ git merge dmaengine/next Already up-to-date. Merging net-next/master (dbbffe6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) $ git merge net-next/master Already up-to-date. Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) $ git merge ipsec-next/master Already up-to-date. Merging wireless-next/master (de9c9f8 Merge tag 'remoteproc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc) $ git merge wireless-next/master Already up-to-date. Merging bluetooth/master (26b5afc Bluetooth: Mgmt Device Found Event) $ git merge bluetooth/master Auto-merging net/bluetooth/l2cap_sock.c Merge made by the 'recursive' strategy. include/net/bluetooth/hci_core.h | 29 ++--- include/net/bluetooth/l2cap.h | 2 +- net/bluetooth/hci_core.c | 182 +++++++++---------------------- net/bluetooth/hci_event.c | 67 +----------- net/bluetooth/l2cap_core.c | 121 ++++++++++++++------- net/bluetooth/l2cap_sock.c | 4 +- net/bluetooth/mgmt.c | 229 ++++++++++++++++++++++++++------------- net/bluetooth/smp.c | 4 +- 8 files changed, 308 insertions(+), 330 deletions(-) Merging mtd/master (a637b0d Merge tag 'for-linus-20130509' of git://git.infradead.org/linux-mtd) $ git merge mtd/master Already up-to-date. Merging l2-mtd/master (7278046 mtd: Convert logging messages) $ git merge l2-mtd/master Merge made by the 'recursive' strategy. arch/mips/bcm63xx/nvram.c | 11 + arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h | 2 + drivers/mtd/bcm63xxpart.c | 9 +- drivers/mtd/chips/cfi_cmdset_0002.c | 4 +- drivers/mtd/devices/bcm47xxsflash.c | 68 ++++++ drivers/mtd/devices/bcm47xxsflash.h | 2 + drivers/mtd/devices/block2mtd.c | 58 +++--- drivers/mtd/devices/elm.c | 6 +- drivers/mtd/devices/m25p80.c | 44 +++- drivers/mtd/devices/mtd_dataflash.c | 8 +- drivers/mtd/devices/spear_smi.c | 6 +- drivers/mtd/devices/sst25l.c | 6 +- drivers/mtd/nand/Kconfig | 2 +- drivers/mtd/nand/fsl_ifc_nand.c | 3 +- drivers/mtd/nand/fsmc_nand.c | 6 +- drivers/mtd/nand/gpio.c | 227 ++++++--------------- drivers/mtd/nand/nand_base.c | 24 +-- drivers/mtd/nand/r852.c | 5 +- include/linux/mtd/nand.h | 11 +- 19 files changed, 249 insertions(+), 253 deletions(-) Merging crypto/master (3862de1 crypto: caam - fix job ring cleanup code) $ git merge crypto/master Already up-to-date. Merging drm/drm-next (9f1d036 drm/mgag200: Fix framebuffer base address programming) $ git merge drm/drm-next Already up-to-date. Merging drm-intel/for-linux-next (1ffc528 drm/i915: clear the stolen fb before resuming) $ git merge drm-intel/for-linux-next Already up-to-date. Merging sound/for-next (f722406 Linux 3.10-rc1) $ git merge sound/for-next Already up-to-date. Merging sound-asoc/for-next (35168a9 Merge remote-tracking branch 'asoc/topic/x86' into asoc-next) $ git merge sound-asoc/for-next Auto-merging sound/soc/codecs/spdif_transmitter.c Merge made by the 'recursive' strategy. .../devicetree/bindings/sound/mxs-saif.txt | 17 +- .../devicetree/bindings/sound/spdif-receiver.txt | 10 + .../bindings/sound/spdif-transmitter.txt | 10 + include/sound/soc-dapm.h | 2 + sound/soc/atmel/sam9g20_wm8731.c | 9 - sound/soc/cirrus/Kconfig | 2 +- sound/soc/cirrus/ep93xx-ac97.c | 16 +- sound/soc/cirrus/ep93xx-i2s.c | 14 +- sound/soc/cirrus/ep93xx-pcm.c | 138 +------ sound/soc/codecs/88pm860x-codec.c | 9 +- sound/soc/codecs/Makefile | 2 +- sound/soc/codecs/ab8500-codec.c | 6 + sound/soc/codecs/ab8500-codec.h | 36 +- sound/soc/codecs/da7213.c | 8 +- sound/soc/codecs/jz4740.c | 2 - sound/soc/codecs/sgtl5000.c | 214 +++++++--- sound/soc/codecs/sgtl5000.h | 2 +- sound/soc/codecs/spdif_receiver.c | 10 + .../{spdif_transciever.c => spdif_transmitter.c} | 10 + sound/soc/codecs/wm0010.c | 1 + sound/soc/codecs/wm8994.c | 49 ++- sound/soc/codecs/wm_adsp.c | 458 ++++++++++++++++++++- sound/soc/codecs/wm_adsp.h | 3 + sound/soc/fsl/imx-audmux.c | 8 - sound/soc/fsl/imx-sgtl5000.c | 5 + sound/soc/jz4740/jz4740-i2s.c | 17 +- sound/soc/mid-x86/mfld_machine.c | 1 - sound/soc/mxs/mxs-pcm.c | 18 - sound/soc/mxs/mxs-pcm.h | 7 - sound/soc/mxs/mxs-saif.c | 37 +- sound/soc/mxs/mxs-saif.h | 1 - sound/soc/mxs/mxs-sgtl5000.c | 10 +- sound/soc/omap/omap-mcbsp.c | 2 - sound/soc/samsung/smdk_wm8580pcm.c | 1 - sound/soc/samsung/smdk_wm8994pcm.c | 1 - sound/soc/soc-core.c | 77 ++-- sound/soc/soc-dapm.c | 16 + sound/soc/spear/spdif_in.c | 19 +- sound/soc/spear/spdif_out.c | 14 +- sound/soc/spear/spear_pcm.c | 152 +------ sound/soc/ux500/mop500_ab8500.c | 20 +- 41 files changed, 867 insertions(+), 567 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt create mode 100644 Documentation/devicetree/bindings/sound/spdif-transmitter.txt rename sound/soc/codecs/{spdif_transciever.c => spdif_transmitter.c} (88%) Merging modules/modules-next (a53a11f3 modpost: fix unwanted VMLINUX_SYMBOL_STR expansion) $ git merge modules/modules-next Already up-to-date. Merging virtio/virtio-next (01d779a caif_virtio: Remove bouncing email addresses) $ git merge virtio/virtio-next Already up-to-date. Merging input/next (d520145 Input: w90p910_keypad - remove redundant platform_set_drvdata()) $ git merge input/next Auto-merging drivers/input/touchscreen/egalax_ts.c Auto-merging drivers/input/keyboard/omap4-keypad.c Merge made by the 'recursive' strategy. drivers/input/keyboard/amikbd.c | 1 - drivers/input/keyboard/bf54x-keys.c | 2 -- drivers/input/keyboard/davinci_keyscan.c | 2 -- drivers/input/keyboard/ep93xx_keypad.c | 3 -- drivers/input/keyboard/gpio_keys.c | 1 - drivers/input/keyboard/gpio_keys_polled.c | 2 -- drivers/input/keyboard/jornada680_kbd.c | 2 -- drivers/input/keyboard/jornada720_kbd.c | 2 -- drivers/input/keyboard/matrix_keypad.c | 2 -- drivers/input/keyboard/omap4-keypad.c | 2 -- drivers/input/keyboard/opencores-kbd.c | 2 -- drivers/input/keyboard/pmic8xxx-keypad.c | 2 -- drivers/input/keyboard/pxa27x_keypad.c | 1 - drivers/input/keyboard/pxa930_rotary.c | 1 - drivers/input/keyboard/samsung-keypad.c | 2 -- drivers/input/keyboard/sh_keysc.c | 2 -- drivers/input/keyboard/spear-keyboard.c | 1 - drivers/input/keyboard/tnetv107x-keypad.c | 2 -- drivers/input/keyboard/twl4030_keypad.c | 1 - drivers/input/keyboard/w90p910_keypad.c | 1 - drivers/input/misc/ab8500-ponkey.c | 2 -- drivers/input/misc/bfin_rotary.c | 1 - drivers/input/misc/gpio_tilt_polled.c | 2 -- drivers/input/misc/max8925_onkey.c | 2 -- drivers/input/misc/mc13783-pwrbutton.c | 1 - drivers/input/misc/pm8xxx-vibrator.c | 2 -- drivers/input/misc/pmic8xxx-pwrkey.c | 2 -- drivers/input/misc/pwm-beeper.c | 1 - drivers/input/misc/rotary_encoder.c | 2 -- drivers/input/mouse/amimouse.c | 1 - drivers/input/mouse/gpio_mouse.c | 3 -- drivers/input/serio/altera_ps2.c | 1 - drivers/input/serio/at32psif.c | 2 -- drivers/input/serio/q40kbd.c | 1 - drivers/input/touchscreen/88pm860x-ts.c | 1 - drivers/input/touchscreen/atmel-wm97xx.c | 2 -- drivers/input/touchscreen/da9052_tsi.c | 2 -- drivers/input/touchscreen/egalax_ts.c | 53 ++++++++--------------------- drivers/input/touchscreen/intel-mid-touch.c | 2 -- drivers/input/touchscreen/jornada720_ts.c | 2 -- drivers/input/touchscreen/mc13783_ts.c | 2 -- drivers/input/touchscreen/ti_am335x_tsc.c | 1 - drivers/input/touchscreen/tnetv107x-ts.c | 2 -- drivers/input/touchscreen/w90p910_ts.c | 2 -- 44 files changed, 14 insertions(+), 112 deletions(-) Merging input-mt/for-next (194664e Input: MT - handle semi-mt devices in core) $ git merge input-mt/for-next Merge made by the 'recursive' strategy. Merging cgroup/for-next (2a0010a cpuset: fix compile warning when CONFIG_SMP=n) $ git merge cgroup/for-next Already up-to-date. Merging block/for-next (410fa26 Merge branch 'for-3.10/drivers' into for-next) $ git merge block/for-next Merge made by the 'recursive' strategy. Merging device-mapper/master (f722406 Linux 3.10-rc1) $ git merge device-mapper/master Already up-to-date. Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) $ git merge pcmcia/master Already up-to-date. Merging mmc/mmc-next (f722406 Linux 3.10-rc1) $ git merge mmc/mmc-next Already up-to-date. Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (8a965b3 mm, slab_common: Fix bootstrap creation of kmalloc caches) $ git merge slab/for-next Already up-to-date. Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (ae59b84 dm-raid: silence compiler warning on rebuilds_per_group.) $ git merge md/for-next Auto-merging drivers/md/raid10.c Auto-merging drivers/md/raid1.c Auto-merging drivers/md/md.c Merge made by the 'recursive' strategy. Documentation/device-mapper/dm-raid.txt | 1 + drivers/md/dm-raid.c | 67 ++++++++++++++++++++++++++++++++- drivers/md/md.c | 2 +- drivers/md/raid1.c | 7 ++-- drivers/md/raid10.c | 10 +++-- 5 files changed, 77 insertions(+), 10 deletions(-) Merging mfd/master (d7ab730 Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next) $ git merge mfd/master Already up-to-date. Merging battery/master (237a1b0 lp8788-charger: Fix kconfig dependency) $ git merge battery/master Auto-merging drivers/power/Kconfig Merge made by the 'recursive' strategy. drivers/power/Kconfig | 1 + 1 file changed, 1 insertion(+) Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) $ git merge fbdev/fbdev-next Already up-to-date. Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (e72b753 fbdev/ps3fb: fix compile warning) $ git merge omap_dss2/for-next Merge made by the 'recursive' strategy. drivers/video/ps3fb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging regulator/for-next (0eeca66 Merge remote-tracking branch 'regulator/topic/isl6271a' into regulator-next) $ git merge regulator/for-next Merge made by the 'recursive' strategy. .../bindings/regulator/ti-abb-regulator.txt | 128 +++ drivers/regulator/88pm8607.c | 1 - drivers/regulator/Kconfig | 10 + drivers/regulator/Makefile | 1 + drivers/regulator/core.c | 5 +- drivers/regulator/dbx500-prcmu.c | 24 +- drivers/regulator/isl6271a-regulator.c | 2 +- drivers/regulator/lp8755.c | 1 - drivers/regulator/lp8788-buck.c | 1 - drivers/regulator/lp8788-ldo.c | 2 - drivers/regulator/max77686.c | 1 - drivers/regulator/max8925-regulator.c | 1 - drivers/regulator/mc13783-regulator.c | 2 - drivers/regulator/mc13892-regulator.c | 2 - drivers/regulator/palmas-regulator.c | 2 +- drivers/regulator/pcap-regulator.c | 1 - drivers/regulator/pcf50633-regulator.c | 1 - drivers/regulator/s2mps11.c | 1 - drivers/regulator/ti-abb-regulator.c | 912 +++++++++++++++++++++ drivers/regulator/tps65217-regulator.c | 2 - drivers/regulator/virtual.c | 2 - drivers/regulator/wm831x-dcdc.c | 7 - drivers/regulator/wm831x-isink.c | 2 - drivers/regulator/wm831x-ldo.c | 2 - drivers/regulator/wm8400-regulator.c | 1 - drivers/regulator/wm8994-regulator.c | 2 - 26 files changed, 1069 insertions(+), 47 deletions(-) create mode 100644 Documentation/devicetree/bindings/regulator/ti-abb-regulator.txt create mode 100644 drivers/regulator/ti-abb-regulator.c Merging security/next (4726e8f security: clarify cap_inode_getsecctx description) $ git merge security/next Merge made by the 'recursive' strategy. include/linux/security.h | 3 +- security/apparmor/audit.c | 2 +- security/apparmor/context.c | 44 +++++---- security/apparmor/domain.c | 26 ++--- security/apparmor/include/apparmor.h | 12 ++- security/apparmor/include/context.h | 61 ++++++++---- security/apparmor/include/file.h | 14 +-- security/apparmor/include/match.h | 21 ++-- security/apparmor/include/policy.h | 16 ++-- security/apparmor/include/procattr.h | 1 - security/apparmor/include/sid.h | 4 +- security/apparmor/ipc.c | 13 +-- security/apparmor/lib.c | 44 ++++----- security/apparmor/lsm.c | 69 +++++++------ security/apparmor/match.c | 23 ++--- security/apparmor/path.c | 2 +- security/apparmor/policy.c | 181 ++++++++++++++++------------------- security/apparmor/policy_unpack.c | 4 +- security/apparmor/procattr.c | 6 -- security/apparmor/resource.c | 15 ++- 20 files changed, 291 insertions(+), 270 deletions(-) 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 (f722406 Linux 3.10-rc1) $ git merge watchdog/master Already up-to-date. Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (0c4513b Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next) $ git merge iommu/next Already up-to-date. Merging vfio/next (664e938 vfio: Set container device mode) $ git merge vfio/next Already up-to-date. Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) $ 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 (071361d mm: Convert print_symbol to %pSR) $ 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 fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging edac/linux_next (de4772c edac: sb_edac.c should not require prescence of IMC_DDRIO device) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (9713fae EDAC: Merge mci.mem_is_per_rank with mci.csbased) $ git merge edac-amd/for-next Already up-to-date. Merging devicetree/devicetree/next (3132f62 Merge branch 'for-next' of git://sources.calxeda.com/kernel/linux into HEAD) $ git merge devicetree/devicetree/next Auto-merging drivers/of/base.c Merge made by the 'recursive' strategy. .../bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} | 0 .../bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} | 0 .../bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} | 0 .../bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} | 0 Documentation/devicetree/usage-model.txt | 8 +++++--- drivers/of/base.c | 4 ++-- include/linux/of_platform.h | 5 +++-- 7 files changed, 10 insertions(+), 7 deletions(-) rename Documentation/devicetree/bindings/{drm/exynos/hdmi.txt => video/exynos_hdmi.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiddc.txt => video/exynos_hdmiddc.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/hdmiphy.txt => video/exynos_hdmiphy.txt} (100%) rename Documentation/devicetree/bindings/{drm/exynos/mixer.txt => video/exynos_mixer.txt} (100%) Merging dt-rh/for-next (a2b9ea7 Documentation/devicetree: make semantic of initrd-end more explicit) $ git merge dt-rh/for-next Already up-to-date. Merging spi/spi/next (00ab539 spi/s3c64xx: let device core setup the default pin configuration) $ git merge spi/spi/next Already up-to-date. Merging spi-mb/for-next (760a8c4 Merge remote-tracking branch 'spi/topic/sirf' into spi-next) $ git merge spi-mb/for-next Merge made by the 'recursive' strategy. drivers/spi/spi-altera.c | 2 -- drivers/spi/spi-ath79.c | 2 -- drivers/spi/spi-au1550.c | 2 -- drivers/spi/spi-bcm2835.c | 7 +++---- drivers/spi/spi-bcm63xx.c | 3 --- drivers/spi/spi-bfin-sport.c | 3 --- drivers/spi/spi-bfin5xx.c | 3 --- drivers/spi/spi-clps711x.c | 2 -- drivers/spi/spi-coldfire-qspi.c | 1 - drivers/spi/spi-dw-mmio.c | 2 -- drivers/spi/spi-ep93xx.c | 2 -- drivers/spi/spi-gpio.c | 2 -- drivers/spi/spi-imx.c | 11 ----------- drivers/spi/spi-mxs.c | 6 ------ drivers/spi/spi-oc-tiny.c | 2 -- drivers/spi/spi-omap2-mcspi.c | 7 ------- drivers/spi/spi-pxa2xx-dma.c | 11 ++++++----- drivers/spi/spi-pxa2xx.c | 40 ++++------------------------------------ drivers/spi/spi-s3c64xx.c | 2 -- drivers/spi/spi-sirf.c | 12 +----------- 20 files changed, 14 insertions(+), 108 deletions(-) Merging tip/auto-latest (57e87c1 Merge branch 'timers/urgent') $ git merge tip/auto-latest Auto-merging kernel/printk.c Merge made by the 'recursive' strategy. Documentation/kernel-per-CPU-kthreads.txt | 202 +++++++++++ arch/Kconfig | 3 + kernel/events/core.c | 240 +++++-------- kernel/printk.c | 2 +- kernel/sched/Makefile | 2 +- kernel/sched/core.c | 569 ----------------------------- kernel/sched/fair.c | 18 + kernel/sched/proc.c | 578 ++++++++++++++++++++++++++++++ kernel/sched/sched.h | 26 +- kernel/time/tick-broadcast.c | 10 +- 10 files changed, 905 insertions(+), 745 deletions(-) create mode 100644 Documentation/kernel-per-CPU-kthreads.txt create mode 100644 kernel/sched/proc.c Merging ftrace/for-next (4c69e6e tracepoints: Prevent null probe from being added) $ git merge ftrace/for-next Already up-to-date. Merging rcu/rcu/next (a9be854 Merge commit '6d87669357936bffa1e8fea7a4e7743e76905736' into next.2013.10.22a) $ git merge rcu/rcu/next Merge made by the 'recursive' strategy. 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 kvm/linux-next (f722406 Linux 3.10-rc1) $ git merge kvm/linux-next Already up-to-date. Merging kvm-arm/kvm-arm-next (b8022d7 arm: kvm: arch_timer: use symbolic constants) $ git merge kvm-arm/kvm-arm-next Resolved 'arch/arm/include/asm/kvm_host.h' using previous resolution. Resolved 'arch/arm/kvm/arm.c' using previous resolution. Auto-merging arch/arm/kvm/arm.c CONFLICT (content): Merge conflict in arch/arm/kvm/arm.c Auto-merging arch/arm/include/asm/kvm_host.h CONFLICT (content): Merge conflict in arch/arm/include/asm/kvm_host.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a5a8985] Merge remote-tracking branch 'kvm-arm/kvm-arm-next' $ git diff -M --stat --summary HEAD^.. Merging kvm-ppc/kvm-ppc-next (5975a2e KVM: PPC: Book3S: Add API for in-kernel XICS emulation) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (f722406 Linux 3.10-rc1) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/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 (f722406 Linux 3.10-rc1) $ git merge xen-two/linux-next Already up-to-date. Merging xen-arm/linux-next (3cc8e40 xen/arm: rename xen_secondary_init and run it on every online cpu) $ git merge xen-arm/linux-next Merge made by the 'recursive' strategy. arch/arm/xen/enlighten.c | 33 ++++++++++++++------------------- 1 file changed, 14 insertions(+), 19 deletions(-) Merging percpu/for-next (a1b2a55 percpu: add documentation on this_cpu operations) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (d325185 workqueue: workqueue_congested() shouldn't translate WORK_CPU_UNBOUND into node number) $ git merge workqueues/for-next Merge made by the 'recursive' strategy. kernel/workqueue.c | 9 +++++++++ 1 file changed, 9 insertions(+) Merging drivers-x86/linux-next (a1ec56e Add support for fan button on Ideapad Z580) $ git merge drivers-x86/linux-next Already up-to-date. Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) $ git merge sysctl/master Already up-to-date. Merging regmap/for-next (0c62677 Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 1 + drivers/base/regmap/regcache-rbtree.c | 62 +++++++++++++++++++++++++++-------- drivers/base/regmap/regcache.c | 37 +++++++++++++++++++++ drivers/base/regmap/regmap-debugfs.c | 7 ++-- drivers/base/regmap/regmap.c | 14 ++++---- include/linux/regmap.h | 12 +++++++ include/trace/events/regmap.h | 23 +++++++++++++ 7 files changed, 133 insertions(+), 23 deletions(-) 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 (5abef69 leds: lp5562: Properly setup of_device_id table) $ git merge leds/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/leds/leds-lp55xx.txt | 147 +++++++++++++++++++++ drivers/leds/leds-atmel-pwm.c | 1 - drivers/leds/leds-gpio.c | 2 - drivers/leds/leds-lp5521.c | 28 +++- drivers/leds/leds-lp5523.c | 28 +++- drivers/leds/leds-lp5562.c | 28 +++- drivers/leds/leds-lp55xx-common.c | 45 +++++++ drivers/leds/leds-lp55xx-common.h | 4 + drivers/leds/leds-mc13783.c | 1 - drivers/leds/leds-ns2.c | 2 - 10 files changed, 265 insertions(+), 21 deletions(-) create mode 100644 Documentation/devicetree/bindings/leds/leds-lp55xx.txt Merging driver-core/driver-core-next (9affd6b arm: fix mismerge of arch/arm/mach-omap2/timer.c) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (f722406 Linux 3.10-rc1) $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next (f722406 Linux 3.10-rc1) $ git merge usb/usb-next Already up-to-date. Merging usb-gadget/next (added5f ARM: mxs_defconfig: add CONFIG_USB_PHY) $ git merge usb-gadget/next Already up-to-date. Merging staging/staging-next (2339b79 staging: vt6656: remove unused definitions) $ git merge staging/staging-next Auto-merging drivers/staging/nvec/nvec.c Auto-merging drivers/staging/comedi/drivers/ni_mio_common.c Auto-merging drivers/staging/comedi/drivers/ni_labpc.h Auto-merging drivers/staging/comedi/drivers/ni_labpc.c Auto-merging drivers/staging/comedi/comedi_fops.c Auto-merging drivers/staging/comedi/comedi_buf.c Merge made by the 'recursive' strategy. MAINTAINERS | 2 +- drivers/staging/android/ashmem.c | 3 +- drivers/staging/android/sync.c | 20 +- drivers/staging/asus_oled/asus_oled.c | 2 +- drivers/staging/bcm/Bcmchar.c | 2 +- drivers/staging/bcm/InterfaceIdleMode.c | 88 ++-- drivers/staging/ced1401/ced_ioc.c | 82 ++-- drivers/staging/comedi/comedi.h | 5 - drivers/staging/comedi/comedi_buf.c | 4 - drivers/staging/comedi/comedi_compat32.c | 5 - drivers/staging/comedi/comedi_compat32.h | 5 - drivers/staging/comedi/comedi_fops.c | 5 - drivers/staging/comedi/comedi_pci.c | 4 - drivers/staging/comedi/comedi_pcmcia.c | 4 - drivers/staging/comedi/comedi_usb.c | 4 - drivers/staging/comedi/comedidev.h | 5 - drivers/staging/comedi/comedilib.h | 5 - drivers/staging/comedi/drivers.c | 5 - drivers/staging/comedi/drivers/8253.h | 5 - drivers/staging/comedi/drivers/8255.c | 5 - drivers/staging/comedi/drivers/8255.h | 5 - drivers/staging/comedi/drivers/8255_pci.c | 4 - .../comedi/drivers/addi-data/APCI1710_Chrono.c | 4 - .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 - .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 4 - .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 4 - .../comedi/drivers/addi-data/APCI1710_Pwm.c | 4 - .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 - .../comedi/drivers/addi-data/APCI1710_Tor.c | 4 - .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 - .../staging/comedi/drivers/addi-data/addi_common.c | 7 - .../staging/comedi/drivers/addi-data/addi_eeprom.c | 7 - .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci035.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci1500.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3120.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 - .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 4 - drivers/staging/comedi/drivers/addi_apci_1032.c | 7 - drivers/staging/comedi/drivers/addi_apci_1516.c | 7 - drivers/staging/comedi/drivers/addi_apci_16xx.c | 7 - drivers/staging/comedi/drivers/addi_apci_2032.c | 7 - drivers/staging/comedi/drivers/addi_apci_2200.c | 7 - drivers/staging/comedi/drivers/addi_apci_3501.c | 7 - drivers/staging/comedi/drivers/addi_watchdog.c | 4 - drivers/staging/comedi/drivers/adl_pci6208.c | 4 - drivers/staging/comedi/drivers/adl_pci7x3x.c | 4 - drivers/staging/comedi/drivers/adl_pci8164.c | 4 - drivers/staging/comedi/drivers/adl_pci9111.c | 4 - drivers/staging/comedi/drivers/adq12b.c | 5 - drivers/staging/comedi/drivers/adv_pci1723.c | 9 +- drivers/staging/comedi/drivers/adv_pci1724.c | 7 +- drivers/staging/comedi/drivers/aio_aio12_8.c | 4 - drivers/staging/comedi/drivers/aio_iiro_16.c | 4 - drivers/staging/comedi/drivers/amplc_dio200.c | 5 - drivers/staging/comedi/drivers/amplc_dio200.h | 5 - .../staging/comedi/drivers/amplc_dio200_common.c | 5 - drivers/staging/comedi/drivers/amplc_dio200_pci.c | 5 - drivers/staging/comedi/drivers/amplc_pc236.c | 5 - drivers/staging/comedi/drivers/amplc_pc263.c | 5 - drivers/staging/comedi/drivers/amplc_pci224.c | 5 - drivers/staging/comedi/drivers/amplc_pci230.c | 4 - drivers/staging/comedi/drivers/amplc_pci263.c | 5 - drivers/staging/comedi/drivers/c6xdigio.c | 5 - drivers/staging/comedi/drivers/cb_das16_cs.c | 4 - drivers/staging/comedi/drivers/cb_pcidas.c | 6 - drivers/staging/comedi/drivers/cb_pcidas64.c | 7 +- drivers/staging/comedi/drivers/cb_pcidda.c | 4 - drivers/staging/comedi/drivers/cb_pcimdas.c | 5 - drivers/staging/comedi/drivers/cb_pcimdda.c | 5 - drivers/staging/comedi/drivers/comedi_bond.c | 5 - drivers/staging/comedi/drivers/comedi_fc.c | 7 +- drivers/staging/comedi/drivers/comedi_fc.h | 7 +- drivers/staging/comedi/drivers/comedi_parport.c | 5 - drivers/staging/comedi/drivers/comedi_test.c | 7 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 5 - drivers/staging/comedi/drivers/daqboard2000.c | 5 - drivers/staging/comedi/drivers/das08.c | 6 - drivers/staging/comedi/drivers/das08.h | 5 - drivers/staging/comedi/drivers/das08_cs.c | 7 - drivers/staging/comedi/drivers/das08_isa.c | 4 - drivers/staging/comedi/drivers/das08_pci.c | 4 - drivers/staging/comedi/drivers/das16.c | 6 - drivers/staging/comedi/drivers/das16m1.c | 6 - drivers/staging/comedi/drivers/das1800.c | 6 - drivers/staging/comedi/drivers/das6402.c | 5 - drivers/staging/comedi/drivers/das800.c | 6 - drivers/staging/comedi/drivers/dmm32at.c | 5 - drivers/staging/comedi/drivers/dt2811.c | 4 - drivers/staging/comedi/drivers/dt2814.c | 5 - drivers/staging/comedi/drivers/dt2815.c | 5 - drivers/staging/comedi/drivers/dt2817.c | 5 - drivers/staging/comedi/drivers/dt282x.c | 5 - drivers/staging/comedi/drivers/dt3000.c | 5 - drivers/staging/comedi/drivers/dt9812.c | 5 - drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 - drivers/staging/comedi/drivers/gsc_hpdi.c | 7 +- drivers/staging/comedi/drivers/icp_multi.c | 5 - drivers/staging/comedi/drivers/jr3_pci.c | 5 - drivers/staging/comedi/drivers/ke_counter.c | 5 - drivers/staging/comedi/drivers/me4000.c | 5 - drivers/staging/comedi/drivers/me_daq.c | 4 - drivers/staging/comedi/drivers/mite.c | 5 - drivers/staging/comedi/drivers/mite.h | 5 - drivers/staging/comedi/drivers/mpc624.c | 5 - drivers/staging/comedi/drivers/multiq3.c | 5 - drivers/staging/comedi/drivers/ni_6527.c | 5 - drivers/staging/comedi/drivers/ni_65xx.c | 5 - drivers/staging/comedi/drivers/ni_660x.c | 4 - drivers/staging/comedi/drivers/ni_670x.c | 5 - drivers/staging/comedi/drivers/ni_at_a2150.c | 6 - drivers/staging/comedi/drivers/ni_at_ao.c | 5 - drivers/staging/comedi/drivers/ni_atmio.c | 4 - drivers/staging/comedi/drivers/ni_atmio16d.c | 5 - drivers/staging/comedi/drivers/ni_daq_700.c | 5 - drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 - drivers/staging/comedi/drivers/ni_labpc.c | 45 +- drivers/staging/comedi/drivers/ni_labpc.h | 25 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 12 +- drivers/staging/comedi/drivers/ni_labpc_pci.c | 11 +- drivers/staging/comedi/drivers/ni_mio_common.c | 5 - drivers/staging/comedi/drivers/ni_mio_cs.c | 5 - drivers/staging/comedi/drivers/ni_pcidio.c | 5 - drivers/staging/comedi/drivers/ni_pcimio.c | 4 - drivers/staging/comedi/drivers/ni_stc.h | 5 - drivers/staging/comedi/drivers/ni_tio.c | 4 - drivers/staging/comedi/drivers/ni_tio.h | 5 - drivers/staging/comedi/drivers/ni_tio_internal.h | 5 - drivers/staging/comedi/drivers/ni_tiocmd.c | 4 - drivers/staging/comedi/drivers/pcl711.c | 5 - drivers/staging/comedi/drivers/pcl726.c | 5 - drivers/staging/comedi/drivers/pcmad.c | 5 - drivers/staging/comedi/drivers/pcmda12.c | 4 - drivers/staging/comedi/drivers/pcmmio.c | 4 - drivers/staging/comedi/drivers/pcmuio.c | 4 - drivers/staging/comedi/drivers/plx9052.h | 5 - drivers/staging/comedi/drivers/poc.c | 4 - drivers/staging/comedi/drivers/rtd520.c | 4 - drivers/staging/comedi/drivers/rti800.c | 4 - drivers/staging/comedi/drivers/rti802.c | 5 - drivers/staging/comedi/drivers/s526.c | 5 - drivers/staging/comedi/drivers/s626.c | 5 - drivers/staging/comedi/drivers/s626.h | 5 - drivers/staging/comedi/drivers/serial2002.c | 5 - drivers/staging/comedi/drivers/skel.c | 5 - drivers/staging/comedi/drivers/ssv_dnp.c | 5 - drivers/staging/comedi/drivers/unioxx5.c | 4 - drivers/staging/comedi/drivers/usbdux.c | 5 - drivers/staging/comedi/drivers/usbduxfast.c | 4 - drivers/staging/comedi/drivers/usbduxsigma.c | 5 - drivers/staging/comedi/drivers/vmk80xx.c | 5 - .../staging/comedi/kcomedilib/kcomedilib_main.c | 5 - drivers/staging/comedi/proc.c | 5 - drivers/staging/comedi/range.c | 5 - drivers/staging/cptm1217/clearpad_tm1217.c | 4 +- drivers/staging/crystalhd/bc_dts_glob_lnx.h | 19 +- drivers/staging/crystalhd/crystalhd_cmds.c | 28 +- drivers/staging/crystalhd/crystalhd_cmds.h | 19 +- drivers/staging/crystalhd/crystalhd_fw_if.h | 81 ++-- drivers/staging/crystalhd/crystalhd_hw.c | 231 ++++++---- drivers/staging/crystalhd/crystalhd_hw.h | 121 ++--- drivers/staging/crystalhd/crystalhd_lnx.c | 28 +- drivers/staging/crystalhd/crystalhd_lnx.h | 4 +- drivers/staging/crystalhd/crystalhd_misc.c | 39 +- drivers/staging/crystalhd/crystalhd_misc.h | 37 +- drivers/staging/csr/csr_wifi_nme_ap_sef.c | 4 +- drivers/staging/csr/drv.c | 6 +- drivers/staging/csr/io.c | 18 +- drivers/staging/csr/netdev.c | 100 ++--- drivers/staging/csr/sdio_mmc.c | 4 +- drivers/staging/csr/sme_blocking.c | 24 +- drivers/staging/csr/sme_native.c | 2 +- drivers/staging/csr/sme_sys.c | 148 +++---- drivers/staging/csr/sme_userspace.c | 4 +- drivers/staging/csr/sme_wext.c | 116 ++--- drivers/staging/csr/ul_int.c | 2 +- drivers/staging/csr/unifi_event.c | 20 +- drivers/staging/csr/unifi_pdu_processing.c | 490 ++++++++++----------- drivers/staging/csr/unifi_priv.h | 30 +- drivers/staging/csr/unifi_sme.c | 24 +- drivers/staging/csr/unifi_sme.h | 8 +- drivers/staging/dgrp/dgrp_dpa_ops.c | 2 +- drivers/staging/dgrp/dgrp_net_ops.c | 4 +- drivers/staging/dgrp/drp.h | 2 +- drivers/staging/echo/echo.c | 78 ++-- drivers/staging/echo/echo.h | 26 +- drivers/staging/goldfish/goldfish_nand.c | 11 +- drivers/staging/goldfish/goldfish_nand_reg.h | 6 +- drivers/staging/iio/adc/ad7192.c | 2 +- drivers/staging/iio/adc/ad7280a.c | 2 +- drivers/staging/iio/adc/ad7606_core.c | 12 +- drivers/staging/iio/adc/ad7816.c | 8 +- drivers/staging/iio/adc/ad799x_core.c | 4 +- drivers/staging/keucr/init.c | 6 +- drivers/staging/keucr/transport.h | 2 +- drivers/staging/keucr/usb.c | 2 +- drivers/staging/nvec/nvec.c | 19 +- drivers/staging/nvec/nvec.h | 5 +- drivers/staging/nvec/nvec_kbd.c | 10 +- drivers/staging/nvec/nvec_power.c | 1 + drivers/staging/nvec/nvec_ps2.c | 8 +- drivers/staging/ozwpan/ozcdev.c | 2 + drivers/staging/rtl8192u/ieee80211/dot11d.c | 14 +- drivers/staging/rtl8192u/ieee80211/dot11d.h | 10 +- drivers/staging/rtl8192u/ieee80211/ieee80211.h | 94 ++-- .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 4 +- .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 2 +- .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 14 +- .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 8 +- .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 4 +- drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 34 +- .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 78 ++-- drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 26 +- .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 106 ++--- .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 82 ++-- drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 10 +- .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 30 +- drivers/staging/rtl8192u/r8190_rtl8256.c | 18 +- drivers/staging/rtl8192u/r8190_rtl8256.h | 10 +- drivers/staging/rtl8192u/r8192U.h | 4 +- drivers/staging/rtl8192u/r8192U_core.c | 202 ++++----- drivers/staging/rtl8192u/r8192U_dm.c | 48 +- drivers/staging/rtl8192u/r8192U_wx.c | 34 +- drivers/staging/rtl8192u/r819xU_cmdpkt.c | 24 +- drivers/staging/rtl8192u/r819xU_cmdpkt.h | 6 +- drivers/staging/rtl8192u/r819xU_firmware.c | 6 +- drivers/staging/rtl8192u/r819xU_phy.c | 90 ++-- drivers/staging/rtl8192u/r819xU_phy.h | 30 +- drivers/staging/sb105x/sb_pci_mp.c | 34 +- drivers/staging/slicoss/slicoss.c | 18 +- drivers/staging/speakup/varhandlers.c | 17 +- drivers/staging/ti-soc-thermal/ti-thermal-common.c | 30 +- drivers/staging/ti-soc-thermal/ti_soc_thermal.txt | 1 + drivers/staging/usbip/usbip_event.c | 2 +- drivers/staging/vme/devices/vme_user.c | 6 +- drivers/staging/vme/devices/vme_user.h | 12 +- drivers/staging/vt6656/tether.h | 10 - drivers/staging/vt6656/tmacro.h | 6 - drivers/staging/wlags49_h2/wl_cs.c | 13 +- drivers/staging/wlags49_h2/wl_cs.h | 4 +- drivers/staging/wlags49_h2/wl_main.c | 3 +- drivers/staging/wlan-ng/prism2sta.c | 3 +- 243 files changed, 1708 insertions(+), 2268 deletions(-) Merging char-misc/char-misc-next (f722406 Linux 3.10-rc1) $ git merge char-misc/char-misc-next Already up-to-date. Merging bcon/master (e284f34 netconsole: s/syslogd/cancd/ in documentation) $ git merge bcon/master Resolved 'drivers/block/Kconfig' using previous resolution. Auto-merging kernel/printk.c Auto-merging init/do_mounts.c Auto-merging include/linux/mount.h Auto-merging include/linux/console.h Auto-merging drivers/net/netconsole.c Auto-merging drivers/block/Makefile Auto-merging drivers/block/Kconfig CONFLICT (content): Merge conflict in drivers/block/Kconfig Auto-merging block/partitions/check.h Auto-merging block/partitions/check.c Auto-merging Documentation/networking/netconsole.txt Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master e3c79be] Merge remote-tracking branch 'bcon/master' $ git diff -M --stat --summary HEAD^.. Documentation/block/blockconsole.txt | 94 ++++ Documentation/block/blockconsole/bcon_tail | 82 ++++ Documentation/block/blockconsole/mkblockconsole | 29 ++ Documentation/networking/netconsole.txt | 16 +- block/partitions/Makefile | 1 + block/partitions/blockconsole.c | 22 + block/partitions/check.c | 3 + block/partitions/check.h | 3 + drivers/block/Kconfig | 6 + drivers/block/Makefile | 1 + drivers/block/blockconsole.c | 618 ++++++++++++++++++++++++ drivers/net/netconsole.c | 2 +- include/linux/blockconsole.h | 7 + include/linux/console.h | 1 + include/linux/mount.h | 2 +- init/do_mounts.c | 2 +- kernel/printk.c | 5 +- 17 files changed, 885 insertions(+), 9 deletions(-) create mode 100644 Documentation/block/blockconsole.txt create mode 100755 Documentation/block/blockconsole/bcon_tail create mode 100755 Documentation/block/blockconsole/mkblockconsole create mode 100644 block/partitions/blockconsole.c create mode 100644 drivers/block/blockconsole.c create mode 100644 include/linux/blockconsole.h Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) $ git merge tmem/linux-next Already up-to-date. Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) $ git merge writeback/writeback-for-next Already up-to-date. Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) $ git merge arm-dt/devicetree/arm-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (f722406 Linux 3.10-rc1) $ git merge pinctrl/for-next Already up-to-date. Merging vhost/linux-next (0107b9b x86: uaccess s/might_sleep/might_fault/) $ git merge vhost/linux-next Resolved 'drivers/vhost/test.c' using previous resolution. Auto-merging kernel/sched/core.c Auto-merging include/linux/sched.h Auto-merging drivers/vhost/test.c CONFLICT (content): Merge conflict in drivers/vhost/test.c Auto-merging arch/tile/include/asm/uaccess.h Auto-merging arch/microblaze/include/asm/uaccess.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 530a68b] Merge remote-tracking branch 'vhost/linux-next' $ git diff -M --stat --summary HEAD^.. arch/arm64/include/asm/uaccess.h | 4 ++-- arch/frv/include/asm/uaccess.h | 4 ++-- arch/m32r/include/asm/uaccess.h | 12 ++++++------ arch/microblaze/include/asm/uaccess.h | 6 +++--- arch/mn10300/include/asm/uaccess.h | 4 ++-- arch/powerpc/include/asm/uaccess.h | 16 ++++++++-------- arch/tile/include/asm/uaccess.h | 2 +- arch/x86/include/asm/uaccess_64.h | 2 +- drivers/vhost/test.c | 12 +++++++----- include/asm-generic/uaccess.h | 10 +++++----- include/linux/sched.h | 1 + kernel/sched/core.c | 24 ++++++++++++++++++++++++ 12 files changed, 62 insertions(+), 35 deletions(-) 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 (b977785 remoteproc: fix kconfig dependencies for VIRTIO) $ git merge remoteproc/for-next Already up-to-date. Merging rpmsg/for-next (397944d rpmsg: fix kconfig dependencies for VIRTIO) $ git merge rpmsg/for-next Already up-to-date. Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) $ git merge irqdomain/irqdomain/next Auto-merging kernel/irq/irqdomain.c Merge made by the 'recursive' strategy. kernel/irq/irqdomain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Merging gpio/gpio/next (08ffb22 gpio: grgpio: Add irq support) $ git merge gpio/gpio/next Already up-to-date. Merging gpio-lw/for-next (352a2d5 gpio/omap: ensure gpio context is initialised) $ git merge gpio-lw/for-next Merge made by the 'recursive' strategy. drivers/gpio/gpio-omap.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-) Merging gen-gpio/for_next (f4c5405 gpio: update gpio Chinese documentation) $ git merge gen-gpio/for_next Already up-to-date. Merging mailbox/dbx500-prcmu-mailbox (c497eba mailbox: fix invalid use of sizeof in mailbox_msg_send()) $ git merge mailbox/dbx500-prcmu-mailbox Auto-merging drivers/remoteproc/Kconfig Auto-merging drivers/mailbox/mailbox-omap2.c Auto-merging drivers/mailbox/mailbox-omap1.c Removing arch/arm/plat-omap/mailbox.c Removing arch/arm/plat-omap/include/plat/mailbox.h Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_2430_data.c Auto-merging arch/arm/mach-omap2/omap_hwmod_2420_data.c Auto-merging arch/arm/mach-omap2/devices.c Auto-merging arch/arm/mach-omap2/Makefile Auto-merging arch/arm/configs/omap1_defconfig Merge made by the 'recursive' strategy. .../devicetree/bindings/mailbox/dbx500-mailbox.txt | 27 + arch/arm/configs/omap1_defconfig | 3 +- arch/arm/mach-omap1/Makefile | 4 - arch/arm/mach-omap2/Makefile | 3 - arch/arm/mach-omap2/devices.c | 13 +- arch/arm/mach-omap2/omap_hwmod_2420_data.c | 12 + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 11 + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 13 + arch/arm/plat-omap/Kconfig | 16 - arch/arm/plat-omap/Makefile | 3 - arch/arm/plat-omap/include/plat/mailbox.h | 105 ---- arch/arm/plat-omap/mailbox.c | 435 -------------- drivers/cpufreq/highbank-cpufreq.c | 2 +- drivers/mailbox/Kconfig | 41 ++ drivers/mailbox/Makefile | 5 + drivers/mailbox/mailbox-dbx500.c | 648 +++++++++++++++++++++ .../mailbox.c => drivers/mailbox/mailbox-omap1.c | 90 ++- .../mailbox.c => drivers/mailbox/mailbox-omap2.c | 330 +++++------ drivers/mailbox/mailbox.c | 552 ++++++++++++++++++ drivers/mailbox/mailbox_internal.h | 70 +++ drivers/mailbox/pl320-ipc.c | 2 +- drivers/remoteproc/Kconfig | 3 +- drivers/remoteproc/omap_remoteproc.c | 36 +- drivers/staging/tidspbridge/Kconfig | 3 +- drivers/staging/tidspbridge/core/_tiomap.h | 2 +- drivers/staging/tidspbridge/core/chnl_sm.c | 8 +- drivers/staging/tidspbridge/core/io_sm.c | 5 +- drivers/staging/tidspbridge/core/tiomap3430.c | 6 +- drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 6 +- drivers/staging/tidspbridge/core/tiomap_io.c | 9 +- .../tidspbridge/include/dspbridge/host_os.h | 2 +- include/linux/mailbox.h | 52 +- include/linux/pl320-ipc.h | 17 + include/linux/platform_data/mailbox-dbx500.h | 12 + include/linux/platform_data/mailbox-omap.h | 53 ++ 36 files changed, 1766 insertions(+), 844 deletions(-) create mode 100644 Documentation/devicetree/bindings/mailbox/dbx500-mailbox.txt delete mode 100644 arch/arm/plat-omap/include/plat/mailbox.h delete mode 100644 arch/arm/plat-omap/mailbox.c create mode 100644 drivers/mailbox/mailbox-dbx500.c rename arch/arm/mach-omap1/mailbox.c => drivers/mailbox/mailbox-omap1.c (64%) rename arch/arm/mach-omap2/mailbox.c => drivers/mailbox/mailbox-omap2.c (50%) create mode 100644 drivers/mailbox/mailbox.c create mode 100644 drivers/mailbox/mailbox_internal.h create mode 100644 include/linux/pl320-ipc.h create mode 100644 include/linux/platform_data/mailbox-dbx500.h create mode 100644 include/linux/platform_data/mailbox-omap.h Merging arm-soc/for-next (a0cdbee Merge branch 'fixes' into for-next) $ git merge arm-soc/for-next Merge made by the 'recursive' strategy. arch/arm/arm-soc-for-next-contents.txt | 14 ++++++++++++++ drivers/clk/tegra/clk-tegra20.c | 11 ++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 arch/arm/arm-soc-for-next-contents.txt Merging bcm2835/for-next (31880c3 Linux 3.9-rc6) $ git merge bcm2835/for-next Already up-to-date. Merging cortex/for-next (4477ca4 ARM: ARMv7-M: Allow the building of new kernel port) $ git merge cortex/for-next Auto-merging arch/arm/mm/Makefile Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/kernel/traps.c Auto-merging arch/arm/kernel/setup.c Auto-merging arch/arm/kernel/entry-header.S Auto-merging arch/arm/kernel/entry-common.S Auto-merging arch/arm/include/asm/glue-cache.h Auto-merging arch/arm/Makefile Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 4 +- arch/arm/Kconfig-nommu | 2 +- arch/arm/Makefile | 1 + arch/arm/include/asm/assembler.h | 17 +++- arch/arm/include/asm/cputype.h | 12 ++- arch/arm/include/asm/glue-cache.h | 27 +++++++ arch/arm/include/asm/glue-df.h | 8 ++ arch/arm/include/asm/glue-proc.h | 9 +++ arch/arm/include/asm/irqflags.h | 22 ++++-- arch/arm/include/asm/ptrace.h | 4 + arch/arm/include/asm/system_info.h | 1 + arch/arm/include/asm/v7m.h | 44 +++++++++++ arch/arm/include/uapi/asm/ptrace.h | 35 +++++++-- arch/arm/kernel/Makefile | 8 +- arch/arm/kernel/entry-common.S | 4 + arch/arm/kernel/entry-header.S | 124 +++++++++++++++++++++++++++++ arch/arm/kernel/entry-v7m.S | 143 +++++++++++++++++++++++++++++++++ arch/arm/kernel/head-nommu.S | 10 ++- arch/arm/kernel/setup.c | 17 +++- arch/arm/kernel/traps.c | 8 ++ arch/arm/mm/Kconfig | 21 ++++- arch/arm/mm/Makefile | 2 + arch/arm/mm/cache-nop.S | 50 ++++++++++++ arch/arm/mm/nommu.c | 7 ++ arch/arm/mm/proc-v7m.S | 157 +++++++++++++++++++++++++++++++++++++ 25 files changed, 711 insertions(+), 26 deletions(-) create mode 100644 arch/arm/include/asm/v7m.h create mode 100644 arch/arm/kernel/entry-v7m.S create mode 100644 arch/arm/mm/cache-nop.S create mode 100644 arch/arm/mm/proc-v7m.S Merging ep93xx/ep93xx-for-next (7ec4429 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 imx-mxs/for-next (4a09469 Merge branch 'mxs/dt' into for-next) $ git merge imx-mxs/for-next Merge made by the 'recursive' strategy. .../devicetree/bindings/clock/imx6sl-clock.txt | 10 + arch/arm/Kconfig.debug | 13 +- arch/arm/boot/dts/Makefile | 4 +- arch/arm/boot/dts/imx27-phytec-phycore.dts | 109 +++ arch/arm/boot/dts/imx27.dtsi | 11 + arch/arm/boot/dts/imx28-cfa10036.dts | 15 +- arch/arm/boot/dts/imx28-cfa10049.dts | 4 +- arch/arm/boot/dts/imx28-m28evk.dts | 14 +- arch/arm/boot/dts/imx28.dtsi | 33 + arch/arm/boot/dts/imx51.dtsi | 23 + arch/arm/boot/dts/imx53-m53evk.dts | 259 +++++++ arch/arm/boot/dts/imx53-qsb.dts | 9 + arch/arm/boot/dts/imx53-tx53.dtsi | 122 ++++ arch/arm/boot/dts/imx53.dtsi | 211 +++++- arch/arm/boot/dts/imx6dl-sabreauto.dts | 1 + arch/arm/boot/dts/imx6dl.dtsi | 34 + arch/arm/boot/dts/imx6q-sabreauto.dts | 1 + arch/arm/boot/dts/imx6q.dtsi | 2 - arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 22 + arch/arm/boot/dts/imx6qdl.dtsi | 9 +- arch/arm/boot/dts/imx6sl-evk.dts | 74 ++ arch/arm/boot/dts/imx6sl.dtsi | 779 +++++++++++++++++++++ arch/arm/include/debug/imx-uart.h | 10 + arch/arm/mach-imx/Kconfig | 19 + arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/clk-imx51-imx53.c | 46 +- arch/arm/mach-imx/clk-imx6q.c | 20 +- arch/arm/mach-imx/clk-imx6sl.c | 270 +++++++ arch/arm/mach-imx/clk.c | 35 + arch/arm/mach-imx/clk.h | 3 + arch/arm/mach-imx/common.h | 2 + arch/arm/mach-imx/hardware.h | 1 + arch/arm/mach-imx/headsmp.S | 12 + arch/arm/mach-imx/imx25-dt.c | 2 + arch/arm/mach-imx/imx27-dt.c | 2 + arch/arm/mach-imx/imx31-dt.c | 2 + arch/arm/mach-imx/imx51-dt.c | 2 + arch/arm/mach-imx/mach-imx53.c | 17 +- arch/arm/mach-imx/mach-imx6q.c | 36 +- arch/arm/mach-imx/mach-imx6sl.c | 51 ++ arch/arm/mach-imx/mm-imx1.c | 2 +- arch/arm/mach-imx/mm-imx21.c | 2 +- arch/arm/mach-imx/mm-imx25.c | 2 +- arch/arm/mach-imx/mm-imx27.c | 2 +- arch/arm/mach-imx/mm-imx3.c | 4 +- arch/arm/mach-imx/mm-imx5.c | 3 +- arch/arm/mach-imx/platsmp.c | 14 + arch/arm/mach-imx/system.c | 47 +- include/dt-bindings/clock/imx6sl-clock.h | 148 ++++ 49 files changed, 2412 insertions(+), 102 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/imx6sl-clock.txt create mode 100644 arch/arm/boot/dts/imx53-m53evk.dts create mode 100644 arch/arm/boot/dts/imx53-tx53.dtsi create mode 100644 arch/arm/boot/dts/imx6sl-evk.dts create mode 100644 arch/arm/boot/dts/imx6sl.dtsi create mode 100644 arch/arm/mach-imx/clk-imx6sl.c create mode 100644 arch/arm/mach-imx/mach-imx6sl.c create mode 100644 include/dt-bindings/clock/imx6sl-clock.h Merging ixp4xx/next (19f949f Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging msm/for-next (1df357a Merge branch 'msm-defconfig' into for-next) $ git merge msm/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging renesas/next (08c89ad Merge branch 'heads/soc-sh73a0' into next) $ git merge renesas/next Resolved 'arch/arm/mach-shmobile/board-armadillo800eva.c' using previous resolution. Resolved 'arch/arm/mach-shmobile/board-bockw.c' using previous resolution. Resolved 'arch/arm/mach-shmobile/setup-r8a7740.c' using previous resolution. Resolved 'drivers/leds/Kconfig' using previous resolution. Resolved 'drivers/pinctrl/sh-pfc/Kconfig' using previous resolution. Removing include/linux/platform_data/leds-renesas-tpu.h Auto-merging drivers/pwm/Kconfig Auto-merging drivers/pinctrl/sh-pfc/Kconfig CONFLICT (content): Merge conflict in drivers/pinctrl/sh-pfc/Kconfig CONFLICT (modify/delete): drivers/leds/leds-renesas-tpu.c deleted in renesas/next and modified in HEAD. Version HEAD of drivers/leds/leds-renesas-tpu.c left in tree. Auto-merging drivers/leds/Makefile Auto-merging drivers/leds/Kconfig CONFLICT (content): Merge conflict in drivers/leds/Kconfig Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c Auto-merging arch/arm/mach-shmobile/setup-sh7372.c Auto-merging arch/arm/mach-shmobile/setup-r8a7740.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-r8a7740.c Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/board-lager.c Auto-merging arch/arm/mach-shmobile/board-kzm9g.c Auto-merging arch/arm/mach-shmobile/board-kzm9d.c Auto-merging arch/arm/mach-shmobile/board-bockw.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-bockw.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/board-armadillo800eva.c Auto-merging arch/arm/mach-shmobile/Kconfig Auto-merging arch/arm/boot/dts/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git rm -f drivers/leds/leds-renesas-tpu.c drivers/leds/leds-renesas-tpu.c: needs merge rm 'drivers/leds/leds-renesas-tpu.c' $ git commit -v -a [master 3c5b75e] Merge remote-tracking branch 'renesas/next' $ git diff -M --stat --summary HEAD^.. .../interrupt-controller/renesas,intc-irqpin.txt | 13 + .../devicetree/bindings/timer/renesas,timer.txt | 45 + arch/arm/boot/dts/Makefile | 1 + .../boot/dts/r8a7740-armadillo800eva-reference.dts | 45 + arch/arm/boot/dts/r8a7740.dtsi | 117 + arch/arm/boot/dts/r8a7779.dtsi | 17 + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 86 + arch/arm/boot/dts/sh73a0.dtsi | 11 + arch/arm/configs/armadillo800eva_defconfig | 2 +- arch/arm/configs/bockw_defconfig | 16 +- arch/arm/configs/kzm9g_defconfig | 3 + arch/arm/mach-shmobile/Kconfig | 19 +- arch/arm/mach-shmobile/Makefile | 3 +- arch/arm/mach-shmobile/board-ap4evb.c | 132 +- arch/arm/mach-shmobile/board-ape6evm.c | 15 + .../board-armadillo800eva-reference.c | 213 ++ arch/arm/mach-shmobile/board-armadillo800eva.c | 168 +- arch/arm/mach-shmobile/board-bockw.c | 80 +- arch/arm/mach-shmobile/board-bonito.c | 47 +- arch/arm/mach-shmobile/board-kota2.c | 178 +- arch/arm/mach-shmobile/board-kzm9d.c | 2 +- arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 - arch/arm/mach-shmobile/board-kzm9g.c | 196 +- arch/arm/mach-shmobile/board-lager.c | 42 + arch/arm/mach-shmobile/board-mackerel.c | 171 +- arch/arm/mach-shmobile/board-marzen.c | 12 +- arch/arm/mach-shmobile/clock-r8a73a4.c | 375 ++- arch/arm/mach-shmobile/clock-r8a7740.c | 12 +- arch/arm/mach-shmobile/clock-r8a7778.c | 156 +- arch/arm/mach-shmobile/clock-r8a7779.c | 4 +- arch/arm/mach-shmobile/clock-r8a7790.c | 238 +- arch/arm/mach-shmobile/clock-sh73a0.c | 106 +- arch/arm/mach-shmobile/cpuidle-r8a7740.c | 62 + arch/arm/mach-shmobile/include/mach/clock.h | 8 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 + arch/arm/mach-shmobile/include/mach/r8a7740.h | 495 +-- arch/arm/mach-shmobile/include/mach/r8a7778.h | 3 + arch/arm/mach-shmobile/include/mach/sh7372.h | 391 --- arch/arm/mach-shmobile/include/mach/sh73a0.h | 373 +-- arch/arm/mach-shmobile/intc-r8a7740.c | 24 +- arch/arm/mach-shmobile/pm-r8a7740.c | 165 +- arch/arm/mach-shmobile/setup-r8a7740.c | 77 +- arch/arm/mach-shmobile/setup-r8a7778.c | 99 +- arch/arm/mach-shmobile/setup-r8a7779.c | 19 +- arch/arm/mach-shmobile/setup-r8a7790.c | 35 +- arch/arm/mach-shmobile/setup-sh7372.c | 24 +- arch/arm/mach-shmobile/setup-sh73a0.c | 141 +- arch/arm/mach-shmobile/sleep-r8a7740.S | 57 + drivers/clocksource/sh_cmt.c | 108 +- drivers/clocksource/sh_tmu.c | 96 +- drivers/gpio/gpio-rcar.c | 2 +- drivers/irqchip/irq-renesas-intc-irqpin.c | 4 + drivers/irqchip/irq-renesas-irqc.c | 12 +- drivers/leds/Kconfig | 12 - drivers/leds/Makefile | 1 - drivers/leds/leds-renesas-tpu.c | 337 -- drivers/pinctrl/sh-pfc/Kconfig | 13 +- drivers/pinctrl/sh-pfc/Makefile | 2 + drivers/pinctrl/sh-pfc/core.c | 22 +- drivers/pinctrl/sh-pfc/core.h | 4 + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 1923 +++++++---- drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 2630 +++++++++++++++ drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 485 ++- drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 3543 ++++++++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh7372.c | 1652 ++++++--- drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 742 ++-- drivers/pinctrl/sh-pfc/sh_pfc.h | 4 +- drivers/pwm/Kconfig | 7 + drivers/pwm/Makefile | 1 + drivers/pwm/pwm-renesas-tpu.c | 462 +++ include/linux/irqchip.h | 4 + include/linux/platform_data/gpio-rcar.h | 2 + include/linux/platform_data/leds-renesas-tpu.h | 14 - include/linux/platform_data/pwm-renesas-tpu.h | 18 + 74 files changed, 12752 insertions(+), 3852 deletions(-) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,intc-irqpin.txt create mode 100644 Documentation/devicetree/bindings/timer/renesas,timer.txt create mode 100644 arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts create mode 100644 arch/arm/mach-shmobile/board-armadillo800eva-reference.c create mode 100644 arch/arm/mach-shmobile/cpuidle-r8a7740.c create mode 100644 arch/arm/mach-shmobile/sleep-r8a7740.S delete mode 100644 drivers/leds/leds-renesas-tpu.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7778.c create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7790.c create mode 100644 drivers/pwm/pwm-renesas-tpu.c delete mode 100644 include/linux/platform_data/leds-renesas-tpu.h create mode 100644 include/linux/platform_data/pwm-renesas-tpu.h Merging samsung/for-next (f722406 Linux 3.10-rc1) $ git merge samsung/for-next Already up-to-date. Merging tegra/for-next (c1be5a5 Linux 3.9) $ git merge tegra/for-next Already up-to-date. Merging dma-mapping/dma-mapping-next (c1be5a5 Linux 3.9) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (affb923 pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config) $ git merge pwm/for-next Already up-to-date. Merging dma-buf/for-next (b89e356 dma-buf: Add debugfs support) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (78008c4 proc: Restrict mounting the proc filesystem) $ git merge userns/for-next Auto-merging fs/proc/root.c Merge made by the 'recursive' strategy. fs/proc/root.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Merging ktest/for-next (df5f7c6 ktest: Reset grub menu cache with different machines) $ git merge ktest/for-next Already up-to-date. Merging signal/for-next (20b4fb4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge signal/for-next Already up-to-date. Merging clk/clk-next (1e43525 clk: add clk_ignore_unused option to keep boot clocks on) $ git merge clk/clk-next Already up-to-date. Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) $ git merge random/dev Already up-to-date. Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) $ git merge lzo-update/lzo-update Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (e0fd9af Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband) $ git merge akpm-current/current Already up-to-date. $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: drivers/block/xsysace.c: fix id with missing port-number Applying: rapidio: make enumeration/discovery configurable Applying: rapidio: add enumeration/discovery start from user space Applying: rapidio: documentation update for enumeration changes Applying: fat: fix possible overflow for fat_clusters Applying: wait: fix false timeouts when using wait_event_timeout() Applying: mm: mmu_notifier: re-fix freed page still mapped in secondary MMU Applying: mm-mmu_notifier-re-fix-freed-page-still-mapped-in-secondary-mmu-fix Applying: ocfs2: unlock rw lock if inode lock failed Applying: drivers/video: implement a simple framebuffer driver Applying: mm: memcg: remove incorrect VM_BUG_ON for swap cache pages in uncharge Applying: hfs: avoid crash in hfs_bnode_create Applying: CPU hotplug: provide a generic helper to disable/enable CPU hotplug Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix Applying: cpu-hotplug-provide-a-generic-helper-to-disable-enable-cpu-hotplug-fix-fix Applying: reboot: rigrate shutdown/reboot to boot cpu Applying: shm-fix-null-pointer-deref-when-userspace-specifies-invalid-hugepage-size-fix Applying: rapidio/tsi721: fix bug in MSI interrupt handling Applying: mm compaction: fix of improper cache flush in migration code Applying: kernel/audit_tree.c:audit_add_tree_rule(): protect `rule' from kill_rules() Applying: ipcsem-fix-semctl-getzcnt-fix Applying: ipcsem-fix-semctl-getncnt-fix Applying: MAINTAINERS: update Hyper-V file list Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: kmsg-honor-dmesg_restrict-sysctl-on-dev-kmsg-fix Applying: drivers/char/random.c: fix priming of last_data Applying: random: fix accounting race condition with lockless irq entropy_count update Applying: x86: mm: add missing comments for initial kernel direct mapping Applying: sound/soc/codecs/si476x.c: don't use 0bNNN Applying: x86: make 'mem=' option to work for efi platform Applying: audit: fix mq_open and mq_unlink to add the MQ root as a hidden parent audit_names record Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: posix_cpu_timer: consolidate expiry time type Applying: posix_cpu_timers: consolidate timer list cleanups Applying: posix_cpu_timers: consolidate expired timers check Applying: selftests: add basic posix timers selftests Applying: posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() Applying: posix_timers: Fix racy timer delta caching on task exit Applying: drivers/infiniband/core/cm.c: convert to using idr_alloc_cyclic() Applying: configfs: use capped length for ->store_attribute() Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: clear_refs: sanitize accepted commands declaration Applying: clear_refs: introduce private struct for mm_walk Applying: pagemap: introduce pagemap_entry_t without pmshift bits Applying: pagemap-introduce-pagemap_entry_t-without-pmshift-bits-v4 Applying: mm: soft-dirty bits for user memory changes tracking Applying: pagemap: prepare to reuse constant bits with page-shift Applying: mm/thp: use the correct function when updating access flags Applying: mm, memcg: don't take task_lock in task_in_mem_cgroup Applying: mm: remove free_area_cache Applying: mm: remove compressed copy from zram in-memory Applying: mm-remove-compressed-copy-from-zram-in-memory-fix Applying: mm/page_alloc.c: fix watermark check in __zone_watermark_ok() Applying: include/linux/mmzone.h: cleanups Applying: include-linux-mmzoneh-cleanups-fix Applying: mm: memmap_init_zone() performance improvement Applying: drop_caches: add some documentation and info message Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev Applying: mm/dmapool.c: fix null dev in dma_pool_create() Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: add vm event counters for balloon pages compaction Applying: err.h: IS_ERR() can accept __user pointers Applying: dump_stack: serialize the output from dump_stack() Applying: dump_stack-serialize-the-output-from-dump_stack-fix Applying: panic: add cpu/pid to warn_slowpath_common in WARNING printk()s Applying: panic-add-cpu-pid-to-warn_slowpath_common-in-warning-printks-fix Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq Applying: backlight: atmel-pwm-bl: remove unnecessary platform_set_drvdata() Applying: backlight: ep93xx: remove unnecessary platform_set_drvdata() Applying: backlight: lp8788: remove unnecessary platform_set_drvdata() Applying: backlight: pcf50633: remove unnecessary platform_set_drvdata() Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask Applying: lib/bitmap.c: speed up bitmap_find_free_region Applying: lib-bitmapc-speed-up-bitmap_find_free_region-fix Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: init: remove permanent string buffer from do_one_initcall() Applying: autofs4: allow autofs to work outside the initial PID namespace Applying: autofs4: translate pids to the right namespace for the daemon Applying: rtc: rtc-88pm80x: remove unnecessary platform_set_drvdata() Applying: drivers/rtc/rtc-v3020.c: remove redundant goto Applying: drivers/rtc/interface.c: fix checkpatch errors Applying: drivers/rtc/rtc-at32ap700x.c: fix checkpatch error Applying: drivers/rtc/rtc-at91rm9200.c: include Applying: drivers/rtc/rtc-cmos.c: fix whitespace related errors Applying: drivers/rtc/rtc-davinci.c: fix whitespace warning Applying: drivers/rtc/rtc-ds1305.c: add missing braces around sizeof Applying: drivers/rtc/rtc-ds1374.c: fix spacing related issues Applying: drivers/rtc/rtc-ds1511.c: fix issues related to spaces and braces Applying: drivers/rtc/rtc-ds3234.c: fix whitespace issue Applying: drivers/rtc/rtc-fm3130.c: fix whitespace related issue Applying: drivers/rtc/rtc-m41t80.c: fix spacing related issue Applying: drivers/rtc/rtc-max6902.c: remove unwanted spaces Applying: drivers/rtc/rtc-max77686.c: remove space before semicolon Applying: drivers/rtc/rtc-max8997.c: remove space before semicolon Applying: drivers/rtc/rtc-mpc5121.c: remove space before tab Applying: drivers/rtc/rtc-msm6242.c: use pr_warn Applying: drivers/rtc/rtc-mxc.c: fix checkpatch error Applying: drivers/rtc/rtc-omap.c: include instead of Applying: drivers/rtc/rtc-pcf2123.c: remove space before tabs Applying: drivers/rtc/rtc-pcf8583.c: move assignment outside if condition Applying: drivers/rtc/rtc-rs5c313.c: include instead of Applying: drivers/rtc/rtc-rs5c313.c: fix spacing related issues Applying: drivers/rtc/rtc-v3020.c: fix spacing issues Applying: drivers/rtc/rtc-vr41xx.c: fix spacing issues Applying: drivers/rtc/rtc-x1205.c: fix checkpatch issues Applying: rtc: rtc-88pm860x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab3100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ab8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at32ap700x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91rm9200: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-at91sam9: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-au1xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bfin: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-bq4802: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-coh901331: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9052: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-da9055: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-davinci: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-dm355evm: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ds1302: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ep93xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-jz4740: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lp8788: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-lpc32xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-ls1x: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t59: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8925: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-max8998: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mc13xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-msm6242: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-mxc: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-nuc900: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pcap: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-pm8xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-s3c: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sa1100: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-sh: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-spear: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-stmp3xxx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-twl: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vr41xx: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-vt8500: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-m48t86: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-puv3: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-rp5c01: remove unnecessary platform_set_drvdata() Applying: rtc: rtc-tile: remove unnecessary platform_set_drvdata() Applying: reiserfs: fix deadlock with nfs racing on create/lookup Applying: fat: additions to support fat_fallocate Applying: fat-additions-to-support-fat_fallocate-fix Applying: idr: print a stack dump after ida_remove warning Applying: idr-print-a-stack-dump-after-ida_remove-warning-fix Applying: mwave: fix info leak in mwave_ioctl() Applying: rapidio/switches: remove tsi500 driver Applying: drivers/parport/share.c: use kzalloc Applying: drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode Applying: drivers-w1-slaves-w1_ds2408c-add-magic-sequence-to-disable-p0-test-mode-fix Applying: relay: fix timer madness Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: block: prep work for batch completion Applying: block-prep-work-for-batch-completion-fix-2 Applying: block-prep-work-for-batch-completion-fix-3 Applying: block-prep-work-for-batch-completion-fix-3-fix Applying: block-prep-work-for-batch-completion-fix-99 Applying: block-aio-batch-completion-for-bios-kiocbs-fix Applying: block, aio: batch completion for bios/kiocbs Applying: virtio-blk: convert to batch completion Applying: mtip32xx: convert to batch completion Applying: aio: fix kioctx not being freed after cancellation at exit time Applying: lib: add weak clz/ctz functions Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: kbuild: fix for updated LZ4 tool with the new streaming format Applying: arm: add support for LZ4-compressed kernel Using index info to reconstruct a base tree... M arch/arm/Kconfig Falling back to patching base and 3-way merge... Auto-merging arch/arm/Kconfig Applying: arm: Remove enforced Os flag for LZ4 decompressor Applying: x86: add support for LZ4-compressed kernel Applying: x86, doc: Add LZ4 magic number for the new compression Applying: lib: add lz4 compressor module Applying: lib-add-lz4-compressor-module-fix Applying: crypto: add lz4 Cryptographic API Applying: crypto-add-lz4-cryptographic-api-fix Applying: scripts/sortextable.c: fix building on non-Linux systems Applying: seccomp: add generic code for jitted seccomp filters. Applying: ARM: net: bpf_jit: make code generation less dependent on struct sk_filter. Applying: ARM: bpf_jit: seccomp filtering: fixup merge conflict Applying: ARM: net: bpf_jit: add support for jitted seccomp filters. Applying: bpf: add comments explaining the schedule_work() operation $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 123905d...c4918a7 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (c4918a7 bpf: add comments explaining the schedule_work() operation) $ git merge --no-ff akpm/master Removing drivers/rapidio/switches/tsi500.c Merge made by the 'recursive' strategy. Documentation/cgroups/memory.txt | 16 + .../bindings/video/simple-framebuffer.txt | 25 + Documentation/filesystems/proc.txt | 7 +- Documentation/rapidio/rapidio.txt | 128 ++++- Documentation/rapidio/sysfs.txt | 17 + Documentation/sysctl/vm.txt | 33 +- Documentation/vm/pagemap.txt | 3 +- Documentation/vm/soft-dirty.txt | 36 ++ Documentation/x86/boot.txt | 7 +- MAINTAINERS | 9 +- arch/Kconfig | 17 + arch/arm/Kconfig | 2 + arch/arm/boot/compressed/.gitignore | 1 + arch/arm/boot/compressed/Makefile | 3 +- arch/arm/boot/compressed/decompress.c | 4 + arch/arm/boot/compressed/piggy.lz4.S | 6 + arch/arm/mm/mmap.c | 2 - arch/arm/net/bpf_jit_32.c | 93 +++- arch/arm64/mm/mmap.c | 2 - arch/mips/mm/mmap.c | 2 - arch/powerpc/mm/mmap_64.c | 2 - arch/powerpc/net/bpf_jit_comp.c | 4 + arch/s390/mm/mmap.c | 4 - arch/s390/net/bpf_jit_comp.c | 4 + arch/sparc/kernel/sys_sparc_64.c | 2 - arch/sparc/net/bpf_jit_comp.c | 4 + arch/tile/mm/mmap.c | 2 - arch/x86/Kconfig | 2 + arch/x86/boot/compressed/Makefile | 6 +- arch/x86/boot/compressed/misc.c | 4 + arch/x86/ia32/ia32_aout.c | 2 - arch/x86/include/asm/e820.h | 2 + arch/x86/include/asm/pgtable.h | 24 +- arch/x86/include/asm/pgtable_types.h | 12 + arch/x86/kernel/e820.c | 72 ++- arch/x86/mm/init.c | 19 +- arch/x86/mm/mmap.c | 2 - arch/x86/net/bpf_jit_comp.c | 4 + arch/x86/platform/efi/efi.c | 15 +- block/blk-core.c | 32 +- block/blk-flush.c | 5 +- block/blk-lib.c | 3 +- block/blk.h | 3 +- block/genhd.c | 2 +- crypto/Kconfig | 16 + crypto/Makefile | 2 + crypto/lz4.c | 106 ++++ crypto/lz4hc.c | 106 ++++ drivers/block/blockconsole.c | 5 +- drivers/block/drbd/drbd_bitmap.c | 3 +- drivers/block/drbd/drbd_worker.c | 9 +- drivers/block/drbd/drbd_wrappers.h | 9 +- drivers/block/floppy.c | 3 +- drivers/block/mtip32xx/mtip32xx.c | 86 ++-- drivers/block/mtip32xx/mtip32xx.h | 8 +- drivers/block/pktcdvd.c | 9 +- drivers/block/swim3.c | 2 +- drivers/block/virtio_blk.c | 31 +- drivers/block/xen-blkback/blkback.c | 3 +- drivers/block/xsysace.c | 3 +- drivers/char/mwave/tp3780i.c | 1 + drivers/char/random.c | 54 ++- drivers/gpu/drm/drm_fb_helper.c | 8 + drivers/infiniband/core/cm.c | 5 +- drivers/leds/leds-ot200.c | 14 +- drivers/md/bcache/alloc.c | 3 +- drivers/md/bcache/btree.c | 3 +- drivers/md/bcache/debug.c | 3 +- drivers/md/bcache/io.c | 6 +- drivers/md/bcache/journal.c | 9 +- drivers/md/bcache/movinggc.c | 3 +- drivers/md/bcache/request.c | 9 +- drivers/md/bcache/request.h | 3 +- drivers/md/bcache/super.c | 11 +- drivers/md/bcache/writeback.c | 8 +- drivers/md/dm-bufio.c | 9 +- drivers/md/dm-cache-target.c | 3 +- drivers/md/dm-crypt.c | 3 +- drivers/md/dm-io.c | 2 +- drivers/md/dm-snap.c | 3 +- drivers/md/dm-thin.c | 3 +- drivers/md/dm-verity.c | 3 +- drivers/md/dm.c | 8 +- drivers/md/faulty.c | 3 +- drivers/md/md.c | 9 +- drivers/md/multipath.c | 3 +- drivers/md/raid1.c | 12 +- drivers/md/raid10.c | 18 +- drivers/md/raid5.c | 15 +- drivers/parport/share.c | 3 +- drivers/rapidio/Kconfig | 20 + drivers/rapidio/Makefile | 3 +- drivers/rapidio/devices/tsi721.c | 12 + drivers/rapidio/rio-driver.c | 8 + drivers/rapidio/rio-scan.c | 190 +++----- drivers/rapidio/rio-sysfs.c | 45 ++ drivers/rapidio/rio.c | 246 +++++++++- drivers/rapidio/rio.h | 13 +- drivers/rapidio/switches/Kconfig | 7 - drivers/rapidio/switches/Makefile | 1 - drivers/rapidio/switches/tsi500.c | 78 --- drivers/rtc/interface.c | 18 +- drivers/rtc/rtc-88pm80x.c | 1 - drivers/rtc/rtc-88pm860x.c | 1 - drivers/rtc/rtc-ab3100.c | 1 - drivers/rtc/rtc-ab8500.c | 2 - drivers/rtc/rtc-at32ap700x.c | 22 +- drivers/rtc/rtc-at91rm9200.c | 4 +- drivers/rtc/rtc-at91sam9.c | 19 +- drivers/rtc/rtc-au1xxx.c | 2 - drivers/rtc/rtc-bfin.c | 1 - drivers/rtc/rtc-bq4802.c | 2 - drivers/rtc/rtc-cmos.c | 6 +- drivers/rtc/rtc-coh901331.c | 5 +- drivers/rtc/rtc-da9052.c | 2 - drivers/rtc/rtc-da9055.c | 2 - drivers/rtc/rtc-davinci.c | 13 +- drivers/rtc/rtc-dm355evm.c | 1 - drivers/rtc/rtc-ds1302.c | 2 - drivers/rtc/rtc-ds1305.c | 32 +- drivers/rtc/rtc-ds1374.c | 11 +- drivers/rtc/rtc-ds1511.c | 93 ++-- drivers/rtc/rtc-ds3234.c | 2 +- drivers/rtc/rtc-ep93xx.c | 2 - drivers/rtc/rtc-fm3130.c | 2 +- drivers/rtc/rtc-jz4740.c | 3 - drivers/rtc/rtc-lp8788.c | 2 - drivers/rtc/rtc-lpc32xx.c | 3 - drivers/rtc/rtc-ls1x.c | 2 - drivers/rtc/rtc-m41t80.c | 2 +- drivers/rtc/rtc-m48t59.c | 1 - drivers/rtc/rtc-m48t86.c | 2 - drivers/rtc/rtc-max6902.c | 6 +- drivers/rtc/rtc-max77686.c | 2 +- drivers/rtc/rtc-max8925.c | 7 +- drivers/rtc/rtc-max8997.c | 2 +- drivers/rtc/rtc-max8998.c | 6 +- drivers/rtc/rtc-mc13xxx.c | 4 - drivers/rtc/rtc-mpc5121.c | 2 +- drivers/rtc/rtc-msm6242.c | 15 +- drivers/rtc/rtc-mxc.c | 7 +- drivers/rtc/rtc-nuc900.c | 2 - drivers/rtc/rtc-omap.c | 4 +- drivers/rtc/rtc-pcap.c | 13 +- drivers/rtc/rtc-pcf2123.c | 10 +- drivers/rtc/rtc-pcf8583.c | 3 +- drivers/rtc/rtc-pm8xxx.c | 2 - drivers/rtc/rtc-puv3.c | 1 - drivers/rtc/rtc-rp5c01.c | 12 +- drivers/rtc/rtc-rs5c313.c | 18 +- drivers/rtc/rtc-s3c.c | 9 +- drivers/rtc/rtc-sa1100.c | 8 +- drivers/rtc/rtc-sh.c | 2 - drivers/rtc/rtc-spear.c | 1 - drivers/rtc/rtc-stmp3xxx.c | 13 +- drivers/rtc/rtc-tile.c | 2 - drivers/rtc/rtc-twl.c | 1 - drivers/rtc/rtc-v3020.c | 18 +- drivers/rtc/rtc-vr41xx.c | 12 +- drivers/rtc/rtc-vt8500.c | 2 - drivers/rtc/rtc-x1205.c | 33 +- drivers/target/target_core_iblock.c | 6 +- drivers/target/target_core_pscsi.c | 3 +- drivers/usb/gadget/amd5536udc.c | 4 +- drivers/video/Kconfig | 17 + drivers/video/Makefile | 1 + drivers/video/backlight/atmel-pwm-bl.c | 2 - drivers/video/backlight/ep93xx_bl.c | 1 - drivers/video/backlight/lp8788_bl.c | 1 - drivers/video/backlight/pcf50633-backlight.c | 2 - drivers/video/cyber2000fb.c | 3 + drivers/video/simplefb.c | 234 +++++++++ drivers/w1/slaves/w1_ds2408.c | 30 ++ fs/aio.c | 430 +++++++++++----- fs/autofs4/autofs_i.h | 4 +- fs/autofs4/dev-ioctl.c | 16 +- fs/autofs4/inode.c | 33 +- fs/autofs4/waitq.c | 16 +- fs/binfmt_aout.c | 2 - fs/binfmt_elf.c | 23 +- fs/bio-integrity.c | 3 +- fs/bio.c | 63 ++- fs/btrfs/check-integrity.c | 14 +- fs/btrfs/compression.c | 6 +- fs/btrfs/disk-io.c | 6 +- fs/btrfs/extent_io.c | 12 +- fs/btrfs/inode.c | 13 +- fs/btrfs/raid56.c | 9 +- fs/btrfs/scrub.c | 18 +- fs/btrfs/volumes.c | 5 +- fs/buffer.c | 3 +- fs/configfs/file.c | 2 +- fs/direct-io.c | 20 +- fs/drop_caches.c | 2 + fs/ext4/page-io.c | 3 +- fs/f2fs/data.c | 2 +- fs/f2fs/segment.c | 3 +- fs/fat/file.c | 108 ++++- fs/fat/inode.c | 69 ++- fs/gfs2/lops.c | 3 +- fs/gfs2/ops_fstype.c | 3 +- fs/hfs/bnode.c | 6 +- fs/hfsplus/wrapper.c | 3 +- fs/jfs/jfs_logmgr.c | 4 +- fs/jfs/jfs_metapage.c | 6 +- fs/logfs/dev_bdev.c | 8 +- fs/mpage.c | 2 +- fs/nfs/blocklayout/blocklayout.c | 17 +- fs/nilfs2/segbuf.c | 3 +- fs/ocfs2/cluster/heartbeat.c | 4 +- fs/ocfs2/file.c | 2 +- fs/proc/kmsg.c | 10 +- fs/proc/task_mmu.c | 140 ++++-- fs/reiserfs/inode.c | 9 +- fs/xfs/xfs_aops.c | 3 +- fs/xfs/xfs_buf.c | 3 +- include/asm-generic/pgtable.h | 22 + include/linux/aio.h | 25 +- include/linux/audit.h | 26 +- include/linux/balloon_compaction.h | 7 + include/linux/batch_complete.h | 23 + include/linux/bio.h | 38 +- include/linux/blk_types.h | 4 +- include/linux/blkdev.h | 12 +- include/linux/cpu.h | 14 + include/linux/decompress/unlz4.h | 10 + include/linux/err.h | 10 +- include/linux/fs.h | 2 +- include/linux/hardirq.h | 5 + include/linux/lockdep.h | 92 +--- include/linux/lz4.h | 87 ++++ include/linux/memcontrol.h | 9 +- include/linux/mm_types.h | 3 - include/linux/mmzone.h | 20 +- include/linux/percpu-refcount.h | 114 +++++ include/linux/posix-timers.h | 16 +- include/linux/rio.h | 18 +- include/linux/rio_drv.h | 1 + include/linux/sched.h | 2 - include/linux/seccomp.h | 18 + include/linux/swap.h | 9 +- include/linux/syslog.h | 4 +- include/linux/vm_event_item.h | 7 +- include/linux/wait.h | 16 +- include/net/ip_vs.h | 8 +- init/Kconfig | 34 +- init/main.c | 3 +- ipc/mqueue.c | 2 + ipc/sem.c | 6 +- ipc/shm.c | 4 +- kernel/audit.h | 1 + kernel/audit_tree.c | 1 + kernel/auditsc.c | 12 +- kernel/cpu.c | 27 +- kernel/fork.c | 4 - kernel/lglock.c | 12 +- kernel/panic.c | 5 +- kernel/posix-cpu-timers.c | 395 ++++++--------- kernel/printk.c | 91 ++-- kernel/relay.c | 14 +- kernel/seccomp.c | 33 +- kernel/smp.c | 11 +- kernel/sys.c | 29 +- kernel/watchdog.c | 10 +- lib/Kconfig | 13 + lib/Makefile | 8 +- lib/bitmap.c | 23 +- lib/clz_ctz.c | 58 +++ lib/decompress.c | 5 + lib/decompress_unlz4.c | 187 +++++++ lib/dump_stack.c | 47 +- lib/idr.c | 7 +- lib/lz4/Makefile | 3 + lib/lz4/lz4_compress.c | 443 +++++++++++++++++ lib/lz4/lz4_decompress.c | 326 +++++++++++++ lib/lz4/lz4defs.h | 156 ++++++ lib/lz4/lz4hc_compress.c | 539 +++++++++++++++++++++ lib/percpu-refcount.c | 251 ++++++++++ mm/Kconfig | 12 + mm/balloon_compaction.c | 2 + mm/bounce.c | 12 +- mm/dmapool.c | 5 +- mm/huge_memory.c | 6 +- mm/memcontrol.c | 217 ++++++++- mm/migrate.c | 3 +- mm/mmap.c | 32 +- mm/mmu_notifier.c | 79 ++- mm/mremap.c | 2 +- mm/nommu.c | 4 - mm/page_alloc.c | 11 +- mm/page_io.c | 43 +- mm/util.c | 1 - mm/vmstat.c | 9 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- scripts/Makefile.lib | 5 + sound/soc/codecs/si476x.c | 6 +- tools/include/tools/be_byteshift.h | 34 +- tools/include/tools/le_byteshift.h | 34 +- tools/testing/selftests/Makefile | 1 + tools/testing/selftests/timers/Makefile | 8 + tools/testing/selftests/timers/posix_timers.c | 221 +++++++++ usr/Kconfig | 9 + 302 files changed, 6219 insertions(+), 1721 deletions(-) create mode 100644 Documentation/devicetree/bindings/video/simple-framebuffer.txt create mode 100644 Documentation/vm/soft-dirty.txt create mode 100644 arch/arm/boot/compressed/piggy.lz4.S create mode 100644 crypto/lz4.c create mode 100644 crypto/lz4hc.c delete mode 100644 drivers/rapidio/switches/tsi500.c create mode 100644 drivers/video/simplefb.c create mode 100644 include/linux/batch_complete.h create mode 100644 include/linux/decompress/unlz4.h create mode 100644 include/linux/lz4.h create mode 100644 include/linux/percpu-refcount.h create mode 100644 lib/clz_ctz.c create mode 100644 lib/decompress_unlz4.c create mode 100644 lib/lz4/Makefile create mode 100644 lib/lz4/lz4_compress.c create mode 100644 lib/lz4/lz4_decompress.c create mode 100644 lib/lz4/lz4defs.h create mode 100644 lib/lz4/lz4hc_compress.c create mode 100644 lib/percpu-refcount.c create mode 100644 tools/testing/selftests/timers/Makefile create mode 100644 tools/testing/selftests/timers/posix_timers.c