--- /dev/null
+$ date
+Tuesday 5 November 08:57:57 EST 2013
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 17f6ee43c336 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
+Merging origin/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge origin/master
+Updating 17f6ee43c336..be408cd3e1fe
+Fast-forward
+ Documentation/networking/dccp.txt | 4 +-
+ Documentation/networking/e100.txt | 2 +-
+ Documentation/networking/ieee802154.txt | 4 +-
+ Documentation/networking/l2tp.txt | 2 +-
+ Documentation/networking/netdev-FAQ.txt | 24 +++---
+ Documentation/networking/netlink_mmap.txt | 6 +-
+ Documentation/networking/operstates.txt | 4 +-
+ Documentation/networking/rxrpc.txt | 2 +-
+ Documentation/networking/stmmac.txt | 8 +-
+ Documentation/networking/vortex.txt | 4 +-
+ Documentation/networking/x25-iface.txt | 2 +-
+ Makefile | 2 +-
+ drivers/net/can/c_can/c_can.c | 6 +-
+ drivers/net/can/usb/kvaser_usb.c | 20 +++--
+ drivers/net/ethernet/broadcom/bgmac.c | 20 +++--
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +--
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 16 +++-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 3 +-
+ drivers/net/ethernet/emulex/benet/be.h | 9 +++
+ drivers/net/ethernet/emulex/benet/be_main.c | 6 ++
+ drivers/net/ethernet/ibm/emac/mal.c | 16 ++--
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 2 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 6 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 7 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 6 +-
+ drivers/net/netconsole.c | 18 +++--
+ drivers/net/usb/ax88179_178a.c | 11 ++-
+ drivers/net/virtio_net.c | 13 ++--
+ drivers/net/wan/sbni.c | 89 ----------------------
+ drivers/net/xen-netback/common.h | 1 +
+ drivers/net/xen-netback/interface.c | 3 +-
+ drivers/net/xen-netback/netback.c | 10 +--
+ include/linux/netpoll.h | 5 +-
+ include/net/ip6_fib.h | 1 +
+ net/bridge/br_device.c | 2 +-
+ net/bridge/br_input.c | 2 +-
+ net/bridge/br_multicast.c | 44 +++++------
+ net/bridge/br_private.h | 6 +-
+ net/bridge/netfilter/ebt_ulog.c | 9 +--
+ net/core/flow_dissector.c | 2 +-
+ net/core/netpoll.c | 31 ++++----
+ net/ipv4/netfilter/arp_tables.c | 5 ++
+ net/ipv4/netfilter/ip_tables.c | 5 ++
+ net/ipv4/netfilter/ipt_ULOG.c | 7 +-
+ net/ipv4/tcp_input.c | 34 ++++++---
+ net/ipv4/tcp_offload.c | 13 ++--
+ net/ipv4/xfrm4_policy.c | 8 +-
+ net/ipv6/netfilter/ip6_tables.c | 5 ++
+ net/ipv6/route.c | 9 ++-
+ net/ipv6/xfrm6_policy.c | 8 +-
+ net/netfilter/x_tables.c | 7 +-
+ net/netfilter/xt_NFQUEUE.c | 7 +-
+ net/openvswitch/dp_notify.c | 7 +-
+ net/openvswitch/vport-netdev.c | 16 +++-
+ net/openvswitch/vport-netdev.h | 1 +
+ net/sched/sch_fq.c | 1 +
+ net/sctp/ipv6.c | 4 +-
+ net/sctp/sm_sideeffect.c | 1 -
+ net/x25/Kconfig | 4 +-
+ net/xfrm/xfrm_ipcomp.c | 12 +--
+ 60 files changed, 304 insertions(+), 288 deletions(-)
+Merging fixes/master (fa8218def1b1 Merge tag 'regmap-v3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (19514fc665ff arm, kbuild: make "make install" not depend on vmlinux)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (18e8a7387340 ARC: [plat-arcfpga] defconfig update)
+$ git merge arc-current/for-curr
+Auto-merging arch/arc/mm/fault.c
+Merge made by the 'recursive' strategy.
+ arch/arc/Kconfig | 10 ++-
+ arch/arc/configs/fpga_defconfig | 3 +
+ arch/arc/include/asm/cache.h | 8 +-
+ arch/arc/include/asm/irq.h | 4 +-
+ arch/arc/include/asm/irqflags.h | 22 ++++++
+ arch/arc/include/asm/mmu.h | 2 +-
+ arch/arc/include/asm/mmu_context.h | 61 +++++++++++----
+ arch/arc/include/asm/setup.h | 2 +-
+ arch/arc/include/asm/smp.h | 2 +-
+ arch/arc/include/asm/tlbflush.h | 11 ++-
+ arch/arc/include/asm/unaligned.h | 3 +-
+ arch/arc/kernel/ctx_sw.c | 13 +++-
+ arch/arc/kernel/ctx_sw_asm.S | 11 ++-
+ arch/arc/kernel/entry.S | 24 +++---
+ arch/arc/kernel/head.S | 2 +-
+ arch/arc/kernel/irq.c | 12 ++-
+ arch/arc/kernel/kgdb.c | 12 +++
+ arch/arc/kernel/kprobes.c | 6 +-
+ arch/arc/kernel/reset.c | 1 +
+ arch/arc/kernel/setup.c | 11 ++-
+ arch/arc/kernel/smp.c | 10 +--
+ arch/arc/kernel/stacktrace.c | 5 +-
+ arch/arc/kernel/time.c | 4 +-
+ arch/arc/kernel/traps.c | 3 +-
+ arch/arc/mm/cache_arc700.c | 155 ++++++++++++++++---------------------
+ arch/arc/mm/fault.c | 2 +-
+ arch/arc/mm/tlb.c | 91 ++++++++++++++++++++--
+ arch/arc/mm/tlbex.S | 4 +-
+ 28 files changed, 321 insertions(+), 173 deletions(-)
+Merging arm-current/fixes (384b38b66947 ARM: 7873/1: vfp: clear vfp_current_hw_state for dying cpu)
+$ git merge arm-current/fixes
+Auto-merging arch/arm/mm/dma-mapping.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-highbank/Kconfig | 2 +-
+ arch/arm/mach-tegra/Kconfig | 2 +-
+ arch/arm/mm/dma-mapping.c | 4 ++--
+ arch/arm/vfp/vfpmodule.c | 6 +++---
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+Merging m68k-current/for-linus (55490050df0f m68k/atari: ARAnyM - Always use physical addresses in NatFeat calls)
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging metag-fixes/fixes (3b2f64d00c46 Linux 3.11-rc2)
+$ git merge metag-fixes/fixes
+Already up-to-date.
+Merging powerpc-merge/merge (8b5ede69d24d powerpc/irq: Don't switch to irq stack from softirq stack)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (6d15ee492809 Merge git://git.kernel.org/pub/scm/virt/kvm/kvm)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (be408cd3e1fe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
+$ git merge net/master
+Already up-to-date.
+Merging ipsec/master (84502b5ef984 xfrm: Fix null pointer dereference when decoding sessions)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (a4461f41b94c ALSA: fix oops in snd_pcm_info() caused by ASoC DPCM)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (67d470e0e171 Revert "x86/PCI: MMCONFIG: Check earlier for MMCONFIG region at address zero")
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (8ce9beac4661 drivers: net: wireless: b43: Fix possible NULL ptr dereference)
+$ git merge wireless/master
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/ath/ath5k/base.c | 6 +-
+ drivers/net/wireless/b43/phy_n.c | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 14 +----
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 22 ++++----
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 6 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 31 +++++++++--
+ drivers/net/wireless/rt2x00/rt2400pci.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 12 ++--
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +
+ net/mac80211/ieee80211_i.h | 1 +
+ net/mac80211/mlme.c | 95 +++++++++++++++++++++++++++++---
+ net/mac80211/rate.c | 15 ++++-
+ 12 files changed, 159 insertions(+), 51 deletions(-)
+Merging driver-core.current/driver-core-linus (31d141e3a666 Linux 3.12-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (6e757ad2c92c tty/serial: at91: fix uart/usart selection for older products)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (e1466ad5b1ae USB: serial: ftdi_sio: add id for Z3X Box device)
+$ git merge usb.current/usb-linus
+Already up-to-date.
+Merging staging.current/staging-linus (31d141e3a666 Linux 3.12-rc6)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (31d141e3a666 Linux 3.12-rc6)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (5beea882e641 Input: ALPS - add support for model found on Dell XT2)
+$ git merge input-current/for-linus
+Already up-to-date.
+Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe)
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus (c158a35c8a68 audit: no leading space in audit_log_d_path prefix)
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master (26052f9b9bb8 crypto: crct10dif - Add fallback for broken initrds)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (64110c16e012 ide: sgiioc4: Staticize ioc4_ide_attach_one())
+$ git merge ide/master
+Already up-to-date.
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging sh-current/sh-fixes-for-linus (44033109e99c SH: Convert out[bwl] macros to inline functions)
+$ git merge sh-current/sh-fixes-for-linus
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (1931ee143b0a Revert "drivers: of: add initialization code for dma reserved memory")
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (f6537f2f0eba scripts/kallsyms: filter symbols not in kernel address space)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging mfd-fixes/master (d0e639c9e06d Linux 3.12-rc4)
+$ git merge mfd-fixes/master
+Already up-to-date.
+Merging vfio-fixes/for-linus (d93b3ac0edb8 VFIO: vfio_iommu_type1: fix bug caused by break in nested loop)
+$ git merge vfio-fixes/for-linus
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (1fbc0d789d12 drm/i915: Fix the PPT fdi lane bifurcate state handling on ivb)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (72decceef59d ARC: [TB10x] Updates for GPIO and pinctrl)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/boot/dts/abilis_tb100.dtsi | 172 ++++++++++++++++---------------
+ arch/arc/boot/dts/abilis_tb100_dvk.dts | 24 ++---
+ arch/arc/boot/dts/abilis_tb101.dtsi | 178 ++++++++++++++++++---------------
+ arch/arc/boot/dts/abilis_tb101_dvk.dts | 24 ++---
+ arch/arc/boot/dts/abilis_tb10x.dtsi | 3 +-
+ arch/arc/plat-tb10x/Kconfig | 2 +
+ 6 files changed, 216 insertions(+), 187 deletions(-)
+Merging arm/for-next (17e09ac56465 Merge branches 'fixes', 'mmci' and 'sa11x0' into for-next)
+$ git merge arm/for-next
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Removing arch/arm/mach-sa1100/include/mach/gpio.h
+Merge made by the 'recursive' strategy.
+ Documentation/DMA-API-HOWTO.txt | 37 +-
+ Documentation/DMA-API.txt | 8 +
+ arch/arm/Kconfig | 36 +-
+ arch/arm/Kconfig.debug | 41 +-
+ arch/arm/Makefile | 1 +
+ arch/arm/boot/compressed/head.S | 9 +-
+ arch/arm/common/Makefile | 2 +
+ arch/arm/common/bL_switcher.c | 822 +++++++
+ arch/arm/common/bL_switcher_dummy_if.c | 71 +
+ arch/arm/common/mcpm_entry.c | 27 +
+ arch/arm/common/mcpm_head.S | 18 +-
+ arch/arm/common/mcpm_platsmp.c | 27 +-
+ arch/arm/common/timer-sp.c | 2 +-
+ arch/arm/configs/h3600_defconfig | 22 +-
+ arch/arm/crypto/.gitignore | 1 +
+ arch/arm/crypto/Makefile | 14 +-
+ arch/arm/crypto/aes_glue.c | 22 +-
+ arch/arm/crypto/aes_glue.h | 19 +
+ arch/arm/crypto/aesbs-core.S_shipped | 2544 +++++++++++++++++++++
+ arch/arm/crypto/aesbs-glue.c | 434 ++++
+ arch/arm/crypto/bsaes-armv7.pl | 2467 ++++++++++++++++++++
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/assembler.h | 7 +
+ arch/arm/include/asm/atomic.h | 33 +-
+ arch/arm/include/asm/bL_switcher.h | 77 +
+ arch/arm/include/asm/bug.h | 10 +-
+ arch/arm/include/asm/cacheflush.h | 46 +
+ arch/arm/include/asm/cmpxchg.h | 58 +-
+ arch/arm/include/asm/cputype.h | 1 +
+ arch/arm/include/asm/dma-mapping.h | 8 +
+ arch/arm/include/asm/hardirq.h | 2 +-
+ arch/arm/include/asm/hardware/coresight.h | 8 +-
+ arch/arm/include/asm/kgdb.h | 3 +-
+ arch/arm/include/asm/mach/arch.h | 1 +
+ arch/arm/include/asm/mcpm.h | 39 +
+ arch/arm/include/asm/memory.h | 76 +-
+ arch/arm/include/asm/mmu.h | 2 +-
+ arch/arm/include/asm/pgtable-2level.h | 7 +
+ arch/arm/include/asm/pgtable-3level.h | 3 +
+ arch/arm/include/asm/processor.h | 33 +-
+ arch/arm/include/asm/setup.h | 2 +-
+ arch/arm/include/asm/smp.h | 2 +
+ arch/arm/include/asm/spinlock.h | 36 +-
+ arch/arm/include/asm/spinlock_types.h | 2 +-
+ arch/arm/include/asm/tlbflush.h | 48 +-
+ arch/arm/include/asm/unified.h | 4 +
+ arch/arm/include/debug/efm32.S | 45 +
+ arch/arm/include/debug/msm.S | 5 +
+ arch/arm/include/debug/pl01x.S | 2 +
+ arch/arm/include/uapi/asm/Kbuild | 1 +
+ arch/arm/include/uapi/asm/perf_regs.h | 23 +
+ arch/arm/kernel/Makefile | 4 +-
+ arch/arm/kernel/armksyms.c | 1 +
+ arch/arm/kernel/entry-armv.S | 5 +-
+ arch/arm/kernel/entry-common.S | 4 +-
+ arch/arm/kernel/head.S | 82 +-
+ arch/arm/kernel/hw_breakpoint.c | 14 +-
+ arch/arm/kernel/kprobes.c | 8 +-
+ arch/arm/kernel/module.c | 57 +-
+ arch/arm/kernel/perf_event.c | 3 +-
+ arch/arm/kernel/perf_event_cpu.c | 2 +-
+ arch/arm/kernel/perf_regs.c | 30 +
+ arch/arm/kernel/setup.c | 28 +-
+ arch/arm/kernel/signal.c | 24 +-
+ arch/arm/kernel/sigreturn_codes.S | 80 +
+ arch/arm/kernel/sleep.S | 27 +-
+ arch/arm/kernel/smp.c | 23 +-
+ arch/arm/kernel/smp_scu.c | 14 +-
+ arch/arm/kernel/smp_tlb.c | 36 +-
+ arch/arm/kernel/smp_twd.c | 24 +-
+ arch/arm/kernel/suspend.c | 8 +-
+ arch/arm/kernel/traps.c | 24 +-
+ arch/arm/kvm/arm.c | 6 +-
+ arch/arm/lib/bitops.h | 5 +
+ arch/arm/lib/uaccess_with_memcpy.c | 41 +-
+ arch/arm/mach-highbank/Kconfig | 1 +
+ arch/arm/mach-ixp4xx/Kconfig | 4 -
+ arch/arm/mach-mvebu/Kconfig | 1 +
+ arch/arm/mach-mvebu/coherency_ll.S | 3 +
+ arch/arm/mach-mvebu/headsmp.S | 4 +
+ arch/arm/mach-sa1100/assabet.c | 3 +
+ arch/arm/mach-sa1100/include/mach/gpio.h | 55 -
+ arch/arm/mach-sa1100/include/mach/h3xxx.h | 2 +
+ arch/arm/mach-sa1100/simpad.c | 1 +
+ arch/arm/mach-vexpress/Kconfig | 1 +
+ arch/arm/mach-vexpress/dcscb.c | 56 +-
+ arch/arm/mach-vexpress/tc2_pm.c | 48 +-
+ arch/arm/mm/Kconfig | 6 +
+ arch/arm/mm/abort-ev6.S | 5 +-
+ arch/arm/mm/alignment.c | 9 +-
+ arch/arm/mm/dma-mapping.c | 51 +-
+ arch/arm/mm/idmap.c | 8 +-
+ arch/arm/mm/init.c | 12 +-
+ arch/arm/mm/mm.h | 2 +
+ arch/arm/mm/mmap.c | 6 +-
+ arch/arm/mm/mmu.c | 82 +
+ arch/arm/mm/proc-v6.S | 4 +-
+ arch/arm/mm/proc-v7.S | 4 +-
+ arch/arm/net/bpf_jit_32.c | 6 +-
+ arch/arm/plat-versatile/headsmp.S | 2 +
+ arch/arm64/kernel/debug-monitors.c | 13 +-
+ arch/arm64/kernel/hw_breakpoint.c | 22 +-
+ arch/arm64/kernel/perf_event.c | 4 +-
+ arch/powerpc/kernel/vio.c | 3 +-
+ block/blk-settings.c | 8 +-
+ crypto/Kconfig | 16 +
+ drivers/amba/bus.c | 6 +-
+ drivers/ata/pata_ixp4xx_cf.c | 5 +-
+ drivers/ata/pata_octeon_cf.c | 5 +-
+ drivers/block/nvme-core.c | 10 +-
+ drivers/bus/arm-cci.c | 6 +-
+ drivers/crypto/ixp4xx_crypto.c | 48 +-
+ drivers/dma/amba-pl08x.c | 5 +
+ drivers/dma/dw/platform.c | 8 +-
+ drivers/dma/edma.c | 10 +-
+ drivers/dma/imx-sdma.c | 4 +
+ drivers/dma/pl330.c | 4 +
+ drivers/firmware/dcdbas.c | 32 +-
+ drivers/firmware/google/gsmi.c | 13 +-
+ drivers/gpio/gpio-sa1100.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 6 +-
+ drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 5 +-
+ drivers/irqchip/irq-gic.c | 151 +-
+ drivers/media/platform/omap3isp/isp.c | 6 +-
+ drivers/media/platform/omap3isp/isp.h | 3 -
+ drivers/mmc/card/queue.c | 3 +-
+ drivers/mmc/host/mmci.c | 78 +-
+ drivers/mmc/host/mmci.h | 4 -
+ drivers/mmc/host/sdhci-acpi.c | 5 +-
+ drivers/net/ethernet/broadcom/b44.c | 3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 13 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 12 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 9 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 18 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 18 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 18 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_main.c | 16 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 15 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 15 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 6 +-
+ drivers/net/ethernet/octeon/octeon_mgmt.c | 5 +-
+ drivers/net/ethernet/sfc/efx.c | 12 +-
+ drivers/net/wireless/b43/dma.c | 9 +-
+ drivers/net/wireless/b43legacy/dma.c | 9 +-
+ drivers/of/platform.c | 3 -
+ drivers/parport/parport_pc.c | 8 +-
+ drivers/scsi/scsi_lib.c | 2 +-
+ drivers/staging/dwc2/platform.c | 5 +-
+ drivers/staging/et131x/et131x.c | 17 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 8 +-
+ drivers/staging/imx-drm/ipuv3-crtc.c | 4 +-
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 5 +-
+ drivers/usb/chipidea/ci_hdrc_imx.c | 7 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 7 +-
+ drivers/usb/gadget/lpc32xx_udc.c | 4 +-
+ drivers/usb/host/bcma-hcd.c | 3 +-
+ drivers/usb/host/ehci-atmel.c | 7 +-
+ drivers/usb/host/ehci-octeon.c | 4 +-
+ drivers/usb/host/ehci-omap.c | 10 +-
+ drivers/usb/host/ehci-orion.c | 7 +-
+ drivers/usb/host/ehci-platform.c | 10 +-
+ drivers/usb/host/ehci-s5p.c | 7 +-
+ drivers/usb/host/ehci-spear.c | 7 +-
+ drivers/usb/host/ehci-tegra.c | 7 +-
+ drivers/usb/host/ohci-at91.c | 9 +-
+ drivers/usb/host/ohci-exynos.c | 7 +-
+ drivers/usb/host/ohci-nxp.c | 5 +-
+ drivers/usb/host/ohci-octeon.c | 5 +-
+ drivers/usb/host/ohci-omap3.c | 10 +-
+ drivers/usb/host/ohci-pxa27x.c | 8 +-
+ drivers/usb/host/ohci-sa1111.c | 6 +
+ drivers/usb/host/ohci-spear.c | 7 +-
+ drivers/usb/host/ssb-hcd.c | 3 +-
+ drivers/usb/host/uhci-platform.c | 7 +-
+ drivers/usb/musb/am35x.c | 50 +-
+ drivers/usb/musb/da8xx.c | 49 +-
+ drivers/usb/musb/davinci.c | 48 +-
+ drivers/usb/musb/tusb6010.c | 49 +-
+ drivers/video/amba-clcd.c | 5 +
+ include/linux/amba/bus.h | 2 -
+ include/linux/dma-mapping.h | 31 +
+ include/linux/irqchip/arm-gic.h | 7 +
+ include/trace/events/power_cpu_migrate.h | 67 +
+ sound/arm/pxa2xx-pcm.c | 10 +-
+ sound/soc/atmel/atmel-pcm.c | 11 +-
+ sound/soc/blackfin/bf5xx-ac97-pcm.c | 11 +-
+ sound/soc/blackfin/bf5xx-i2s-pcm.c | 10 +-
+ sound/soc/davinci/davinci-pcm.c | 9 +-
+ sound/soc/fsl/fsl_dma.c | 9 +-
+ sound/soc/fsl/imx-pcm-fiq.c | 12 +-
+ sound/soc/fsl/mpc5200_dma.c | 10 +-
+ sound/soc/jz4740/jz4740-pcm.c | 12 +-
+ sound/soc/kirkwood/kirkwood-dma.c | 9 +-
+ sound/soc/nuc900/nuc900-pcm.c | 9 +-
+ sound/soc/omap/omap-pcm.c | 11 +-
+ sound/soc/pxa/pxa2xx-pcm.c | 11 +-
+ sound/soc/s6000/s6000-pcm.c | 9 +-
+ sound/soc/samsung/dma.c | 11 +-
+ sound/soc/samsung/idma.c | 11 +-
+ tools/perf/arch/arm/Makefile | 3 +
+ tools/perf/arch/arm/include/perf_regs.h | 54 +
+ tools/perf/arch/arm/util/unwind.c | 48 +
+ tools/perf/config/Makefile | 13 +-
+ tools/perf/config/feature-tests.mak | 21 +-
+ tools/perf/util/unwind.c | 75 +-
+ 206 files changed, 8567 insertions(+), 1125 deletions(-)
+ create mode 100644 arch/arm/common/bL_switcher.c
+ create mode 100644 arch/arm/common/bL_switcher_dummy_if.c
+ create mode 100644 arch/arm/crypto/.gitignore
+ create mode 100644 arch/arm/crypto/aes_glue.h
+ create mode 100644 arch/arm/crypto/aesbs-core.S_shipped
+ create mode 100644 arch/arm/crypto/aesbs-glue.c
+ create mode 100644 arch/arm/crypto/bsaes-armv7.pl
+ create mode 100644 arch/arm/include/asm/bL_switcher.h
+ create mode 100644 arch/arm/include/debug/efm32.S
+ create mode 100644 arch/arm/include/uapi/asm/perf_regs.h
+ create mode 100644 arch/arm/kernel/perf_regs.c
+ create mode 100644 arch/arm/kernel/sigreturn_codes.S
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/gpio.h
+ create mode 100644 include/trace/events/power_cpu_migrate.h
+ create mode 100644 tools/perf/arch/arm/include/perf_regs.h
+ create mode 100644 tools/perf/arch/arm/util/unwind.c
+Merging arm-perf/for-next/perf (15c03dd4859a Linux 3.12-rc3)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (c1b35c610b89 Merge branch 'next/dt' into for-next)
+$ git merge arm-soc/for-next
+Resolved 'arch/arm/mach-tegra/Kconfig' using previous resolution.
+Resolved 'drivers/clk/clk-nomadik.c' using previous resolution.
+Removing include/linux/platform_data/clk-nomadik.h
+Auto-merging drivers/clk/clk-nomadik.c
+CONFLICT (content): Merge conflict in drivers/clk/clk-nomadik.c
+Auto-merging drivers/bus/arm-cci.c
+Removing arch/arm/mach-vt8500/common.h
+Auto-merging arch/arm/mach-vexpress/Kconfig
+Removing arch/arm/mach-ux500/usb.c
+Removing arch/arm/mach-ux500/devices-common.h
+Removing arch/arm/mach-ux500/devices-common.c
+Removing arch/arm/mach-ux500/board-mop500-uib.c
+Removing arch/arm/mach-ux500/board-mop500-u8500uib.c
+Removing arch/arm/mach-ux500/board-mop500-stuib.c
+Removing arch/arm/mach-tegra/gpio-names.h
+Removing arch/arm/mach-tegra/common.c
+Removing arch/arm/mach-tegra/board-paz00.h
+Auto-merging arch/arm/mach-tegra/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig
+Removing arch/arm/mach-shark/pci.c
+Removing arch/arm/mach-shark/leds.c
+Removing arch/arm/mach-shark/irq.c
+Removing arch/arm/mach-shark/include/mach/uncompress.h
+Removing arch/arm/mach-shark/include/mach/timex.h
+Removing arch/arm/mach-shark/include/mach/memory.h
+Removing arch/arm/mach-shark/include/mach/isa-dma.h
+Removing arch/arm/mach-shark/include/mach/irqs.h
+Removing arch/arm/mach-shark/include/mach/hardware.h
+Removing arch/arm/mach-shark/include/mach/framebuffer.h
+Removing arch/arm/mach-shark/include/mach/entry-macro.S
+Removing arch/arm/mach-shark/include/mach/debug-macro.S
+Removing arch/arm/mach-shark/dma.c
+Removing arch/arm/mach-shark/core.c
+Removing arch/arm/mach-shark/Makefile.boot
+Removing arch/arm/mach-shark/Makefile
+Removing arch/arm/mach-s3c64xx/clock.c
+Removing arch/arm/mach-omap2/board-zoom.h
+Removing arch/arm/mach-omap2/board-zoom.c
+Removing arch/arm/mach-omap2/board-zoom-peripherals.c
+Removing arch/arm/mach-omap2/board-zoom-display.c
+Removing arch/arm/mach-omap2/board-zoom-debugboard.c
+Removing arch/arm/mach-omap2/board-rm680.c
+Removing arch/arm/mach-omap2/board-omap3evm.c
+Removing arch/arm/mach-omap2/board-igep0020.c
+Removing arch/arm/mach-omap2/board-3630sdp.c
+Removing arch/arm/mach-msm/include/mach/irqs-8x60.h
+Removing arch/arm/mach-msm/include/mach/irqs-8960.h
+Auto-merging arch/arm/mach-msm/board-dt.c
+Removing arch/arm/mach-msm/board-dt-8660.c
+Removing arch/arm/mach-integrator/include/mach/irqs.h
+Auto-merging arch/arm/mach-integrator/cm.h
+Removing arch/arm/mach-highbank/platsmp.c
+Removing arch/arm/mach-highbank/hotplug.c
+Auto-merging arch/arm/mach-highbank/Kconfig
+Removing arch/arm/mach-davinci/include/mach/gpio.h
+Removing arch/arm/mach-davinci/include/mach/gpio-davinci.h
+Removing arch/arm/lib/io-shark.c
+Removing arch/arm/include/asm/sched_clock.h
+Removing arch/arm/configs/shark_defconfig
+Removing arch/arm/common/via82c505.c
+Auto-merging arch/arm/common/Makefile
+Removing arch/arm/boot/dts/ste-hrefv60plus.dts
+Auto-merging arch/arm/boot/dts/ste-hrefprev60.dtsi
+Auto-merging arch/arm/boot/dts/ste-href-stuib.dtsi
+Auto-merging arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+Auto-merging arch/arm/boot/dts/socfpga_cyclone5.dtsi
+Removing arch/arm/boot/dts/emev2-kzm9d-reference.dts
+Removing arch/arm/boot/compressed/ofw-shark.c
+Removing arch/arm/boot/compressed/head-shark.S
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt
+Removing Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt
+Removing Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt
+Removing Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt
+Removing Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt
+Removing Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt
+Removing Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fe5dd46cc2d3] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/arm/Marvell/README | 1 +
+ Documentation/arm/sunxi/README | 26 +-
+ Documentation/devicetree/bindings/arm/arm-boards | 50 +-
+ .../devicetree/bindings/arm/armada-370-xp-mpic.txt | 3 +
+ Documentation/devicetree/bindings/arm/cci.txt | 60 +-
+ .../devicetree/bindings/arm/omap/omap.txt | 3 +-
+ Documentation/devicetree/bindings/arm/vic.txt | 12 +
+ .../devicetree/bindings/clock/imx6q-clock.txt | 5 +
+ .../bindings/clock/mvebu-corediv-clock.txt | 19 +
+ .../bindings/clock/mvebu-gated-clock.txt | 14 +-
+ Documentation/devicetree/bindings/clock/sunxi.txt | 4 +-
+ .../bindings/clock/sunxi/sun4i-a10-gates.txt | 93 -
+ .../bindings/clock/sunxi/sun5i-a10s-gates.txt | 75 -
+ .../bindings/clock/sunxi/sun5i-a13-gates.txt | 58 -
+ .../bindings/clock/sunxi/sun6i-a31-gates.txt | 83 -
+ .../bindings/clock/sunxi/sun7i-a20-gates.txt | 98 -
+ .../devicetree/bindings/crypto/omap-aes.txt | 31 +
+ .../devicetree/bindings/crypto/omap-sham.txt | 28 +
+ .../devicetree/bindings/hwrng/omap_rng.txt | 22 +
+ .../interrupt-controller/allwinner,sun4i-ic.txt | 3 -
+ .../interrupt-controller/sunxi/sun4i-a10.txt | 89 -
+ .../interrupt-controller/sunxi/sun5i-a13.txt | 55 -
+ .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 26 +-
+ .../devicetree/bindings/pci/mvebu-pci.txt | 10 +
+ .../bindings/pinctrl/fsl,mxs-pinctrl.txt | 859 +-------
+ .../devicetree/bindings/pinctrl/pinctrl-single.txt | 11 +
+ .../devicetree/bindings/usb/ux500-usb.txt | 2 +-
+ .../devicetree/bindings/video/exynos_hdmi.txt | 14 +-
+ .../devicetree/bindings/video/exynos_mixer.txt | 4 +
+ MAINTAINERS | 19 +-
+ arch/arm/Kconfig | 43 +-
+ arch/arm/Kconfig.debug | 8 +
+ arch/arm/Makefile | 1 -
+ arch/arm/arm-soc-for-next-contents.txt | 173 ++
+ arch/arm/boot/compressed/Makefile | 4 -
+ arch/arm/boot/compressed/head-shark.S | 140 --
+ arch/arm/boot/compressed/ofw-shark.c | 260 ---
+ arch/arm/boot/dts/Makefile | 52 +-
+ arch/arm/boot/dts/am335x-base0033.dts | 16 +
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 311 +--
+ arch/arm/boot/dts/am335x-bone.dts | 18 +
+ arch/arm/boot/dts/am335x-boneblack.dts | 61 +
+ arch/arm/boot/dts/am335x-evm.dts | 771 ++++---
+ arch/arm/boot/dts/am335x-evmsk.dts | 474 ++--
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 278 +++
+ arch/arm/boot/dts/am335x-nano.dts | 431 ++++
+ arch/arm/boot/dts/am33xx.dtsi | 155 +-
+ arch/arm/boot/dts/am4372.dtsi | 599 +++++
+ arch/arm/boot/dts/am43x-epos-evm.dts | 168 ++
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 193 ++
+ arch/arm/boot/dts/armada-370-xp.dtsi | 20 +-
+ arch/arm/boot/dts/armada-370.dtsi | 9 +
+ arch/arm/boot/dts/armada-xp-matrix.dts | 75 +
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp.dtsi | 10 +
+ arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 1 -
+ arch/arm/boot/dts/at91sam9g25.dtsi | 2 +
+ arch/arm/boot/dts/at91sam9g35.dtsi | 1 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 3 +
+ arch/arm/boot/dts/at91sam9n12ek.dts | 34 +
+ arch/arm/boot/dts/at91sam9x25.dtsi | 24 +-
+ arch/arm/boot/dts/at91sam9x35.dtsi | 1 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 67 -
+ arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 56 +
+ arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 44 +
+ arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 51 +
+ arch/arm/boot/dts/atlas6.dtsi | 33 +-
+ arch/arm/boot/dts/bcm11351-brt.dts | 1 +
+ arch/arm/boot/dts/bcm11351.dtsi | 54 +-
+ arch/arm/boot/dts/bcm28155-ap.dts | 1 +
+ arch/arm/boot/dts/dove-cm-a510.dts | 2 +-
+ arch/arm/boot/dts/dove-cubox.dts | 20 +-
+ arch/arm/boot/dts/dove-d2plug.dts | 2 +-
+ arch/arm/boot/dts/dove-d3plug.dts | 103 +
+ arch/arm/boot/dts/dove-dove-db.dts | 2 +-
+ arch/arm/boot/dts/dove.dtsi | 1037 +++++----
+ arch/arm/boot/dts/dra7-evm.dts | 275 +++
+ arch/arm/boot/dts/dra7.dtsi | 586 +++++
+ arch/arm/boot/dts/ecx-common.dtsi | 8 +
+ arch/arm/boot/dts/emev2-kzm9d-reference.dts | 57 -
+ arch/arm/boot/dts/emev2-kzm9d.dts | 33 +-
+ arch/arm/boot/dts/exynos4.dtsi | 10 +
+ arch/arm/boot/dts/exynos4210-origen.dts | 28 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 7 +-
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 4 +
+ arch/arm/boot/dts/exynos4412-origen.dts | 21 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 33 +-
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 44 +-
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 -
+ arch/arm/boot/dts/exynos5250.dtsi | 11 +-
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 26 +
+ arch/arm/boot/dts/exynos5420.dtsi | 75 +
+ arch/arm/boot/dts/exynos5440-sd5v1.dts | 2 +-
+ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 4 +-
+ arch/arm/boot/dts/exynos5440.dtsi | 2 +
+ arch/arm/boot/dts/imx23-evk.dts | 16 +-
+ arch/arm/boot/dts/imx23-olinuxino.dts | 18 +-
+ arch/arm/boot/dts/imx23-pinfunc.h | 333 +++
+ arch/arm/boot/dts/imx23-stmp378x_devb.dts | 12 +-
+ arch/arm/boot/dts/imx23.dtsi | 221 +-
+ arch/arm/boot/dts/imx27-apf27dev.dts | 26 +
+ arch/arm/boot/dts/imx27.dtsi | 1 +
+ arch/arm/boot/dts/imx28-apf28.dts | 2 +-
+ arch/arm/boot/dts/imx28-apf28dev.dts | 36 +-
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 60 +-
+ arch/arm/boot/dts/imx28-cfa10036.dts | 26 +-
+ arch/arm/boot/dts/imx28-cfa10037.dts | 18 +-
+ arch/arm/boot/dts/imx28-cfa10049.dts | 156 +-
+ arch/arm/boot/dts/imx28-cfa10055.dts | 80 +-
+ arch/arm/boot/dts/imx28-cfa10056.dts | 38 +-
+ arch/arm/boot/dts/imx28-cfa10057.dts | 66 +-
+ arch/arm/boot/dts/imx28-cfa10058.dts | 24 +-
+ arch/arm/boot/dts/imx28-evk.dts | 59 +-
+ arch/arm/boot/dts/imx28-m28cu3.dts | 266 +++
+ arch/arm/boot/dts/imx28-m28evk.dts | 28 +-
+ arch/arm/boot/dts/imx28-pinfunc.h | 506 +++++
+ arch/arm/boot/dts/imx28-sps1.dts | 14 +-
+ arch/arm/boot/dts/imx28-tx28.dts | 703 +++++-
+ arch/arm/boot/dts/imx28.dtsi | 620 +++---
+ arch/arm/boot/dts/imx51-apf51dev.dts | 27 +
+ arch/arm/boot/dts/imx51-babbage.dts | 37 +-
+ arch/arm/boot/dts/imx51.dtsi | 23 +
+ arch/arm/boot/dts/imx53-qsb.dts | 9 +-
+ arch/arm/boot/dts/imx6q-pinfunc.h | 4 +-
+ arch/arm/boot/dts/imx6q-sabrelite.dts | 104 +-
+ arch/arm/boot/dts/imx6q-udoo.dts | 39 +
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 18 +
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 23 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 67 +
+ arch/arm/boot/dts/imx6sl-evk.dts | 67 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 176 +-
+ arch/arm/boot/dts/integrator.dtsi | 5 +
+ arch/arm/boot/dts/integratorap.dts | 5 +-
+ arch/arm/boot/dts/integratorcp.dts | 4 +-
+ arch/arm/boot/dts/keystone-clocks.dtsi | 821 +++++++
+ arch/arm/boot/dts/keystone.dts | 63 +-
+ arch/arm/boot/dts/kirkwood-db-88f6281.dts | 1 -
+ arch/arm/boot/dts/kirkwood-db-88f6282.dts | 1 -
+ arch/arm/boot/dts/kirkwood-db.dtsi | 44 +-
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 76 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 40 +-
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 51 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 40 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 53 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 59 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 51 +-
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 63 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 61 +-
+ arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 86 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 1 -
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 74 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 223 ++
+ arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 42 +-
+ arch/arm/boot/dts/kirkwood-topkick.dts | 62 +-
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 1 -
+ arch/arm/boot/dts/kirkwood.dtsi | 57 +-
+ arch/arm/boot/dts/mxs-pinfunc.h | 31 +
+ arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 52 +
+ arch/arm/boot/dts/omap-zoom-common.dtsi | 33 +
+ arch/arm/boot/dts/omap2420-h4.dts | 6 +-
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 65 +-
+ arch/arm/boot/dts/omap3-beagle.dts | 46 +-
+ arch/arm/boot/dts/omap3-devkit8000.dts | 2 +-
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 151 ++
+ arch/arm/boot/dts/omap3-evm-common.dtsi | 94 +
+ arch/arm/boot/dts/omap3-evm.dts | 58 +-
+ arch/arm/boot/dts/omap3-gta04.dts | 170 ++
+ arch/arm/boot/dts/omap3-igep.dtsi | 11 +
+ arch/arm/boot/dts/omap3-igep0020.dts | 107 +-
+ arch/arm/boot/dts/omap3-igep0030.dts | 17 +-
+ arch/arm/boot/dts/omap3-n9.dts | 18 +
+ arch/arm/boot/dts/omap3-n900.dts | 484 +++++
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 174 ++
+ arch/arm/boot/dts/omap3-n950.dts | 18 +
+ arch/arm/boot/dts/omap3-zoom3.dts | 217 ++
+ arch/arm/boot/dts/omap3.dtsi | 58 +-
+ arch/arm/boot/dts/omap3430-sdp.dts | 22 +-
+ arch/arm/boot/dts/omap36xx.dtsi | 4 +
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 82 +-
+ arch/arm/boot/dts/omap4-panda-es.dts | 4 +
+ arch/arm/boot/dts/omap4-sdp.dts | 21 +-
+ arch/arm/boot/dts/omap4.dtsi | 37 +-
+ arch/arm/boot/dts/omap5-uevm.dts | 84 +-
+ arch/arm/boot/dts/omap5.dtsi | 30 +-
+ arch/arm/boot/dts/prima2.dtsi | 30 +-
+ .../{msm8660-surf.dts => qcom-msm8660-surf.dts} | 0
+ .../dts/{msm8960-cdp.dts => qcom-msm8960-cdp.dts} | 0
+ arch/arm/boot/dts/r7s72100-genmai.dts | 31 +
+ arch/arm/boot/dts/r7s72100.dtsi | 36 +
+ arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 73 +
+ arch/arm/boot/dts/r8a73a4-ape6evm.dts | 1 +
+ arch/arm/boot/dts/r8a73a4.dtsi | 52 +
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 78 +
+ arch/arm/boot/dts/r8a7740.dtsi | 35 +
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 27 +-
+ arch/arm/boot/dts/r8a7778.dtsi | 19 +
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 8 +-
+ arch/arm/boot/dts/r8a7779.dtsi | 5 +
+ arch/arm/boot/dts/r8a7790.dtsi | 89 +
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 32 +
+ arch/arm/boot/dts/r8a7791.dtsi | 74 +
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 109 +
+ arch/arm/boot/dts/rk3066a.dtsi | 120 +-
+ arch/arm/boot/dts/rk3188-clocks.dtsi | 289 +++
+ arch/arm/boot/dts/rk3188-radxarock.dts | 80 +
+ arch/arm/boot/dts/rk3188.dtsi | 253 +++
+ arch/arm/boot/dts/rk3xxx.dtsi | 124 ++
+ arch/arm/boot/dts/s3c6400.dtsi | 41 +
+ arch/arm/boot/dts/s3c6410-mini6410.dts | 228 ++
+ arch/arm/boot/dts/s3c6410-smdk6410.dts | 103 +
+ arch/arm/boot/dts/s3c6410.dtsi | 57 +
+ arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 687 ++++++
+ arch/arm/boot/dts/s3c64xx.dtsi | 199 ++
+ arch/arm/boot/dts/sama5d3.dtsi | 203 --
+ arch/arm/boot/dts/sama5d31.dtsi | 16 +
+ arch/arm/boot/dts/sama5d31ek.dts | 3 +-
+ arch/arm/boot/dts/sama5d33.dtsi | 14 +
+ arch/arm/boot/dts/sama5d33ek.dts | 3 +-
+ arch/arm/boot/dts/sama5d34.dtsi | 16 +
+ arch/arm/boot/dts/sama5d34ek.dts | 3 +-
+ arch/arm/boot/dts/sama5d35.dtsi | 18 +
+ arch/arm/boot/dts/sama5d35ek.dts | 3 +-
+ arch/arm/boot/dts/sama5d3_can.dtsi | 54 +
+ arch/arm/boot/dts/sama5d3_emac.dtsi | 44 +
+ arch/arm/boot/dts/sama5d3_gmac.dtsi | 77 +
+ arch/arm/boot/dts/sama5d3_lcd.dtsi | 55 +
+ arch/arm/boot/dts/sama5d3_mci2.dtsi | 47 +
+ arch/arm/boot/dts/sama5d3_tcb1.dtsi | 27 +
+ arch/arm/boot/dts/sama5d3_uart.dtsi | 53 +
+ arch/arm/boot/dts/sama5d3xcm.dtsi | 1 -
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 +
+ arch/arm/boot/dts/sh73a0.dtsi | 5 +
+ arch/arm/boot/dts/socfpga.dtsi | 297 +--
+ arch/arm/boot/dts/socfpga_arria5.dtsi | 58 +
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 40 +
+ ...{socfpga_cyclone5.dts => socfpga_cyclone5.dtsi} | 20 -
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 40 +
+ .../arm/boot/dts/socfpga_cyclone5_sockit.dts | 29 +-
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 216 +-
+ .../dts/{ste-stuib.dtsi => ste-href-stuib.dtsi} | 2 -
+ arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 41 +
+ arch/arm/boot/dts/ste-href.dtsi | 109 +-
+ arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 34 +
+ arch/arm/boot/dts/ste-hrefprev60-tvk.dts | 19 +
+ .../{ste-hrefprev60.dts => ste-hrefprev60.dtsi} | 37 +-
+ arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 36 +
+ arch/arm/boot/dts/ste-hrefv60plus-tvk.dts | 21 +
+ arch/arm/boot/dts/ste-hrefv60plus.dts | 210 --
+ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 70 +
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 12 +-
+ arch/arm/boot/dts/ste-snowball.dts | 85 +-
+ arch/arm/boot/dts/sun4i-a10.dtsi | 5 +
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 5 +
+ arch/arm/boot/dts/sun5i-a13.dtsi | 5 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 2 +-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 +
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 63 +
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 18 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 71 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 32 +-
+ arch/arm/boot/dts/tegra114.dtsi | 6 +-
+ arch/arm/boot/dts/tegra124-venice2.dts | 27 +
+ arch/arm/boot/dts/tegra124.dtsi | 149 ++
+ arch/arm/boot/dts/tegra30-cardhu.dtsi | 3 +-
+ arch/arm/boot/dts/tegra30.dtsi | 5 +-
+ arch/arm/boot/dts/twl4030.dtsi | 49 +-
+ arch/arm/boot/dts/twl6030_omap4.dtsi | 38 +
+ arch/arm/boot/dts/vf610-cosmic.dts | 47 +
+ arch/arm/boot/dts/vf610-twr.dts | 17 +
+ arch/arm/boot/dts/vf610.dtsi | 12 +
+ arch/arm/common/Makefile | 1 -
+ arch/arm/common/via82c505.c | 83 -
+ arch/arm/configs/bcm_defconfig | 10 +-
+ arch/arm/configs/bockw_defconfig | 4 +
+ arch/arm/configs/imx_v6_v7_defconfig | 16 +-
+ arch/arm/configs/integrator_defconfig | 25 +-
+ arch/arm/configs/keystone_defconfig | 2 +
+ arch/arm/configs/koelsch_defconfig | 54 +
+ arch/arm/configs/lager_defconfig | 2 +
+ arch/arm/configs/marzen_defconfig | 2 +
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm/configs/mxs_defconfig | 7 +-
+ arch/arm/configs/omap2plus_defconfig | 109 +-
+ arch/arm/configs/shark_defconfig | 80 -
+ arch/arm/configs/sunxi_defconfig | 61 +
+ arch/arm/configs/tegra_defconfig | 5 +
+ arch/arm/configs/u8500_defconfig | 12 +-
+ arch/arm/configs/vexpress_defconfig | 73 +-
+ arch/arm/include/asm/mach/pci.h | 4 -
+ arch/arm/include/asm/sched_clock.h | 4 -
+ arch/arm/include/debug/vf.S | 26 +
+ arch/arm/kernel/psci_smp.c | 1 -
+ arch/arm/kernel/time.c | 29 +-
+ arch/arm/lib/Makefile | 1 -
+ arch/arm/lib/io-shark.c | 13 -
+ arch/arm/mach-at91/at91sam9n12.c | 1 +
+ arch/arm/mach-at91/board-cam60.c | 2 +-
+ arch/arm/mach-at91/board-dt-rm9200.c | 7 -
+ arch/arm/mach-at91/board-dt-sam9.c | 7 -
+ arch/arm/mach-bcm/Kconfig | 22 +-
+ arch/arm/mach-bcm/Makefile | 2 +-
+ arch/arm/mach-bcm/board_bcm281xx.c | 3 +-
+ arch/arm/mach-bcm2835/bcm2835.c | 2 -
+ arch/arm/mach-clps711x/common.c | 2 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 16 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 6 +
+ arch/arm/mach-davinci/board-dm355-evm.c | 15 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 14 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 6 +
+ arch/arm/mach-davinci/board-dm644x-evm.c | 5 +
+ arch/arm/mach-davinci/board-dm646x-evm.c | 13 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 14 +-
+ arch/arm/mach-davinci/board-omapl138-hawk.c | 8 +-
+ arch/arm/mach-davinci/da830.c | 16 +-
+ arch/arm/mach-davinci/da850.c | 16 +-
+ arch/arm/mach-davinci/davinci.h | 7 +
+ arch/arm/mach-davinci/devices-da8xx.c | 26 +
+ arch/arm/mach-davinci/devices.c | 13 +
+ arch/arm/mach-davinci/dm355.c | 35 +-
+ arch/arm/mach-davinci/dm365.c | 37 +-
+ arch/arm/mach-davinci/dm644x.c | 30 +-
+ arch/arm/mach-davinci/dm646x.c | 30 +-
+ arch/arm/mach-davinci/include/mach/da8xx.h | 3 +
+ arch/arm/mach-davinci/include/mach/gpio-davinci.h | 91 -
+ arch/arm/mach-davinci/include/mach/gpio.h | 88 -
+ arch/arm/mach-davinci/time.c | 13 +-
+ arch/arm/mach-dove/board-dt.c | 50 +-
+ arch/arm/mach-exynos/Kconfig | 38 +-
+ arch/arm/mach-exynos/Makefile | 4 +-
+ arch/arm/mach-exynos/common.c | 8 -
+ arch/arm/mach-exynos/common.h | 1 -
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 5 -
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 5 -
+ arch/arm/mach-gemini/time.c | 97 +-
+ arch/arm/mach-highbank/Kconfig | 2 +-
+ arch/arm/mach-highbank/Makefile | 2 -
+ arch/arm/mach-highbank/core.h | 4 -
+ arch/arm/mach-highbank/highbank.c | 47 +-
+ arch/arm/mach-highbank/hotplug.c | 37 -
+ arch/arm/mach-highbank/platsmp.c | 68 -
+ arch/arm/mach-highbank/pm.c | 27 +-
+ arch/arm/mach-imx/Kconfig | 15 +-
+ arch/arm/mach-imx/Makefile | 2 +
+ arch/arm/mach-imx/anatop.c | 33 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 42 +-
+ arch/arm/mach-imx/clk-imx6q.c | 190 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 3 +
+ arch/arm/mach-imx/common.h | 190 +-
+ arch/arm/mach-imx/cpu.c | 95 +-
+ arch/arm/mach-imx/epit.c | 2 +-
+ arch/arm/mach-imx/gpc.c | 4 +-
+ arch/arm/mach-imx/hotplug.c | 4 +-
+ arch/arm/mach-imx/imx51-dt.c | 6 -
+ arch/arm/mach-imx/mach-armadillo5x0.c | 3 +-
+ arch/arm/mach-imx/mach-imx53.c | 6 -
+ arch/arm/mach-imx/mach-imx6q.c | 89 +-
+ arch/arm/mach-imx/mach-imx6sl.c | 40 +-
+ arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
+ arch/arm/mach-imx/mach-pcm037.c | 3 +-
+ arch/arm/mach-imx/mach-vf610.c | 9 -
+ arch/arm/mach-imx/mm-imx5.c | 19 +-
+ arch/arm/mach-imx/mx31lilly-db.c | 3 +-
+ arch/arm/mach-imx/mxc.h | 6 +
+ arch/arm/mach-imx/pm-imx6q.c | 176 +-
+ arch/arm/mach-imx/src.c | 1 +
+ arch/arm/mach-imx/system.c | 5 +
+ arch/arm/mach-imx/time.c | 2 +-
+ arch/arm/mach-integrator/{include/mach => }/cm.h | 7 +-
+ arch/arm/mach-integrator/core.c | 182 +-
+ arch/arm/mach-integrator/include/mach/irqs.h | 81 -
+ arch/arm/mach-integrator/integrator_ap.c | 152 +-
+ arch/arm/mach-integrator/integrator_cp.c | 185 +-
+ arch/arm/mach-integrator/leds.c | 5 +-
+ arch/arm/mach-integrator/pci_v3.c | 127 +-
+ arch/arm/mach-keystone/Kconfig | 2 +
+ arch/arm/mach-keystone/Makefile | 3 +
+ arch/arm/mach-keystone/pm_domain.c | 82 +
+ arch/arm/mach-kirkwood/Makefile | 2 +
+ arch/arm/mach-kirkwood/board-dt.c | 103 +-
+ arch/arm/mach-kirkwood/common.c | 1 +
+ arch/arm/mach-kirkwood/common.h | 6 +
+ arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 2 +
+ arch/arm/mach-kirkwood/pm.c | 73 +
+ arch/arm/mach-msm/Kconfig | 13 +-
+ arch/arm/mach-msm/Makefile | 3 +-
+ arch/arm/mach-msm/board-dt-8660.c | 48 -
+ arch/arm/mach-msm/{board-dt-8960.c => board-dt.c} | 17 +-
+ arch/arm/mach-msm/include/mach/irqs-8960.h | 277 ---
+ arch/arm/mach-msm/include/mach/irqs-8x60.h | 258 ---
+ arch/arm/mach-msm/include/mach/irqs.h | 5 -
+ arch/arm/mach-mxs/mach-mxs.c | 20 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 71 +-
+ arch/arm/mach-nspire/nspire.c | 9 -
+ arch/arm/mach-omap1/common.h | 3 +
+ arch/arm/mach-omap1/fpga.c | 3 +-
+ arch/arm/mach-omap1/gpio15xx.c | 8 +-
+ arch/arm/mach-omap1/gpio16xx.c | 22 +-
+ arch/arm/mach-omap1/gpio7xx.c | 30 +-
+ arch/arm/mach-omap1/pm.c | 1 -
+ arch/arm/mach-omap1/time.c | 2 +-
+ arch/arm/mach-omap1/timer32k.c | 2 +-
+ arch/arm/mach-omap2/Kconfig | 65 +-
+ arch/arm/mach-omap2/Makefile | 29 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 225 --
+ arch/arm/mach-omap2/board-generic.c | 40 +-
+ arch/arm/mach-omap2/board-igep0020.c | 718 ------
+ arch/arm/mach-omap2/board-ldp.c | 3 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 756 -------
+ arch/arm/mach-omap2/board-rm680.c | 167 --
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 19 +
+ arch/arm/mach-omap2/board-rx51.c | 12 +
+ arch/arm/mach-omap2/board-zoom-debugboard.c | 139 --
+ arch/arm/mach-omap2/board-zoom-display.c | 71 -
+ arch/arm/mach-omap2/board-zoom-peripherals.c | 360 ----
+ arch/arm/mach-omap2/board-zoom.c | 159 --
+ arch/arm/mach-omap2/board-zoom.h | 10 -
+ arch/arm/mach-omap2/cclock3xxx_data.c | 1 +
+ arch/arm/mach-omap2/clkt2xxx_apll.c | 4 +-
+ arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 11 +-
+ arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 24 +-
+ arch/arm/mach-omap2/clock.c | 38 +
+ arch/arm/mach-omap2/clock.h | 2 +
+ arch/arm/mach-omap2/clockdomain.h | 4 +-
+ arch/arm/mach-omap2/clockdomains43xx_data.c | 196 ++
+ arch/arm/mach-omap2/cm2xxx.c | 67 +
+ arch/arm/mach-omap2/cm2xxx.h | 8 +
+ arch/arm/mach-omap2/cm33xx.c | 16 +-
+ arch/arm/mach-omap2/cm33xx.h | 12 +-
+ arch/arm/mach-omap2/cm3xxx.c | 22 +
+ arch/arm/mach-omap2/cm3xxx.h | 1 +
+ arch/arm/mach-omap2/cminst44xx.c | 29 +-
+ arch/arm/mach-omap2/cminst44xx.h | 26 +-
+ arch/arm/mach-omap2/common.h | 7 +
+ arch/arm/mach-omap2/control.c | 54 +-
+ arch/arm/mach-omap2/control.h | 1 +
+ arch/arm/mach-omap2/devices.c | 46 +-
+ arch/arm/mach-omap2/display.c | 28 +
+ arch/arm/mach-omap2/display.h | 4 +
+ arch/arm/mach-omap2/drm.c | 24 +-
+ arch/arm/mach-omap2/dss-common.c | 44 +
+ arch/arm/mach-omap2/dss-common.h | 1 +
+ arch/arm/mach-omap2/fb.c | 14 +-
+ arch/arm/mach-omap2/gpmc.c | 38 +
+ arch/arm/mach-omap2/id.c | 20 +-
+ arch/arm/mach-omap2/io.c | 26 +
+ arch/arm/mach-omap2/irq.c | 2 +-
+ arch/arm/mach-omap2/mcbsp.c | 16 +-
+ arch/arm/mach-omap2/mux.c | 8 +-
+ arch/arm/mach-omap2/omap-secure.c | 76 +
+ arch/arm/mach-omap2/omap-secure.h | 17 +
+ arch/arm/mach-omap2/omap-smc.S | 21 +-
+ arch/arm/mach-omap2/omap-smp.c | 7 +
+ arch/arm/mach-omap2/omap-wakeupgen.c | 18 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 57 +-
+ arch/arm/mach-omap2/omap_hwmod.h | 1 +
+ .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 163 ++
+ .../omap_hwmod_33xx_43xx_interconnect_data.c | 643 ++++++
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1469 +++++++++++++
+ arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2280 ++------------------
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 48 +
+ arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 758 +++++++
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 6 +-
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 230 +-
+ arch/arm/mach-omap2/opp.c | 4 +
+ arch/arm/mach-omap2/pdata-quirks.c | 174 ++
+ arch/arm/mach-omap2/pm.c | 12 +-
+ arch/arm/mach-omap2/pm24xx.c | 24 +-
+ arch/arm/mach-omap2/pm34xx.c | 3 +-
+ arch/arm/mach-omap2/powerdomain.h | 1 +
+ arch/arm/mach-omap2/powerdomains43xx_data.c | 136 ++
+ arch/arm/mach-omap2/prcm43xx.h | 146 ++
+ arch/arm/mach-omap2/prm3xxx.h | 8 +-
+ arch/arm/mach-omap2/prm44xx_54xx.h | 8 +-
+ arch/arm/mach-omap2/prm_common.c | 11 +
+ arch/arm/mach-omap2/soc.h | 2 -
+ arch/arm/mach-omap2/timer.c | 19 +-
+ arch/arm/mach-prima2/common.c | 11 -
+ arch/arm/mach-prima2/common.h | 1 -
+ arch/arm/mach-rockchip/Kconfig | 5 +-
+ arch/arm/mach-rockchip/rockchip.c | 9 -
+ arch/arm/mach-s3c24xx/Kconfig | 3 +-
+ arch/arm/mach-s3c24xx/clock-s3c2412.c | 8 +-
+ arch/arm/mach-s3c24xx/common-s3c2443.c | 12 +-
+ arch/arm/mach-s3c24xx/common.c | 206 ++
+ arch/arm/mach-s3c24xx/common.h | 5 +
+ arch/arm/mach-s3c24xx/mach-jive.c | 1 +
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 1 +
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 1 +
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 1 +
+ arch/arm/mach-s3c24xx/mach-vstms.c | 1 +
+ arch/arm/mach-s3c64xx/Kconfig | 29 +-
+ arch/arm/mach-s3c64xx/Makefile | 3 +-
+ arch/arm/mach-s3c64xx/clock.c | 1007 ---------
+ arch/arm/mach-s3c64xx/common.c | 33 +-
+ arch/arm/mach-s3c64xx/common.h | 12 +-
+ arch/arm/mach-s3c64xx/dma.c | 13 +-
+ arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 132 +-
+ arch/arm/mach-s3c64xx/irq-pm.c | 9 +
+ arch/arm/mach-s3c64xx/mach-anw6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-hmt.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-ncp.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 85 +
+ arch/arm/mach-s3c64xx/mach-smartq.c | 11 +-
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +-
+ arch/arm/mach-s3c64xx/pm.c | 21 -
+ arch/arm/mach-s3c64xx/s3c6400.c | 15 +-
+ arch/arm/mach-s3c64xx/s3c6410.c | 16 +-
+ arch/arm/mach-shark/Makefile | 10 -
+ arch/arm/mach-shark/Makefile.boot | 2 -
+ arch/arm/mach-shark/core.c | 146 --
+ arch/arm/mach-shark/dma.c | 23 -
+ arch/arm/mach-shark/include/mach/debug-macro.S | 34 -
+ arch/arm/mach-shark/include/mach/entry-macro.S | 36 -
+ arch/arm/mach-shark/include/mach/framebuffer.h | 16 -
+ arch/arm/mach-shark/include/mach/hardware.h | 16 -
+ arch/arm/mach-shark/include/mach/irqs.h | 13 -
+ arch/arm/mach-shark/include/mach/isa-dma.h | 13 -
+ arch/arm/mach-shark/include/mach/memory.h | 26 -
+ arch/arm/mach-shark/include/mach/timex.h | 7 -
+ arch/arm/mach-shark/include/mach/uncompress.h | 50 -
+ arch/arm/mach-shark/irq.c | 108 -
+ arch/arm/mach-shark/leds.c | 117 -
+ arch/arm/mach-shark/pci.c | 57 -
+ arch/arm/mach-shmobile/Kconfig | 46 +-
+ arch/arm/mach-shmobile/Makefile | 14 +-
+ arch/arm/mach-shmobile/Makefile.boot | 3 +-
+ arch/arm/mach-shmobile/board-ape6evm-reference.c | 2 +-
+ arch/arm/mach-shmobile/board-ape6evm.c | 61 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
+ arch/arm/mach-shmobile/board-bockw-reference.c | 20 +
+ arch/arm/mach-shmobile/board-bockw.c | 418 +++-
+ arch/arm/mach-shmobile/board-genmai.c | 43 +
+ arch/arm/mach-shmobile/board-koelsch.c | 47 +
+ arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 +
+ arch/arm/mach-shmobile/board-kzm9g.c | 1 +
+ arch/arm/mach-shmobile/board-lager-reference.c | 5 +-
+ arch/arm/mach-shmobile/board-lager.c | 87 +-
+ arch/arm/mach-shmobile/board-marzen-reference.c | 1 +
+ arch/arm/mach-shmobile/board-marzen.c | 74 +
+ arch/arm/mach-shmobile/clock-r7s72100.c | 202 ++
+ arch/arm/mach-shmobile/clock-r8a73a4.c | 5 +-
+ arch/arm/mach-shmobile/clock-r8a7778.c | 44 +-
+ arch/arm/mach-shmobile/clock-r8a7779.c | 2 +-
+ arch/arm/mach-shmobile/clock-r8a7790.c | 24 +-
+ arch/arm/mach-shmobile/clock-r8a7791.c | 237 ++
+ arch/arm/mach-shmobile/headsmp.S | 3 +
+ arch/arm/mach-shmobile/include/mach/common.h | 12 +-
+ arch/arm/mach-shmobile/include/mach/r7s72100.h | 8 +
+ arch/arm/mach-shmobile/include/mach/r8a73a4.h | 11 +-
+ arch/arm/mach-shmobile/include/mach/r8a7778.h | 14 +-
+ arch/arm/mach-shmobile/include/mach/r8a7779.h | 8 +
+ arch/arm/mach-shmobile/include/mach/r8a7790.h | 9 +-
+ arch/arm/mach-shmobile/include/mach/r8a7791.h | 10 +
+ arch/arm/mach-shmobile/include/mach/rcar-gen2.h | 8 +
+ arch/arm/mach-shmobile/platsmp-apmu.c | 195 ++
+ arch/arm/mach-shmobile/platsmp-scu.c | 30 +-
+ arch/arm/mach-shmobile/platsmp.c | 22 +-
+ arch/arm/mach-shmobile/setup-r7s72100.c | 88 +
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 95 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c | 178 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 160 +-
+ arch/arm/mach-shmobile/setup-r8a7790.c | 94 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 184 ++
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 91 +
+ arch/arm/mach-shmobile/smp-emev2.c | 6 -
+ arch/arm/mach-shmobile/smp-r8a7779.c | 4 -
+ arch/arm/mach-shmobile/smp-r8a7790.c | 67 +
+ arch/arm/mach-shmobile/smp-r8a7791.c | 62 +
+ arch/arm/mach-shmobile/smp-sh73a0.c | 14 +-
+ arch/arm/mach-socfpga/Kconfig | 1 -
+ arch/arm/mach-socfpga/socfpga.c | 2 -
+ arch/arm/mach-spear/Kconfig | 2 -
+ arch/arm/mach-sti/board-dt.c | 10 +-
+ arch/arm/mach-sunxi/Kconfig | 6 +-
+ arch/arm/mach-sunxi/sunxi.c | 45 +-
+ arch/arm/mach-tegra/Kconfig | 12 +-
+ arch/arm/mach-tegra/Makefile | 6 +-
+ arch/arm/mach-tegra/board-paz00.c | 5 +-
+ arch/arm/mach-tegra/board-paz00.h | 25 -
+ arch/arm/mach-tegra/board.h | 12 -
+ arch/arm/mach-tegra/common.c | 115 -
+ arch/arm/mach-tegra/cpuidle.c | 4 +-
+ arch/arm/mach-tegra/flowctrl.c | 2 +
+ arch/arm/mach-tegra/fuse.c | 56 +-
+ arch/arm/mach-tegra/fuse.h | 1 +
+ arch/arm/mach-tegra/gpio-names.h | 247 ---
+ arch/arm/mach-tegra/hotplug.c | 2 +
+ arch/arm/mach-tegra/iomap.h | 155 +-
+ arch/arm/mach-tegra/irammap.h | 6 +
+ arch/arm/mach-tegra/platsmp.c | 2 +
+ arch/arm/mach-tegra/pm.c | 20 +-
+ arch/arm/mach-tegra/pm.h | 3 -
+ arch/arm/mach-tegra/pmc.c | 58 +-
+ arch/arm/mach-tegra/pmc.h | 5 +
+ arch/arm/mach-tegra/powergate.c | 48 +-
+ arch/arm/mach-tegra/reset-handler.S | 13 +-
+ arch/arm/mach-tegra/reset.c | 2 +-
+ arch/arm/mach-tegra/sleep-tegra20.S | 5 +-
+ arch/arm/mach-tegra/sleep-tegra30.S | 54 +-
+ arch/arm/mach-tegra/tegra.c | 73 +-
+ arch/arm/mach-u300/Kconfig | 1 -
+ arch/arm/mach-ux500/Kconfig | 29 +-
+ arch/arm/mach-ux500/Makefile | 5 +-
+ arch/arm/mach-ux500/board-mop500-audio.c | 50 -
+ arch/arm/mach-ux500/board-mop500-sdi.c | 51 -
+ arch/arm/mach-ux500/board-mop500-stuib.c | 120 --
+ arch/arm/mach-ux500/board-mop500-u8500uib.c | 92 -
+ arch/arm/mach-ux500/board-mop500-uib.c | 133 --
+ arch/arm/mach-ux500/board-mop500.c | 637 ------
+ arch/arm/mach-ux500/board-mop500.h | 16 -
+ arch/arm/mach-ux500/cpu-db8500.c | 124 +-
+ arch/arm/mach-ux500/cpu.c | 19 +-
+ arch/arm/mach-ux500/devices-common.c | 60 -
+ arch/arm/mach-ux500/devices-common.h | 149 --
+ arch/arm/mach-ux500/devices-db8500.c | 94 -
+ arch/arm/mach-ux500/devices-db8500.h | 110 -
+ arch/arm/mach-ux500/devices.h | 8 -
+ arch/arm/mach-ux500/setup.h | 1 -
+ arch/arm/mach-ux500/timer.c | 4 +-
+ arch/arm/mach-ux500/usb.c | 135 --
+ arch/arm/mach-vexpress/Kconfig | 2 -
+ arch/arm/mach-vexpress/v2m.c | 14 +-
+ arch/arm/mach-vt8500/Kconfig | 1 -
+ arch/arm/mach-vt8500/common.h | 24 -
+ arch/arm/mach-vt8500/vt8500.c | 6 -
+ arch/arm/plat-omap/dma.c | 1 -
+ arch/arm/plat-samsung/devs.c | 5 +-
+ arch/arm/plat-samsung/include/plat/cpu.h | 4 +
+ arch/arm/plat-samsung/init.c | 12 +-
+ drivers/block/Kconfig | 2 +-
+ drivers/bus/arm-cci.c | 617 +++++-
+ drivers/clk/clk-bcm2835.c | 8 -
+ drivers/clk/clk-highbank.c | 10 +-
+ drivers/clk/clk-nomadik.c | 187 +-
+ drivers/clk/clk-prima2.c | 29 +-
+ drivers/clk/clk-vt8500.c | 34 +-
+ drivers/clk/mxs/clk-imx23.c | 15 +-
+ drivers/clk/mxs/clk-imx28.c | 16 +-
+ drivers/clk/samsung/Makefile | 2 -
+ drivers/clk/sunxi/clk-sunxi.c | 11 +-
+ drivers/clk/ux500/Makefile | 1 +
+ drivers/clk/ux500/u8500_of_clk.c | 559 +++++
+ drivers/clk/ux500/u8540_clk.c | 2 +-
+ drivers/cpufreq/integrator-cpufreq.c | 61 +-
+ drivers/cpuidle/Kconfig.arm | 2 +-
+ drivers/cpuidle/cpuidle-calxeda.c | 61 +-
+ drivers/dma/Kconfig | 14 +-
+ drivers/dma/Makefile | 1 +
+ drivers/dma/s3c24xx-dma.c | 1350 ++++++++++++
+ drivers/gpio/gpio-davinci.c | 132 +-
+ drivers/gpio/gpio-samsung.c | 42 +-
+ drivers/gpio/gpio-tnetv107x.c | 1 +
+ drivers/ide/Kconfig | 4 +-
+ drivers/input/serio/Kconfig | 2 +-
+ drivers/irqchip/irq-armada-370-xp.c | 202 +-
+ drivers/irqchip/irq-vic.c | 7 +-
+ drivers/media/platform/Kconfig | 2 +-
+ drivers/mfd/db8500-prcmu.c | 1 -
+ drivers/mfd/dbx500-prcmu-regs.h | 1 -
+ drivers/pci/host/Kconfig | 2 +-
+ drivers/pci/host/pci-mvebu.c | 235 +-
+ drivers/pinctrl/pinctrl-single.c | 388 +++-
+ drivers/usb/host/ohci-s3c2410.c | 8 +-
+ drivers/usb/musb/ux500.c | 2 +-
+ drivers/video/cyber2000fb.c | 70 -
+ include/dt-bindings/mfd/dbx500-prcmu.h | 83 +
+ include/dt-bindings/pinctrl/am43xx.h | 31 +
+ include/dt-bindings/pinctrl/dra.h | 50 +
+ include/linux/clk/mxs.h | 2 -
+ include/linux/mfd/dbx500-prcmu.h | 70 +-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 5 +
+ include/linux/platform_data/clk-nomadik.h | 2 -
+ include/linux/platform_data/clk-ux500.h | 3 +
+ include/linux/platform_data/dma-s3c24xx.h | 46 +
+ include/linux/platform_data/gpio-davinci.h | 60 +
+ include/linux/platform_data/pinctrl-single.h | 12 +
+ include/linux/tegra-powergate.h | 9 +-
+ sound/soc/samsung/Kconfig | 2 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 6 +-
+ 686 files changed, 30270 insertions(+), 18691 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun4i-a10-gates.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a10s-gates.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun5i-a13-gates.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun6i-a31-gates.txt
+ delete mode 100644 Documentation/devicetree/bindings/clock/sunxi/sun7i-a20-gates.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt
+ create mode 100644 Documentation/devicetree/bindings/crypto/omap-sham.txt
+ create mode 100644 Documentation/devicetree/bindings/hwrng/omap_rng.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/sunxi/sun4i-a10.txt
+ delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/sunxi/sun5i-a13.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ delete mode 100644 arch/arm/boot/compressed/head-shark.S
+ delete mode 100644 arch/arm/boot/compressed/ofw-shark.c
+ create mode 100644 arch/arm/boot/dts/am335x-base0033.dts
+ create mode 100644 arch/arm/boot/dts/am335x-igep0033.dtsi
+ create mode 100644 arch/arm/boot/dts/am335x-nano.dts
+ create mode 100644 arch/arm/boot/dts/armada-370-netgear-rn104.dts
+ create mode 100644 arch/arm/boot/dts/armada-xp-matrix.dts
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_macb0.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_macb1.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_usart3.dtsi
+ create mode 100644 arch/arm/boot/dts/dove-d3plug.dts
+ create mode 100644 arch/arm/boot/dts/dra7-evm.dts
+ create mode 100644 arch/arm/boot/dts/dra7.dtsi
+ delete mode 100644 arch/arm/boot/dts/emev2-kzm9d-reference.dts
+ create mode 100644 arch/arm/boot/dts/imx23-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx28-m28cu3.dts
+ create mode 100644 arch/arm/boot/dts/imx28-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx6q-udoo.dts
+ create mode 100644 arch/arm/boot/dts/keystone-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-openblocks_a7.dts
+ create mode 100644 arch/arm/boot/dts/mxs-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi
+ create mode 100644 arch/arm/boot/dts/omap-zoom-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-evm-37xx.dts
+ create mode 100644 arch/arm/boot/dts/omap3-evm-common.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-gta04.dts
+ create mode 100644 arch/arm/boot/dts/omap3-n9.dts
+ create mode 100644 arch/arm/boot/dts/omap3-n900.dts
+ create mode 100644 arch/arm/boot/dts/omap3-n950-n9.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-n950.dts
+ create mode 100644 arch/arm/boot/dts/omap3-zoom3.dts
+ rename arch/arm/boot/dts/{msm8660-surf.dts => qcom-msm8660-surf.dts} (100%)
+ rename arch/arm/boot/dts/{msm8960-cdp.dts => qcom-msm8960-cdp.dts} (100%)
+ create mode 100644 arch/arm/boot/dts/r7s72100-genmai.dts
+ create mode 100644 arch/arm/boot/dts/r7s72100.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7791-koelsch.dts
+ create mode 100644 arch/arm/boot/dts/r8a7791.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3066a-bqcurie2.dts
+ create mode 100644 arch/arm/boot/dts/rk3188-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3188-radxarock.dts
+ create mode 100644 arch/arm/boot/dts/rk3188.dtsi
+ create mode 100644 arch/arm/boot/dts/rk3xxx.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c6400.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c6410-mini6410.dts
+ create mode 100644 arch/arm/boot/dts/s3c6410-smdk6410.dts
+ create mode 100644 arch/arm/boot/dts/s3c6410.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c64xx-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/s3c64xx.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d31.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d33.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d34.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d35.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_can.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_emac.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_gmac.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_lcd.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_mci2.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_tcb1.dtsi
+ create mode 100644 arch/arm/boot/dts/sama5d3_uart.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_arria5.dtsi
+ create mode 100644 arch/arm/boot/dts/socfpga_arria5_socdk.dts
+ rename arch/arm/boot/dts/{socfpga_cyclone5.dts => socfpga_cyclone5.dtsi} (78%)
+ create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_socdk.dts
+ rename include/linux/clk/sunxi.h => arch/arm/boot/dts/socfpga_cyclone5_sockit.dts (50%)
+ rename arch/arm/boot/dts/{ste-stuib.dtsi => ste-href-stuib.dtsi} (95%)
+ create mode 100644 arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+ create mode 100644 arch/arm/boot/dts/ste-hrefprev60-stuib.dts
+ create mode 100644 arch/arm/boot/dts/ste-hrefprev60-tvk.dts
+ rename arch/arm/boot/dts/{ste-hrefprev60.dts => ste-hrefprev60.dtsi} (60%)
+ create mode 100644 arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
+ create mode 100644 arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
+ delete mode 100644 arch/arm/boot/dts/ste-hrefv60plus.dts
+ create mode 100644 arch/arm/boot/dts/ste-hrefv60plus.dtsi
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+ create mode 100644 arch/arm/boot/dts/tegra124-venice2.dts
+ create mode 100644 arch/arm/boot/dts/tegra124.dtsi
+ create mode 100644 arch/arm/boot/dts/twl6030_omap4.dtsi
+ create mode 100644 arch/arm/boot/dts/vf610-cosmic.dts
+ delete mode 100644 arch/arm/common/via82c505.c
+ create mode 100644 arch/arm/configs/koelsch_defconfig
+ delete mode 100644 arch/arm/configs/shark_defconfig
+ create mode 100644 arch/arm/configs/sunxi_defconfig
+ delete mode 100644 arch/arm/include/asm/sched_clock.h
+ create mode 100644 arch/arm/include/debug/vf.S
+ delete mode 100644 arch/arm/lib/io-shark.c
+ delete mode 100644 arch/arm/mach-davinci/include/mach/gpio-davinci.h
+ delete mode 100644 arch/arm/mach-davinci/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-highbank/hotplug.c
+ delete mode 100644 arch/arm/mach-highbank/platsmp.c
+ rename arch/arm/mach-integrator/{include/mach => }/cm.h (88%)
+ delete mode 100644 arch/arm/mach-integrator/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-keystone/pm_domain.c
+ create mode 100644 arch/arm/mach-kirkwood/pm.c
+ delete mode 100644 arch/arm/mach-msm/board-dt-8660.c
+ rename arch/arm/mach-msm/{board-dt-8960.c => board-dt.c} (64%)
+ delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h
+ delete mode 100644 arch/arm/mach-msm/include/mach/irqs-8x60.h
+ delete mode 100644 arch/arm/mach-omap2/board-3630sdp.c
+ delete mode 100644 arch/arm/mach-omap2/board-igep0020.c
+ delete mode 100644 arch/arm/mach-omap2/board-omap3evm.c
+ delete mode 100644 arch/arm/mach-omap2/board-rm680.c
+ delete mode 100644 arch/arm/mach-omap2/board-zoom-debugboard.c
+ delete mode 100644 arch/arm/mach-omap2/board-zoom-display.c
+ delete mode 100644 arch/arm/mach-omap2/board-zoom-peripherals.c
+ delete mode 100644 arch/arm/mach-omap2/board-zoom.c
+ delete mode 100644 arch/arm/mach-omap2/board-zoom.h
+ create mode 100644 arch/arm/mach-omap2/clockdomains43xx_data.c
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_interconnect_data.c
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c
+ create mode 100644 arch/arm/mach-omap2/omap_hwmod_43xx_data.c
+ create mode 100644 arch/arm/mach-omap2/pdata-quirks.c
+ create mode 100644 arch/arm/mach-omap2/powerdomains43xx_data.c
+ create mode 100644 arch/arm/mach-omap2/prcm43xx.h
+ delete mode 100644 arch/arm/mach-s3c64xx/clock.c
+ create mode 100644 arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c
+ delete mode 100644 arch/arm/mach-shark/Makefile
+ delete mode 100644 arch/arm/mach-shark/Makefile.boot
+ delete mode 100644 arch/arm/mach-shark/core.c
+ delete mode 100644 arch/arm/mach-shark/dma.c
+ delete mode 100644 arch/arm/mach-shark/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-shark/include/mach/entry-macro.S
+ delete mode 100644 arch/arm/mach-shark/include/mach/framebuffer.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/hardware.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/irqs.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/isa-dma.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/memory.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-shark/include/mach/uncompress.h
+ delete mode 100644 arch/arm/mach-shark/irq.c
+ delete mode 100644 arch/arm/mach-shark/leds.c
+ delete mode 100644 arch/arm/mach-shark/pci.c
+ create mode 100644 arch/arm/mach-shmobile/board-genmai.c
+ create mode 100644 arch/arm/mach-shmobile/board-koelsch.c
+ create mode 100644 arch/arm/mach-shmobile/clock-r7s72100.c
+ create mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c
+ create mode 100644 arch/arm/mach-shmobile/include/mach/r7s72100.h
+ create mode 100644 arch/arm/mach-shmobile/include/mach/r8a7791.h
+ create mode 100644 arch/arm/mach-shmobile/include/mach/rcar-gen2.h
+ create mode 100644 arch/arm/mach-shmobile/platsmp-apmu.c
+ create mode 100644 arch/arm/mach-shmobile/setup-r7s72100.c
+ create mode 100644 arch/arm/mach-shmobile/setup-r8a7791.c
+ create mode 100644 arch/arm/mach-shmobile/setup-rcar-gen2.c
+ create mode 100644 arch/arm/mach-shmobile/smp-r8a7790.c
+ create mode 100644 arch/arm/mach-shmobile/smp-r8a7791.c
+ delete mode 100644 arch/arm/mach-tegra/board-paz00.h
+ delete mode 100644 arch/arm/mach-tegra/common.c
+ delete mode 100644 arch/arm/mach-tegra/gpio-names.h
+ delete mode 100644 arch/arm/mach-ux500/board-mop500-stuib.c
+ delete mode 100644 arch/arm/mach-ux500/board-mop500-u8500uib.c
+ delete mode 100644 arch/arm/mach-ux500/board-mop500-uib.c
+ delete mode 100644 arch/arm/mach-ux500/devices-common.c
+ delete mode 100644 arch/arm/mach-ux500/devices-common.h
+ delete mode 100644 arch/arm/mach-ux500/usb.c
+ delete mode 100644 arch/arm/mach-vt8500/common.h
+ create mode 100644 drivers/clk/ux500/u8500_of_clk.c
+ create mode 100644 drivers/dma/s3c24xx-dma.c
+ create mode 100644 include/dt-bindings/mfd/dbx500-prcmu.h
+ create mode 100644 include/dt-bindings/pinctrl/am43xx.h
+ create mode 100644 include/dt-bindings/pinctrl/dra.h
+ delete mode 100644 include/linux/platform_data/clk-nomadik.h
+ create mode 100644 include/linux/platform_data/dma-s3c24xx.h
+ create mode 100644 include/linux/platform_data/gpio-davinci.h
+ create mode 100644 include/linux/platform_data/pinctrl-single.h
+Merging bcm2835/for-next (7d132055814e Linux 3.10-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging cortex/for-next (59c1d32321fb ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs)
+$ git merge cortex/for-next
+Removing arch/arm/plat-omap/include/plat/timex.h
+Removing arch/arm/mach-w90x900/include/mach/timex.h
+Removing arch/arm/mach-versatile/include/mach/timex.h
+Removing arch/arm/mach-spear/include/mach/timex.h
+Removing arch/arm/mach-shmobile/include/mach/timex.h
+Removing arch/arm/mach-sa1100/include/mach/timex.h
+Removing arch/arm/mach-s5pv210/include/mach/timex.h
+Removing arch/arm/mach-s5pc100/include/mach/timex.h
+Removing arch/arm/mach-s5p64x0/include/mach/timex.h
+Removing arch/arm/mach-s3c64xx/include/mach/timex.h
+Removing arch/arm/mach-s3c24xx/include/mach/timex.h
+Removing arch/arm/mach-rpc/include/mach/timex.h
+Removing arch/arm/mach-realview/include/mach/timex.h
+Removing arch/arm/mach-pxa/include/mach/timex.h
+Removing arch/arm/mach-orion5x/include/mach/timex.h
+Removing arch/arm/mach-omap2/include/mach/timex.h
+Removing arch/arm/mach-omap1/include/mach/timex.h
+Removing arch/arm/mach-netx/include/mach/timex.h
+Removing arch/arm/mach-mv78xx0/include/mach/timex.h
+Removing arch/arm/mach-msm/include/mach/timex.h
+Removing arch/arm/mach-mmp/include/mach/timex.h
+Removing arch/arm/mach-lpc32xx/include/mach/timex.h
+Removing arch/arm/mach-kirkwood/include/mach/timex.h
+Removing arch/arm/mach-iop33x/include/mach/timex.h
+Removing arch/arm/mach-iop32x/include/mach/timex.h
+Removing arch/arm/mach-iop13xx/include/mach/timex.h
+Removing arch/arm/mach-integrator/include/mach/timex.h
+Removing arch/arm/mach-gemini/include/mach/timex.h
+Removing arch/arm/mach-footbridge/include/mach/timex.h
+Removing arch/arm/mach-exynos/include/mach/timex.h
+Removing arch/arm/mach-ep93xx/include/mach/timex.h
+Removing arch/arm/mach-ebsa110/include/mach/timex.h
+Removing arch/arm/mach-dove/include/mach/timex.h
+Removing arch/arm/mach-davinci/include/mach/timex.h
+Removing arch/arm/mach-clps711x/include/mach/timex.h
+Auto-merging arch/arm/boot/Makefile
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 28 ++++++-
+ arch/arm/Makefile | 1 +
+ arch/arm/boot/Makefile | 13 +++-
+ arch/arm/configs/efm32_defconfig | 102 ++++++++++++++++++++++++++
+ arch/arm/include/asm/timex.h | 6 +-
+ arch/arm/kernel/entry-v7m.S | 2 -
+ arch/arm/mach-clps711x/include/mach/timex.h | 2 -
+ arch/arm/mach-davinci/include/mach/timex.h | 22 ------
+ arch/arm/mach-dove/include/mach/timex.h | 9 ---
+ arch/arm/mach-ebsa110/include/mach/timex.h | 19 -----
+ arch/arm/mach-efm32/Makefile | 1 +
+ arch/arm/mach-efm32/dtmachine.c | 15 ++++
+ arch/arm/mach-ep93xx/include/mach/timex.h | 5 --
+ arch/arm/mach-exynos/include/mach/timex.h | 29 --------
+ arch/arm/mach-footbridge/include/mach/timex.h | 18 -----
+ arch/arm/mach-gemini/include/mach/timex.h | 13 ----
+ arch/arm/mach-integrator/include/mach/timex.h | 26 -------
+ arch/arm/mach-iop13xx/include/mach/timex.h | 1 -
+ arch/arm/mach-iop32x/include/mach/timex.h | 6 --
+ arch/arm/mach-iop33x/include/mach/timex.h | 6 --
+ arch/arm/mach-kirkwood/include/mach/timex.h | 10 ---
+ arch/arm/mach-lpc32xx/include/mach/timex.h | 28 -------
+ arch/arm/mach-mmp/include/mach/timex.h | 13 ----
+ arch/arm/mach-msm/include/mach/timex.h | 21 ------
+ arch/arm/mach-mv78xx0/include/mach/timex.h | 9 ---
+ arch/arm/mach-netx/include/mach/timex.h | 20 -----
+ arch/arm/mach-omap1/include/mach/timex.h | 5 --
+ arch/arm/mach-omap2/include/mach/timex.h | 5 --
+ arch/arm/mach-orion5x/include/mach/timex.h | 11 ---
+ arch/arm/mach-pxa/include/mach/timex.h | 34 ---------
+ arch/arm/mach-realview/include/mach/timex.h | 23 ------
+ arch/arm/mach-rpc/include/mach/timex.h | 17 -----
+ arch/arm/mach-s3c24xx/include/mach/timex.h | 24 ------
+ arch/arm/mach-s3c64xx/include/mach/timex.h | 24 ------
+ arch/arm/mach-s5p64x0/include/mach/timex.h | 27 -------
+ arch/arm/mach-s5pc100/include/mach/timex.h | 24 ------
+ arch/arm/mach-s5pv210/include/mach/timex.h | 29 --------
+ arch/arm/mach-sa1100/include/mach/timex.h | 12 ---
+ arch/arm/mach-shmobile/include/mach/timex.h | 6 --
+ arch/arm/mach-spear/include/mach/timex.h | 19 -----
+ arch/arm/mach-versatile/include/mach/timex.h | 23 ------
+ arch/arm/mach-w90x900/include/mach/timex.h | 25 -------
+ arch/arm/plat-omap/include/plat/timex.h | 33 ---------
+ 43 files changed, 161 insertions(+), 605 deletions(-)
+ create mode 100644 arch/arm/configs/efm32_defconfig
+ delete mode 100644 arch/arm/mach-clps711x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-davinci/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-dove/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-ebsa110/include/mach/timex.h
+ create mode 100644 arch/arm/mach-efm32/Makefile
+ create mode 100644 arch/arm/mach-efm32/dtmachine.c
+ delete mode 100644 arch/arm/mach-ep93xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-exynos/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-footbridge/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-gemini/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-integrator/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-iop13xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-kirkwood/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-lpc32xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-mmp/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-msm/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-mv78xx0/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-netx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-omap1/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-omap2/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-orion5x/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-realview/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-rpc/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-s3c64xx/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-s5p64x0/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-s5pc100/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-s5pv210/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-sa1100/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-spear/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-versatile/include/mach/timex.h
+ delete mode 100644 arch/arm/mach-w90x900/include/mach/timex.h
+ delete mode 100644 arch/arm/plat-omap/include/plat/timex.h
+Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
+$ git merge ep93xx/ep93xx-for-next
+Auto-merging arch/arm/mach-ep93xx/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-ep93xx/Kconfig | 1 +
+ arch/arm/mach-ep93xx/core.c | 110 ++++++++++++++++++++++++++-
+ arch/arm/mach-ep93xx/include/mach/platform.h | 3 +-
+ 3 files changed, 111 insertions(+), 3 deletions(-)
+Merging imx-mxs/for-next (bce60c9ff4b5 Merge branches 'imx/fixes-3.13', 'imx/soc-3.14' and 'imx/dt-3.14' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm/mach-imx/Kconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ arch/arm/Kconfig.debug | 9 +
+ arch/arm/boot/dts/Makefile | 13 +
+ arch/arm/boot/dts/imx25.dtsi | 15 +-
+ arch/arm/boot/dts/imx28.dtsi | 13 +
+ arch/arm/boot/dts/imx50-evk.dts | 85 ++
+ arch/arm/boot/dts/imx50-pinfunc.h | 923 +++++++++++++++++++++
+ arch/arm/boot/dts/imx50.dtsi | 670 +++++++++++++++
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 63 ++
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 132 +++
+ arch/arm/boot/dts/imx51.dtsi | 16 +
+ arch/arm/boot/dts/imx53-voipac-bsb.dts | 135 +++
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 193 +++++
+ arch/arm/boot/dts/imx53.dtsi | 15 +
+ arch/arm/boot/dts/imx6dl-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw52xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw53xx.dts | 19 +
+ arch/arm/boot/dts/imx6dl-gw54xx.dts | 19 +
+ arch/arm/boot/dts/imx6q-arm2.dts | 17 +
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 53 ++
+ arch/arm/boot/dts/imx6q-gw51xx.dts | 19 +
+ arch/arm/boot/dts/imx6q-gw52xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw53xx.dts | 23 +
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 443 ++++++++++
+ arch/arm/boot/dts/imx6q-gw54xx.dts | 23 +
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 272 ++++++
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 373 +++++++++
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 429 ++++++++++
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 457 ++++++++++
+ arch/arm/boot/dts/imx6qdl.dtsi | 62 ++
+ arch/arm/configs/imx_v4_v5_defconfig | 2 +
+ arch/arm/configs/imx_v6_v7_defconfig | 1 +
+ arch/arm/include/debug/imx-uart.h | 10 +
+ arch/arm/mach-imx/Kconfig | 8 +
+ arch/arm/mach-imx/Makefile | 4 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 58 ++
+ arch/arm/mach-imx/clk-imx6q.c | 2 +-
+ arch/arm/mach-imx/common.h | 5 -
+ arch/arm/mach-imx/mach-imx6q.c | 30 +
+ arch/arm/mach-imx/src.c | 15 -
+ arch/arm/mach-imx/system.c | 12 +-
+ 41 files changed, 4672 insertions(+), 29 deletions(-)
+ create mode 100644 arch/arm/boot/dts/imx50-evk.dts
+ create mode 100644 arch/arm/boot/dts/imx50-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx50.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi
+ create mode 100644 arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-bsb.dts
+ create mode 100644 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-cm-fx6.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw51xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw52xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw53xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw5400-a.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-gw54xx.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (b91cf40516e0 Merge branch 'mvebu/dt' into for-next)
+$ git merge mvebu/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (597472bb771b Merge branch 'heads/clock' into next)
+$ git merge renesas/next
+Auto-merging drivers/clocksource/em_sti.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/emev2-clock.txt | 98 +++++++++++++++++
+ arch/arm/configs/genmai_defconfig | 116 +++++++++++++++++++++
+ drivers/clk/Makefile | 1 +
+ drivers/clk/shmobile/Makefile | 3 +
+ drivers/clk/shmobile/clk-emev2.c | 104 ++++++++++++++++++
+ drivers/clocksource/em_sti.c | 4 +-
+ drivers/tty/serial/8250/8250_em.c | 6 +-
+ 7 files changed, 327 insertions(+), 5 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/emev2-clock.txt
+ create mode 100644 arch/arm/configs/genmai_defconfig
+ create mode 100644 drivers/clk/shmobile/Makefile
+ create mode 100644 drivers/clk/shmobile/clk-emev2.c
+Merging samsung/for-next (d2287944920d Merge branch 'v3.13-next/samsung' into for-next)
+$ git merge samsung/for-next
+Auto-merging arch/arm/boot/dts/exynos5440-sd5v1.dts
+Auto-merging arch/arm/boot/dts/exynos5250.dtsi
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/exynos-dw-mshc.txt | 2 +
+ arch/arm/Kconfig | 2 +-
+ arch/arm/boot/dts/cros5250-common.dtsi | 8 +--
+ arch/arm/boot/dts/exynos5.dtsi | 21 --------
+ arch/arm/boot/dts/exynos5250-arndale.dts | 16 ++----
+ arch/arm/boot/dts/exynos5250-smdk5250.dts | 16 ++----
+ arch/arm/boot/dts/exynos5250-snow.dts | 2 +-
+ arch/arm/boot/dts/exynos5250.dtsi | 36 ++++++++++---
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 33 ++++++++++++
+ arch/arm/boot/dts/exynos5420.dtsi | 59 ++++++++++++++++++++++
+ arch/arm/boot/dts/exynos5440-sd5v1.dts | 7 +++
+ arch/arm/plat-samsung/include/plat/uncompress.h | 2 +
+ arch/arm/plat-samsung/s5p-irq-eint.c | 4 ++
+ drivers/irqchip/exynos-combiner.c | 15 ++----
+ 14 files changed, 152 insertions(+), 71 deletions(-)
+Merging tegra/for-next (1ebd0d6a0589 Merge branch for-3.13/maintainers into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+Merging arm64/upstream (7ade67b5984d arm64: move enabling of GIC before CPUs are set online)
+$ git merge arm64/upstream
+Removing arch/arm64/kernel/smp_psci.c
+Auto-merging arch/arm64/kernel/perf_event.c
+Merge made by the 'recursive' strategy.
+ Documentation/arm64/booting.txt | 45 ++++---
+ Documentation/arm64/memory.txt | 2 +-
+ arch/arm64/Kconfig | 13 ++
+ arch/arm64/Makefile | 6 +
+ arch/arm64/include/asm/assembler.h | 31 +++++
+ arch/arm64/include/asm/cmpxchg.h | 2 +
+ arch/arm64/include/asm/compat.h | 14 +++
+ arch/arm64/include/asm/cpu_ops.h | 59 +++++++++
+ arch/arm64/include/asm/elf.h | 18 +++
+ arch/arm64/include/asm/io.h | 2 +-
+ arch/arm64/include/asm/irq.h | 1 +
+ arch/arm64/include/asm/processor.h | 5 +
+ arch/arm64/include/asm/psci.h | 19 ---
+ arch/arm64/include/asm/ptrace.h | 1 +
+ arch/arm64/include/asm/smp.h | 15 +--
+ arch/arm64/include/asm/spinlock.h | 83 +++++++++----
+ arch/arm64/include/asm/spinlock_types.h | 15 ++-
+ arch/arm64/include/asm/syscall.h | 6 +
+ arch/arm64/include/asm/virt.h | 3 +-
+ arch/arm64/include/uapi/asm/byteorder.h | 4 +
+ arch/arm64/kernel/Makefile | 4 +-
+ arch/arm64/kernel/arm64ksyms.c | 1 +
+ arch/arm64/kernel/cpu_ops.c | 87 +++++++++++++
+ arch/arm64/kernel/cputable.c | 2 +-
+ arch/arm64/kernel/head.S | 61 +++++++--
+ arch/arm64/kernel/irq.c | 61 +++++++++
+ arch/arm64/kernel/kuser32.S | 57 +++++++--
+ arch/arm64/kernel/perf_event.c | 7 +-
+ arch/arm64/kernel/process.c | 7 ++
+ arch/arm64/kernel/psci.c | 87 ++++++++++++-
+ arch/arm64/kernel/setup.c | 9 +-
+ arch/arm64/kernel/signal32.c | 28 -----
+ arch/arm64/kernel/smp.c | 212 ++++++++++++++++----------------
+ arch/arm64/kernel/smp_psci.c | 53 --------
+ arch/arm64/kernel/smp_spin_table.c | 97 ++++++++++++++-
+ arch/arm64/kernel/sys32.S | 22 ++--
+ arch/arm64/kernel/vdso.c | 5 +-
+ arch/arm64/kernel/vmlinux.lds.S | 32 ++---
+ arch/arm64/mm/ioremap.c | 20 ++-
+ arch/arm64/mm/proc.S | 4 +-
+ 40 files changed, 860 insertions(+), 340 deletions(-)
+ create mode 100644 arch/arm64/include/asm/cpu_ops.h
+ create mode 100644 arch/arm64/kernel/cpu_ops.c
+ delete mode 100644 arch/arm64/kernel/smp_psci.c
+Merging blackfin/for-linus (08b67faa23fd blackfin: Ignore generated uImages)
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging c6x/for-linux-next (b2c32b32a212 c6x: remove unused COMMON_CLKDEV Kconfig parameter)
+$ git merge c6x/for-linux-next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9ba8eb359ac3] Merge remote-tracking branch 'c6x/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/Kconfig | 1 +
+ arch/arm/Kconfig | 1 +
+ arch/c6x/Kconfig | 7 -------
+ arch/ia64/Kconfig | 1 +
+ arch/m68k/Kconfig | 1 +
+ arch/microblaze/Kconfig | 1 +
+ arch/mips/Kconfig | 1 +
+ arch/parisc/Kconfig | 1 +
+ arch/powerpc/Kconfig | 1 +
+ arch/sh/Kconfig | 1 +
+ arch/sparc/Kconfig | 1 +
+ arch/unicore32/Kconfig | 1 +
+ arch/x86/Kconfig | 1 +
+ drivers/parport/Kconfig | 10 +++++++---
+ 14 files changed, 19 insertions(+), 10 deletions(-)
+Merging cris/for-next (be8cb7f42ab9 CRIS: drop unused Kconfig symbols)
+$ git merge cris/for-next
+Already up-to-date.
+Merging h8300-remove/h8300-remove (b400126add8f CREDITS: Add Yoshinori Sato for h8300)
+$ git merge h8300-remove/h8300-remove
+Removing drivers/net/ethernet/8390/ne-h8300.c
+Removing drivers/ide/ide-h8300.c
+Auto-merging drivers/ide/Kconfig
+Removing arch/h8300/platform/h8s/ptrace_h8s.c
+Removing arch/h8300/platform/h8s/irq.c
+Removing arch/h8300/platform/h8s/generic/crt0_rom.S
+Removing arch/h8300/platform/h8s/generic/crt0_ram.S
+Removing arch/h8300/platform/h8s/generic/Makefile
+Removing arch/h8300/platform/h8s/edosk2674/crt0_rom.S
+Removing arch/h8300/platform/h8s/edosk2674/crt0_ram.S
+Removing arch/h8300/platform/h8s/edosk2674/Makefile
+Removing arch/h8300/platform/h8s/Makefile
+Removing arch/h8300/platform/h8300h/ptrace_h8300h.c
+Removing arch/h8300/platform/h8300h/irq.c
+Removing arch/h8300/platform/h8300h/h8max/crt0_ram.S
+Removing arch/h8300/platform/h8300h/h8max/Makefile
+Removing arch/h8300/platform/h8300h/generic/crt0_rom.S
+Removing arch/h8300/platform/h8300h/generic/crt0_ram.S
+Removing arch/h8300/platform/h8300h/generic/Makefile
+Removing arch/h8300/platform/h8300h/aki3068net/crt0_ram.S
+Removing arch/h8300/platform/h8300h/aki3068net/Makefile
+Removing arch/h8300/platform/h8300h/Makefile
+Removing arch/h8300/mm/memory.c
+Removing arch/h8300/mm/kmap.c
+Removing arch/h8300/mm/init.c
+Removing arch/h8300/mm/fault.c
+Removing arch/h8300/mm/Makefile
+Removing arch/h8300/lib/romfs.S
+Removing arch/h8300/lib/memset.S
+Removing arch/h8300/lib/memcpy.S
+Removing arch/h8300/lib/checksum.c
+Removing arch/h8300/lib/ashrdi3.c
+Removing arch/h8300/lib/abs.S
+Removing arch/h8300/lib/Makefile
+Removing arch/h8300/kernel/vmlinux.lds.S
+Removing arch/h8300/kernel/traps.c
+Removing arch/h8300/kernel/timer/tpu.c
+Removing arch/h8300/kernel/timer/timer8.c
+Removing arch/h8300/kernel/timer/timer16.c
+Removing arch/h8300/kernel/timer/itu.c
+Removing arch/h8300/kernel/timer/Makefile
+Removing arch/h8300/kernel/time.c
+Removing arch/h8300/kernel/syscalls.S
+Removing arch/h8300/kernel/sys_h8300.c
+Removing arch/h8300/kernel/signal.c
+Removing arch/h8300/kernel/setup.c
+Removing arch/h8300/kernel/ptrace.c
+Removing arch/h8300/kernel/process.c
+Removing arch/h8300/kernel/module.c
+Removing arch/h8300/kernel/irq.c
+Removing arch/h8300/kernel/h8300_ksyms.c
+Removing arch/h8300/kernel/gpio.c
+Removing arch/h8300/kernel/entry.S
+Removing arch/h8300/kernel/asm-offsets.c
+Removing arch/h8300/kernel/Makefile
+Removing arch/h8300/include/uapi/asm/unistd.h
+Removing arch/h8300/include/uapi/asm/types.h
+Removing arch/h8300/include/uapi/asm/termios.h
+Removing arch/h8300/include/uapi/asm/termbits.h
+Removing arch/h8300/include/uapi/asm/swab.h
+Removing arch/h8300/include/uapi/asm/statfs.h
+Removing arch/h8300/include/uapi/asm/stat.h
+Removing arch/h8300/include/uapi/asm/sockios.h
+Removing arch/h8300/include/uapi/asm/socket.h
+Removing arch/h8300/include/uapi/asm/signal.h
+Removing arch/h8300/include/uapi/asm/siginfo.h
+Removing arch/h8300/include/uapi/asm/sigcontext.h
+Removing arch/h8300/include/uapi/asm/shmbuf.h
+Removing arch/h8300/include/uapi/asm/setup.h
+Removing arch/h8300/include/uapi/asm/sembuf.h
+Removing arch/h8300/include/uapi/asm/resource.h
+Removing arch/h8300/include/uapi/asm/ptrace.h
+Removing arch/h8300/include/uapi/asm/posix_types.h
+Removing arch/h8300/include/uapi/asm/poll.h
+Removing arch/h8300/include/uapi/asm/param.h
+Removing arch/h8300/include/uapi/asm/msgbuf.h
+Removing arch/h8300/include/uapi/asm/mman.h
+Removing arch/h8300/include/uapi/asm/kvm_para.h
+Removing arch/h8300/include/uapi/asm/ipcbuf.h
+Removing arch/h8300/include/uapi/asm/ioctls.h
+Removing arch/h8300/include/uapi/asm/ioctl.h
+Removing arch/h8300/include/uapi/asm/fcntl.h
+Removing arch/h8300/include/uapi/asm/errno.h
+Removing arch/h8300/include/uapi/asm/byteorder.h
+Removing arch/h8300/include/uapi/asm/bitsperlong.h
+Removing arch/h8300/include/uapi/asm/auxvec.h
+Removing arch/h8300/include/uapi/asm/Kbuild
+Removing arch/h8300/include/asm/virtconvert.h
+Removing arch/h8300/include/asm/user.h
+Removing arch/h8300/include/asm/unistd.h
+Removing arch/h8300/include/asm/unaligned.h
+Removing arch/h8300/include/asm/ucontext.h
+Removing arch/h8300/include/asm/uaccess.h
+Removing arch/h8300/include/asm/types.h
+Removing arch/h8300/include/asm/traps.h
+Removing arch/h8300/include/asm/topology.h
+Removing arch/h8300/include/asm/tlbflush.h
+Removing arch/h8300/include/asm/tlb.h
+Removing arch/h8300/include/asm/timex.h
+Removing arch/h8300/include/asm/timer.h
+Removing arch/h8300/include/asm/thread_info.h
+Removing arch/h8300/include/asm/termios.h
+Removing arch/h8300/include/asm/target_time.h
+Removing arch/h8300/include/asm/switch_to.h
+Removing arch/h8300/include/asm/string.h
+Removing arch/h8300/include/asm/spinlock.h
+Removing arch/h8300/include/asm/smp.h
+Removing arch/h8300/include/asm/signal.h
+Removing arch/h8300/include/asm/shmparam.h
+Removing arch/h8300/include/asm/shm.h
+Removing arch/h8300/include/asm/sh_bios.h
+Removing arch/h8300/include/asm/segment.h
+Removing arch/h8300/include/asm/sections.h
+Removing arch/h8300/include/asm/scatterlist.h
+Removing arch/h8300/include/asm/regs306x.h
+Removing arch/h8300/include/asm/regs267x.h
+Removing arch/h8300/include/asm/ptrace.h
+Removing arch/h8300/include/asm/processor.h
+Removing arch/h8300/include/asm/pgtable.h
+Removing arch/h8300/include/asm/pgalloc.h
+Removing arch/h8300/include/asm/percpu.h
+Removing arch/h8300/include/asm/pci.h
+Removing arch/h8300/include/asm/param.h
+Removing arch/h8300/include/asm/page_offset.h
+Removing arch/h8300/include/asm/page.h
+Removing arch/h8300/include/asm/mutex.h
+Removing arch/h8300/include/asm/mmu_context.h
+Removing arch/h8300/include/asm/mc146818rtc.h
+Removing arch/h8300/include/asm/local64.h
+Removing arch/h8300/include/asm/local.h
+Removing arch/h8300/include/asm/kmap_types.h
+Removing arch/h8300/include/asm/kdebug.h
+Removing arch/h8300/include/asm/irqflags.h
+Removing arch/h8300/include/asm/irq_regs.h
+Removing arch/h8300/include/asm/irq.h
+Removing arch/h8300/include/asm/io.h
+Removing arch/h8300/include/asm/hw_irq.h
+Removing arch/h8300/include/asm/hardirq.h
+Removing arch/h8300/include/asm/gpio-internal.h
+Removing arch/h8300/include/asm/futex.h
+Removing arch/h8300/include/asm/ftrace.h
+Removing arch/h8300/include/asm/fpu.h
+Removing arch/h8300/include/asm/flat.h
+Removing arch/h8300/include/asm/fb.h
+Removing arch/h8300/include/asm/emergency-restart.h
+Removing arch/h8300/include/asm/elf.h
+Removing arch/h8300/include/asm/dma.h
+Removing arch/h8300/include/asm/div64.h
+Removing arch/h8300/include/asm/device.h
+Removing arch/h8300/include/asm/delay.h
+Removing arch/h8300/include/asm/dbg.h
+Removing arch/h8300/include/asm/current.h
+Removing arch/h8300/include/asm/cputime.h
+Removing arch/h8300/include/asm/cmpxchg.h
+Removing arch/h8300/include/asm/checksum.h
+Removing arch/h8300/include/asm/cacheflush.h
+Removing arch/h8300/include/asm/cachectl.h
+Removing arch/h8300/include/asm/cache.h
+Removing arch/h8300/include/asm/bugs.h
+Removing arch/h8300/include/asm/bug.h
+Removing arch/h8300/include/asm/bootinfo.h
+Removing arch/h8300/include/asm/bitops.h
+Removing arch/h8300/include/asm/barrier.h
+Removing arch/h8300/include/asm/atomic.h
+Removing arch/h8300/include/asm/asm-offsets.h
+Removing arch/h8300/include/asm/Kbuild
+Removing arch/h8300/defconfig
+Removing arch/h8300/boot/compressed/vmlinux.scr
+Removing arch/h8300/boot/compressed/vmlinux.lds
+Removing arch/h8300/boot/compressed/misc.c
+Removing arch/h8300/boot/compressed/head.S
+Removing arch/h8300/boot/compressed/Makefile
+Removing arch/h8300/boot/Makefile
+Removing arch/h8300/README
+Removing arch/h8300/Makefile
+Removing arch/h8300/Kconfig.ide
+Removing arch/h8300/Kconfig.debug
+Removing arch/h8300/Kconfig.cpu
+Removing arch/h8300/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging CREDITS
+Merge made by the 'recursive' strategy.
+ CREDITS | 5 +
+ Documentation/scheduler/sched-arch.txt | 5 -
+ MAINTAINERS | 8 -
+ arch/h8300/Kconfig | 108 ----
+ arch/h8300/Kconfig.cpu | 171 ------
+ arch/h8300/Kconfig.debug | 68 ---
+ arch/h8300/Kconfig.ide | 44 --
+ arch/h8300/Makefile | 71 ---
+ arch/h8300/README | 38 --
+ arch/h8300/boot/Makefile | 22 -
+ arch/h8300/boot/compressed/Makefile | 37 --
+ arch/h8300/boot/compressed/head.S | 47 --
+ arch/h8300/boot/compressed/misc.c | 180 ------
+ arch/h8300/boot/compressed/vmlinux.lds | 32 --
+ arch/h8300/boot/compressed/vmlinux.scr | 9 -
+ arch/h8300/defconfig | 42 --
+ arch/h8300/include/asm/Kbuild | 8 -
+ arch/h8300/include/asm/asm-offsets.h | 1 -
+ arch/h8300/include/asm/atomic.h | 146 -----
+ arch/h8300/include/asm/barrier.h | 29 -
+ arch/h8300/include/asm/bitops.h | 211 -------
+ arch/h8300/include/asm/bootinfo.h | 2 -
+ arch/h8300/include/asm/bug.h | 12 -
+ arch/h8300/include/asm/bugs.h | 16 -
+ arch/h8300/include/asm/cache.h | 13 -
+ arch/h8300/include/asm/cachectl.h | 14 -
+ arch/h8300/include/asm/cacheflush.h | 40 --
+ arch/h8300/include/asm/checksum.h | 102 ----
+ arch/h8300/include/asm/cmpxchg.h | 60 --
+ arch/h8300/include/asm/cputime.h | 6 -
+ arch/h8300/include/asm/current.h | 25 -
+ arch/h8300/include/asm/dbg.h | 2 -
+ arch/h8300/include/asm/delay.h | 38 --
+ arch/h8300/include/asm/device.h | 7 -
+ arch/h8300/include/asm/div64.h | 1 -
+ arch/h8300/include/asm/dma.h | 15 -
+ arch/h8300/include/asm/elf.h | 101 ----
+ arch/h8300/include/asm/emergency-restart.h | 6 -
+ arch/h8300/include/asm/fb.h | 12 -
+ arch/h8300/include/asm/flat.h | 26 -
+ arch/h8300/include/asm/fpu.h | 1 -
+ arch/h8300/include/asm/ftrace.h | 1 -
+ arch/h8300/include/asm/futex.h | 6 -
+ arch/h8300/include/asm/gpio-internal.h | 52 --
+ arch/h8300/include/asm/hardirq.h | 19 -
+ arch/h8300/include/asm/hw_irq.h | 1 -
+ arch/h8300/include/asm/io.h | 358 ------------
+ arch/h8300/include/asm/irq.h | 49 --
+ arch/h8300/include/asm/irq_regs.h | 1 -
+ arch/h8300/include/asm/irqflags.h | 43 --
+ arch/h8300/include/asm/kdebug.h | 1 -
+ arch/h8300/include/asm/kmap_types.h | 6 -
+ arch/h8300/include/asm/local.h | 6 -
+ arch/h8300/include/asm/local64.h | 1 -
+ arch/h8300/include/asm/mc146818rtc.h | 9 -
+ arch/h8300/include/asm/mmu_context.h | 32 --
+ arch/h8300/include/asm/mutex.h | 9 -
+ arch/h8300/include/asm/page.h | 78 ---
+ arch/h8300/include/asm/page_offset.h | 3 -
+ arch/h8300/include/asm/param.h | 9 -
+ arch/h8300/include/asm/pci.h | 19 -
+ arch/h8300/include/asm/percpu.h | 6 -
+ arch/h8300/include/asm/pgalloc.h | 8 -
+ arch/h8300/include/asm/pgtable.h | 73 ---
+ arch/h8300/include/asm/processor.h | 139 -----
+ arch/h8300/include/asm/ptrace.h | 33 --
+ arch/h8300/include/asm/regs267x.h | 336 -----------
+ arch/h8300/include/asm/regs306x.h | 212 -------
+ arch/h8300/include/asm/scatterlist.h | 6 -
+ arch/h8300/include/asm/sections.h | 6 -
+ arch/h8300/include/asm/segment.h | 49 --
+ arch/h8300/include/asm/sh_bios.h | 29 -
+ arch/h8300/include/asm/shm.h | 31 -
+ arch/h8300/include/asm/shmparam.h | 6 -
+ arch/h8300/include/asm/signal.h | 24 -
+ arch/h8300/include/asm/smp.h | 1 -
+ arch/h8300/include/asm/spinlock.h | 6 -
+ arch/h8300/include/asm/string.h | 44 --
+ arch/h8300/include/asm/switch_to.h | 50 --
+ arch/h8300/include/asm/target_time.h | 4 -
+ arch/h8300/include/asm/termios.h | 50 --
+ arch/h8300/include/asm/thread_info.h | 103 ----
+ arch/h8300/include/asm/timer.h | 25 -
+ arch/h8300/include/asm/timex.h | 19 -
+ arch/h8300/include/asm/tlb.h | 8 -
+ arch/h8300/include/asm/tlbflush.h | 55 --
+ arch/h8300/include/asm/topology.h | 6 -
+ arch/h8300/include/asm/traps.h | 37 --
+ arch/h8300/include/asm/types.h | 9 -
+ arch/h8300/include/asm/uaccess.h | 163 ------
+ arch/h8300/include/asm/ucontext.h | 12 -
+ arch/h8300/include/asm/unaligned.h | 11 -
+ arch/h8300/include/asm/unistd.h | 36 --
+ arch/h8300/include/asm/user.h | 75 ---
+ arch/h8300/include/asm/virtconvert.h | 20 -
+ arch/h8300/include/uapi/asm/Kbuild | 34 --
+ arch/h8300/include/uapi/asm/auxvec.h | 4 -
+ arch/h8300/include/uapi/asm/bitsperlong.h | 1 -
+ arch/h8300/include/uapi/asm/byteorder.h | 6 -
+ arch/h8300/include/uapi/asm/errno.h | 6 -
+ arch/h8300/include/uapi/asm/fcntl.h | 11 -
+ arch/h8300/include/uapi/asm/ioctl.h | 1 -
+ arch/h8300/include/uapi/asm/ioctls.h | 8 -
+ arch/h8300/include/uapi/asm/ipcbuf.h | 1 -
+ arch/h8300/include/uapi/asm/kvm_para.h | 1 -
+ arch/h8300/include/uapi/asm/mman.h | 1 -
+ arch/h8300/include/uapi/asm/msgbuf.h | 31 -
+ arch/h8300/include/uapi/asm/param.h | 16 -
+ arch/h8300/include/uapi/asm/poll.h | 11 -
+ arch/h8300/include/uapi/asm/posix_types.h | 26 -
+ arch/h8300/include/uapi/asm/ptrace.h | 44 --
+ arch/h8300/include/uapi/asm/resource.h | 6 -
+ arch/h8300/include/uapi/asm/sembuf.h | 25 -
+ arch/h8300/include/uapi/asm/setup.h | 6 -
+ arch/h8300/include/uapi/asm/shmbuf.h | 42 --
+ arch/h8300/include/uapi/asm/sigcontext.h | 18 -
+ arch/h8300/include/uapi/asm/siginfo.h | 6 -
+ arch/h8300/include/uapi/asm/signal.h | 115 ----
+ arch/h8300/include/uapi/asm/socket.h | 79 ---
+ arch/h8300/include/uapi/asm/sockios.h | 13 -
+ arch/h8300/include/uapi/asm/stat.h | 78 ---
+ arch/h8300/include/uapi/asm/statfs.h | 6 -
+ arch/h8300/include/uapi/asm/swab.h | 10 -
+ arch/h8300/include/uapi/asm/termbits.h | 201 -------
+ arch/h8300/include/uapi/asm/termios.h | 44 --
+ arch/h8300/include/uapi/asm/types.h | 1 -
+ arch/h8300/include/uapi/asm/unistd.h | 330 -----------
+ arch/h8300/kernel/Makefile | 12 -
+ arch/h8300/kernel/asm-offsets.c | 60 --
+ arch/h8300/kernel/entry.S | 402 -------------
+ arch/h8300/kernel/gpio.c | 178 ------
+ arch/h8300/kernel/h8300_ksyms.c | 100 ----
+ arch/h8300/kernel/irq.c | 165 ------
+ arch/h8300/kernel/module.c | 75 ---
+ arch/h8300/kernel/process.c | 154 -----
+ arch/h8300/kernel/ptrace.c | 168 ------
+ arch/h8300/kernel/setup.c | 242 --------
+ arch/h8300/kernel/signal.c | 444 ---------------
+ arch/h8300/kernel/sys_h8300.c | 48 --
+ arch/h8300/kernel/syscalls.S | 338 -----------
+ arch/h8300/kernel/time.c | 66 ---
+ arch/h8300/kernel/timer/Makefile | 6 -
+ arch/h8300/kernel/timer/itu.c | 82 ---
+ arch/h8300/kernel/timer/timer16.c | 77 ---
+ arch/h8300/kernel/timer/timer8.c | 102 ----
+ arch/h8300/kernel/timer/tpu.c | 100 ----
+ arch/h8300/kernel/traps.c | 166 ------
+ arch/h8300/kernel/vmlinux.lds.S | 157 ------
+ arch/h8300/lib/Makefile | 5 -
+ arch/h8300/lib/abs.S | 21 -
+ arch/h8300/lib/ashrdi3.c | 63 ---
+ arch/h8300/lib/checksum.c | 164 ------
+ arch/h8300/lib/memcpy.S | 84 ---
+ arch/h8300/lib/memset.S | 61 --
+ arch/h8300/lib/romfs.S | 57 --
+ arch/h8300/mm/Makefile | 5 -
+ arch/h8300/mm/fault.c | 56 --
+ arch/h8300/mm/init.c | 155 -----
+ arch/h8300/mm/kmap.c | 58 --
+ arch/h8300/mm/memory.c | 54 --
+ arch/h8300/platform/h8300h/Makefile | 7 -
+ arch/h8300/platform/h8300h/aki3068net/Makefile | 5 -
+ arch/h8300/platform/h8300h/aki3068net/crt0_ram.S | 110 ----
+ arch/h8300/platform/h8300h/generic/Makefile | 5 -
+ arch/h8300/platform/h8300h/generic/crt0_ram.S | 107 ----
+ arch/h8300/platform/h8300h/generic/crt0_rom.S | 122 ----
+ arch/h8300/platform/h8300h/h8max/Makefile | 5 -
+ arch/h8300/platform/h8300h/h8max/crt0_ram.S | 110 ----
+ arch/h8300/platform/h8300h/irq.c | 82 ---
+ arch/h8300/platform/h8300h/ptrace_h8300h.c | 284 ----------
+ arch/h8300/platform/h8s/Makefile | 7 -
+ arch/h8300/platform/h8s/edosk2674/Makefile | 5 -
+ arch/h8300/platform/h8s/edosk2674/crt0_ram.S | 130 -----
+ arch/h8300/platform/h8s/edosk2674/crt0_rom.S | 186 ------
+ arch/h8300/platform/h8s/generic/Makefile | 5 -
+ arch/h8300/platform/h8s/generic/crt0_ram.S | 127 -----
+ arch/h8300/platform/h8s/generic/crt0_rom.S | 128 -----
+ arch/h8300/platform/h8s/irq.c | 104 ----
+ arch/h8300/platform/h8s/ptrace_h8s.c | 84 ---
+ drivers/ide/Kconfig | 7 -
+ drivers/ide/Makefile | 2 -
+ drivers/ide/ide-h8300.c | 109 ----
+ drivers/net/Space.c | 3 +-
+ drivers/net/ethernet/8390/Kconfig | 7 -
+ drivers/net/ethernet/8390/Makefile | 1 -
+ drivers/net/ethernet/8390/ne-h8300.c | 684 -----------------------
+ drivers/net/ethernet/smsc/smc9194.c | 24 -
+ drivers/watchdog/Kconfig | 2 -
+ drivers/watchdog/Makefile | 2 -
+ fs/minix/Kconfig | 2 +-
+ include/linux/serial_sci.h | 2 +-
+ include/uapi/linux/audit.h | 1 -
+ include/uapi/linux/elf-em.h | 1 -
+ tools/testing/ktest/examples/crosstests.conf | 6 -
+ 194 files changed, 8 insertions(+), 11741 deletions(-)
+ delete mode 100644 arch/h8300/Kconfig
+ delete mode 100644 arch/h8300/Kconfig.cpu
+ delete mode 100644 arch/h8300/Kconfig.debug
+ delete mode 100644 arch/h8300/Kconfig.ide
+ delete mode 100644 arch/h8300/Makefile
+ delete mode 100644 arch/h8300/README
+ delete mode 100644 arch/h8300/boot/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/Makefile
+ delete mode 100644 arch/h8300/boot/compressed/head.S
+ delete mode 100644 arch/h8300/boot/compressed/misc.c
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.lds
+ delete mode 100644 arch/h8300/boot/compressed/vmlinux.scr
+ delete mode 100644 arch/h8300/defconfig
+ delete mode 100644 arch/h8300/include/asm/Kbuild
+ delete mode 100644 arch/h8300/include/asm/asm-offsets.h
+ delete mode 100644 arch/h8300/include/asm/atomic.h
+ delete mode 100644 arch/h8300/include/asm/barrier.h
+ delete mode 100644 arch/h8300/include/asm/bitops.h
+ delete mode 100644 arch/h8300/include/asm/bootinfo.h
+ delete mode 100644 arch/h8300/include/asm/bug.h
+ delete mode 100644 arch/h8300/include/asm/bugs.h
+ delete mode 100644 arch/h8300/include/asm/cache.h
+ delete mode 100644 arch/h8300/include/asm/cachectl.h
+ delete mode 100644 arch/h8300/include/asm/cacheflush.h
+ delete mode 100644 arch/h8300/include/asm/checksum.h
+ delete mode 100644 arch/h8300/include/asm/cmpxchg.h
+ delete mode 100644 arch/h8300/include/asm/cputime.h
+ delete mode 100644 arch/h8300/include/asm/current.h
+ delete mode 100644 arch/h8300/include/asm/dbg.h
+ delete mode 100644 arch/h8300/include/asm/delay.h
+ delete mode 100644 arch/h8300/include/asm/device.h
+ delete mode 100644 arch/h8300/include/asm/div64.h
+ delete mode 100644 arch/h8300/include/asm/dma.h
+ delete mode 100644 arch/h8300/include/asm/elf.h
+ delete mode 100644 arch/h8300/include/asm/emergency-restart.h
+ delete mode 100644 arch/h8300/include/asm/fb.h
+ delete mode 100644 arch/h8300/include/asm/flat.h
+ delete mode 100644 arch/h8300/include/asm/fpu.h
+ delete mode 100644 arch/h8300/include/asm/ftrace.h
+ delete mode 100644 arch/h8300/include/asm/futex.h
+ delete mode 100644 arch/h8300/include/asm/gpio-internal.h
+ delete mode 100644 arch/h8300/include/asm/hardirq.h
+ delete mode 100644 arch/h8300/include/asm/hw_irq.h
+ delete mode 100644 arch/h8300/include/asm/io.h
+ delete mode 100644 arch/h8300/include/asm/irq.h
+ delete mode 100644 arch/h8300/include/asm/irq_regs.h
+ delete mode 100644 arch/h8300/include/asm/irqflags.h
+ delete mode 100644 arch/h8300/include/asm/kdebug.h
+ delete mode 100644 arch/h8300/include/asm/kmap_types.h
+ delete mode 100644 arch/h8300/include/asm/local.h
+ delete mode 100644 arch/h8300/include/asm/local64.h
+ delete mode 100644 arch/h8300/include/asm/mc146818rtc.h
+ delete mode 100644 arch/h8300/include/asm/mmu_context.h
+ delete mode 100644 arch/h8300/include/asm/mutex.h
+ delete mode 100644 arch/h8300/include/asm/page.h
+ delete mode 100644 arch/h8300/include/asm/page_offset.h
+ delete mode 100644 arch/h8300/include/asm/param.h
+ delete mode 100644 arch/h8300/include/asm/pci.h
+ delete mode 100644 arch/h8300/include/asm/percpu.h
+ delete mode 100644 arch/h8300/include/asm/pgalloc.h
+ delete mode 100644 arch/h8300/include/asm/pgtable.h
+ delete mode 100644 arch/h8300/include/asm/processor.h
+ delete mode 100644 arch/h8300/include/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/asm/regs267x.h
+ delete mode 100644 arch/h8300/include/asm/regs306x.h
+ delete mode 100644 arch/h8300/include/asm/scatterlist.h
+ delete mode 100644 arch/h8300/include/asm/sections.h
+ delete mode 100644 arch/h8300/include/asm/segment.h
+ delete mode 100644 arch/h8300/include/asm/sh_bios.h
+ delete mode 100644 arch/h8300/include/asm/shm.h
+ delete mode 100644 arch/h8300/include/asm/shmparam.h
+ delete mode 100644 arch/h8300/include/asm/signal.h
+ delete mode 100644 arch/h8300/include/asm/smp.h
+ delete mode 100644 arch/h8300/include/asm/spinlock.h
+ delete mode 100644 arch/h8300/include/asm/string.h
+ delete mode 100644 arch/h8300/include/asm/switch_to.h
+ delete mode 100644 arch/h8300/include/asm/target_time.h
+ delete mode 100644 arch/h8300/include/asm/termios.h
+ delete mode 100644 arch/h8300/include/asm/thread_info.h
+ delete mode 100644 arch/h8300/include/asm/timer.h
+ delete mode 100644 arch/h8300/include/asm/timex.h
+ delete mode 100644 arch/h8300/include/asm/tlb.h
+ delete mode 100644 arch/h8300/include/asm/tlbflush.h
+ delete mode 100644 arch/h8300/include/asm/topology.h
+ delete mode 100644 arch/h8300/include/asm/traps.h
+ delete mode 100644 arch/h8300/include/asm/types.h
+ delete mode 100644 arch/h8300/include/asm/uaccess.h
+ delete mode 100644 arch/h8300/include/asm/ucontext.h
+ delete mode 100644 arch/h8300/include/asm/unaligned.h
+ delete mode 100644 arch/h8300/include/asm/unistd.h
+ delete mode 100644 arch/h8300/include/asm/user.h
+ delete mode 100644 arch/h8300/include/asm/virtconvert.h
+ delete mode 100644 arch/h8300/include/uapi/asm/Kbuild
+ delete mode 100644 arch/h8300/include/uapi/asm/auxvec.h
+ delete mode 100644 arch/h8300/include/uapi/asm/bitsperlong.h
+ delete mode 100644 arch/h8300/include/uapi/asm/byteorder.h
+ delete mode 100644 arch/h8300/include/uapi/asm/errno.h
+ delete mode 100644 arch/h8300/include/uapi/asm/fcntl.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ioctl.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ioctls.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ipcbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/kvm_para.h
+ delete mode 100644 arch/h8300/include/uapi/asm/mman.h
+ delete mode 100644 arch/h8300/include/uapi/asm/msgbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/param.h
+ delete mode 100644 arch/h8300/include/uapi/asm/poll.h
+ delete mode 100644 arch/h8300/include/uapi/asm/posix_types.h
+ delete mode 100644 arch/h8300/include/uapi/asm/ptrace.h
+ delete mode 100644 arch/h8300/include/uapi/asm/resource.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sembuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/setup.h
+ delete mode 100644 arch/h8300/include/uapi/asm/shmbuf.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sigcontext.h
+ delete mode 100644 arch/h8300/include/uapi/asm/siginfo.h
+ delete mode 100644 arch/h8300/include/uapi/asm/signal.h
+ delete mode 100644 arch/h8300/include/uapi/asm/socket.h
+ delete mode 100644 arch/h8300/include/uapi/asm/sockios.h
+ delete mode 100644 arch/h8300/include/uapi/asm/stat.h
+ delete mode 100644 arch/h8300/include/uapi/asm/statfs.h
+ delete mode 100644 arch/h8300/include/uapi/asm/swab.h
+ delete mode 100644 arch/h8300/include/uapi/asm/termbits.h
+ delete mode 100644 arch/h8300/include/uapi/asm/termios.h
+ delete mode 100644 arch/h8300/include/uapi/asm/types.h
+ delete mode 100644 arch/h8300/include/uapi/asm/unistd.h
+ delete mode 100644 arch/h8300/kernel/Makefile
+ delete mode 100644 arch/h8300/kernel/asm-offsets.c
+ delete mode 100644 arch/h8300/kernel/entry.S
+ delete mode 100644 arch/h8300/kernel/gpio.c
+ delete mode 100644 arch/h8300/kernel/h8300_ksyms.c
+ delete mode 100644 arch/h8300/kernel/irq.c
+ delete mode 100644 arch/h8300/kernel/module.c
+ delete mode 100644 arch/h8300/kernel/process.c
+ delete mode 100644 arch/h8300/kernel/ptrace.c
+ delete mode 100644 arch/h8300/kernel/setup.c
+ delete mode 100644 arch/h8300/kernel/signal.c
+ delete mode 100644 arch/h8300/kernel/sys_h8300.c
+ delete mode 100644 arch/h8300/kernel/syscalls.S
+ delete mode 100644 arch/h8300/kernel/time.c
+ delete mode 100644 arch/h8300/kernel/timer/Makefile
+ delete mode 100644 arch/h8300/kernel/timer/itu.c
+ delete mode 100644 arch/h8300/kernel/timer/timer16.c
+ delete mode 100644 arch/h8300/kernel/timer/timer8.c
+ delete mode 100644 arch/h8300/kernel/timer/tpu.c
+ delete mode 100644 arch/h8300/kernel/traps.c
+ delete mode 100644 arch/h8300/kernel/vmlinux.lds.S
+ delete mode 100644 arch/h8300/lib/Makefile
+ delete mode 100644 arch/h8300/lib/abs.S
+ delete mode 100644 arch/h8300/lib/ashrdi3.c
+ delete mode 100644 arch/h8300/lib/checksum.c
+ delete mode 100644 arch/h8300/lib/memcpy.S
+ delete mode 100644 arch/h8300/lib/memset.S
+ delete mode 100644 arch/h8300/lib/romfs.S
+ delete mode 100644 arch/h8300/mm/Makefile
+ delete mode 100644 arch/h8300/mm/fault.c
+ delete mode 100644 arch/h8300/mm/init.c
+ delete mode 100644 arch/h8300/mm/kmap.c
+ delete mode 100644 arch/h8300/mm/memory.c
+ delete mode 100644 arch/h8300/platform/h8300h/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/aki3068net/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/aki3068net/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/generic/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/generic/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8300h/h8max/Makefile
+ delete mode 100644 arch/h8300/platform/h8300h/h8max/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8300h/irq.c
+ delete mode 100644 arch/h8300/platform/h8300h/ptrace_h8300h.c
+ delete mode 100644 arch/h8300/platform/h8s/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8s/edosk2674/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8s/generic/Makefile
+ delete mode 100644 arch/h8300/platform/h8s/generic/crt0_ram.S
+ delete mode 100644 arch/h8300/platform/h8s/generic/crt0_rom.S
+ delete mode 100644 arch/h8300/platform/h8s/irq.c
+ delete mode 100644 arch/h8300/platform/h8s/ptrace_h8s.c
+ delete mode 100644 drivers/ide/ide-h8300.c
+ delete mode 100644 drivers/net/ethernet/8390/ne-h8300.c
+Merging hexagon/linux-next (de44443a45e3 HEXAGON: Remove non existent reference to GENERIC_KERNEL_EXECVE & GENERIC_KERNEL_THREAD)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (959f58544b7f Linux 3.12-rc7)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (77a42796786c m68k: Remove deprecated IRQF_DISABLED)
+$ git merge m68k/for-next
+Auto-merging arch/m68k/platform/68360/config.c
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/floppy.h | 2 +-
+ arch/m68k/include/asm/sun3xflop.h | 2 +-
+ arch/m68k/include/asm/uaccess.h | 7 +++++++
+ arch/m68k/platform/68000/timers.c | 2 +-
+ arch/m68k/platform/68360/config.c | 2 +-
+ arch/m68k/platform/coldfire/pit.c | 2 +-
+ arch/m68k/platform/coldfire/sltimers.c | 4 ++--
+ arch/m68k/platform/coldfire/timers.c | 4 ++--
+ 8 files changed, 16 insertions(+), 9 deletions(-)
+Merging m68knommu/for-next (959f58544b7f Linux 3.12-rc7)
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging metag/for-next (b6ef9161e43a irq-imgpdc: add ImgTec PDC irqchip driver)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (d5d04bb48f0e Bye, bye, WfW flag)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (edf7b938321e MIPS: Random whitespace clean-ups)
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/powertv/time.c
+Removing arch/mips/powertv/reset.h
+Removing arch/mips/powertv/reset.c
+Removing arch/mips/powertv/powertv_setup.c
+Removing arch/mips/powertv/powertv-usb.c
+Removing arch/mips/powertv/powertv-clock.h
+Removing arch/mips/powertv/pci/powertv-pci.h
+Removing arch/mips/powertv/pci/fixup-powertv.c
+Removing arch/mips/powertv/pci/Makefile
+Removing arch/mips/powertv/memory.c
+Removing arch/mips/powertv/ioremap.c
+Removing arch/mips/powertv/init.h
+Removing arch/mips/powertv/init.c
+Removing arch/mips/powertv/asic/prealloc.h
+Removing arch/mips/powertv/asic/prealloc-zeus.c
+Removing arch/mips/powertv/asic/prealloc-gaia.c
+Removing arch/mips/powertv/asic/prealloc-cronuslite.c
+Removing arch/mips/powertv/asic/prealloc-cronus.c
+Removing arch/mips/powertv/asic/prealloc-calliope.c
+Removing arch/mips/powertv/asic/irq_asic.c
+Removing arch/mips/powertv/asic/asic_int.c
+Removing arch/mips/powertv/asic/asic_devices.c
+Removing arch/mips/powertv/asic/asic-zeus.c
+Removing arch/mips/powertv/asic/asic-gaia.c
+Removing arch/mips/powertv/asic/asic-cronus.c
+Removing arch/mips/powertv/asic/asic-calliope.c
+Removing arch/mips/powertv/asic/Makefile
+Removing arch/mips/powertv/Platform
+Removing arch/mips/powertv/Makefile
+Removing arch/mips/powertv/Kconfig
+Auto-merging arch/mips/mti-malta/malta-int.c
+Removing arch/mips/kernel/csrc-powertv.c
+Removing arch/mips/include/asm/mach-powertv/war.h
+Removing arch/mips/include/asm/mach-powertv/powertv-clock.h
+Removing arch/mips/include/asm/mach-powertv/irq.h
+Removing arch/mips/include/asm/mach-powertv/ioremap.h
+Removing arch/mips/include/asm/mach-powertv/interrupts.h
+Removing arch/mips/include/asm/mach-powertv/dma-coherence.h
+Removing arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
+Removing arch/mips/include/asm/mach-powertv/asic_regs.h
+Removing arch/mips/include/asm/mach-powertv/asic_reg_map.h
+Removing arch/mips/include/asm/mach-powertv/asic.h
+Removing arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
+Removing arch/mips/configs/powertv_defconfig
+Removing arch/mips/cobalt/console.c
+Auto-merging arch/mips/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/mips/Kbuild.platforms | 1 -
+ arch/mips/Kconfig | 27 +-
+ arch/mips/Kconfig.debug | 8 +
+ arch/mips/Makefile | 14 +-
+ arch/mips/alchemy/devboards/db1235.c | 2 +-
+ arch/mips/ath79/dev-common.c | 6 -
+ arch/mips/bcm47xx/Makefile | 1 +
+ arch/mips/bcm47xx/board.c | 309 ++++++++
+ arch/mips/bcm47xx/nvram.c | 20 +
+ arch/mips/bcm47xx/prom.c | 27 +-
+ arch/mips/bcm47xx/setup.c | 2 +
+ arch/mips/bcm47xx/time.c | 23 +
+ arch/mips/boot/compressed/Makefile | 6 +
+ arch/mips/boot/compressed/decompress.c | 13 +-
+ arch/mips/boot/compressed/ld.script | 5 +-
+ arch/mips/cavium-octeon/setup.c | 4 +-
+ arch/mips/cobalt/Makefile | 1 -
+ arch/mips/cobalt/console.c | 20 -
+ arch/mips/cobalt/setup.c | 3 +
+ arch/mips/configs/powertv_defconfig | 136 ----
+ arch/mips/dec/int-handler.S | 8 +-
+ arch/mips/dec/ioasic-irq.c | 43 +-
+ arch/mips/dec/prom/call_o32.S | 2 +-
+ arch/mips/dec/prom/init.c | 2 +-
+ arch/mips/dec/prom/memory.c | 2 +-
+ arch/mips/dec/setup.c | 4 +-
+ arch/mips/include/asm/addrspace.h | 4 +-
+ arch/mips/include/asm/atomic.h | 2 +-
+ arch/mips/include/asm/barrier.h | 6 +-
+ arch/mips/include/asm/cacheops.h | 93 +--
+ arch/mips/include/asm/dec/ioasic.h | 2 -
+ arch/mips/include/asm/dec/ioasic_addrs.h | 2 +-
+ arch/mips/include/asm/dec/kn01.h | 12 +-
+ arch/mips/include/asm/dec/kn02ca.h | 2 +-
+ arch/mips/include/asm/dec/prom.h | 2 +-
+ arch/mips/include/asm/elf.h | 1 +
+ .../include/asm/mach-ath79/ar933x_uart_platform.h | 18 -
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 110 +++
+ arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 2 +
+ .../include/asm/mach-cavium-octeon/dma-coherence.h | 12 -
+ .../include/asm/mach-dec/cpu-feature-overrides.h | 87 +++
+ arch/mips/include/asm/mach-generic/dma-coherence.h | 10 -
+ arch/mips/include/asm/mach-ip27/dma-coherence.h | 10 -
+ arch/mips/include/asm/mach-ip32/dma-coherence.h | 11 -
+ arch/mips/include/asm/mach-jazz/dma-coherence.h | 10 -
+ .../mips/include/asm/mach-loongson/dma-coherence.h | 10 -
+ arch/mips/include/asm/mach-powertv/asic.h | 120 ---
+ arch/mips/include/asm/mach-powertv/asic_reg_map.h | 90 ---
+ arch/mips/include/asm/mach-powertv/asic_regs.h | 125 ---
+ .../asm/mach-powertv/cpu-feature-overrides.h | 60 --
+ arch/mips/include/asm/mach-powertv/dma-coherence.h | 117 ---
+ arch/mips/include/asm/mach-powertv/interrupts.h | 253 ------
+ arch/mips/include/asm/mach-powertv/ioremap.h | 167 ----
+ arch/mips/include/asm/mach-powertv/irq.h | 25 -
+ arch/mips/include/asm/mach-powertv/powertv-clock.h | 29 -
+ arch/mips/include/asm/mach-powertv/war.h | 27 -
+ arch/mips/include/asm/mips-boards/piix4.h | 78 +-
+ arch/mips/include/asm/mmu_context.h | 22 +-
+ arch/mips/include/asm/ptrace.h | 14 +-
+ arch/mips/include/asm/r4kcache.h | 41 +-
+ arch/mips/include/asm/setup.h | 8 +
+ arch/mips/include/asm/stackframe.h | 24 +-
+ arch/mips/include/asm/syscall.h | 116 +++
+ arch/mips/include/asm/thread_info.h | 42 +-
+ arch/mips/include/asm/time.h | 2 +-
+ arch/mips/include/asm/unistd.h | 7 +
+ arch/mips/include/uapi/asm/siginfo.h | 9 +
+ arch/mips/kernel/Makefile | 3 +-
+ arch/mips/kernel/cpu-probe.c | 32 +-
+ arch/mips/kernel/csrc-powertv.c | 151 ----
+ arch/mips/kernel/early_printk_8250.c | 66 ++
+ arch/mips/kernel/ftrace.c | 33 +
+ arch/mips/kernel/genex.S | 14 +-
+ arch/mips/kernel/irq_cpu.c | 2 +-
+ arch/mips/kernel/module.c | 3 +-
+ arch/mips/kernel/ptrace.c | 199 +++--
+ arch/mips/kernel/scall32-o32.S | 846 ++++++++++-----------
+ arch/mips/kernel/scall64-64.S | 3 +-
+ arch/mips/kernel/scall64-n32.S | 1 +
+ arch/mips/kernel/scall64-o32.S | 10 +-
+ arch/mips/kernel/setup.c | 19 +-
+ arch/mips/kernel/smp-bmips.c | 4 +-
+ arch/mips/kernel/smp.c | 1 -
+ arch/mips/kernel/traps.c | 38 +-
+ arch/mips/lantiq/irq.c | 2 +-
+ arch/mips/lantiq/xway/sysctrl.c | 2 +-
+ arch/mips/mm/c-r4k.c | 52 +-
+ arch/mips/mm/dma-default.c | 4 +-
+ arch/mips/mm/tlb-funcs.S | 2 -
+ arch/mips/mm/tlb-r4k.c | 37 +-
+ arch/mips/mm/tlbex.c | 307 ++++----
+ arch/mips/mti-malta/malta-int.c | 1 -
+ arch/mips/netlogic/common/smp.c | 2 +-
+ arch/mips/pci/fixup-malta.c | 36 +-
+ arch/mips/pci/pci-ar71xx.c | 3 -
+ arch/mips/pci/pci-ar724x.c | 9 -
+ arch/mips/pci/pci.c | 50 +-
+ arch/mips/powertv/Kconfig | 12 -
+ arch/mips/powertv/Makefile | 29 -
+ arch/mips/powertv/Platform | 7 -
+ arch/mips/powertv/asic/Makefile | 21 -
+ arch/mips/powertv/asic/asic-calliope.c | 101 ---
+ arch/mips/powertv/asic/asic-cronus.c | 101 ---
+ arch/mips/powertv/asic/asic-gaia.c | 96 ---
+ arch/mips/powertv/asic/asic-zeus.c | 101 ---
+ arch/mips/powertv/asic/asic_devices.c | 549 -------------
+ arch/mips/powertv/asic/asic_int.c | 125 ---
+ arch/mips/powertv/asic/irq_asic.c | 115 ---
+ arch/mips/powertv/asic/prealloc-calliope.c | 385 ----------
+ arch/mips/powertv/asic/prealloc-cronus.c | 340 ---------
+ arch/mips/powertv/asic/prealloc-cronuslite.c | 174 -----
+ arch/mips/powertv/asic/prealloc-gaia.c | 589 --------------
+ arch/mips/powertv/asic/prealloc-zeus.c | 304 --------
+ arch/mips/powertv/asic/prealloc.h | 70 --
+ arch/mips/powertv/init.c | 90 ---
+ arch/mips/powertv/init.h | 28 -
+ arch/mips/powertv/ioremap.c | 136 ----
+ arch/mips/powertv/memory.c | 353 ---------
+ arch/mips/powertv/pci/Makefile | 19 -
+ arch/mips/powertv/pci/fixup-powertv.c | 37 -
+ arch/mips/powertv/pci/powertv-pci.h | 31 -
+ arch/mips/powertv/powertv-clock.h | 26 -
+ arch/mips/powertv/powertv-usb.c | 404 ----------
+ arch/mips/powertv/powertv_setup.c | 319 --------
+ arch/mips/powertv/reset.c | 35 -
+ arch/mips/powertv/reset.h | 26 -
+ arch/mips/powertv/time.c | 36 -
+ arch/mips/ralink/clk.c | 2 +-
+ arch/mips/ralink/mt7620.c | 2 +-
+ arch/mips/ralink/of.c | 2 +-
+ arch/mips/ralink/rt305x.c | 2 +-
+ drivers/net/ethernet/amd/declance.c | 3 +-
+ 132 files changed, 1984 insertions(+), 7089 deletions(-)
+ create mode 100644 arch/mips/bcm47xx/board.c
+ delete mode 100644 arch/mips/cobalt/console.c
+ delete mode 100644 arch/mips/configs/powertv_defconfig
+ delete mode 100644 arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
+ create mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h
+ create mode 100644 arch/mips/include/asm/mach-dec/cpu-feature-overrides.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/asic.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/asic_reg_map.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/asic_regs.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/cpu-feature-overrides.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/dma-coherence.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/interrupts.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/ioremap.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/irq.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/powertv-clock.h
+ delete mode 100644 arch/mips/include/asm/mach-powertv/war.h
+ create mode 100644 arch/mips/include/asm/syscall.h
+ delete mode 100644 arch/mips/kernel/csrc-powertv.c
+ create mode 100644 arch/mips/kernel/early_printk_8250.c
+ delete mode 100644 arch/mips/powertv/Kconfig
+ delete mode 100644 arch/mips/powertv/Makefile
+ delete mode 100644 arch/mips/powertv/Platform
+ delete mode 100644 arch/mips/powertv/asic/Makefile
+ delete mode 100644 arch/mips/powertv/asic/asic-calliope.c
+ delete mode 100644 arch/mips/powertv/asic/asic-cronus.c
+ delete mode 100644 arch/mips/powertv/asic/asic-gaia.c
+ delete mode 100644 arch/mips/powertv/asic/asic-zeus.c
+ delete mode 100644 arch/mips/powertv/asic/asic_devices.c
+ delete mode 100644 arch/mips/powertv/asic/asic_int.c
+ delete mode 100644 arch/mips/powertv/asic/irq_asic.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc-calliope.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc-cronus.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc-cronuslite.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc-gaia.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc-zeus.c
+ delete mode 100644 arch/mips/powertv/asic/prealloc.h
+ delete mode 100644 arch/mips/powertv/init.c
+ delete mode 100644 arch/mips/powertv/init.h
+ delete mode 100644 arch/mips/powertv/ioremap.c
+ delete mode 100644 arch/mips/powertv/memory.c
+ delete mode 100644 arch/mips/powertv/pci/Makefile
+ delete mode 100644 arch/mips/powertv/pci/fixup-powertv.c
+ delete mode 100644 arch/mips/powertv/pci/powertv-pci.h
+ delete mode 100644 arch/mips/powertv/powertv-clock.h
+ delete mode 100644 arch/mips/powertv/powertv-usb.c
+ delete mode 100644 arch/mips/powertv/powertv_setup.c
+ delete mode 100644 arch/mips/powertv/reset.c
+ delete mode 100644 arch/mips/powertv/reset.h
+ delete mode 100644 arch/mips/powertv/time.c
+Merging openrisc/for-upstream (6af609515d78 openrisc: remove HAVE_VIRT_TO_BUS)
+$ git merge openrisc/for-upstream
+Already up-to-date.
+Merging parisc/for-next (6c700d71f7fa [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 (89bcde9f4c7f parisc: make "make install" not depend on vmlinux)
+$ git merge parisc-hd/for-next
+Auto-merging arch/parisc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/parisc/Kconfig | 4 +
+ arch/parisc/Makefile | 22 +-
+ arch/parisc/configs/generic-32bit_defconfig | 328 ++++++++++++++++++++++++++
+ arch/parisc/configs/generic-64bit_defconfig | 345 ++++++++++++++++++++++++++++
+ arch/parisc/include/asm/assembly.h | 12 +
+ arch/parisc/include/asm/ptrace.h | 4 +
+ arch/parisc/include/asm/socket.h | 10 +
+ arch/parisc/include/asm/thread_info.h | 4 +-
+ arch/parisc/include/asm/uaccess.h | 7 +-
+ arch/parisc/include/uapi/asm/socket.h | 11 +-
+ arch/parisc/install.sh | 44 +++-
+ arch/parisc/kernel/Makefile | 1 +
+ arch/parisc/kernel/audit.c | 81 +++++++
+ arch/parisc/kernel/compat_audit.c | 40 ++++
+ arch/parisc/kernel/ptrace.c | 26 ++-
+ arch/parisc/kernel/syscall.S | 6 +-
+ arch/parisc/lib/lusercopy.S | 10 +-
+ arch/parisc/mm/fault.c | 6 +
+ init/Kconfig | 2 +-
+ 19 files changed, 921 insertions(+), 42 deletions(-)
+ create mode 100644 arch/parisc/configs/generic-32bit_defconfig
+ create mode 100644 arch/parisc/configs/generic-64bit_defconfig
+ create mode 100644 arch/parisc/include/asm/socket.h
+ create mode 100644 arch/parisc/kernel/audit.c
+ create mode 100644 arch/parisc/kernel/compat_audit.c
+Merging powerpc/next (b0c06d333505 powerpc/bpf: Support MOD operation)
+$ git merge powerpc/next
+Auto-merging drivers/of/base.c
+Removing arch/powerpc/platforms/85xx/t4240_qds.c
+Removing arch/powerpc/platforms/85xx/p5040_ds.c
+Removing arch/powerpc/platforms/85xx/p5020_ds.c
+Removing arch/powerpc/platforms/85xx/p4080_ds.c
+Removing arch/powerpc/platforms/85xx/p3041_ds.c
+Removing arch/powerpc/platforms/85xx/p2041_rdb.c
+Removing arch/powerpc/platforms/85xx/corenet_ds.h
+Removing arch/powerpc/platforms/85xx/corenet_ds.c
+Removing arch/powerpc/platforms/85xx/b4_qds.c
+Auto-merging arch/powerpc/net/bpf_jit_comp.c
+Auto-merging arch/powerpc/kernel/vio.c
+Removing arch/powerpc/kernel/setup.h
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 12 +-
+ arch/powerpc/Makefile | 37 +-
+ arch/powerpc/boot/Makefile | 3 +-
+ arch/powerpc/boot/dts/b4860emu.dts | 218 ++++++++
+ arch/powerpc/boot/dts/b4qds.dtsi | 51 +-
+ arch/powerpc/boot/dts/c293pcie.dts | 1 +
+ arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 2 +
+ arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 2 +
+ arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi | 2 +-
+ arch/powerpc/boot/dts/fsl/bsc9131si-pre.dtsi | 3 +
+ arch/powerpc/boot/dts/t4240emu.dts | 268 ++++++++++
+ arch/powerpc/boot/dts/t4240qds.dts | 73 +--
+ arch/powerpc/boot/wrapper | 4 +
+ arch/powerpc/configs/corenet32_smp_defconfig | 7 +-
+ arch/powerpc/configs/corenet64_smp_defconfig | 5 +-
+ arch/powerpc/configs/mpc85xx_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
+ arch/powerpc/configs/ppc64_defconfig | 27 +-
+ arch/powerpc/configs/ppc64e_defconfig | 12 +-
+ arch/powerpc/configs/ppc6xx_defconfig | 2 +-
+ arch/powerpc/configs/pseries_defconfig | 25 +-
+ arch/powerpc/include/asm/archrandom.h | 32 ++
+ arch/powerpc/include/asm/checksum.h | 5 +
+ arch/powerpc/include/asm/emulated_ops.h | 1 +
+ arch/powerpc/include/asm/hvsi.h | 16 +-
+ arch/powerpc/include/asm/io.h | 69 ++-
+ arch/powerpc/include/asm/lppaca.h | 12 +-
+ arch/powerpc/include/asm/machdep.h | 16 +
+ arch/powerpc/include/asm/mmu-hash64.h | 4 +-
+ arch/powerpc/include/asm/opal.h | 109 +++-
+ arch/powerpc/include/asm/page.h | 4 +-
+ arch/powerpc/include/asm/pgtable-ppc64.h | 2 +
+ arch/powerpc/include/asm/ppc-opcode.h | 8 +-
+ arch/powerpc/include/asm/ppc_asm.h | 135 ++---
+ arch/powerpc/include/asm/processor.h | 91 ++--
+ arch/powerpc/include/asm/prom.h | 3 -
+ arch/powerpc/include/asm/reg.h | 7 +-
+ arch/powerpc/include/asm/reg_booke.h | 8 +-
+ arch/powerpc/include/asm/scom.h | 23 +-
+ arch/powerpc/include/asm/setup.h | 4 +
+ arch/powerpc/include/asm/sfp-machine.h | 2 +-
+ arch/powerpc/include/asm/string.h | 4 +
+ arch/powerpc/include/asm/switch_to.h | 1 +
+ arch/powerpc/include/asm/word-at-a-time.h | 78 +++
+ arch/powerpc/include/asm/xor.h | 67 +++
+ arch/powerpc/include/uapi/asm/byteorder.h | 4 +
+ arch/powerpc/kernel/align.c | 173 ++++---
+ arch/powerpc/kernel/asm-offsets.c | 29 +-
+ arch/powerpc/kernel/eeh.c | 6 +-
+ arch/powerpc/kernel/entry_64.S | 40 +-
+ arch/powerpc/kernel/exceptions-64e.S | 6 +-
+ arch/powerpc/kernel/fpu.S | 86 ++--
+ arch/powerpc/kernel/ftrace.c | 4 +
+ arch/powerpc/kernel/head_64.S | 3 +
+ arch/powerpc/kernel/head_8xx.S | 3 +
+ arch/powerpc/kernel/head_fsl_booke.S | 10 +-
+ arch/powerpc/kernel/kgdb.c | 6 +-
+ arch/powerpc/kernel/legacy_serial.c | 2 +-
+ arch/powerpc/kernel/machine_kexec_64.c | 2 +-
+ arch/powerpc/kernel/misc_32.S | 14 +
+ arch/powerpc/kernel/module.c | 3 +-
+ arch/powerpc/kernel/module_32.c | 3 +-
+ arch/powerpc/kernel/module_64.c | 19 +-
+ arch/powerpc/kernel/nvram_64.c | 10 +-
+ arch/powerpc/kernel/paca.c | 6 +-
+ arch/powerpc/kernel/pci_of_scan.c | 4 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 10 +
+ arch/powerpc/kernel/process.c | 67 +--
+ arch/powerpc/kernel/prom.c | 31 --
+ arch/powerpc/kernel/prom_init.c | 28 +-
+ arch/powerpc/kernel/ptrace.c | 209 ++++----
+ arch/powerpc/kernel/ptrace32.c | 13 +-
+ arch/powerpc/kernel/rtas_pci.c | 6 +-
+ arch/powerpc/kernel/setup-common.c | 2 -
+ arch/powerpc/kernel/setup.h | 9 -
+ arch/powerpc/kernel/setup_32.c | 2 -
+ arch/powerpc/kernel/setup_64.c | 2 -
+ arch/powerpc/kernel/signal_32.c | 81 +--
+ arch/powerpc/kernel/signal_64.c | 32 +-
+ arch/powerpc/kernel/swsusp_asm64.S | 4 +
+ arch/powerpc/kernel/tm.S | 49 +-
+ arch/powerpc/kernel/traps.c | 56 ++-
+ arch/powerpc/kernel/vdso.c | 3 +-
+ arch/powerpc/kernel/vdso32/vdso32.lds.S | 4 +
+ arch/powerpc/kernel/vdso64/vdso64.lds.S | 4 +
+ arch/powerpc/kernel/vecemu.c | 6 +-
+ arch/powerpc/kernel/vector.S | 80 +--
+ arch/powerpc/kernel/vio.c | 4 +-
+ arch/powerpc/kvm/Kconfig | 1 +
+ arch/powerpc/kvm/book3s_pr.c | 36 +-
+ arch/powerpc/kvm/booke.c | 19 +-
+ arch/powerpc/lib/Makefile | 21 +-
+ arch/powerpc/lib/copyuser_power7.S | 54 +-
+ arch/powerpc/lib/memcpy_power7.S | 55 +-
+ arch/powerpc/lib/sstep.c | 97 +++-
+ arch/powerpc/lib/xor_vmx.c | 177 +++++++
+ arch/powerpc/mm/hash_native_64.c | 46 +-
+ arch/powerpc/mm/hash_utils_64.c | 38 +-
+ arch/powerpc/mm/init_32.c | 5 +
+ arch/powerpc/mm/init_64.c | 51 +-
+ arch/powerpc/mm/numa.c | 8 +-
+ arch/powerpc/mm/pgtable.c | 19 +-
+ arch/powerpc/net/bpf_jit.h | 11 +
+ arch/powerpc/net/bpf_jit_64.S | 9 +-
+ arch/powerpc/net/bpf_jit_comp.c | 37 +-
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 -
+ arch/powerpc/platforms/85xx/Kconfig | 101 +---
+ arch/powerpc/platforms/85xx/Makefile | 8 +-
+ arch/powerpc/platforms/85xx/b4_qds.c | 102 ----
+ arch/powerpc/platforms/85xx/corenet_ds.c | 96 ----
+ arch/powerpc/platforms/85xx/corenet_ds.h | 19 -
+ arch/powerpc/platforms/85xx/corenet_generic.c | 182 +++++++
+ arch/powerpc/platforms/85xx/p1010rdb.c | 2 +
+ arch/powerpc/platforms/85xx/p2041_rdb.c | 87 ----
+ arch/powerpc/platforms/85xx/p3041_ds.c | 89 ----
+ arch/powerpc/platforms/85xx/p4080_ds.c | 87 ----
+ arch/powerpc/platforms/85xx/p5020_ds.c | 93 ----
+ arch/powerpc/platforms/85xx/p5040_ds.c | 84 ----
+ arch/powerpc/platforms/85xx/t4240_qds.c | 93 ----
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 4 +-
+ arch/powerpc/platforms/Kconfig.cputype | 9 +-
+ arch/powerpc/platforms/chrp/nvram.c | 4 +-
+ arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 1 +
+ arch/powerpc/platforms/powernv/Kconfig | 2 +
+ arch/powerpc/platforms/powernv/Makefile | 4 +-
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 153 +++++-
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 5 +-
+ arch/powerpc/platforms/powernv/opal-flash.c | 667 +++++++++++++++++++++++++
+ arch/powerpc/platforms/powernv/opal-nvram.c | 4 +-
+ arch/powerpc/platforms/powernv/opal-rtc.c | 12 +-
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 16 +-
+ arch/powerpc/platforms/powernv/opal-xscom.c | 105 ++++
+ arch/powerpc/platforms/powernv/opal.c | 57 ++-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 76 ++-
+ arch/powerpc/platforms/powernv/pci-p5ioc2.c | 4 +-
+ arch/powerpc/platforms/powernv/pci.c | 68 ++-
+ arch/powerpc/platforms/powernv/pci.h | 5 +-
+ arch/powerpc/platforms/powernv/rng.c | 125 +++++
+ arch/powerpc/platforms/pseries/Makefile | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 59 +--
+ arch/powerpc/platforms/pseries/nvram.c | 10 +-
+ arch/powerpc/platforms/pseries/rng.c | 44 ++
+ arch/powerpc/platforms/wsp/scom_smp.c | 18 +-
+ arch/powerpc/platforms/wsp/scom_wsp.c | 12 +-
+ arch/powerpc/platforms/wsp/wsp.c | 13 +-
+ arch/powerpc/sysdev/Kconfig | 2 +-
+ arch/powerpc/sysdev/fsl_pci.c | 5 +-
+ arch/powerpc/sysdev/mpic.c | 8 +-
+ arch/powerpc/sysdev/mv64x60_dev.c | 2 +-
+ arch/powerpc/sysdev/scom.c | 36 +-
+ arch/powerpc/sysdev/xics/ics-opal.c | 17 +-
+ drivers/char/hw_random/Kconfig | 13 +
+ drivers/char/hw_random/Makefile | 1 +
+ drivers/char/hw_random/powernv-rng.c | 81 +++
+ drivers/char/hw_random/pseries-rng.c | 14 +-
+ drivers/macintosh/Kconfig | 1 +
+ drivers/of/base.c | 31 ++
+ drivers/tty/hvc/hvc_opal.c | 4 +-
+ drivers/tty/hvc/hvsi_lib.c | 25 +-
+ include/linux/hashtable.h | 15 +
+ include/linux/mm.h | 14 +
+ include/linux/of.h | 2 +
+ include/linux/page-flags.h | 4 +-
+ 164 files changed, 4047 insertions(+), 2029 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/b4860emu.dts
+ create mode 100644 arch/powerpc/boot/dts/t4240emu.dts
+ create mode 100644 arch/powerpc/include/asm/archrandom.h
+ delete mode 100644 arch/powerpc/kernel/setup.h
+ create mode 100644 arch/powerpc/lib/xor_vmx.c
+ delete mode 100644 arch/powerpc/platforms/85xx/b4_qds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/corenet_ds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/corenet_ds.h
+ create mode 100644 arch/powerpc/platforms/85xx/corenet_generic.c
+ delete mode 100644 arch/powerpc/platforms/85xx/p2041_rdb.c
+ delete mode 100644 arch/powerpc/platforms/85xx/p3041_ds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/p4080_ds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/p5020_ds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/p5040_ds.c
+ delete mode 100644 arch/powerpc/platforms/85xx/t4240_qds.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-flash.c
+ create mode 100644 arch/powerpc/platforms/powernv/opal-xscom.c
+ create mode 100644 arch/powerpc/platforms/powernv/rng.c
+ create mode 100644 arch/powerpc/platforms/pseries/rng.c
+ create mode 100644 drivers/char/hw_random/powernv-rng.c
+Merging mpc5xxx/next (7e198197ec87 powerpc/mpc512x: remove unnecessary #if)
+$ git merge mpc5xxx/next
+Merge made by the 'recursive' strategy.
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 18 +++++++-----------
+ arch/powerpc/platforms/52xx/Kconfig | 2 +-
+ arch/powerpc/platforms/52xx/mpc52xx_pic.c | 5 ++---
+ arch/powerpc/sysdev/fsl_soc.h | 3 ---
+ 4 files changed, 10 insertions(+), 18 deletions(-)
+Merging galak/next (9e2ecdbba3b0 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 (106078641f32 s390/mm,tlb: correct tlb flush on page table upgrade)
+$ git merge s390/features
+Removing arch/s390/lib/uaccess_std.c
+Removing arch/s390/kernel/bitmap.c
+Merge made by the 'recursive' strategy.
+ Documentation/s390/s390dbf.txt | 10 +
+ arch/s390/Kconfig | 62 ++
+ arch/s390/Makefile | 22 +-
+ arch/s390/appldata/appldata_base.c | 18 +-
+ arch/s390/configs/default_defconfig | 655 ++++++++++++++++++++
+ arch/s390/configs/gcov_defconfig | 618 +++++++++++++++++++
+ arch/s390/configs/performance_defconfig | 610 +++++++++++++++++++
+ arch/s390/configs/zfcpdump_defconfig | 86 +++
+ arch/s390/crypto/aes_s390.c | 15 +-
+ arch/s390/defconfig | 4 +-
+ arch/s390/include/asm/atomic.h | 190 ++++--
+ arch/s390/include/asm/bitops.h | 1008 +++++++++----------------------
+ arch/s390/include/asm/compat.h | 5 +-
+ arch/s390/include/asm/ctl_reg.h | 112 ++--
+ arch/s390/include/asm/debug.h | 5 +
+ arch/s390/include/asm/dis.h | 52 ++
+ arch/s390/include/asm/fcx.h | 38 +-
+ arch/s390/include/asm/ipl.h | 10 +-
+ arch/s390/include/asm/mmu_context.h | 10 +-
+ arch/s390/include/asm/page.h | 7 +-
+ arch/s390/include/asm/pci_debug.h | 5 -
+ arch/s390/include/asm/pci_insn.h | 15 +-
+ arch/s390/include/asm/percpu.h | 137 +++--
+ arch/s390/include/asm/processor.h | 18 +-
+ arch/s390/include/asm/ptrace.h | 7 +-
+ arch/s390/include/asm/setup.h | 7 -
+ arch/s390/include/asm/smp.h | 1 -
+ arch/s390/include/asm/switch_to.h | 124 ++--
+ arch/s390/include/asm/timex.h | 6 +-
+ arch/s390/include/asm/uaccess.h | 18 +-
+ arch/s390/include/uapi/asm/ptrace.h | 4 +-
+ arch/s390/include/uapi/asm/sigcontext.h | 1 +
+ arch/s390/kernel/Makefile | 2 +-
+ arch/s390/kernel/bitmap.c | 54 --
+ arch/s390/kernel/cache.c | 5 +-
+ arch/s390/kernel/compat_linux.c | 4 -
+ arch/s390/kernel/compat_linux.h | 1 +
+ arch/s390/kernel/compat_signal.c | 89 +--
+ arch/s390/kernel/crash_dump.c | 35 +-
+ arch/s390/kernel/debug.c | 2 +-
+ arch/s390/kernel/dis.c | 81 +--
+ arch/s390/kernel/dumpstack.c | 1 +
+ arch/s390/kernel/early.c | 2 +
+ arch/s390/kernel/entry.h | 1 -
+ arch/s390/kernel/ftrace.c | 9 +-
+ arch/s390/kernel/head.S | 2 +-
+ arch/s390/kernel/ipl.c | 4 +-
+ arch/s390/kernel/kprobes.c | 13 +-
+ arch/s390/kernel/pgm_check.S | 2 +-
+ arch/s390/kernel/process.c | 15 +-
+ arch/s390/kernel/ptrace.c | 70 ++-
+ arch/s390/kernel/runtime_instr.c | 2 -
+ arch/s390/kernel/setup.c | 59 +-
+ arch/s390/kernel/signal.c | 49 +-
+ arch/s390/kernel/smp.c | 21 +-
+ arch/s390/kernel/vdso.c | 9 +-
+ arch/s390/kernel/vtime.c | 4 +-
+ arch/s390/kvm/kvm-s390.c | 23 +-
+ arch/s390/kvm/trace.h | 1 +
+ arch/s390/lib/Makefile | 2 +-
+ arch/s390/lib/find.c | 77 +++
+ arch/s390/lib/uaccess_mvcos.c | 30 -
+ arch/s390/lib/uaccess_pt.c | 2 -
+ arch/s390/lib/uaccess_std.c | 305 ----------
+ arch/s390/math-emu/math.c | 2 +
+ arch/s390/mm/cmm.c | 12 +-
+ arch/s390/mm/fault.c | 46 +-
+ arch/s390/mm/gup.c | 83 +--
+ arch/s390/mm/mmap.c | 12 +-
+ arch/s390/mm/pageattr.c | 4 +-
+ arch/s390/mm/pgtable.c | 43 +-
+ arch/s390/net/bpf_jit_comp.c | 6 +-
+ arch/s390/pci/pci.c | 108 ++--
+ arch/s390/pci/pci_clp.c | 33 +-
+ arch/s390/pci/pci_dma.c | 18 +-
+ arch/s390/pci/pci_event.c | 35 +-
+ drivers/pci/hotplug/s390_pci_hpc.c | 6 +-
+ drivers/s390/block/dasd.c | 3 +-
+ drivers/s390/block/scm_blk.h | 2 +-
+ drivers/s390/char/monwriter.c | 2 +-
+ drivers/s390/char/raw3270.c | 4 +-
+ drivers/s390/char/zcore.c | 20 +-
+ drivers/s390/cio/airq.c | 19 +-
+ drivers/s390/cio/eadm_sch.c | 29 +-
+ drivers/s390/cio/eadm_sch.h | 4 +-
+ drivers/s390/cio/qdio_debug.h | 8 +-
+ drivers/s390/cio/qdio_main.c | 2 +-
+ drivers/s390/crypto/zcrypt_debug.h | 12 +-
+ drivers/s390/net/claw.h | 8 +-
+ drivers/s390/net/ctcm_dbug.c | 2 +-
+ drivers/s390/net/lcs.h | 8 +-
+ drivers/s390/net/netiucv.c | 8 +-
+ drivers/s390/net/qeth_core_main.c | 2 +-
+ drivers/s390/scsi/zfcp_dbf.h | 4 +-
+ drivers/tty/hvc/hvc_iucv.c | 3 +-
+ 95 files changed, 3422 insertions(+), 1982 deletions(-)
+ create mode 100644 arch/s390/configs/default_defconfig
+ create mode 100644 arch/s390/configs/gcov_defconfig
+ create mode 100644 arch/s390/configs/performance_defconfig
+ create mode 100644 arch/s390/configs/zfcpdump_defconfig
+ create mode 100644 arch/s390/include/asm/dis.h
+ delete mode 100644 arch/s390/kernel/bitmap.c
+ create mode 100644 arch/s390/lib/find.c
+ delete mode 100644 arch/s390/lib/uaccess_std.c
+Merging sh/sh-latest (37284bd93103 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.
+Resolved 'drivers/tty/serial/sh-sci.c' using previous resolution.
+Resolved 'include/linux/serial_sci.h' using previous resolution.
+Auto-merging include/linux/serial_sci.h
+CONFLICT (content): Merge conflict in include/linux/serial_sci.h
+Auto-merging drivers/tty/serial/sh-sci.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/sh-sci.c
+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 d8f1602ec254] 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 (f8ce1faf5595 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 (e823acc0a9e3 tile: remove stray blank space)
+$ git merge tile/master
+Already up-to-date.
+Merging unicore32/unicore32 (c284464658ac arch/unicore32: remove CONFIG_EXPERIMENTAL)
+$ git merge unicore32/unicore32
+Already up-to-date.
+Merging xtensa/for_next (8872366df396 xtensa: Fix broken allmodconfig build)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (d7396f07358a Btrfs: optimize key searches in btrfs_search_slot)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (53d028160f1a ceph: implement readv/preadv for sync operation)
+$ git merge ceph/master
+Merge made by the 'recursive' strategy.
+ fs/ceph/cache.c | 3 +
+ fs/ceph/caps.c | 27 ++--
+ fs/ceph/dir.c | 11 +-
+ fs/ceph/file.c | 435 ++++++++++++++++++++++++++++++++++++---------------
+ fs/ceph/inode.c | 59 ++++++-
+ fs/ceph/mds_client.c | 53 +++++--
+ fs/ceph/mds_client.h | 1 +
+ fs/ceph/super.c | 1 +
+ fs/ceph/super.h | 9 +-
+ 9 files changed, 435 insertions(+), 164 deletions(-)
+Merging cifs/for-next (81f4821f0bec SMB2/SMB3 Copy offload support (refcopy) phase 1)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsglob.h | 32 +++++++-
+ fs/cifs/cifspdu.h | 34 ++++++++-
+ fs/cifs/cifsproto.h | 2 +
+ fs/cifs/cifssmb.c | 54 +++++++++++++
+ fs/cifs/connect.c | 25 ++++--
+ fs/cifs/ioctl.c | 160 ++++++++++++++++++++++++++++++++++-----
+ fs/cifs/misc.c | 22 ++----
+ fs/cifs/smb1ops.c | 12 ++-
+ fs/cifs/smb2ops.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++++
+ fs/cifs/smb2pdu.c | 115 ++++++++++++++++++++++++++--
+ fs/cifs/smb2pdu.h | 43 ++++++++++-
+ fs/cifs/smb2proto.h | 4 +
+ fs/cifs/smb2transport.c | 12 ++-
+ fs/cifs/transport.c | 13 +++-
+ 14 files changed, 666 insertions(+), 58 deletions(-)
+Merging configfs/linux-next (b930c26416c4 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 (959f58544b7f Linux 3.12-rc7)
+$ git merge ecryptfs/next
+Already up-to-date.
+Merging ext3/for_next (547e662c3894 fs/ext3: use rbtree postorder iteration helper instead of opencoding)
+$ git merge ext3/for_next
+Merge made by the 'recursive' strategy.
+ fs/ext3/dir.c | 36 +++++-------------------------------
+ fs/ext3/super.c | 4 ++++
+ fs/jbd/transaction.c | 8 ++++----
+ fs/quota/quota.c | 1 +
+ fs/udf/super.c | 45 ++++++++++++++++++++++++++++++++++++---------
+ 5 files changed, 50 insertions(+), 44 deletions(-)
+Merging ext4/dev (efbed4dc5857 ext4: add ratelimiting to ext4 messages)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4.h | 6 +++
+ fs/ext4/inode.c | 29 ++++++-----
+ fs/ext4/page-io.c | 5 +-
+ fs/ext4/super.c | 152 +++++++++++++++++++++++++++++++++---------------------
+ 4 files changed, 119 insertions(+), 73 deletions(-)
+Merging f2fs/dev (4bf08ff6f9f3 f2fs: remove unnecessary TestClearPageError when wait pages writeback)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/f2fs.txt | 7 ++
+ fs/f2fs/Kconfig | 8 +++
+ fs/f2fs/acl.c | 36 +++++-----
+ fs/f2fs/acl.h | 9 +--
+ fs/f2fs/checkpoint.c | 68 ++++++++----------
+ fs/f2fs/data.c | 29 ++++----
+ fs/f2fs/dir.c | 4 +-
+ fs/f2fs/f2fs.h | 117 ++++++++++++++++--------------
+ fs/f2fs/file.c | 45 ++++++------
+ fs/f2fs/gc.c | 31 ++++----
+ fs/f2fs/inode.c | 62 +++++++++-------
+ fs/f2fs/namei.c | 52 +++++++-------
+ fs/f2fs/node.c | 142 ++++++++++++++++++++++++-------------
+ fs/f2fs/recovery.c | 45 +++++++-----
+ fs/f2fs/segment.c | 94 ++++++++++++------------
+ fs/f2fs/segment.h | 38 +++++++---
+ fs/f2fs/super.c | 132 +++++++++++++++++++++++-----------
+ fs/f2fs/xattr.c | 36 ++++++----
+ include/trace/events/f2fs.h | 51 +++++++++++++
+ 19 files changed, 611 insertions(+), 395 deletions(-)
+Merging fscache/fscache (f1fe29b4a02d NFS: Use i_writecount to control whether to get an fscache cookie in nfs_open())
+$ git merge fscache/fscache
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/cifs/fscache.c
+Auto-merging fs/ceph/cache.c
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/caching/netfs-api.txt | 73 +++++++--
+ fs/9p/cache.c | 6 +-
+ fs/afs/cell.c | 2 +-
+ fs/afs/inode.c | 2 +-
+ fs/afs/vlocation.c | 3 +-
+ fs/afs/volume.c | 2 +-
+ fs/cachefiles/interface.c | 2 +-
+ fs/ceph/cache.c | 4 +-
+ fs/cifs/fscache.c | 8 +-
+ fs/fscache/cookie.c | 193 ++++++++++++++++------
+ fs/fscache/fsdef.c | 1 +
+ fs/fscache/netfs.c | 1 +
+ fs/fscache/object.c | 7 +-
+ fs/fscache/page.c | 59 +++++--
+ fs/nfs/dir.c | 2 +-
+ fs/nfs/fscache.c | 202 +++++++-----------------
+ fs/nfs/fscache.h | 18 +--
+ fs/nfs/inode.c | 6 +-
+ fs/nfs/nfs4file.c | 2 +-
+ include/linux/fs.h | 5 +
+ include/linux/fscache-cache.h | 50 +++---
+ include/linux/fscache.h | 113 +++++++++++--
+ include/linux/nfs_fs.h | 8 +-
+ 23 files changed, 464 insertions(+), 305 deletions(-)
+Merging fuse/for-next (16f60ab14ce2 fuse: writepages: protect secondary requests from fuse file release)
+$ git merge fuse/for-next
+Auto-merging include/linux/miscdevice.h
+Auto-merging fs/dcache.c
+Merge made by the 'recursive' strategy.
+ Documentation/devices.txt | 1 +
+ fs/dcache.c | 26 ++++
+ fs/fuse/cuse.c | 5 +-
+ fs/fuse/dir.c | 42 +-----
+ fs/fuse/file.c | 361 +++++++++++++++++++++++++++++++++++++++++----
+ fs/fuse/fuse_i.h | 4 +-
+ fs/fuse/inode.c | 2 -
+ include/linux/dcache.h | 1 +
+ include/linux/miscdevice.h | 1 +
+ 9 files changed, 376 insertions(+), 67 deletions(-)
+Merging gfs2/master (2147dbfd059e GFS2: Use generic list_lru for quota)
+$ git merge gfs2/master
+Auto-merging lib/lockref.c
+Auto-merging fs/gfs2/inode.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 4 +-
+ fs/gfs2/bmap.c | 7 +-
+ fs/gfs2/file.c | 10 +-
+ fs/gfs2/glock.c | 83 ++++++-------
+ fs/gfs2/glock.h | 2 -
+ fs/gfs2/glops.c | 4 +-
+ fs/gfs2/incore.h | 41 +++++--
+ fs/gfs2/inode.c | 44 ++++---
+ fs/gfs2/main.c | 19 +--
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/gfs2/quota.c | 321 +++++++++++++++++++++++++++---------------------
+ fs/gfs2/quota.h | 9 +-
+ fs/gfs2/rgrp.c | 208 +++++++++++++++++++------------
+ fs/gfs2/rgrp.h | 4 +-
+ fs/gfs2/super.c | 2 +-
+ fs/gfs2/sys.c | 2 -
+ fs/gfs2/util.c | 20 ---
+ fs/gfs2/util.h | 2 -
+ fs/gfs2/xattr.c | 3 +-
+ include/linux/lockref.h | 6 +
+ lib/lockref.c | 1 +
+ 21 files changed, 455 insertions(+), 339 deletions(-)
+Merging jfs/jfs-next (8660998608cf jfs: fix error path in ialloc)
+$ git merge jfs/jfs-next
+Already up-to-date.
+Merging logfs/master (339466142b3f 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 (fcb63a9bd842 NFS: Fix a missing initialisation when reading the SELinux label)
+$ git merge nfs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/nfs/Kconfig | 11 +
+ fs/nfs/callback.c | 3 +-
+ fs/nfs/client.c | 10 +-
+ fs/nfs/dir.c | 8 +-
+ fs/nfs/inode.c | 2 +
+ fs/nfs/internal.h | 8 +-
+ fs/nfs/nfs4_fs.h | 17 +-
+ fs/nfs/nfs4client.c | 138 ++++++++++++-
+ fs/nfs/nfs4namespace.c | 118 ++++++++++-
+ fs/nfs/nfs4proc.c | 442 ++++++++++++++++++++++++++++++++++++-----
+ fs/nfs/nfs4state.c | 264 ++++++++++++++++++++++--
+ fs/nfs/nfs4super.c | 12 +-
+ fs/nfs/nfs4xdr.c | 113 +++++++++--
+ fs/nfs/super.c | 198 +++++++++++-------
+ fs/nfs/unlink.c | 3 +-
+ include/linux/nfs4.h | 1 +
+ include/linux/nfs_fs_sb.h | 10 +
+ include/linux/nfs_xdr.h | 24 +++
+ include/linux/sunrpc/clnt.h | 6 +
+ include/linux/sunrpc/sched.h | 1 +
+ include/linux/sunrpc/xprt.h | 2 +-
+ include/uapi/linux/nfs_mount.h | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 57 ++++--
+ net/sunrpc/clnt.c | 148 +++++++++++---
+ net/sunrpc/xprt.c | 63 ++++--
+ net/sunrpc/xprtsock.c | 47 +++--
+ 26 files changed, 1443 insertions(+), 265 deletions(-)
+Merging nfsd/nfsd-next (3378b7f40d79 nfsd4: fix discarded security labels on setattr)
+$ git merge nfsd/nfsd-next
+Auto-merging include/linux/nfs4.h
+Merge made by the 'recursive' strategy.
+ fs/nfsd/Kconfig | 2 +-
+ fs/nfsd/export.c | 24 ++++++--
+ fs/nfsd/nfs4recover.c | 12 ++--
+ fs/nfsd/nfs4state.c | 43 ++++++++-------
+ fs/nfsd/nfs4xdr.c | 101 +++++++++++++++-------------------
+ fs/nfsd/nfsfh.c | 36 ++++++------
+ fs/nfsd/nfsfh.h | 4 +-
+ fs/nfsd/vfs.c | 9 ++-
+ include/linux/nfs4.h | 3 +
+ net/sunrpc/auth_gss/gss_krb5_unseal.c | 8 +--
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 10 ++--
+ net/sunrpc/auth_gss/gss_rpc_upcall.c | 3 +-
+ net/sunrpc/auth_gss/gss_rpc_xdr.c | 29 +++++-----
+ net/sunrpc/auth_gss/svcauth_gss.c | 4 +-
+ 14 files changed, 146 insertions(+), 142 deletions(-)
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (8ae6a7f5a3a8 squashfs: enhance parallel I/O)
+$ git merge squashfs/master
+Merge made by the 'recursive' strategy.
+ fs/squashfs/Kconfig | 13 +++
+ fs/squashfs/Makefile | 7 ++
+ fs/squashfs/block.c | 11 ++-
+ fs/squashfs/decompressor.c | 47 ++++++---
+ fs/squashfs/decompressor.h | 21 ++--
+ fs/squashfs/decompressor_multi.c | 200 ++++++++++++++++++++++++++++++++++++++
+ fs/squashfs/decompressor_single.c | 86 ++++++++++++++++
+ fs/squashfs/lzo_wrapper.c | 24 +----
+ fs/squashfs/squashfs.h | 9 +-
+ fs/squashfs/squashfs_fs_sb.h | 3 +-
+ fs/squashfs/super.c | 10 +-
+ fs/squashfs/xz_wrapper.c | 89 +++++++++--------
+ fs/squashfs/zlib_wrapper.c | 50 +++-------
+ 13 files changed, 435 insertions(+), 135 deletions(-)
+ create mode 100644 fs/squashfs/decompressor_multi.c
+ create mode 100644 fs/squashfs/decompressor_single.c
+Merging v9fs/for-next (94876b5bb6a8 9P: introduction of a new cache=mmap model.)
+$ git merge v9fs/for-next
+Auto-merging fs/9p/vfs_inode_dotl.c
+Auto-merging fs/9p/v9fs.c
+Auto-merging fs/9p/cache.c
+Merge made by the 'recursive' strategy.
+ fs/9p/cache.c | 3 +-
+ fs/9p/v9fs.c | 9 +++-
+ fs/9p/v9fs.h | 1 +
+ fs/9p/v9fs_vfs.h | 2 +
+ fs/9p/vfs_addr.c | 7 +++
+ fs/9p/vfs_file.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++---
+ fs/9p/vfs_inode.c | 26 +++++----
+ fs/9p/vfs_inode_dotl.c | 17 ++----
+ fs/9p/vfs_super.c | 8 +--
+ fs/9p/xattr.c | 10 ++--
+ 10 files changed, 189 insertions(+), 38 deletions(-)
+Merging ubifs/linux-next (58a4e23703b2 UBIFS: correct data corruption range)
+$ git merge ubifs/linux-next
+Auto-merging fs/ubifs/super.c
+Merge made by the 'recursive' strategy.
+ fs/ubifs/debug.c | 6 +++---
+ fs/ubifs/gc.c | 3 +--
+ fs/ubifs/super.c | 8 ++++++--
+ 3 files changed, 10 insertions(+), 7 deletions(-)
+Merging xfs/for-next (10e6e65dfced xfs: be more forgiving of a v4 secondary sb w/ junk in v5 fields)
+$ git merge xfs/for-next
+Resolved 'fs/xfs/xfs_da_format.h' using previous resolution.
+Resolved 'fs/xfs/xfs_dir2_block.c' using previous resolution.
+Resolved 'fs/xfs/xfs_dir2_readdir.c' using previous resolution.
+Resolved 'fs/xfs/xfs_dir2_sf.c' using previous resolution.
+Auto-merging fs/xfs/xfs_log_recover.c
+Auto-merging fs/xfs/xfs_dquot.c
+Auto-merging fs/xfs/xfs_dir2_sf.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_sf.c
+Auto-merging fs/xfs/xfs_dir2_readdir.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_readdir.c
+Auto-merging fs/xfs/xfs_dir2_block.c
+CONFLICT (content): Merge conflict in fs/xfs/xfs_dir2_block.c
+Auto-merging fs/xfs/xfs_da_format.h
+CONFLICT (content): Merge conflict in fs/xfs/xfs_da_format.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bb38d4b85c89] Merge remote-tracking branch 'xfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/xfs/Makefile | 8 +-
+ fs/xfs/xfs_acl.c | 8 +-
+ fs/xfs/xfs_ag.h | 4 -
+ fs/xfs/xfs_alloc.c | 14 +-
+ fs/xfs/xfs_alloc.h | 3 -
+ fs/xfs/xfs_alloc_btree.c | 14 +-
+ fs/xfs/xfs_alloc_btree.h | 35 -
+ fs/xfs/xfs_aops.c | 16 +-
+ fs/xfs/xfs_attr.c | 12 +-
+ fs/xfs/xfs_attr_inactive.c | 21 +-
+ fs/xfs/xfs_attr_leaf.c | 29 +-
+ fs/xfs/xfs_attr_leaf.h | 232 ----
+ fs/xfs/xfs_attr_list.c | 32 +-
+ fs/xfs/xfs_attr_remote.c | 14 +-
+ fs/xfs/xfs_attr_remote.h | 29 -
+ fs/xfs/xfs_bit.c | 4 +-
+ fs/xfs/xfs_bmap.c | 22 +-
+ fs/xfs/xfs_bmap_btree.c | 13 +-
+ fs/xfs/xfs_bmap_btree.h | 105 --
+ fs/xfs/xfs_bmap_util.c | 293 +---
+ fs/xfs/xfs_bmap_util.h | 9 +-
+ fs/xfs/xfs_btree.c | 12 +-
+ fs/xfs/xfs_btree.h | 79 +-
+ fs/xfs/xfs_buf.c | 11 +-
+ fs/xfs/xfs_buf_item.c | 9 +-
+ fs/xfs/xfs_buf_item.h | 4 -
+ fs/xfs/xfs_da_btree.c | 264 ++--
+ fs/xfs/xfs_da_btree.h | 143 +-
+ fs/xfs/xfs_da_format.c | 907 ++++++++++++
+ fs/xfs/{xfs_dir2_format.h => xfs_da_format.h} | 681 ++++-----
+ fs/xfs/xfs_dir2.c | 20 +-
+ fs/xfs/xfs_dir2.h | 106 +-
+ fs/xfs/xfs_dir2_block.c | 109 +-
+ fs/xfs/xfs_dir2_data.c | 161 ++-
+ fs/xfs/xfs_dir2_leaf.c | 243 ++--
+ fs/xfs/xfs_dir2_node.c | 351 +++--
+ fs/xfs/xfs_dir2_priv.h | 20 +-
+ fs/xfs/xfs_dir2_readdir.c | 42 +-
+ fs/xfs/xfs_dir2_sf.c | 216 +--
+ fs/xfs/xfs_discard.c | 11 +-
+ fs/xfs/xfs_dquot.c | 133 +-
+ fs/xfs/xfs_dquot.h | 2 -
+ fs/xfs/xfs_dquot_buf.c | 288 ++++
+ fs/xfs/xfs_dquot_item.c | 14 +-
+ fs/xfs/xfs_error.c | 11 +-
+ fs/xfs/xfs_export.c | 12 +-
+ fs/xfs/xfs_extent_busy.c | 11 +-
+ fs/xfs/xfs_extent_busy.h | 4 +
+ fs/xfs/xfs_extfree_item.c | 8 +-
+ fs/xfs/xfs_file.c | 92 +-
+ fs/xfs/xfs_filestream.c | 12 +-
+ fs/xfs/xfs_format.h | 263 +++-
+ fs/xfs/xfs_fs.h | 4 +-
+ fs/xfs/xfs_fsops.c | 45 +-
+ fs/xfs/xfs_ialloc.c | 14 +-
+ fs/xfs/xfs_ialloc.h | 5 +-
+ fs/xfs/xfs_ialloc_btree.c | 13 +-
+ fs/xfs/xfs_ialloc_btree.h | 51 -
+ fs/xfs/xfs_icache.c | 20 +-
+ fs/xfs/xfs_icreate_item.c | 7 +-
+ fs/xfs/xfs_inode.c | 266 ++--
+ fs/xfs/xfs_inode.h | 6 +-
+ fs/xfs/xfs_inode_buf.c | 10 +-
+ fs/xfs/xfs_inode_buf.h | 3 -
+ fs/xfs/xfs_inode_fork.c | 31 +-
+ fs/xfs/xfs_inode_fork.h | 1 +
+ fs/xfs/xfs_inode_item.c | 12 +-
+ fs/xfs/xfs_ioctl.c | 146 +-
+ fs/xfs/xfs_ioctl32.c | 7 +-
+ fs/xfs/xfs_iomap.c | 23 +-
+ fs/xfs/xfs_iomap.h | 8 +-
+ fs/xfs/xfs_iops.c | 70 +-
+ fs/xfs/xfs_iops.h | 8 +-
+ fs/xfs/xfs_itable.c | 15 +-
+ fs/xfs/xfs_log.c | 74 +-
+ fs/xfs/xfs_log.h | 10 +-
+ fs/xfs/xfs_log_cil.c | 26 +-
+ fs/xfs/xfs_log_format.h | 177 ---
+ fs/xfs/xfs_log_priv.h | 17 +-
+ fs/xfs/xfs_log_recover.c | 171 +--
+ fs/xfs/xfs_log_rlimit.c | 9 +-
+ fs/xfs/xfs_message.c | 5 +-
+ fs/xfs/xfs_mount.c | 21 +-
+ fs/xfs/xfs_mount.h | 3 +
+ fs/xfs/xfs_qm.c | 39 +-
+ fs/xfs/xfs_qm.h | 2 -
+ fs/xfs/xfs_qm_bhv.c | 12 +-
+ fs/xfs/xfs_qm_syscalls.c | 28 +-
+ fs/xfs/xfs_quota.h | 4 -
+ fs/xfs/xfs_quota_defs.h | 4 +
+ fs/xfs/xfs_quotaops.c | 5 +-
+ fs/xfs/xfs_rtalloc.c | 1848 ++++++-------------------
+ fs/xfs/xfs_rtalloc.h | 24 +
+ fs/xfs/xfs_rtbitmap.c | 974 +++++++++++++
+ fs/xfs/xfs_sb.c | 46 +-
+ fs/xfs/xfs_sb.h | 3 -
+ fs/xfs/xfs_shared.h | 244 ++++
+ fs/xfs/xfs_super.c | 38 +-
+ fs/xfs/xfs_symlink.c | 102 +-
+ fs/xfs/xfs_symlink.h | 2 +-
+ fs/xfs/xfs_symlink_remote.c | 6 +-
+ fs/xfs/xfs_trace.c | 16 +-
+ fs/xfs/xfs_trans.c | 23 +-
+ fs/xfs/xfs_trans.h | 20 +-
+ fs/xfs/xfs_trans_ail.c | 7 +-
+ fs/xfs/xfs_trans_buf.c | 12 +-
+ fs/xfs/xfs_trans_dquot.c | 15 +-
+ fs/xfs/xfs_trans_extfree.c | 7 +-
+ fs/xfs/xfs_trans_inode.c | 13 +-
+ fs/xfs/xfs_trans_priv.h | 1 -
+ fs/xfs/xfs_trans_resv.c | 18 +-
+ fs/xfs/xfs_vnode.h | 8 -
+ fs/xfs/xfs_xattr.c | 8 +-
+ 113 files changed, 5195 insertions(+), 4768 deletions(-)
+ create mode 100644 fs/xfs/xfs_da_format.c
+ rename fs/xfs/{xfs_dir2_format.h => xfs_da_format.h} (60%)
+ create mode 100644 fs/xfs/xfs_dquot_buf.c
+ create mode 100644 fs/xfs/xfs_rtbitmap.c
+ create mode 100644 fs/xfs/xfs_shared.h
+Merging vfs/for-next (dc03a60dfcff do_remount(): pull touch_mnt_namespace() up)
+$ git merge vfs/for-next
+Resolved 'fs/9p/vfs_file.c' using previous resolution.
+Resolved 'fs/9p/vfs_inode.c' using previous resolution.
+Resolved 'fs/nfsd/nfsfh.c' using previous resolution.
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfsd/nfsfh.c
+CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.c
+Auto-merging fs/nfs/unlink.c
+Auto-merging fs/nfs/nfs4proc.c
+Auto-merging fs/nfs/nfs4namespace.c
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/gfs2/inode.c
+Auto-merging fs/cifs/cifsfs.h
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/btrfs/ioctl.c
+Auto-merging fs/btrfs/ctree.h
+Auto-merging fs/9p/vfs_inode_dotl.c
+CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c
+Auto-merging fs/9p/vfs_inode.c
+CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c
+Auto-merging fs/9p/vfs_file.c
+CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/9p/vfs_inode_dotl.c'.
+[master 7bc4998e77d1] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/9p/cache.h | 12 +++++
+ fs/9p/vfs_file.c | 2 -
+ fs/9p/vfs_inode.c | 6 ---
+ fs/9p/vfs_inode_dotl.c | 4 --
+ fs/befs/linuxvfs.c | 61 +++++++++++-----------
+ fs/btrfs/ctree.h | 5 --
+ fs/btrfs/ioctl.c | 8 +--
+ fs/cifs/cifsfs.c | 2 +-
+ fs/cifs/cifsfs.h | 2 -
+ fs/cifs/link.c | 7 ---
+ fs/ecryptfs/dentry.c | 29 +++++-----
+ fs/ecryptfs/ecryptfs_kernel.h | 19 ++-----
+ fs/ecryptfs/inode.c | 16 ++----
+ fs/ecryptfs/main.c | 3 +-
+ fs/gfs2/inode.c | 9 +---
+ fs/libfs.c | 79 +++++++++++++++-------------
+ fs/namespace.c | 22 ++------
+ fs/ncpfs/dir.c | 55 +++++++------------
+ fs/ncpfs/file.c | 12 ++---
+ fs/nfs/dir.c | 119 +++++++++++++++++-------------------------
+ fs/nfs/direct.c | 17 +++---
+ fs/nfs/file.c | 117 +++++++++++++++--------------------------
+ fs/nfs/namespace.c | 5 +-
+ fs/nfs/nfs3proc.c | 8 +--
+ fs/nfs/nfs4file.c | 4 +-
+ fs/nfs/nfs4namespace.c | 7 ++-
+ fs/nfs/nfs4proc.c | 5 +-
+ fs/nfs/proc.c | 8 +--
+ fs/nfs/unlink.c | 9 ++--
+ fs/nfs/write.c | 6 +--
+ fs/proc/self.c | 10 +---
+ fs/ubifs/dir.c | 41 +++++++--------
+ fs/ubifs/journal.c | 6 +--
+ fs/ubifs/xattr.c | 16 +++---
+ include/linux/fs.h | 1 +
+ net/sunrpc/rpc_pipe.c | 12 ++---
+ 36 files changed, 301 insertions(+), 443 deletions(-)
+Merging pci/next (33de1b8bf6e1 Merge branch 'pci/misc' into next)
+$ git merge pci/next
+Auto-merging include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+Auto-merging drivers/staging/et131x/et131x.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/hotplug/acpiphp_glue.c
+Auto-merging drivers/pci/host/Kconfig
+Auto-merging drivers/gpu/drm/radeon/evergreen.c
+Auto-merging arch/powerpc/sysdev/fsl_pci.c
+Auto-merging arch/powerpc/kernel/eeh.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/pci/designware-pcie.txt
+Merge made by the 'recursive' strategy.
+ Documentation/PCI/pci.txt | 8 +-
+ .../devicetree/bindings/pci/designware-pcie.txt | 7 +-
+ MAINTAINERS | 7 +
+ arch/cris/include/asm/pci.h | 1 -
+ arch/frv/mb93090-mb00/pci-frv.h | 1 -
+ arch/frv/mb93090-mb00/pci-vdk.c | 36 --
+ arch/mn10300/include/asm/pci.h | 1 -
+ arch/mn10300/kernel/setup.c | 3 -
+ arch/mn10300/unit-asb2305/pci-asb2305.h | 1 -
+ arch/mn10300/unit-asb2305/pci.c | 5 -
+ arch/powerpc/kernel/eeh.c | 3 +-
+ arch/powerpc/sysdev/fsl_pci.c | 2 +-
+ arch/tile/kernel/pci.c | 7 +-
+ arch/x86/pci/acpi.c | 8 +-
+ arch/x86/pci/fixup.c | 18 +-
+ drivers/acpi/apei/apei-base.c | 6 +-
+ drivers/acpi/bus.c | 18 +-
+ drivers/acpi/pci_root.c | 246 +++++----
+ drivers/gpu/drm/radeon/evergreen.c | 19 +-
+ drivers/infiniband/hw/qib/qib_pcie.c | 126 ++---
+ drivers/pci/host/Kconfig | 14 +
+ drivers/pci/host/Makefile | 2 +
+ drivers/pci/host/pci-exynos.c | 132 ++++-
+ drivers/pci/host/pci-imx6.c | 568 +++++++++++++++++++++
+ drivers/pci/host/pci-rcar-gen2.c | 333 ++++++++++++
+ drivers/pci/host/pci-tegra.c | 4 +-
+ drivers/pci/host/pcie-designware.c | 257 +++++++++-
+ drivers/pci/host/pcie-designware.h | 26 +-
+ drivers/pci/hotplug/acpi_pcihp.c | 2 +-
+ drivers/pci/hotplug/acpiphp.h | 10 -
+ drivers/pci/hotplug/acpiphp_core.c | 37 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 23 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 58 +--
+ drivers/pci/hotplug/shpchp.h | 2 +-
+ drivers/pci/msi.c | 6 +-
+ drivers/pci/pci-driver.c | 28 +-
+ drivers/pci/pci-sysfs.c | 132 +++--
+ drivers/pci/pci.c | 11 +-
+ drivers/pci/pci.h | 4 +-
+ drivers/pci/probe.c | 4 +-
+ drivers/pci/quirks.c | 23 +
+ drivers/pci/setup-bus.c | 4 +-
+ drivers/scsi/bfa/bfad.c | 53 +-
+ drivers/scsi/csiostor/csio_hw.c | 22 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 6 +-
+ drivers/scsi/qla2xxx/qla_os.c | 14 +-
+ drivers/staging/et131x/et131x.c | 14 +-
+ include/linux/acpi.h | 81 ++-
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 8 +
+ include/linux/pci.h | 10 +-
+ include/uapi/linux/pci_regs.h | 4 +-
+ 51 files changed, 1822 insertions(+), 593 deletions(-)
+ create mode 100644 drivers/pci/host/pci-imx6.c
+ create mode 100644 drivers/pci/host/pci-rcar-gen2.c
+Merging hid/for-next (bdae615c84bb Merge branch 'for-3.13/roccat' into for-next)
+$ git merge hid/for-next
+Removing drivers/hid/hid-roccat-konepure.h
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-driver-hid-roccat-ryos | 178 +++++++++++++++
+ Documentation/ABI/testing/sysfs-driver-hid-wiimote | 18 ++
+ drivers/hid/Kconfig | 14 +-
+ drivers/hid/Makefile | 2 +-
+ drivers/hid/hid-apple.c | 22 ++
+ drivers/hid/hid-core.c | 11 +-
+ drivers/hid/hid-elo.c | 35 ++-
+ drivers/hid/hid-holtek-mouse.c | 4 +
+ drivers/hid/hid-ids.h | 16 +-
+ drivers/hid/hid-lenovo-tpkbd.c | 50 ++---
+ drivers/hid/hid-lg.c | 138 ++++++++++++
+ drivers/hid/hid-lg2ff.c | 2 +-
+ drivers/hid/hid-logitech-dj.c | 14 +-
+ drivers/hid/hid-multitouch.c | 27 ++-
+ drivers/hid/hid-roccat-common.c | 65 +++++-
+ drivers/hid/hid-roccat-common.h | 62 ++++++
+ drivers/hid/hid-roccat-konepure.c | 158 +++-----------
+ drivers/hid/hid-roccat-konepure.h | 72 ------
+ drivers/hid/hid-roccat-kovaplus.c | 4 +
+ drivers/hid/hid-roccat-ryos.c | 241 +++++++++++++++++++++
+ drivers/hid/hid-roccat-savu.c | 123 ++---------
+ drivers/hid/hid-roccat-savu.h | 32 ---
+ drivers/hid/hid-sensor-hub.c | 13 +-
+ drivers/hid/hid-sony.c | 11 +-
+ drivers/hid/hid-wiimote-modules.c | 117 +++++++++-
+ drivers/hid/hid-wiimote.h | 2 +
+ drivers/hid/i2c-hid/i2c-hid.c | 4 -
+ drivers/hid/usbhid/hid-quirks.c | 2 +
+ 28 files changed, 1014 insertions(+), 423 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-ryos
+ delete mode 100644 drivers/hid/hid-roccat-konepure.h
+ create mode 100644 drivers/hid/hid-roccat-ryos.c
+Merging i2c/i2c/for-next (8a73cd4cfa15 i2c: exynos5: add High Speed I2C controller driver)
+$ git merge i2c/i2c/for-next
+Auto-merging include/linux/platform_data/at24.h
+Auto-merging drivers/i2c/muxes/i2c-mux-pinctrl.c
+Auto-merging drivers/i2c/muxes/i2c-mux-gpio.c
+Auto-merging drivers/i2c/muxes/i2c-arb-gpio-challenge.c
+Auto-merging drivers/i2c/i2c-core.c
+Auto-merging drivers/i2c/busses/i2c-mxs.c
+Auto-merging arch/arm/mach-imx/mach-pcm037.c
+Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm644x-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Auto-merging arch/arm/mach-davinci/board-da830-evm.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-exynos5.txt | 44 ++
+ Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 23 +
+ MAINTAINERS | 2 +-
+ arch/arm/mach-at91/board-sam9260ek.c | 2 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 2 +-
+ arch/arm/mach-davinci/board-da830-evm.c | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 2 +-
+ arch/arm/mach-davinci/board-mityomapl138.c | 2 +-
+ arch/arm/mach-davinci/board-sffsdr.c | 2 +-
+ arch/arm/mach-imx/mach-pca100.c | 2 +-
+ arch/arm/mach-imx/mach-pcm037.c | 2 +-
+ arch/arm/mach-imx/mach-pcm038.c | 2 +-
+ arch/arm/mach-imx/mach-pcm043.c | 2 +-
+ arch/arm/mach-imx/mach-vpr200.c | 2 +-
+ arch/arm/mach-kirkwood/lacie_v2-common.c | 2 +-
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 2 +-
+ arch/arm/mach-omap2/board-h4.c | 2 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 2 +-
+ arch/arm/mach-pxa/stargate2.c | 2 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +-
+ drivers/gpu/drm/drm_encoder_slave.c | 8 +-
+ drivers/gpu/drm/nouveau/core/subdev/therm/ic.c | 3 +-
+ drivers/i2c/busses/Kconfig | 11 +-
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-bfin-twi.c | 6 +-
+ drivers/i2c/busses/i2c-davinci.c | 2 +-
+ drivers/i2c/busses/i2c-exynos5.c | 774 +++++++++++++++++++++
+ drivers/i2c/busses/i2c-gpio.c | 1 +
+ drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
+ drivers/i2c/busses/i2c-mxs.c | 340 ++++++---
+ drivers/i2c/busses/i2c-pnx.c | 1 +
+ drivers/i2c/busses/i2c-rcar.c | 65 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 1 +
+ drivers/i2c/busses/i2c-scmi.c | 6 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 8 +-
+ drivers/i2c/busses/i2c-xiic.c | 3 +-
+ drivers/i2c/i2c-core.c | 21 +-
+ drivers/i2c/i2c-dev.c | 19 +-
+ drivers/i2c/i2c-smbus.c | 10 +-
+ drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +-
+ drivers/i2c/muxes/i2c-mux-gpio.c | 10 +-
+ drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 +
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 6 +-
+ drivers/media/v4l2-core/tuner-core.c | 6 +-
+ drivers/media/v4l2-core/v4l2-common.c | 10 +-
+ drivers/misc/eeprom/at24.c | 2 +-
+ include/linux/i2c.h | 2 -
+ include/linux/{i2c => platform_data}/at24.h | 2 +-
+ include/media/v4l2-common.h | 2 +-
+ sound/ppc/keywest.c | 4 +-
+ sound/soc/fsl/imx-wm8962.c | 2 +-
+ 56 files changed, 1223 insertions(+), 221 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-exynos5.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-rcar.txt
+ create mode 100644 drivers/i2c/busses/i2c-exynos5.c
+ rename include/linux/{i2c => platform_data}/at24.h (97%)
+Merging jdelvare-hwmon/master (0f07c1dd7545 hwmon: (lm90) Add support for TI TMP451)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/lm90 | 6 +
+ drivers/hwmon/lm90.c | 478 ++++++++++++++++++++++++++++++++---------------
+ 2 files changed, 332 insertions(+), 152 deletions(-)
+Merging hwmon-staging/hwmon-next (26336c8a36c0 hwmon: (w83793) Clean up a signedness issue)
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/lm25066 | 20 ++++-
+ Documentation/hwmon/ltc2978 | 44 ++++++----
+ drivers/hwmon/abituguru.c | 6 +-
+ drivers/hwmon/abituguru3.c | 2 +-
+ drivers/hwmon/acpi_power_meter.c | 13 ++-
+ drivers/hwmon/adcxx.c | 2 -
+ drivers/hwmon/adm1026.c | 6 +-
+ drivers/hwmon/adt7462.c | 5 +-
+ drivers/hwmon/asc7621.c | 12 +--
+ drivers/hwmon/asus_atk0110.c | 2 +-
+ drivers/hwmon/atxp1.c | 3 +-
+ drivers/hwmon/ds1621.c | 63 ++++---------
+ drivers/hwmon/emc1403.c | 120 ++++++++++++++-----------
+ drivers/hwmon/f71882fg.c | 1 -
+ drivers/hwmon/f75375s.c | 4 +-
+ drivers/hwmon/gpio-fan.c | 46 ++++------
+ drivers/hwmon/hwmon.c | 185 +++++++++++++++++++++++++++++++++++----
+ drivers/hwmon/ina209.c | 46 ++++------
+ drivers/hwmon/ina2xx.c | 64 +++++---------
+ drivers/hwmon/jc42.c | 62 +++++--------
+ drivers/hwmon/lm70.c | 2 -
+ drivers/hwmon/lm73.c | 70 +++++----------
+ drivers/hwmon/lm95234.c | 138 +++++++++++------------------
+ drivers/hwmon/ltc4245.c | 78 +++++------------
+ drivers/hwmon/ltc4261.c | 56 ++++--------
+ drivers/hwmon/max16065.c | 124 +++++++++++---------------
+ drivers/hwmon/max6642.c | 73 +++++----------
+ drivers/hwmon/max6650.c | 2 +-
+ drivers/hwmon/max6697.c | 55 ++++--------
+ drivers/hwmon/mc13783-adc.c | 2 +-
+ drivers/hwmon/nct6775.c | 143 +++++++++---------------------
+ drivers/hwmon/pmbus/lm25066.c | 91 +++++++++++++++++--
+ drivers/hwmon/pmbus/ltc2978.c | 16 +++-
+ drivers/hwmon/pmbus/pmbus_core.c | 24 ++---
+ drivers/hwmon/tmp401.c | 92 ++++++-------------
+ drivers/hwmon/w83791d.c | 2 +-
+ drivers/hwmon/w83792d.c | 2 +-
+ drivers/hwmon/w83793.c | 5 +-
+ include/linux/hwmon-vid.h | 2 +-
+ include/linux/hwmon.h | 10 +++
+ 40 files changed, 805 insertions(+), 888 deletions(-)
+Merging v4l-dvb/master (5c52a0f259af Merge branch 'build_fixes' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging include/media/v4l2-common.h
+Auto-merging drivers/media/v4l2-core/tuner-core.c
+Auto-merging drivers/media/platform/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/media/st-rc.txt | 29 +
+ drivers/media/common/b2c2/flexcop-sram.c | 6 +-
+ drivers/media/common/saa7146/saa7146_core.c | 4 +-
+ drivers/media/common/siano/smscoreapi.c | 8 +-
+ drivers/media/common/siano/smsdvb-main.c | 8 +-
+ drivers/media/dvb-core/dvb_demux.c | 17 +-
+ drivers/media/dvb-frontends/Kconfig | 7 +
+ drivers/media/dvb-frontends/Makefile | 1 +
+ drivers/media/dvb-frontends/cx24110.c | 2 +-
+ drivers/media/dvb-frontends/cx24117.c | 1650 +++++++++++++++
+ drivers/media/dvb-frontends/cx24117.h | 47 +
+ drivers/media/dvb-frontends/cx24123.c | 2 +-
+ drivers/media/dvb-frontends/cxd2820r_core.c | 4 +-
+ drivers/media/dvb-frontends/dib9000.c | 4 +-
+ drivers/media/dvb-frontends/drxd_hard.c | 12 +-
+ drivers/media/dvb-frontends/drxk_hard.c | 4 +-
+ drivers/media/dvb-frontends/rtl2832.c | 1 +
+ drivers/media/dvb-frontends/rtl2832.h | 1 +
+ drivers/media/dvb-frontends/tda8083.c | 4 +-
+ drivers/media/dvb-frontends/ts2020.c | 7 +-
+ drivers/media/dvb-frontends/ts2020.h | 1 +
+ drivers/media/i2c/Kconfig | 9 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/adv7343.c | 1 +
+ drivers/media/i2c/lm3560.c | 488 +++++
+ drivers/media/i2c/soc_camera/imx074.c | 4 +-
+ drivers/media/i2c/soc_camera/ov9640.c | 2 +-
+ drivers/media/i2c/ths8200.c | 1 +
+ drivers/media/i2c/tvp514x.c | 1 +
+ drivers/media/i2c/tvp7002.c | 1 +
+ drivers/media/pci/b2c2/flexcop-pci.c | 2 -
+ drivers/media/pci/bt8xx/bt878.c | 4 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
+ drivers/media/pci/cx18/Kconfig | 1 +
+ drivers/media/pci/cx18/cx18-driver.c | 23 +-
+ drivers/media/pci/cx23885/Kconfig | 1 +
+ drivers/media/pci/cx23885/cx23885-cards.c | 108 +
+ drivers/media/pci/cx23885/cx23885-core.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-dvb.c | 24 +
+ drivers/media/pci/cx23885/cx23885-input.c | 12 +
+ drivers/media/pci/cx23885/cx23885-video.c | 3 +-
+ drivers/media/pci/cx23885/cx23885.h | 3 +
+ drivers/media/pci/cx25821/cx25821-cards.c | 2 -
+ drivers/media/pci/cx25821/cx25821-medusa-video.c | 18 +-
+ drivers/media/pci/cx25821/cx25821-medusa-video.h | 6 -
+ drivers/media/pci/cx25821/cx25821-video-upstream.c | 8 +-
+ drivers/media/pci/cx88/cx88-alsa.c | 29 +-
+ drivers/media/pci/cx88/cx88-mpeg.c | 17 +-
+ drivers/media/pci/cx88/cx88-video.c | 18 +-
+ drivers/media/pci/ddbridge/ddbridge-core.c | 2 +-
+ drivers/media/pci/dm1105/dm1105.c | 5 +-
+ drivers/media/pci/ivtv/ivtv-driver.c | 2 +-
+ drivers/media/pci/mantis/mantis_pci.c | 2 -
+ drivers/media/pci/meye/meye.c | 2 +-
+ drivers/media/pci/ngene/ngene-core.c | 4 +-
+ drivers/media/pci/pluto2/pluto2.c | 2 -
+ drivers/media/pci/pt1/pt1.c | 2 -
+ drivers/media/pci/saa7134/saa7134-alsa.c | 2 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-core.c | 3 +-
+ drivers/media/pci/zoran/Kconfig | 1 +
+ drivers/media/pci/zoran/zoran_card.c | 2 +-
+ drivers/media/platform/Kconfig | 21 +-
+ drivers/media/platform/Makefile | 2 +
+ drivers/media/platform/coda.c | 278 ++-
+ drivers/media/platform/davinci/vpbe_display.c | 2 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 4 +-
+ drivers/media/platform/davinci/vpif_capture.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-core.h | 1 +
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 29 +-
+ drivers/media/platform/exynos4-is/fimc-isp.c | 2 +-
+ drivers/media/platform/m2m-deinterlace.c | 3 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 14 +-
+ drivers/media/platform/marvell-ccic/mmp-driver.c | 1 -
+ drivers/media/platform/mem2mem_testdev.c | 3 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 12 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v5.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_cmd_v6.c | 2 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 8 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +-
+ drivers/media/platform/s5p-tv/mixer_grp_layer.c | 2 +-
+ drivers/media/platform/s5p-tv/mixer_vp_layer.c | 2 +-
+ drivers/media/platform/soc_camera/Kconfig | 1 +
+ drivers/media/platform/soc_camera/rcar_vin.c | 5 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 2 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 46 +-
+ drivers/media/platform/ti-vpe/Makefile | 5 +
+ drivers/media/platform/ti-vpe/vpdma.c | 846 ++++++++
+ drivers/media/platform/ti-vpe/vpdma.h | 203 ++
+ drivers/media/platform/ti-vpe/vpdma_priv.h | 641 ++++++
+ drivers/media/platform/ti-vpe/vpe.c | 2099 ++++++++++++++++++++
+ drivers/media/platform/ti-vpe/vpe_regs.h | 496 +++++
+ drivers/media/platform/timblogiw.c | 4 +-
+ drivers/media/radio/radio-keene.c | 2 +-
+ drivers/media/radio/radio-sf16fmr2.c | 5 +-
+ drivers/media/radio/radio-shark.c | 2 +
+ drivers/media/radio/radio-shark2.c | 2 +
+ drivers/media/radio/si470x/radio-si470x-common.c | 2 +-
+ drivers/media/radio/si470x/radio-si470x-i2c.c | 4 +-
+ drivers/media/radio/si4713-i2c.c | 2 +-
+ drivers/media/radio/tef6862.c | 20 +-
+ drivers/media/radio/wl128x/fmdrv_common.c | 2 +-
+ drivers/media/rc/Kconfig | 10 +
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/fintek-cir.h | 4 +-
+ drivers/media/rc/gpio-ir-recv.c | 1 +
+ drivers/media/rc/iguanair.c | 1 +
+ drivers/media/rc/ir-rx51.c | 3 +-
+ drivers/media/rc/nuvoton-cir.h | 4 +-
+ drivers/media/rc/st_rc.c | 395 ++++
+ drivers/media/rc/winbond-cir.c | 2 +-
+ drivers/media/tuners/fc0012.c | 2 +-
+ drivers/media/tuners/fc0013.c | 2 +-
+ drivers/media/tuners/r820t.c | 22 +-
+ drivers/media/tuners/tda9887.c | 4 +-
+ drivers/media/tuners/tuner-xc2028.c | 4 +-
+ drivers/media/usb/b2c2/flexcop-usb.c | 6 +-
+ drivers/media/usb/cpia2/cpia2_usb.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-cards.c | 110 +-
+ drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 4 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 42 +
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 1 +
+ drivers/media/usb/dvb-usb/az6027.c | 4 +-
+ drivers/media/usb/dvb-usb/dw2102.c | 13 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 42 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 121 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 63 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 7 +-
+ drivers/media/usb/em28xx/em28xx.h | 2 +
+ drivers/media/usb/gspca/conex.c | 3 +-
+ drivers/media/usb/gspca/cpia1.c | 4 +-
+ drivers/media/usb/gspca/gspca.c | 48 +-
+ drivers/media/usb/gspca/gspca.h | 10 +-
+ drivers/media/usb/gspca/jeilinj.c | 5 +-
+ drivers/media/usb/gspca/jl2005bcd.c | 2 +-
+ drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 2 +-
+ drivers/media/usb/gspca/mars.c | 7 +-
+ drivers/media/usb/gspca/mr97310a.c | 6 +-
+ drivers/media/usb/gspca/nw80x.c | 11 +-
+ drivers/media/usb/gspca/ov519.c | 52 +-
+ drivers/media/usb/gspca/ov534.c | 5 +-
+ drivers/media/usb/gspca/ov534_9.c | 334 +++-
+ drivers/media/usb/gspca/pac207.c | 4 +-
+ drivers/media/usb/gspca/pac7311.c | 6 +-
+ drivers/media/usb/gspca/se401.c | 6 +-
+ drivers/media/usb/gspca/sn9c20x.c | 6 +-
+ drivers/media/usb/gspca/sonixb.c | 7 +-
+ drivers/media/usb/gspca/sonixj.c | 3 +-
+ drivers/media/usb/gspca/spca1528.c | 3 +-
+ drivers/media/usb/gspca/spca500.c | 3 +-
+ drivers/media/usb/gspca/sq905c.c | 2 +-
+ drivers/media/usb/gspca/sq930x.c | 3 +-
+ drivers/media/usb/gspca/stk014.c | 5 +-
+ drivers/media/usb/gspca/stk1135.c | 76 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx.c | 2 +-
+ drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 2 +-
+ drivers/media/usb/gspca/sunplus.c | 3 +-
+ drivers/media/usb/gspca/topro.c | 13 +-
+ drivers/media/usb/gspca/tv8532.c | 7 +-
+ drivers/media/usb/gspca/vicam.c | 8 +-
+ drivers/media/usb/gspca/w996Xcf.c | 28 +-
+ drivers/media/usb/gspca/xirlink_cit.c | 46 +-
+ drivers/media/usb/gspca/zc3xx.c | 3 +-
+ drivers/media/usb/hdpvr/hdpvr-core.c | 11 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
+ drivers/media/usb/siano/smsusb.c | 43 +-
+ drivers/media/usb/tlg2300/pd-main.c | 2 +-
+ drivers/media/usb/ttusb-dec/ttusb_dec.c | 152 +-
+ drivers/media/usb/uvc/uvc_ctrl.c | 4 +-
+ drivers/media/usb/uvc/uvc_video.c | 2 +-
+ drivers/media/v4l2-core/tuner-core.c | 2 +-
+ drivers/media/v4l2-core/v4l2-clk.c | 39 +
+ drivers/media/v4l2-core/v4l2-ctrls.c | 8 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 16 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 19 +-
+ drivers/media/v4l2-core/videobuf2-dma-sg.c | 149 +-
+ drivers/staging/media/lirc/TODO | 5 +
+ drivers/staging/media/lirc/lirc_bt829.c | 33 +-
+ drivers/staging/media/lirc/lirc_serial.c | 9 +-
+ drivers/staging/media/msi3101/Kconfig | 3 +-
+ drivers/staging/media/solo6x10/solo6x10-disp.c | 25 +-
+ drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 170 +-
+ drivers/staging/media/solo6x10/solo6x10.h | 1 -
+ include/media/lm3560.h | 97 +
+ include/media/soc_camera.h | 27 +-
+ include/media/v4l2-clk.h | 17 +
+ include/media/v4l2-common.h | 2 +-
+ include/media/v4l2-ctrls.h | 2 +-
+ include/media/v4l2-fh.h | 2 +
+ include/media/v4l2-subdev.h | 19 +-
+ include/media/videobuf2-core.h | 4 +-
+ include/media/videobuf2-dma-sg.h | 10 +-
+ include/uapi/linux/v4l2-controls.h | 4 +
+ 194 files changed, 8919 insertions(+), 981 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/st-rc.txt
+ create mode 100644 drivers/media/dvb-frontends/cx24117.c
+ create mode 100644 drivers/media/dvb-frontends/cx24117.h
+ create mode 100644 drivers/media/i2c/lm3560.c
+ create mode 100644 drivers/media/platform/ti-vpe/Makefile
+ create mode 100644 drivers/media/platform/ti-vpe/vpdma.c
+ create mode 100644 drivers/media/platform/ti-vpe/vpdma.h
+ create mode 100644 drivers/media/platform/ti-vpe/vpdma_priv.h
+ create mode 100644 drivers/media/platform/ti-vpe/vpe.c
+ create mode 100644 drivers/media/platform/ti-vpe/vpe_regs.h
+ create mode 100644 drivers/media/rc/st_rc.c
+ create mode 100644 include/media/lm3560.h
+Merging kbuild/for-next (9fbe8e5b9724 Merge branch 'kbuild/kconfig' into kbuild/for-next)
+$ git merge kbuild/for-next
+Removing scripts/coccinelle/api/devm_request_and_ioremap.cocci
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/kconfig.txt | 11 +--
+ MAINTAINERS | 5 +-
+ Makefile | 6 ++
+ .../coccinelle/api/devm_request_and_ioremap.cocci | 105 ---------------------
+ scripts/kconfig/expr.h | 2 +-
+ scripts/kconfig/mconf.c | 60 ++++++------
+ scripts/kconfig/menu.c | 11 ++-
+ scripts/kconfig/qconf.cc | 5 +
+ scripts/kconfig/qconf.h | 1 +
+ scripts/kconfig/symbol.c | 2 +-
+ scripts/kconfig/zconf.l | 1 -
+ scripts/show_delta | 12 +--
+ scripts/tags.sh | 5 +-
+ 13 files changed, 63 insertions(+), 163 deletions(-)
+ delete mode 100644 scripts/coccinelle/api/devm_request_and_ioremap.cocci
+Merging kconfig/for-next (4eae518d4b01 localmodconfig: Fix localyesconfig to set to 'y' not 'm')
+$ git merge kconfig/for-next
+Already up-to-date.
+Merging libata/for-next (1ca953d5f992 Merge branch 'for-3.13' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ drivers/ata/ahci.c | 4 ++
+ drivers/ata/ahci.h | 2 +
+ drivers/ata/ahci_imx.c | 101 ++++++++++++++++++++++++++++++++++++++++-
+ drivers/ata/ahci_platform.c | 3 +-
+ drivers/ata/ata_piix.c | 19 ++++----
+ drivers/ata/libahci.c | 27 +++++++++--
+ drivers/ata/libata-core.c | 1 +
+ drivers/ata/libata-eh.c | 13 ++++--
+ drivers/ata/libata-transport.c | 16 +++----
+ drivers/ata/sata_highbank.c | 8 ++--
+ drivers/ata/sata_rcar.c | 10 ++--
+ include/linux/ata.h | 7 +++
+ 12 files changed, 173 insertions(+), 38 deletions(-)
+Merging pstore/master (bd08ec33b5c2 pstore/ram: Restore ecc information block)
+$ git merge pstore/master
+Already up-to-date.
+Merging pm/linux-next (de4f40f1f46d Merge branch 'pm-cpufreq-next' into linux-next)
+$ git merge pm/linux-next
+Resolved 'arch/arm/mach-imx/mach-imx6q.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/opp.c' using previous resolution.
+Resolved 'drivers/i2c/i2c-core.c' using previous resolution.
+Removing include/linux/opp.h
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/pci/hotplug/acpi_pcihp.c
+Auto-merging drivers/i2c/i2c-core.c
+CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
+Auto-merging drivers/hid/i2c-hid/i2c-hid.c
+Auto-merging drivers/cpuidle/cpuidle-at91.c
+Auto-merging drivers/cpuidle/Kconfig.arm
+Auto-merging drivers/cpufreq/integrator-cpufreq.c
+Removing drivers/acpi/cm_sbs.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm/mach-vexpress/tc2_pm.c
+Auto-merging arch/arm/mach-vexpress/Kconfig
+Auto-merging arch/arm/mach-ux500/Kconfig
+Auto-merging arch/arm/mach-omap2/pm.c
+Auto-merging arch/arm/mach-omap2/opp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/opp.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-exynos/mach-exynos5-dt.c
+Auto-merging arch/arm/mach-exynos/mach-exynos4-dt.c
+Auto-merging arch/arm/mach-exynos/common.h
+Auto-merging arch/arm/mach-exynos/common.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bfbeb87b0e4d] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-powercap | 152 +++
+ Documentation/cpu-freq/cpu-drivers.txt | 27 +-
+ Documentation/cpu-freq/governors.txt | 4 +-
+ Documentation/cpuidle/governor.txt | 1 -
+ Documentation/power/opp.txt | 108 +-
+ Documentation/power/powercap/powercap.txt | 236 ++++
+ Documentation/power/runtime_pm.txt | 14 +-
+ MAINTAINERS | 14 +
+ arch/arm/mach-at91/Makefile | 1 -
+ arch/arm/mach-at91/at91rm9200.c | 2 +
+ arch/arm/mach-at91/at91sam9260.c | 2 +
+ arch/arm/mach-at91/at91sam9261.c | 2 +
+ arch/arm/mach-at91/at91sam9263.c | 2 +
+ arch/arm/mach-at91/at91sam9g45.c | 2 +
+ arch/arm/mach-at91/at91sam9rl.c | 2 +
+ arch/arm/mach-at91/pm.c | 27 +-
+ arch/arm/mach-at91/pm.h | 59 +-
+ arch/arm/mach-at91/setup.c | 14 +-
+ arch/arm/mach-davinci/Kconfig | 1 -
+ arch/arm/mach-exynos/common.c | 11 +
+ arch/arm/mach-exynos/common.h | 1 +
+ arch/arm/mach-exynos/cpuidle.c | 18 +-
+ arch/arm/mach-exynos/mach-exynos4-dt.c | 2 +
+ arch/arm/mach-exynos/mach-exynos5-dt.c | 2 +
+ arch/arm/mach-imx/mach-imx6q.c | 4 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 10 +-
+ arch/arm/mach-omap2/omap-pm.h | 2 +-
+ arch/arm/mach-omap2/opp.c | 6 +-
+ arch/arm/mach-omap2/pm.c | 8 +-
+ arch/arm/mach-pxa/Kconfig | 3 -
+ arch/arm/mach-sa1100/generic.c | 81 +-
+ arch/arm/mach-sa1100/generic.h | 7 +-
+ arch/arm/mach-ux500/Kconfig | 1 -
+ arch/arm/mach-vexpress/Kconfig | 12 +
+ arch/arm/mach-vexpress/Makefile | 3 +-
+ arch/arm/mach-vexpress/spc.c | 366 ++++-
+ arch/arm/mach-vexpress/spc.h | 2 +-
+ arch/arm/mach-vexpress/tc2_pm.c | 7 +-
+ arch/arm/mach-zynq/common.c | 6 +
+ arch/blackfin/Kconfig | 1 -
+ arch/cris/Kconfig | 2 -
+ arch/ia64/kernel/acpi.c | 38 +-
+ arch/powerpc/kernel/smp.c | 12 -
+ arch/powerpc/platforms/pseries/dlpar.c | 43 +-
+ arch/x86/Kconfig | 4 -
+ arch/x86/include/asm/acpi.h | 1 +
+ arch/x86/include/asm/mpspec.h | 2 +-
+ arch/x86/include/asm/msr.h | 22 +
+ arch/x86/kernel/acpi/boot.c | 90 +-
+ arch/x86/kernel/acpi/sleep.c | 11 +
+ arch/x86/kernel/acpi/sleep.h | 2 +
+ arch/x86/kernel/acpi/wakeup_32.S | 2 +-
+ arch/x86/kernel/acpi/wakeup_64.S | 2 +-
+ arch/x86/kernel/apic/apic.c | 8 +-
+ arch/x86/kernel/smpboot.c | 21 -
+ arch/x86/kernel/topology.c | 11 +-
+ arch/x86/lib/msr-smp.c | 62 +
+ arch/x86/platform/olpc/olpc-xo15-sci.c | 9 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/acpi/Kconfig | 20 +-
+ drivers/acpi/Makefile | 1 -
+ drivers/acpi/ac.c | 256 +---
+ drivers/acpi/acpi_ipmi.c | 580 ++++----
+ drivers/acpi/acpi_lpss.c | 12 +-
+ drivers/acpi/acpi_memhotplug.c | 7 +-
+ drivers/acpi/acpi_platform.c | 7 +
+ drivers/acpi/acpi_processor.c | 28 +-
+ drivers/acpi/acpica/acdebug.h | 8 +-
+ drivers/acpi/acpica/acevents.h | 9 +-
+ drivers/acpi/acpica/acglobal.h | 20 +-
+ drivers/acpi/acpica/aclocal.h | 11 +-
+ drivers/acpi/acpica/acmacros.h | 31 -
+ drivers/acpi/acpica/acnamesp.h | 6 +
+ drivers/acpi/acpica/acutils.h | 17 +-
+ drivers/acpi/acpica/dsargs.c | 2 +-
+ drivers/acpi/acpica/dsfield.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 5 +-
+ drivers/acpi/acpica/dsobject.c | 2 +-
+ drivers/acpi/acpica/dsopcode.c | 2 +-
+ drivers/acpi/acpica/dsutils.c | 10 +-
+ drivers/acpi/acpica/dswexec.c | 6 +-
+ drivers/acpi/acpica/dswload2.c | 2 +-
+ drivers/acpi/acpica/evglock.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 3 +-
+ drivers/acpi/acpica/evgpeblk.c | 6 +-
+ drivers/acpi/acpica/evgpeinit.c | 2 +-
+ drivers/acpi/acpica/evgpeutil.c | 4 +-
+ drivers/acpi/acpica/evhandler.c | 4 +-
+ drivers/acpi/acpica/evmisc.c | 14 +-
+ drivers/acpi/acpica/evregion.c | 29 +-
+ drivers/acpi/acpica/evsci.c | 79 +-
+ drivers/acpi/acpica/evxface.c | 148 ++-
+ drivers/acpi/acpica/evxfevnt.c | 3 +-
+ drivers/acpi/acpica/evxfgpe.c | 9 +-
+ drivers/acpi/acpica/evxfregn.c | 7 +-
+ drivers/acpi/acpica/excreate.c | 8 +-
+ drivers/acpi/acpica/exfield.c | 2 +-
+ drivers/acpi/acpica/exfldio.c | 8 +-
+ drivers/acpi/acpica/exmisc.c | 4 +-
+ drivers/acpi/acpica/exoparg1.c | 8 +-
+ drivers/acpi/acpica/exoparg2.c | 10 +-
+ drivers/acpi/acpica/exoparg3.c | 4 +-
+ drivers/acpi/acpica/exoparg6.c | 2 +-
+ drivers/acpi/acpica/exregion.c | 1 +
+ drivers/acpi/acpica/exresolv.c | 2 +-
+ drivers/acpi/acpica/exresop.c | 2 +-
+ drivers/acpi/acpica/hwregs.c | 2 +-
+ drivers/acpi/acpica/hwtimer.c | 3 +-
+ drivers/acpi/acpica/hwxface.c | 43 +-
+ drivers/acpi/acpica/hwxfsleep.c | 7 +-
+ drivers/acpi/acpica/nsaccess.c | 7 +-
+ drivers/acpi/acpica/nsdump.c | 143 +-
+ drivers/acpi/acpica/nsdumpdv.c | 7 +-
+ drivers/acpi/acpica/nseval.c | 4 +-
+ drivers/acpi/acpica/nsinit.c | 2 +-
+ drivers/acpi/acpica/nsload.c | 2 +-
+ drivers/acpi/acpica/nsparse.c | 2 +-
+ drivers/acpi/acpica/nspredef.c | 2 +-
+ drivers/acpi/acpica/nsprepkg.c | 4 +-
+ drivers/acpi/acpica/nsrepair.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 2 +-
+ drivers/acpi/acpica/nssearch.c | 3 +-
+ drivers/acpi/acpica/nsutils.c | 2 +-
+ drivers/acpi/acpica/nsxfeval.c | 23 +-
+ drivers/acpi/acpica/nsxfname.c | 7 +-
+ drivers/acpi/acpica/nsxfobj.c | 7 +-
+ drivers/acpi/acpica/psparse.c | 2 +-
+ drivers/acpi/acpica/psxface.c | 6 +-
+ drivers/acpi/acpica/rsmisc.c | 4 +-
+ drivers/acpi/acpica/rsutils.c | 2 +-
+ drivers/acpi/acpica/rsxface.c | 3 +-
+ drivers/acpi/acpica/tbinstal.c | 18 +-
+ drivers/acpi/acpica/tbprint.c | 18 +-
+ drivers/acpi/acpica/tbutils.c | 5 +-
+ drivers/acpi/acpica/tbxface.c | 16 +-
+ drivers/acpi/acpica/tbxfload.c | 11 +-
+ drivers/acpi/acpica/tbxfroot.c | 5 +-
+ drivers/acpi/acpica/utalloc.c | 117 +-
+ drivers/acpi/acpica/utcache.c | 2 +-
+ drivers/acpi/acpica/utcopy.c | 4 +-
+ drivers/acpi/acpica/utdebug.c | 5 +-
+ drivers/acpi/acpica/utdecode.c | 1 -
+ drivers/acpi/acpica/utdelete.c | 2 +-
+ drivers/acpi/acpica/uteval.c | 2 +-
+ drivers/acpi/acpica/utexcep.c | 3 +-
+ drivers/acpi/acpica/utglobal.c | 20 +-
+ drivers/acpi/acpica/utids.c | 2 +-
+ drivers/acpi/acpica/utobject.c | 26 +-
+ drivers/acpi/acpica/utownerid.c | 2 +-
+ drivers/acpi/acpica/utresrc.c | 4 +-
+ drivers/acpi/acpica/utstate.c | 1 -
+ drivers/acpi/acpica/utstring.c | 66 +-
+ drivers/acpi/acpica/uttrack.c | 31 +-
+ drivers/acpi/acpica/utxface.c | 45 +-
+ drivers/acpi/acpica/utxferror.c | 3 +-
+ drivers/acpi/acpica/utxfinit.c | 18 +-
+ drivers/acpi/battery.c | 328 +----
+ drivers/acpi/blacklist.c | 61 +
+ drivers/acpi/button.c | 9 +-
+ drivers/acpi/cm_sbs.c | 105 --
+ drivers/acpi/device_pm.c | 8 +-
+ drivers/acpi/dock.c | 6 +-
+ drivers/acpi/ec.c | 49 +-
+ drivers/acpi/fan.c | 2 +-
+ drivers/acpi/internal.h | 4 +-
+ drivers/acpi/numa.c | 4 +-
+ drivers/acpi/osl.c | 48 +-
+ drivers/acpi/proc.c | 305 -----
+ drivers/acpi/processor_core.c | 26 +-
+ drivers/acpi/processor_driver.c | 4 +-
+ drivers/acpi/processor_idle.c | 15 +-
+ drivers/acpi/processor_perflib.c | 22 -
+ drivers/acpi/sbs.c | 325 +----
+ drivers/acpi/sysfs.c | 18 +-
+ drivers/acpi/thermal.c | 43 +-
+ drivers/acpi/utils.c | 21 +-
+ drivers/acpi/video.c | 465 ++++---
+ drivers/acpi/video_detect.c | 12 +-
+ drivers/base/cpu.c | 39 +-
+ drivers/base/power/main.c | 73 +
+ drivers/base/power/opp.c | 115 +-
+ drivers/base/power/runtime.c | 5 +-
+ drivers/cpufreq/Kconfig | 11 -
+ drivers/cpufreq/Kconfig.arm | 19 +-
+ drivers/cpufreq/Kconfig.powerpc | 6 -
+ drivers/cpufreq/Kconfig.x86 | 13 -
+ drivers/cpufreq/Makefile | 6 +-
+ drivers/cpufreq/acpi-cpufreq.c | 52 +-
+ drivers/cpufreq/arm_big_little.c | 453 ++++++-
+ drivers/cpufreq/arm_big_little.h | 5 -
+ drivers/cpufreq/arm_big_little_dt.c | 2 +-
+ drivers/cpufreq/at32ap-cpufreq.c | 106 +-
+ drivers/cpufreq/blackfin-cpufreq.c | 54 +-
+ drivers/cpufreq/cpufreq-cpu0.c | 119 +-
+ drivers/cpufreq/cpufreq-nforce2.c | 5 +-
+ drivers/cpufreq/cpufreq.c | 322 ++---
+ drivers/cpufreq/cpufreq_governor.h | 5 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 1 -
+ drivers/cpufreq/cpufreq_userspace.c | 11 -
+ drivers/cpufreq/cris-artpec3-cpufreq.c | 64 +-
+ drivers/cpufreq/cris-etraxfs-cpufreq.c | 61 +-
+ drivers/cpufreq/davinci-cpufreq.c | 77 +-
+ drivers/cpufreq/dbx500-cpufreq.c | 78 +-
+ drivers/cpufreq/e_powersaver.c | 59 +-
+ drivers/cpufreq/elanfreq.c | 88 +-
+ drivers/cpufreq/exynos-cpufreq.c | 85 +-
+ drivers/cpufreq/exynos4210-cpufreq.c | 67 +-
+ drivers/cpufreq/exynos4x12-cpufreq.c | 69 +-
+ drivers/cpufreq/exynos5440-cpufreq.c | 67 +-
+ drivers/cpufreq/freq_table.c | 59 +-
+ drivers/cpufreq/gx-suspmod.c | 5 +-
+ drivers/cpufreq/highbank-cpufreq.c | 3 +-
+ drivers/cpufreq/ia64-acpi-cpufreq.c | 71 +-
+ drivers/cpufreq/imx6q-cpufreq.c | 117 +-
+ drivers/cpufreq/integrator-cpufreq.c | 14 +-
+ drivers/cpufreq/intel_pstate.c | 181 ++-
+ drivers/cpufreq/kirkwood-cpufreq.c | 107 +-
+ drivers/cpufreq/longhaul.c | 45 +-
+ drivers/cpufreq/longrun.c | 4 +-
+ drivers/cpufreq/loongson2_cpufreq.c | 57 +-
+ drivers/cpufreq/maple-cpufreq.c | 56 +-
+ drivers/cpufreq/omap-cpufreq.c | 143 +-
+ drivers/cpufreq/p4-clockmod.c | 53 +-
+ drivers/cpufreq/pasemi-cpufreq.c | 51 +-
+ drivers/cpufreq/pcc-cpufreq.c | 15 +-
+ drivers/cpufreq/pmac32-cpufreq.c | 53 +-
+ drivers/cpufreq/pmac64-cpufreq.c | 70 +-
+ drivers/cpufreq/powernow-k6.c | 67 +-
+ drivers/cpufreq/powernow-k7.c | 42 +-
+ drivers/cpufreq/powernow-k8.c | 52 +-
+ drivers/cpufreq/ppc-corenet-cpufreq.c | 54 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 50 +-
+ drivers/cpufreq/pxa2xx-cpufreq.c | 70 +-
+ drivers/cpufreq/pxa3xx-cpufreq.c | 46 +-
+ drivers/cpufreq/s3c2416-cpufreq.c | 67 +-
+ drivers/cpufreq/s3c24xx-cpufreq.c | 27 +-
+ drivers/cpufreq/s3c64xx-cpufreq.c | 81 +-
+ drivers/cpufreq/s5pv210-cpufreq.c | 86 +-
+ drivers/cpufreq/sa1100-cpufreq.c | 49 +-
+ drivers/cpufreq/sa1110-cpufreq.c | 46 +-
+ drivers/cpufreq/sc520_freq.c | 64 +-
+ drivers/cpufreq/sh-cpufreq.c | 22 +-
+ drivers/cpufreq/sparc-us2e-cpufreq.c | 42 +-
+ drivers/cpufreq/sparc-us3-cpufreq.c | 44 +-
+ drivers/cpufreq/spear-cpufreq.c | 64 +-
+ drivers/cpufreq/speedstep-centrino.c | 84 +-
+ drivers/cpufreq/speedstep-ich.c | 85 +-
+ drivers/cpufreq/speedstep-smi.c | 76 +-
+ drivers/cpufreq/tegra-cpufreq.c | 70 +-
+ drivers/cpufreq/unicore2-cpufreq.c | 5 +-
+ drivers/cpufreq/vexpress-spc-cpufreq.c | 70 +
+ drivers/cpuidle/Kconfig.arm | 25 +-
+ drivers/cpuidle/Makefile | 3 +-
+ drivers/cpuidle/coupled.c | 2 +-
+ .../cpuidle.c => drivers/cpuidle/cpuidle-at91.c | 29 +-
+ drivers/cpuidle/cpuidle-ux500.c | 2 +-
+ drivers/cpuidle/cpuidle-zynq.c | 17 +-
+ drivers/cpuidle/cpuidle.c | 78 +-
+ drivers/cpuidle/driver.c | 67 +-
+ drivers/cpuidle/governor.c | 43 -
+ drivers/cpuidle/sysfs.c | 7 +-
+ drivers/devfreq/devfreq.c | 29 +-
+ drivers/devfreq/exynos/exynos4_bus.c | 29 +-
+ drivers/devfreq/exynos/exynos5_bus.c | 57 +-
+ drivers/gpio/gpiolib-acpi.c | 9 +-
+ drivers/gpu/drm/i915/intel_acpi.c | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +-
+ drivers/hid/i2c-hid/i2c-hid.c | 18 +-
+ drivers/i2c/i2c-core.c | 33 +-
+ drivers/idle/intel_idle.c | 18 +-
+ drivers/iommu/dmar.c | 4 +-
+ drivers/iommu/intel_irq_remapping.c | 8 +-
+ drivers/pci/hotplug/acpi_pcihp.c | 7 +-
+ drivers/pci/pci-acpi.c | 3 +-
+ drivers/platform/x86/eeepc-laptop.c | 8 +-
+ drivers/platform/x86/fujitsu-laptop.c | 44 +-
+ drivers/platform/x86/ideapad-laptop.c | 344 ++---
+ drivers/platform/x86/intel-rst.c | 48 +-
+ drivers/platform/x86/intel-smartconnect.c | 27 +-
+ drivers/platform/x86/intel_menlow.c | 8 +-
+ drivers/platform/x86/sony-laptop.c | 28 +-
+ drivers/platform/x86/thinkpad_acpi.c | 31 +-
+ drivers/platform/x86/topstar-laptop.c | 8 +-
+ drivers/platform/x86/toshiba_acpi.c | 44 +-
+ drivers/platform/x86/wmi.c | 30 +-
+ drivers/pnp/pnpacpi/core.c | 11 +-
+ drivers/powercap/Kconfig | 32 +
+ drivers/powercap/Makefile | 2 +
+ drivers/powercap/intel_rapl.c | 1395 ++++++++++++++++++++
+ drivers/powercap/powercap_sys.c | 685 ++++++++++
+ drivers/spi/spi.c | 37 +-
+ drivers/thermal/Kconfig | 1 -
+ drivers/video/backlight/backlight.c | 31 +
+ include/acpi/acconfig.h | 2 +
+ include/acpi/acexcep.h | 8 +-
+ include/acpi/acnames.h | 26 +-
+ include/acpi/acpi_bus.h | 3 +-
+ include/acpi/acpiosxf.h | 155 ++-
+ include/acpi/acpixf.h | 93 +-
+ include/acpi/actbl.h | 19 +-
+ include/acpi/actbl2.h | 4 +-
+ include/acpi/actypes.h | 77 +-
+ include/acpi/platform/acenv.h | 8 +-
+ include/acpi/platform/aclinux.h | 134 +-
+ include/acpi/processor.h | 4 +-
+ include/linux/acpi.h | 12 +-
+ include/linux/backlight.h | 4 +
+ include/linux/bitops.h | 3 +
+ include/linux/cpu.h | 13 -
+ include/linux/cpufreq.h | 75 +-
+ include/linux/cpuidle.h | 8 +-
+ include/linux/devfreq.h | 6 +-
+ include/linux/opp.h | 134 --
+ include/linux/pm_opp.h | 139 ++
+ include/linux/powercap.h | 325 +++++
+ kernel/power/Kconfig | 16 +
+ kernel/power/qos.c | 26 +-
+ kernel/power/user.c | 20 +-
+ 319 files changed, 8215 insertions(+), 6589 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-powercap
+ create mode 100644 Documentation/power/powercap/powercap.txt
+ delete mode 100644 drivers/acpi/cm_sbs.c
+ create mode 100644 drivers/cpufreq/vexpress-spc-cpufreq.c
+ rename arch/arm/mach-at91/cpuidle.c => drivers/cpuidle/cpuidle-at91.c (79%)
+ create mode 100644 drivers/powercap/Kconfig
+ create mode 100644 drivers/powercap/Makefile
+ create mode 100644 drivers/powercap/intel_rapl.c
+ create mode 100644 drivers/powercap/powercap_sys.c
+ delete mode 100644 include/linux/opp.h
+ create mode 100644 include/linux/pm_opp.h
+ create mode 100644 include/linux/powercap.h
+Merging idle/next (d7b0a1b0b9b1 intel_idle: Support Intel Atom Processor C2000 Product Family)
+$ git merge idle/next
+Auto-merging drivers/idle/intel_idle.c
+Merge made by the 'recursive' strategy.
+ arch/x86/include/uapi/asm/msr-index.h | 2 +
+ drivers/idle/intel_idle.c | 38 ++++++++-
+ tools/power/x86/turbostat/turbostat.c | 155 +++++++++++++++++++++++++---------
+ 3 files changed, 153 insertions(+), 42 deletions(-)
+Merging apm/for-next (fb9d78aca709 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 cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles)
+$ git merge cpupowerutils/master
+Already up-to-date.
+Merging thermal/next (79122105c394 Merge branches 'intel_powerclamp', 'misc' and 'x86_pkg_temp' of .git into next)
+$ git merge thermal/next
+Auto-merging drivers/thermal/Kconfig
+Auto-merging drivers/acpi/thermal.c
+Merge made by the 'recursive' strategy.
+ drivers/acpi/thermal.c | 10 +++++-----
+ drivers/thermal/Kconfig | 7 ++++---
+ drivers/thermal/intel_powerclamp.c | 29 ++++++++++++++++++++++++++---
+ 3 files changed, 35 insertions(+), 11 deletions(-)
+Merging ieee1394/for-next (db9ae8fec7b1 firewire: ohci: Fix deadlock at bus reset)
+$ git merge ieee1394/for-next
+Already up-to-date.
+Merging ubi/linux-next (ae0d14695566 UBI: Add some asserts to ubi_attach_fastmap())
+$ git merge ubi/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/attach.c | 11 ++++++-----
+ drivers/mtd/ubi/fastmap.c | 41 +++++++++++++++++++++++++++++++++++++----
+ drivers/mtd/ubi/wl.c | 4 ----
+ 3 files changed, 43 insertions(+), 13 deletions(-)
+Merging dlm/next (a97f4a66d8ee dlm: Avoid that dlm_release_lockspace() incorrectly returns -EBUSY)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/lockspace.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+Merging swiotlb/linux-next (af51a9f1848f swiotlb: Do not export swiotlb_bounce since there are no external consumers)
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (6b327a028f09 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Auto-merging drivers/tty/serial/sh-sci.c
+Auto-merging drivers/dma/pl330.c
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/edma.c
+Auto-merging drivers/dma/amba-pl08x.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/atmel-dma.txt | 2 +-
+ arch/arm/common/edma.c | 4 +-
+ crypto/async_tx/async_tx.c | 4 +-
+ drivers/dma/amba-pl08x.c | 7 +-
+ drivers/dma/at_hdmac.c | 2 +-
+ drivers/dma/coh901318.c | 4 +-
+ drivers/dma/cppi41.c | 96 +++++----
+ drivers/dma/dma-jz4740.c | 2 +-
+ drivers/dma/dmaengine.c | 2 +-
+ drivers/dma/dmatest.c | 2 +-
+ drivers/dma/dw/core.c | 4 +-
+ drivers/dma/edma.c | 217 +++++++++++++--------
+ drivers/dma/imx-dma.c | 42 ++--
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/dma/intel_mid_dma.c | 4 +-
+ drivers/dma/ioat/dma.c | 4 +-
+ drivers/dma/ioat/dma_v3.c | 8 +-
+ drivers/dma/iop-adma.c | 16 +-
+ drivers/dma/k3dma.c | 4 +-
+ drivers/dma/mmp_pdma.c | 7 +-
+ drivers/dma/mmp_tdma.c | 40 +++-
+ drivers/dma/mv_xor.c | 6 +-
+ drivers/dma/mxs-dma.c | 6 +-
+ drivers/dma/omap-dma.c | 2 +-
+ drivers/dma/pl330.c | 28 ++-
+ drivers/dma/ppc4xx/adma.c | 2 +-
+ drivers/dma/sa11x0-dma.c | 2 +-
+ drivers/dma/sh/shdma-base.c | 2 +-
+ drivers/dma/sh/shdmac.c | 4 +-
+ drivers/dma/ste_dma40.c | 7 +-
+ drivers/dma/tegra20-apb-dma.c | 6 +-
+ drivers/dma/txx9dmac.c | 4 +-
+ drivers/tty/serial/sh-sci.c | 2 +-
+ include/linux/dmaengine.h | 12 +-
+ include/linux/platform_data/edma.h | 8 +-
+ net/ipv4/tcp.c | 4 +-
+ 36 files changed, 345 insertions(+), 223 deletions(-)
+Merging dmaengine/next (4a43f394a082 dmaengine: dma_sync_wait and dma_find_channel undefined)
+$ git merge dmaengine/next
+Already up-to-date.
+Merging net-next/master (6fcf018ae449 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/openvswitch)
+$ git merge net-next/master
+Resolved 'arch/parisc/include/uapi/asm/socket.h' using previous resolution.
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging net/ipv4/tcp.c
+Removing net/batman-adv/vis.h
+Removing net/batman-adv/vis.c
+Removing net/batman-adv/unicast.h
+Removing net/batman-adv/unicast.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
+Auto-merging drivers/net/ethernet/smsc/smc9194.c
+Auto-merging drivers/net/ethernet/octeon/octeon_mgmt.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/igbvf/netdev.c
+Auto-merging drivers/net/ethernet/intel/igb/igb_main.c
+Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c
+Auto-merging drivers/net/ethernet/emulex/benet/be_main.c
+Auto-merging drivers/net/ethernet/brocade/bna/bnad.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/net/ethernet/broadcom/b44.c
+Auto-merging drivers/net/ethernet/amd/declance.c
+Auto-merging arch/parisc/include/uapi/asm/socket.h
+CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/socket.h
+CONFLICT (modify/delete): arch/h8300/include/uapi/asm/socket.h deleted in HEAD and modified in net-next/master. Version net-next/master of arch/h8300/include/uapi/asm/socket.h left in tree.
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/h8300/include/uapi/asm/socket.h
+arch/h8300/include/uapi/asm/socket.h: needs merge
+rm 'arch/h8300/include/uapi/asm/socket.h'
+$ git commit -v -a
+[master 7e0f7a4e70f7] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-class-net-batman-adv | 4 +-
+ Documentation/ABI/testing/sysfs-class-net-mesh | 34 +-
+ .../devicetree/bindings/net/cpsw-phy-sel.txt | 28 +
+ Documentation/networking/batman-adv.txt | 54 +-
+ Documentation/networking/bonding.txt | 66 +-
+ Documentation/networking/netdevices.txt | 10 +-
+ Documentation/ptp/testptp.c | 65 +-
+ MAINTAINERS | 14 +-
+ arch/alpha/include/uapi/asm/socket.h | 4 +-
+ arch/arm/boot/dts/am33xx.dtsi | 6 +
+ arch/avr32/include/uapi/asm/socket.h | 2 +
+ arch/cris/include/uapi/asm/socket.h | 2 +
+ arch/frv/include/uapi/asm/socket.h | 2 +
+ arch/ia64/include/uapi/asm/socket.h | 2 +
+ arch/m32r/include/uapi/asm/socket.h | 2 +
+ arch/mips/include/uapi/asm/socket.h | 2 +
+ arch/mn10300/include/uapi/asm/socket.h | 2 +
+ arch/parisc/include/uapi/asm/socket.h | 2 +
+ arch/powerpc/include/uapi/asm/socket.h | 2 +
+ arch/s390/include/uapi/asm/socket.h | 2 +
+ arch/sparc/include/uapi/asm/socket.h | 2 +
+ arch/x86/kernel/jump_label.c | 25 +-
+ arch/xtensa/include/uapi/asm/socket.h | 2 +
+ drivers/atm/firestream.h | 1 -
+ drivers/bcma/host_pci.c | 8 +-
+ drivers/bluetooth/Makefile | 2 +
+ drivers/bluetooth/btmrvl_drv.h | 12 +-
+ drivers/bluetooth/btmrvl_main.c | 269 +-
+ drivers/bluetooth/btmrvl_sdio.c | 15 +-
+ drivers/bluetooth/btmrvl_sdio.h | 2 +
+ drivers/bluetooth/hci_vhci.c | 170 +-
+ drivers/infiniband/core/cma.c | 2 +-
+ drivers/infiniband/hw/mlx4/main.c | 8 +-
+ drivers/isdn/hardware/eicon/divasmain.c | 2 +-
+ drivers/isdn/hardware/eicon/um_idi.c | 2 +-
+ drivers/isdn/sc/init.c | 2 +-
+ drivers/net/bonding/Makefile | 2 +-
+ drivers/net/bonding/bond_3ad.c | 199 +-
+ drivers/net/bonding/bond_alb.c | 150 +-
+ drivers/net/bonding/bond_alb.h | 4 +-
+ drivers/net/bonding/bond_main.c | 660 ++-
+ drivers/net/bonding/bond_netlink.c | 131 +
+ drivers/net/bonding/bond_options.c | 142 +
+ drivers/net/bonding/bond_procfs.c | 21 +-
+ drivers/net/bonding/bond_sysfs.c | 215 +-
+ drivers/net/bonding/bonding.h | 110 +-
+ drivers/net/can/at91_can.c | 2 +-
+ drivers/net/can/bfin_can.c | 2 +-
+ drivers/net/can/c_can/c_can_pci.c | 2 -
+ drivers/net/can/c_can/c_can_platform.c | 2 +-
+ drivers/net/can/cc770/cc770_platform.c | 4 +-
+ drivers/net/can/flexcan.c | 2 +-
+ drivers/net/can/janz-ican3.c | 2 +-
+ drivers/net/can/mcp251x.c | 2 +-
+ drivers/net/can/mscan/mscan.h | 6 +-
+ drivers/net/can/pch_can.c | 1 -
+ drivers/net/can/sja1000/ems_pci.c | 1 -
+ drivers/net/can/sja1000/kvaser_pci.c | 1 -
+ drivers/net/can/sja1000/peak_pci.c | 2 -
+ drivers/net/can/sja1000/plx_pci.c | 1 -
+ drivers/net/can/sja1000/sja1000_platform.c | 2 +-
+ drivers/net/can/softing/softing.h | 24 +-
+ drivers/net/can/softing/softing_main.c | 2 +-
+ drivers/net/can/ti_hecc.c | 2 +-
+ drivers/net/ethernet/3com/Kconfig | 4 +-
+ drivers/net/ethernet/3com/typhoon.c | 1 -
+ drivers/net/ethernet/8390/8390.h | 40 +-
+ drivers/net/ethernet/8390/ax88796.c | 2 +-
+ drivers/net/ethernet/8390/ne2k-pci.c | 3 -
+ drivers/net/ethernet/adaptec/starfire.c | 2 -
+ drivers/net/ethernet/adi/bfin_mac.h | 2 +-
+ drivers/net/ethernet/amd/7990.h | 12 +-
+ drivers/net/ethernet/amd/amd8111e.c | 2 -
+ drivers/net/ethernet/amd/atarilance.c | 4 +-
+ drivers/net/ethernet/amd/au1000_eth.c | 2 +-
+ drivers/net/ethernet/amd/declance.c | 16 +-
+ drivers/net/ethernet/amd/lance.c | 2 +-
+ drivers/net/ethernet/amd/pcnet32.c | 3 +-
+ drivers/net/ethernet/apple/bmac.c | 4 +-
+ drivers/net/ethernet/arc/emac_main.c | 6 +-
+ drivers/net/ethernet/atheros/alx/main.c | 1 -
+ drivers/net/ethernet/atheros/atl1c/atl1c.h | 6 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e.h | 12 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 46 +-
+ drivers/net/ethernet/atheros/atlx/atl2.h | 2 +-
+ drivers/net/ethernet/broadcom/b44.c | 12 +-
+ drivers/net/ethernet/broadcom/bgmac.c | 117 +-
+ drivers/net/ethernet/broadcom/bnx2.c | 9 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 11 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 18 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 22 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 25 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 80 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 30 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 -
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 149 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h | 7 +
+ drivers/net/ethernet/broadcom/cnic.c | 4 +-
+ drivers/net/ethernet/broadcom/cnic_if.h | 4 +-
+ drivers/net/ethernet/broadcom/tg3.c | 142 +-
+ drivers/net/ethernet/broadcom/tg3.h | 3 +
+ drivers/net/ethernet/brocade/bna/bnad.c | 1 -
+ drivers/net/ethernet/brocade/bna/bnad.h | 43 +-
+ drivers/net/ethernet/chelsio/cxgb/common.h | 46 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 -
+ drivers/net/ethernet/chelsio/cxgb/pm3393.c | 4 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 -
+ drivers/net/ethernet/chelsio/cxgb3/regs.h | 35 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 1 -
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 5 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 5 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 11 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 2 -
+ drivers/net/ethernet/davicom/dm9000.c | 2 +-
+ drivers/net/ethernet/dec/tulip/de2104x.c | 1 -
+ drivers/net/ethernet/dec/tulip/de4x5.c | 2 +-
+ drivers/net/ethernet/dec/tulip/dmfe.c | 3 -
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 1 -
+ drivers/net/ethernet/dec/tulip/uli526x.c | 2 -
+ drivers/net/ethernet/dec/tulip/winbond-840.c | 3 -
+ drivers/net/ethernet/dec/tulip/xircom_cb.c | 2 -
+ drivers/net/ethernet/dlink/dl2k.c | 1 -
+ drivers/net/ethernet/dlink/sundance.c | 2 -
+ drivers/net/ethernet/emulex/benet/be.h | 177 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 27 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 332 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 40 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 315 +-
+ drivers/net/ethernet/fealnx.c | 1 -
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 87 +-
+ drivers/net/ethernet/freescale/gianfar.h | 26 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +-
+ drivers/net/ethernet/fujitsu/Kconfig | 2 +-
+ drivers/net/ethernet/hp/hp100.c | 2 +-
+ drivers/net/ethernet/i825xx/82596.c | 4 +-
+ drivers/net/ethernet/i825xx/lib82596.c | 6 +-
+ drivers/net/ethernet/ibm/emac/core.c | 2 +-
+ drivers/net/ethernet/ibm/emac/debug.h | 14 +-
+ drivers/net/ethernet/ibm/emac/rgmii.h | 18 +-
+ drivers/net/ethernet/ibm/emac/tah.h | 14 +-
+ drivers/net/ethernet/ibm/emac/zmii.h | 18 +-
+ drivers/net/ethernet/ibm/ibmveth.c | 4 +-
+ drivers/net/ethernet/icplus/ipg.c | 1 -
+ drivers/net/ethernet/intel/e100.c | 2 -
+ drivers/net/ethernet/intel/e1000/e1000.h | 32 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 3 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 45 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 13 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 338 +-
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 69 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 484 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 433 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.h | 35 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 16 +-
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 6 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.h | 38 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 2 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 8 +-
+ drivers/net/ethernet/intel/igb/igb.h | 74 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 94 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 61 +-
+ drivers/net/ethernet/intel/igbvf/igbvf.h | 22 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 8 +-
+ drivers/net/ethernet/intel/igbvf/vf.c | 4 +-
+ drivers/net/ethernet/intel/ixgb/ixgb.h | 22 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 25 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 238 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 109 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 84 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 40 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 9 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 5 +
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 12 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c | 234 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 178 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 255 +-
+ drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +-
+ drivers/net/ethernet/jme.c | 6 +-
+ drivers/net/ethernet/korina.c | 2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 4 +-
+ drivers/net/ethernet/marvell/mvmdio.c | 110 +-
+ drivers/net/ethernet/marvell/mvneta.c | 2 +-
+ drivers/net/ethernet/marvell/skge.c | 2 -
+ drivers/net/ethernet/marvell/sky2.c | 3 -
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 103 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 61 +-
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 21 +-
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 87 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 3 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 510 ++-
+ drivers/net/ethernet/mellanox/mlx4/srq.c | 1 +
+ drivers/net/ethernet/micrel/ks8851_mll.c | 4 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 4 +-
+ drivers/net/ethernet/moxa/moxart_ether.c | 1 -
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 9 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 -
+ drivers/net/ethernet/neterion/s2io.c | 2 -
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 -
+ drivers/net/ethernet/octeon/octeon_mgmt.c | 2 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 56 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 1 -
+ drivers/net/ethernet/packetengines/yellowfin.c | 2 -
+ drivers/net/ethernet/pasemi/pasemi_mac.c | 1 -
+ drivers/net/ethernet/qlogic/netxen/netxen_nic.h | 9 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_hdr.h | 1 +
+ drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +-
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 30 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 2 -
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 181 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 145 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 18 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 78 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c | 47 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 20 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 184 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 109 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 260 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.h | 8 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 67 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 434 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 41 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 15 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 12 +-
+ drivers/net/ethernet/qlogic/qlge/qlge.h | 60 +-
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 127 +-
+ drivers/net/ethernet/rdc/r6040.c | 2 -
+ drivers/net/ethernet/realtek/8139cp.c | 1 -
+ drivers/net/ethernet/realtek/8139too.c | 1 -
+ drivers/net/ethernet/realtek/r8169.c | 1 -
+ drivers/net/ethernet/renesas/sh_eth.c | 14 +-
+ drivers/net/ethernet/renesas/sh_eth.h | 3 +
+ drivers/net/ethernet/sfc/ef10.c | 319 +-
+ drivers/net/ethernet/sfc/ef10_regs.h | 1 +
+ drivers/net/ethernet/sfc/efx.h | 105 +-
+ drivers/net/ethernet/sfc/ethtool.c | 5 +-
+ drivers/net/ethernet/sfc/io.h | 5 +
+ drivers/net/ethernet/sfc/mcdi.h | 120 +-
+ drivers/net/ethernet/sfc/mdio_10g.h | 26 +-
+ drivers/net/ethernet/sfc/net_driver.h | 10 +
+ drivers/net/ethernet/sfc/nic.c | 73 +-
+ drivers/net/ethernet/sfc/nic.h | 256 +-
+ drivers/net/ethernet/sfc/phy.h | 8 +-
+ drivers/net/ethernet/sfc/rx.c | 90 +-
+ drivers/net/ethernet/sfc/selftest.h | 15 +-
+ drivers/net/ethernet/sfc/tx.c | 426 +-
+ drivers/net/ethernet/sgi/meth.c | 2 +-
+ drivers/net/ethernet/sis/sis190.c | 1 -
+ drivers/net/ethernet/smsc/epic100.c | 126 +-
+ drivers/net/ethernet/smsc/smc911x.c | 331 +-
+ drivers/net/ethernet/smsc/smc911x.h | 2 +-
+ drivers/net/ethernet/smsc/smc9194.c | 52 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 43 +-
+ drivers/net/ethernet/smsc/smc91x.c | 237 +-
+ drivers/net/ethernet/smsc/smc91x.h | 4 +-
+ drivers/net/ethernet/smsc/smsc911x.c | 4 +-
+ drivers/net/ethernet/smsc/smsc9420.c | 28 +-
+ drivers/net/ethernet/stmicro/stmmac/common.h | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 17 +-
+ drivers/net/ethernet/stmicro/stmmac/mmc.h | 6 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac.h | 10 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 1 -
+ drivers/net/ethernet/sun/cassini.c | 4 +-
+ drivers/net/ethernet/sun/niu.c | 2 -
+ drivers/net/ethernet/sun/sungem.c | 4 +-
+ drivers/net/ethernet/sun/sunhme.c | 12 +-
+ drivers/net/ethernet/sun/sunqe.c | 2 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 1 -
+ drivers/net/ethernet/ti/Kconfig | 8 +
+ drivers/net/ethernet/ti/Makefile | 1 +
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 161 +
+ drivers/net/ethernet/ti/cpsw.c | 159 +-
+ drivers/net/ethernet/ti/cpsw.h | 2 +
+ drivers/net/ethernet/ti/cpts.h | 9 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 2 +-
+ drivers/net/ethernet/ti/tlan.c | 1 -
+ drivers/net/ethernet/tile/tilegx.c | 2 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_net.h | 29 +-
+ drivers/net/ethernet/toshiba/ps3_gelic_wireless.h | 6 +-
+ drivers/net/ethernet/toshiba/spider_net.c | 1 -
+ drivers/net/ethernet/toshiba/spider_net.h | 4 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 1 -
+ drivers/net/ethernet/via/via-rhine.c | 1 -
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 41 +-
+ drivers/net/fddi/skfp/fplustm.c | 2 +-
+ drivers/net/fddi/skfp/h/smc.h | 28 +-
+ drivers/net/fddi/skfp/skfddi.c | 6 +-
+ drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
+ drivers/net/hamradio/baycom_ser_hdx.c | 2 +-
+ drivers/net/hamradio/scc.c | 2 +-
+ drivers/net/hamradio/yam.c | 2 +-
+ drivers/net/irda/bfin_sir.c | 4 +-
+ drivers/net/irda/donauboe.c | 4 +-
+ drivers/net/irda/sh_irda.c | 2 +-
+ drivers/net/irda/sh_sir.c | 2 +-
+ drivers/net/irda/sir-dev.h | 29 +-
+ drivers/net/macvlan.c | 11 +-
+ drivers/net/netconsole.c | 57 +-
+ drivers/net/phy/at803x.c | 57 +-
+ drivers/net/phy/marvell.c | 4 +-
+ drivers/net/phy/micrel.c | 24 +
+ drivers/net/plip/plip.c | 2 +-
+ drivers/net/usb/catc.c | 8 +-
+ drivers/net/usb/cdc-phonet.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 104 +-
+ drivers/net/usb/cdc_ncm.c | 490 +-
+ drivers/net/usb/qmi_wwan.c | 69 +-
+ drivers/net/veth.c | 9 +
+ drivers/net/virtio_net.c | 164 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
+ drivers/net/vxlan.c | 37 +-
+ drivers/net/wan/hostess_sv11.c | 2 +-
+ drivers/net/wan/sealevel.c | 2 +-
+ drivers/net/wan/x25_asy.h | 2 +-
+ drivers/net/wan/z85230.h | 27 +-
+ drivers/net/wimax/i2400m/i2400m-usb.h | 27 +-
+ drivers/net/wimax/i2400m/i2400m.h | 117 +-
+ drivers/net/wireless/adm8211.c | 1 -
+ drivers/net/wireless/airo.c | 1 -
+ drivers/net/wireless/ath/Kconfig | 1 +
+ drivers/net/wireless/ath/Makefile | 1 +
+ drivers/net/wireless/ath/ar5523/ar5523.c | 1 +
+ drivers/net/wireless/ath/ath10k/bmi.c | 42 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 382 +-
+ drivers/net/wireless/ath/ath10k/ce.h | 120 +-
+ drivers/net/wireless/ath/ath10k/core.c | 70 +-
+ drivers/net/wireless/ath/ath10k/core.h | 35 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 144 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 22 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 241 +-
+ drivers/net/wireless/ath/ath10k/htc.h | 5 +-
+ drivers/net/wireless/ath/ath10k/htt.c | 19 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 13 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 314 +-
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 285 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 25 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 244 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 446 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 73 +-
+ drivers/net/wireless/ath/ath10k/rx_desc.h | 24 +-
+ drivers/net/wireless/ath/ath10k/trace.h | 32 +-
+ drivers/net/wireless/ath/ath10k/txrx.c | 67 +-
+ drivers/net/wireless/ath/ath10k/txrx.h | 5 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 236 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 71 +-
+ drivers/net/wireless/ath/ath5k/ahb.c | 15 +-
+ drivers/net/wireless/ath/ath6kl/common.h | 3 +-
+ drivers/net/wireless/ath/ath6kl/debug.h | 9 +-
+ drivers/net/wireless/ath/ath9k/ahb.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 6 +-
+ drivers/net/wireless/ath/ath9k/antenna.c | 36 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 48 +-
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 11 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 26 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 3 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 92 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 34 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 2 +
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 5 +
+ drivers/net/wireless/ath/ath9k/ar9003_mci.c | 6 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 145 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 4 +
+ drivers/net/wireless/ath/ath9k/ar9003_rtt.c | 58 +-
+ drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 218 +-
+ .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 24 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 34 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 2 +
+ drivers/net/wireless/ath/ath9k/calib.c | 23 +-
+ drivers/net/wireless/ath/ath9k/common.c | 91 +-
+ drivers/net/wireless/ath/ath9k/common.h | 7 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 446 +-
+ drivers/net/wireless/ath/ath9k/debug.h | 12 +-
+ drivers/net/wireless/ath/ath9k/dfs_debug.c | 25 +-
+ drivers/net/wireless/ath/ath9k/dfs_pri_detector.c | 2 +-
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 10 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 8 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 12 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 22 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 456 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 32 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 126 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 108 +-
+ drivers/net/wireless/ath/ath9k/init.c | 107 +-
+ drivers/net/wireless/ath/ath9k/link.c | 12 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 6 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 2 -
+ drivers/net/wireless/ath/ath9k/main.c | 167 +-
+ drivers/net/wireless/ath/ath9k/mci.c | 8 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 195 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 32 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 48 +-
+ drivers/net/wireless/ath/ath9k/wmi.h | 2 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 14 +-
+ drivers/net/wireless/ath/wcn36xx/Kconfig | 16 +
+ drivers/net/wireless/ath/wcn36xx/Makefile | 7 +
+ drivers/net/wireless/ath/wcn36xx/debug.c | 181 +
+ drivers/net/wireless/ath/wcn36xx/debug.h | 49 +
+ drivers/net/wireless/ath/wcn36xx/dxe.c | 805 ++++
+ drivers/net/wireless/ath/wcn36xx/dxe.h | 284 ++
+ drivers/net/wireless/ath/wcn36xx/hal.h | 4657 ++++++++++++++++++++
+ drivers/net/wireless/ath/wcn36xx/main.c | 1036 +++++
+ drivers/net/wireless/ath/wcn36xx/pmc.c | 62 +
+ drivers/net/wireless/ath/wcn36xx/pmc.h | 33 +
+ drivers/net/wireless/ath/wcn36xx/smd.c | 2126 +++++++++
+ drivers/net/wireless/ath/wcn36xx/smd.h | 127 +
+ drivers/net/wireless/ath/wcn36xx/txrx.c | 284 ++
+ drivers/net/wireless/ath/wcn36xx/txrx.h | 160 +
+ drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 238 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 4 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 -
+ drivers/net/wireless/atmel.c | 92 +-
+ drivers/net/wireless/b43/xmit.c | 2 +-
+ drivers/net/wireless/b43legacy/xmit.c | 2 +-
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 13 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 32 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 29 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 38 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 12 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 234 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fweh.h | 5 +-
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 2 +
+ .../net/wireless/brcm80211/brcmfmac/sdio_chip.c | 28 +
+ .../net/wireless/brcm80211/brcmfmac/sdio_chip.h | 31 +-
+ .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 92 +-
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 +-
+ drivers/net/wireless/brcm80211/brcmsmac/aiutils.h | 18 +-
+ drivers/net/wireless/brcm80211/brcmsmac/ampdu.h | 22 +-
+ drivers/net/wireless/brcm80211/brcmsmac/antsel.h | 14 +-
+ drivers/net/wireless/brcm80211/brcmsmac/channel.h | 20 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 38 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 8 +-
+ drivers/net/wireless/brcm80211/brcmsmac/main.h | 110 +-
+ .../net/wireless/brcm80211/brcmsmac/phy/phy_hal.h | 219 +-
+ .../net/wireless/brcm80211/brcmsmac/phy/phy_int.h | 371 +-
+ drivers/net/wireless/brcm80211/brcmsmac/phy_shim.h | 91 +-
+ drivers/net/wireless/brcm80211/brcmsmac/pmu.h | 4 +-
+ drivers/net/wireless/brcm80211/brcmsmac/pub.h | 145 +-
+ drivers/net/wireless/brcm80211/brcmsmac/rate.h | 48 +-
+ drivers/net/wireless/brcm80211/brcmsmac/stf.h | 31 +-
+ .../net/wireless/brcm80211/brcmsmac/ucode_loader.h | 16 +-
+ .../net/wireless/brcm80211/include/brcm_hw_ids.h | 1 +
+ drivers/net/wireless/brcm80211/include/brcmu_d11.h | 2 +-
+ .../net/wireless/brcm80211/include/brcmu_utils.h | 44 +-
+ drivers/net/wireless/cw1200/cw1200_spi.c | 4 +-
+ drivers/net/wireless/hostap/hostap_info.c | 2 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 4 +-
+ drivers/net/wireless/ipw2x00/libipw.h | 87 +-
+ drivers/net/wireless/iwlegacy/3945-mac.c | 2 -
+ drivers/net/wireless/iwlegacy/3945.h | 82 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 2 -
+ drivers/net/wireless/iwlegacy/4965.h | 2 +-
+ drivers/net/wireless/iwlegacy/common.h | 66 +-
+ drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.h | 8 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 9 +-
+ drivers/net/wireless/libertas/if_spi.c | 2 +-
+ drivers/net/wireless/mwifiex/cmdevt.c | 2 +-
+ drivers/net/wireless/mwifiex/join.c | 2 +-
+ drivers/net/wireless/mwifiex/main.c | 4 +-
+ drivers/net/wireless/mwifiex/pcie.c | 6 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 2 +-
+ drivers/net/wireless/mwifiex/wmm.c | 2 +-
+ drivers/net/wireless/mwifiex/wmm.h | 24 +-
+ drivers/net/wireless/mwl8k.c | 2 -
+ drivers/net/wireless/orinoco/orinoco.h | 31 +-
+ drivers/net/wireless/orinoco/orinoco_nortel.c | 2 -
+ drivers/net/wireless/orinoco/orinoco_pci.c | 2 -
+ drivers/net/wireless/orinoco/orinoco_plx.c | 2 -
+ drivers/net/wireless/orinoco/orinoco_tmd.c | 2 -
+ drivers/net/wireless/p54/p54pci.c | 1 -
+ drivers/net/wireless/p54/p54spi.c | 2 +-
+ drivers/net/wireless/prism54/isl_ioctl.c | 10 +-
+ drivers/net/wireless/prism54/islpci_dev.c | 2 +-
+ drivers/net/wireless/prism54/oid_mgt.c | 2 +-
+ drivers/net/wireless/rt2x00/Kconfig | 1 +
+ drivers/net/wireless/rt2x00/rt2800.h | 44 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 222 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 17 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 103 +-
+ drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +-
+ drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +-
+ drivers/net/wireless/rt2x00/rt2x00link.c | 74 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 39 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +
+ drivers/net/wireless/rt2x00/rt61pci.c | 20 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 18 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 1 -
+ drivers/net/wireless/rtlwifi/base.c | 29 +
+ drivers/net/wireless/rtlwifi/base.h | 2 +-
+ drivers/net/wireless/rtlwifi/cam.h | 10 +-
+ drivers/net/wireless/rtlwifi/core.c | 10 +-
+ drivers/net/wireless/rtlwifi/efuse.c | 18 +-
+ drivers/net/wireless/rtlwifi/efuse.h | 29 +-
+ drivers/net/wireless/rtlwifi/pci.c | 4 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 1 +
+ drivers/net/wireless/rtlwifi/rtl8188ee/phy.c | 28 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/phy.h | 52 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 25 +-
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 30 -
+ drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 4 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 52 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 20 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 13 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 187 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 13 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 -
+ drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 8 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/hw.c | 18 -
+ drivers/net/wireless/rtlwifi/rtl8192de/hw.h | 7 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 28 -
+ drivers/net/wireless/rtlwifi/rtl8192de/phy.h | 49 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/rf.h | 18 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 5 -
+ drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.c | 29 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/phy.h | 62 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/rf.h | 13 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/usb.c | 6 +-
+ drivers/net/wireless/rtlwifi/wifi.h | 2 -
+ drivers/net/wireless/ti/wl1251/spi.c | 2 +-
+ drivers/net/wireless/ti/wl1251/wl1251.h | 4 +-
+ drivers/net/wireless/ti/wl12xx/main.c | 2 +-
+ drivers/net/wireless/ti/wl18xx/main.c | 95 +-
+ drivers/net/wireless/ti/wl18xx/reg.h | 33 +-
+ drivers/net/wireless/ti/wlcore/cmd.c | 58 +-
+ drivers/net/wireless/ti/wlcore/main.c | 158 +-
+ drivers/net/wireless/ti/wlcore/ps.c | 4 +
+ drivers/net/wireless/ti/wlcore/scan.c | 27 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 2 +-
+ drivers/net/wireless/ti/wlcore/testmode.c | 13 +-
+ drivers/net/wireless/ti/wlcore/tx.c | 27 +-
+ drivers/net/wireless/ti/wlcore/tx.h | 3 +
+ drivers/net/wireless/ti/wlcore/wlcore.h | 2 +
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 11 +
+ drivers/net/xen-netback/common.h | 12 +-
+ drivers/net/xen-netback/interface.c | 16 +-
+ drivers/net/xen-netback/netback.c | 294 +-
+ drivers/net/xen-netback/xenbus.c | 52 +-
+ drivers/net/xen-netfront.c | 4 +-
+ include/linux/crc32.h | 40 +
+ include/linux/etherdevice.h | 35 +-
+ include/linux/fcdevice.h | 2 +-
+ include/linux/fddidevice.h | 7 +-
+ include/linux/hippidevice.h | 10 +-
+ include/linux/ieee80211.h | 4 +-
+ include/linux/inetdevice.h | 28 +-
+ include/linux/ipv6.h | 76 +-
+ include/linux/jump_label.h | 10 +
+ include/linux/jump_label_ratelimit.h | 2 +
+ include/linux/mlx4/cmd.h | 6 +-
+ include/linux/mlx4/device.h | 22 +-
+ include/linux/net.h | 109 +-
+ include/linux/netdev_features.h | 4 +
+ include/linux/netdevice.h | 466 +-
+ include/linux/netfilter.h | 24 +-
+ include/linux/netfilter/ipset/ip_set.h | 151 +-
+ include/linux/netfilter/ipset/ip_set_comment.h | 57 +
+ include/linux/netfilter/ipset/ip_set_timeout.h | 4 +-
+ include/linux/netfilter/nf_conntrack_common.h | 2 +-
+ include/linux/netfilter/nf_conntrack_h323.h | 14 +-
+ include/linux/netfilter/nf_conntrack_proto_gre.h | 4 +-
+ include/linux/netfilter/nf_conntrack_sip.h | 162 +-
+ include/linux/netfilter/nfnetlink.h | 29 +-
+ include/linux/netfilter/nfnetlink_acct.h | 6 +-
+ include/linux/netfilter/x_tables.h | 128 +-
+ include/linux/netfilter_bridge.h | 4 +-
+ include/linux/netfilter_ipv4.h | 6 +-
+ include/linux/netfilter_ipv6.h | 10 +-
+ include/linux/rtnetlink.h | 2 +-
+ include/linux/skbuff.h | 282 +-
+ include/linux/ssb/ssb_driver_gige.h | 14 +
+ include/linux/usb/cdc_ncm.h | 30 +-
+ include/net/bluetooth/bluetooth.h | 21 +-
+ include/net/bluetooth/hci.h | 81 +-
+ include/net/bluetooth/hci_core.h | 25 +-
+ include/net/bluetooth/l2cap.h | 1 +
+ include/net/bluetooth/mgmt.h | 11 +
+ include/net/bluetooth/rfcomm.h | 4 +-
+ include/net/caif/caif_hsi.h | 2 +-
+ include/net/cfg80211.h | 9 +
+ include/net/checksum.h | 11 +
+ include/net/compat.h | 48 +-
+ include/net/dcbevent.h | 6 +-
+ include/net/dn.h | 20 +-
+ include/net/dn_dev.h | 30 +-
+ include/net/dn_fib.h | 47 +-
+ include/net/dn_neigh.h | 12 +-
+ include/net/dn_nsp.h | 49 +-
+ include/net/dn_route.h | 13 +-
+ include/net/dst.h | 25 +-
+ include/net/esp.h | 12 +-
+ include/net/fib_rules.h | 17 +-
+ include/net/flow.h | 11 +-
+ include/net/flow_keys.h | 3 +-
+ include/net/garp.h | 27 +-
+ include/net/gen_stats.h | 51 +-
+ include/net/genetlink.h | 26 +-
+ include/net/gre.h | 8 +-
+ include/net/icmp.h | 10 +-
+ include/net/if_inet6.h | 5 +-
+ include/net/inet6_connection_sock.h | 32 +-
+ include/net/inet6_hashtables.h | 67 +-
+ include/net/inet_common.h | 48 +-
+ include/net/inet_connection_sock.h | 79 +-
+ include/net/inet_frag.h | 4 +
+ include/net/inet_hashtables.h | 99 +-
+ include/net/inet_sock.h | 49 +-
+ include/net/inet_timewait_sock.h | 69 +-
+ include/net/inetpeer.h | 12 +-
+ include/net/ip.h | 189 +-
+ include/net/ip6_checksum.h | 4 +-
+ include/net/ip6_fib.h | 51 +-
+ include/net/ip6_route.h | 98 +-
+ include/net/ip_fib.h | 61 +-
+ include/net/ip_tunnels.h | 3 +
+ include/net/ip_vs.h | 245 +-
+ include/net/ipv6.h | 270 +-
+ include/net/ipx.h | 12 +-
+ include/net/irda/ircomm_tty.h | 14 +-
+ include/net/irda/irda.h | 21 +-
+ include/net/irda/irda_device.h | 2 +-
+ include/net/irda/irlap_event.h | 2 +-
+ include/net/irda/irlap_frame.h | 4 +-
+ include/net/iw_handler.h | 38 +-
+ include/net/lapb.h | 52 +-
+ include/net/llc.h | 50 +-
+ include/net/llc_c_ac.h | 190 +-
+ include/net/llc_c_ev.h | 207 +-
+ include/net/llc_conn.h | 36 +-
+ include/net/llc_if.h | 7 +-
+ include/net/llc_pdu.h | 33 +-
+ include/net/llc_s_ac.h | 20 +-
+ include/net/llc_s_ev.h | 21 +-
+ include/net/llc_sap.h | 22 +-
+ include/net/mac80211.h | 42 +
+ include/net/mrp.h | 26 +-
+ include/net/ndisc.h | 61 +-
+ include/net/net_namespace.h | 32 +-
+ include/net/netevent.h | 6 +-
+ include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 6 +-
+ include/net/netfilter/ipv4/nf_defrag_ipv4.h | 2 +-
+ include/net/netfilter/ipv6/nf_defrag_ipv6.h | 17 +-
+ include/net/netfilter/nf_conntrack.h | 69 +-
+ include/net/netfilter/nf_conntrack_acct.h | 12 +-
+ include/net/netfilter/nf_conntrack_core.h | 69 +-
+ include/net/netfilter/nf_conntrack_ecache.h | 22 +-
+ include/net/netfilter/nf_conntrack_extend.h | 2 +-
+ include/net/netfilter/nf_conntrack_helper.h | 40 +-
+ include/net/netfilter/nf_conntrack_l3proto.h | 16 +-
+ include/net/netfilter/nf_conntrack_l4proto.h | 32 +-
+ include/net/netfilter/nf_conntrack_seqadj.h | 30 +-
+ include/net/netfilter/nf_conntrack_synproxy.h | 28 +-
+ include/net/netfilter/nf_conntrack_timeout.h | 4 +-
+ include/net/netfilter/nf_conntrack_timestamp.h | 8 +-
+ include/net/netfilter/nf_nat.h | 13 +-
+ include/net/netfilter/nf_nat_core.h | 8 +-
+ include/net/netfilter/nf_nat_helper.h | 29 +-
+ include/net/netfilter/nf_nat_l3proto.h | 23 +-
+ include/net/netfilter/nf_nat_l4proto.h | 30 +-
+ include/net/netfilter/nf_queue.h | 2 +-
+ include/net/netfilter/nf_tables.h | 519 +++
+ include/net/netfilter/nf_tables_core.h | 42 +
+ include/net/netfilter/nf_tables_ipv4.h | 23 +
+ include/net/netfilter/nf_tables_ipv6.h | 30 +
+ include/net/netfilter/xt_rateest.h | 4 +-
+ include/net/netlink.h | 63 +-
+ include/net/netns/ipv4.h | 7 +-
+ include/net/netns/nftables.h | 19 +
+ include/net/netrom.h | 89 +-
+ include/net/p8022.h | 18 +-
+ include/net/ping.h | 4 +-
+ include/net/protocol.h | 24 +-
+ include/net/psnap.h | 4 +-
+ include/net/raw.h | 6 +-
+ include/net/rawv6.h | 3 +-
+ include/net/request_sock.h | 15 +-
+ include/net/rose.h | 114 +-
+ include/net/route.h | 62 +-
+ include/net/rtnetlink.h | 40 +-
+ include/net/sch_generic.h | 11 +-
+ include/net/scm.h | 10 +-
+ include/net/sctp/checksum.h | 56 +-
+ include/net/sctp/sctp.h | 13 +-
+ include/net/secure_seq.h | 26 +-
+ include/net/sock.h | 276 +-
+ include/net/stp.h | 4 +-
+ include/net/tcp.h | 449 +-
+ include/net/tcp_memcontrol.h | 12 -
+ include/net/udp.h | 95 +-
+ include/net/udplite.h | 6 +-
+ include/net/vxlan.h | 11 +
+ include/net/wext.h | 16 +-
+ include/net/wimax.h | 33 +-
+ include/net/x25.h | 141 +-
+ include/net/xfrm.h | 382 +-
+ include/uapi/asm-generic/socket.h | 2 +
+ include/uapi/linux/can/bcm.h | 32 +
+ include/uapi/linux/can/error.h | 32 +
+ include/uapi/linux/can/gw.h | 32 +
+ include/uapi/linux/can/netlink.h | 8 +
+ include/uapi/linux/can/raw.h | 32 +
+ include/uapi/linux/hsr_netlink.h | 50 +
+ include/uapi/linux/if_bonding.h | 2 +
+ include/uapi/linux/if_ether.h | 1 +
+ include/uapi/linux/if_link.h | 24 +
+ include/uapi/linux/netfilter/Kbuild | 2 +
+ include/uapi/linux/netfilter/ipset/ip_set.h | 16 +-
+ include/uapi/linux/netfilter/nf_conntrack_common.h | 4 +
+ include/uapi/linux/netfilter/nf_tables.h | 718 +++
+ include/uapi/linux/netfilter/nf_tables_compat.h | 38 +
+ include/uapi/linux/netfilter/nfnetlink.h | 10 +-
+ include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 2 +
+ include/uapi/linux/openvswitch.h | 18 +-
+ include/uapi/linux/pkt_cls.h | 14 +
+ include/uapi/linux/pkt_sched.h | 2 +
+ include/xen/interface/io/netif.h | 18 +-
+ init/main.c | 7 +
+ kernel/jump_label.c | 5 +
+ lib/crc32.c | 456 +-
+ mm/memcontrol.c | 6 +-
+ net/8021q/vlan.c | 18 +-
+ net/8021q/vlan.h | 28 +-
+ net/Kconfig | 1 +
+ net/Makefile | 1 +
+ net/ax25/af_ax25.c | 2 +-
+ net/batman-adv/Makefile | 3 +-
+ net/batman-adv/bat_iv_ogm.c | 510 ++-
+ net/batman-adv/bridge_loop_avoidance.c | 64 +-
+ net/batman-adv/bridge_loop_avoidance.h | 10 +-
+ net/batman-adv/debugfs.c | 9 -
+ net/batman-adv/distributed-arp-table.c | 231 +-
+ net/batman-adv/distributed-arp-table.h | 5 +
+ net/batman-adv/fragmentation.c | 491 +++
+ net/batman-adv/fragmentation.h | 50 +
+ net/batman-adv/gateway_client.c | 247 +-
+ net/batman-adv/gateway_client.h | 2 +-
+ net/batman-adv/gateway_common.c | 230 +-
+ net/batman-adv/gateway_common.h | 14 +-
+ net/batman-adv/hard-interface.c | 110 +-
+ net/batman-adv/hard-interface.h | 2 +-
+ net/batman-adv/icmp_socket.c | 128 +-
+ net/batman-adv/icmp_socket.h | 2 +-
+ net/batman-adv/main.c | 689 ++-
+ net/batman-adv/main.h | 68 +-
+ net/batman-adv/network-coding.c | 71 +-
+ net/batman-adv/network-coding.h | 5 +
+ net/batman-adv/originator.c | 364 +-
+ net/batman-adv/originator.h | 13 +-
+ net/batman-adv/packet.h | 356 +-
+ net/batman-adv/routing.c | 557 ++-
+ net/batman-adv/routing.h | 13 +-
+ net/batman-adv/send.c | 239 +-
+ net/batman-adv/send.h | 53 +
+ net/batman-adv/soft-interface.c | 269 +-
+ net/batman-adv/soft-interface.h | 4 +
+ net/batman-adv/sysfs.c | 274 +-
+ net/batman-adv/sysfs.h | 10 +
+ net/batman-adv/translation-table.c | 2086 ++++++---
+ net/batman-adv/translation-table.h | 46 +-
+ net/batman-adv/types.h | 436 +-
+ net/batman-adv/unicast.c | 491 ---
+ net/batman-adv/unicast.h | 92 -
+ net/batman-adv/vis.c | 938 ----
+ net/batman-adv/vis.h | 36 -
+ net/bluetooth/Makefile | 2 +
+ net/bluetooth/af_bluetooth.c | 41 +
+ net/bluetooth/hci_conn.c | 4 +
+ net/bluetooth/hci_core.c | 189 +-
+ net/bluetooth/hci_event.c | 17 +-
+ net/bluetooth/hci_sock.c | 204 +-
+ net/bluetooth/hidp/hidp.h | 4 +-
+ net/bluetooth/l2cap_core.c | 162 +-
+ net/bluetooth/l2cap_sock.c | 20 +-
+ net/bluetooth/mgmt.c | 562 ++-
+ net/bluetooth/rfcomm/sock.c | 7 +-
+ net/bluetooth/smp.c | 15 +-
+ net/bridge/br_multicast.c | 4 +-
+ net/bridge/br_netfilter.c | 22 +-
+ net/bridge/br_private.h | 300 +-
+ net/bridge/br_private_stp.h | 24 +-
+ net/bridge/netfilter/Kconfig | 3 +
+ net/bridge/netfilter/Makefile | 2 +
+ net/bridge/netfilter/ebt_among.c | 2 +-
+ net/bridge/netfilter/ebtable_filter.c | 16 +-
+ net/bridge/netfilter/ebtable_nat.c | 16 +-
+ net/bridge/netfilter/nf_tables_bridge.c | 65 +
+ net/can/af_can.h | 6 +-
+ net/ceph/auth_none.h | 2 +-
+ net/ceph/auth_x.h | 2 +-
+ net/ceph/crypto.h | 48 +-
+ net/core/datagram.c | 2 +-
+ net/core/dev.c | 539 ++-
+ net/core/dev_addr_lists.c | 4 +-
+ net/core/ethtool.c | 2 +
+ net/core/flow_dissector.c | 73 +-
+ net/core/iovec.c | 2 +-
+ net/core/neighbour.c | 2 +-
+ net/core/net-sysfs.c | 2 +-
+ net/core/netprio_cgroup.c | 3 +-
+ net/core/rtnetlink.c | 12 +-
+ net/core/secure_seq.c | 16 +-
+ net/core/skbuff.c | 96 +-
+ net/core/sock.c | 45 +-
+ net/core/utils.c | 49 +
+ net/dccp/ackvec.h | 21 +-
+ net/dccp/ccid.h | 18 +-
+ net/dccp/ccids/lib/loss_interval.h | 8 +-
+ net/dccp/ccids/lib/packet_history.h | 25 +-
+ net/dccp/ccids/lib/tfrc.h | 22 +-
+ net/dccp/dccp.h | 186 +-
+ net/dccp/feat.h | 26 +-
+ net/dccp/ipv4.c | 18 +-
+ net/dccp/ipv6.c | 83 +-
+ net/dccp/ipv6.h | 2 -
+ net/dccp/minisocks.c | 15 +-
+ net/dccp/output.c | 4 +-
+ net/dccp/proto.c | 4 +-
+ net/decnet/netfilter/dn_rtmsg.c | 2 +-
+ net/ethernet/eth.c | 30 +-
+ net/hsr/Kconfig | 27 +
+ net/hsr/Makefile | 7 +
+ net/hsr/hsr_device.c | 596 +++
+ net/hsr/hsr_device.h | 29 +
+ net/hsr/hsr_framereg.c | 503 +++
+ net/hsr/hsr_framereg.h | 53 +
+ net/hsr/hsr_main.c | 469 ++
+ net/hsr/hsr_main.h | 166 +
+ net/hsr/hsr_netlink.c | 457 ++
+ net/hsr/hsr_netlink.h | 30 +
+ net/ieee802154/6lowpan.c | 46 +-
+ net/ipv4/af_inet.c | 92 +-
+ net/ipv4/esp4.c | 49 +-
+ net/ipv4/fib_frontend.c | 2 -
+ net/ipv4/fib_lookup.h | 26 +-
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/fib_trie.c | 15 +-
+ net/ipv4/gre_demux.c | 29 -
+ net/ipv4/gre_offload.c | 3 +-
+ net/ipv4/icmp.c | 5 +
+ net/ipv4/inet_connection_sock.c | 54 +-
+ net/ipv4/inet_diag.c | 120 +-
+ net/ipv4/inet_fragment.c | 3 -
+ net/ipv4/inet_hashtables.c | 110 +-
+ net/ipv4/inet_timewait_sock.c | 59 +-
+ net/ipv4/ip_fragment.c | 1 +
+ net/ipv4/ip_output.c | 25 +-
+ net/ipv4/ip_sockglue.c | 25 +-
+ net/ipv4/ip_tunnel_core.c | 33 +
+ net/ipv4/ip_vti.c | 67 +-
+ net/ipv4/ipip.c | 11 +-
+ net/ipv4/netfilter/Kconfig | 21 +
+ net/ipv4/netfilter/Makefile | 6 +
+ net/ipv4/netfilter/arptable_filter.c | 5 +-
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +-
+ net/ipv4/netfilter/ipt_SYNPROXY.c | 2 +-
+ net/ipv4/netfilter/iptable_filter.c | 7 +-
+ net/ipv4/netfilter/iptable_mangle.c | 10 +-
+ net/ipv4/netfilter/iptable_nat.c | 26 +-
+ net/ipv4/netfilter/iptable_raw.c | 6 +-
+ net/ipv4/netfilter/iptable_security.c | 7 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 12 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 6 +-
+ net/ipv4/netfilter/nf_tables_arp.c | 102 +
+ net/ipv4/netfilter/nf_tables_ipv4.c | 128 +
+ net/ipv4/netfilter/nft_chain_nat_ipv4.c | 205 +
+ net/ipv4/netfilter/nft_chain_route_ipv4.c | 90 +
+ net/ipv4/netfilter/nft_reject_ipv4.c | 123 +
+ net/ipv4/ping.c | 29 +-
+ net/ipv4/raw.c | 6 +-
+ net/ipv4/route.c | 16 +-
+ net/ipv4/syncookies.c | 80 +-
+ net/ipv4/sysctl_net_ipv4.c | 130 +-
+ net/ipv4/tcp.c | 17 +-
+ net/ipv4/tcp_fastopen.c | 27 +-
+ net/ipv4/tcp_input.c | 131 +-
+ net/ipv4/tcp_ipv4.c | 124 +-
+ net/ipv4/tcp_memcontrol.c | 90 +-
+ net/ipv4/tcp_metrics.c | 27 +-
+ net/ipv4/tcp_minisocks.c | 7 +-
+ net/ipv4/tcp_offload.c | 8 +-
+ net/ipv4/tcp_output.c | 33 +-
+ net/ipv4/tcp_probe.c | 29 +-
+ net/ipv4/tcp_timer.c | 9 +-
+ net/ipv4/tcp_vegas.h | 10 +-
+ net/ipv4/udp.c | 235 +-
+ net/ipv4/udp_impl.h | 36 +-
+ net/ipv4/udp_offload.c | 1 +
+ net/ipv4/xfrm4_mode_tunnel.c | 16 +-
+ net/ipv6/Kconfig | 29 +-
+ net/ipv6/Makefile | 1 +
+ net/ipv6/addrconf.c | 41 +-
+ net/ipv6/af_inet6.c | 65 +-
+ net/ipv6/datagram.c | 25 +-
+ net/ipv6/esp6.c | 48 +-
+ net/ipv6/inet6_connection_sock.c | 33 +-
+ net/ipv6/inet6_hashtables.c | 122 +-
+ net/ipv6/ip6_fib.c | 205 +-
+ net/ipv6/ip6_offload.c | 40 +-
+ net/ipv6/ip6_vti.c | 1056 +++++
+ net/ipv6/ipv6_sockglue.c | 7 +-
+ net/ipv6/netfilter/Kconfig | 13 +
+ net/ipv6/netfilter/Makefile | 5 +
+ net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +-
+ net/ipv6/netfilter/ip6table_filter.c | 5 +-
+ net/ipv6/netfilter/ip6table_mangle.c | 10 +-
+ net/ipv6/netfilter/ip6table_nat.c | 27 +-
+ net/ipv6/netfilter/ip6table_raw.c | 5 +-
+ net/ipv6/netfilter/ip6table_security.c | 5 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 16 +-
+ net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 6 +-
+ net/ipv6/netfilter/nf_tables_ipv6.c | 127 +
+ net/ipv6/netfilter/nft_chain_nat_ipv6.c | 211 +
+ net/ipv6/netfilter/nft_chain_route_ipv6.c | 88 +
+ net/ipv6/ping.c | 2 +-
+ net/ipv6/raw.c | 17 +-
+ net/ipv6/reassembly.c | 12 +-
+ net/ipv6/route.c | 51 +-
+ net/ipv6/sit.c | 28 +-
+ net/ipv6/syncookies.c | 75 +-
+ net/ipv6/tcp_ipv6.c | 113 +-
+ net/ipv6/tcpv6_offload.c | 2 +-
+ net/ipv6/udp.c | 88 +-
+ net/ipv6/udp_impl.h | 41 +-
+ net/ipv6/udp_offload.c | 2 +
+ net/ipv6/xfrm6_mode_tunnel.c | 69 +
+ net/irda/irnet/irnet.h | 15 +-
+ net/l2tp/l2tp_core.c | 10 +-
+ net/l2tp/l2tp_core.h | 57 +-
+ net/l2tp/l2tp_debugfs.c | 5 +-
+ net/l2tp/l2tp_ip6.c | 16 +-
+ net/l2tp/l2tp_netlink.c | 4 +-
+ net/l2tp/l2tp_ppp.c | 12 +-
+ net/mac80211/cfg.c | 92 +-
+ net/mac80211/chan.c | 5 -
+ net/mac80211/debugfs.c | 55 +-
+ net/mac80211/driver-ops.h | 27 +
+ net/mac80211/ibss.c | 608 ++-
+ net/mac80211/ieee80211_i.h | 30 +-
+ net/mac80211/iface.c | 4 +
+ net/mac80211/key.c | 2 +-
+ net/mac80211/mlme.c | 334 +-
+ net/mac80211/rate.h | 12 +-
+ net/mac80211/rc80211_minstrel.c | 14 +
+ net/mac80211/rc80211_minstrel_ht.c | 23 +-
+ net/mac80211/rc80211_pid_debugfs.c | 26 +-
+ net/mac80211/rx.c | 39 +-
+ net/mac80211/scan.c | 3 +-
+ net/mac80211/spectmgmt.c | 162 +
+ net/mac80211/trace.h | 39 +-
+ net/mac80211/tx.c | 39 +-
+ net/mac80211/util.c | 162 +-
+ net/mac80211/vht.c | 4 +-
+ net/mac802154/ieee802154_dev.c | 6 +-
+ net/mac802154/wpan.c | 2 +
+ net/mpls/mpls_gso.c | 1 +
+ net/netfilter/Kconfig | 52 +
+ net/netfilter/Makefile | 18 +
+ net/netfilter/core.c | 2 +-
+ net/netfilter/ipset/Kconfig | 20 +-
+ net/netfilter/ipset/Makefile | 2 +
+ net/netfilter/ipset/ip_set_bitmap_gen.h | 163 +-
+ net/netfilter/ipset/ip_set_bitmap_ip.c | 125 +-
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c | 156 +-
+ net/netfilter/ipset/ip_set_bitmap_port.c | 112 +-
+ net/netfilter/ipset/ip_set_core.c | 361 +-
+ net/netfilter/ipset/ip_set_getport.c | 18 +-
+ net/netfilter/ipset/ip_set_hash_gen.h | 526 +--
+ net/netfilter/ipset/ip_set_hash_ip.c | 58 +-
+ net/netfilter/ipset/ip_set_hash_ipport.c | 80 +-
+ net/netfilter/ipset/ip_set_hash_ipportip.c | 86 +-
+ net/netfilter/ipset/ip_set_hash_ipportnet.c | 108 +-
+ net/netfilter/ipset/ip_set_hash_net.c | 85 +-
+ net/netfilter/ipset/ip_set_hash_netiface.c | 98 +-
+ net/netfilter/ipset/ip_set_hash_netnet.c | 483 ++
+ net/netfilter/ipset/ip_set_hash_netport.c | 92 +-
+ net/netfilter/ipset/ip_set_hash_netportnet.c | 588 +++
+ net/netfilter/ipset/ip_set_list_set.c | 263 +-
+ net/netfilter/ipvs/ip_vs_core.c | 42 +-
+ net/netfilter/nf_conntrack_sip.c | 133 +-
+ net/netfilter/nf_internals.h | 28 +-
+ net/netfilter/nf_nat_core.c | 20 +
+ net/netfilter/nf_nat_sip.c | 35 +-
+ net/netfilter/nf_tables_api.c | 3275 ++++++++++++++
+ net/netfilter/nf_tables_core.c | 270 ++
+ net/netfilter/nfnetlink.c | 175 +-
+ net/netfilter/nfnetlink_cttimeout.c | 161 +-
+ net/netfilter/nfnetlink_log.c | 11 +-
+ net/netfilter/nfnetlink_queue_core.c | 6 +-
+ net/netfilter/nft_bitwise.c | 146 +
+ net/netfilter/nft_byteorder.c | 173 +
+ net/netfilter/nft_cmp.c | 223 +
+ net/netfilter/nft_compat.c | 768 ++++
+ net/netfilter/nft_counter.c | 113 +
+ net/netfilter/nft_ct.c | 258 ++
+ net/netfilter/nft_expr_template.c | 94 +
+ net/netfilter/nft_exthdr.c | 133 +
+ net/netfilter/nft_hash.c | 231 +
+ net/netfilter/nft_immediate.c | 132 +
+ net/netfilter/nft_limit.c | 119 +
+ net/netfilter/nft_log.c | 146 +
+ net/netfilter/nft_lookup.c | 141 +
+ net/netfilter/nft_meta.c | 228 +
+ net/netfilter/nft_meta_target.c | 117 +
+ net/netfilter/nft_nat.c | 220 +
+ net/netfilter/nft_payload.c | 160 +
+ net/netfilter/nft_rbtree.c | 247 ++
+ net/netfilter/xt_TCPMSS.c | 72 +-
+ net/netfilter/xt_TPROXY.c | 2 +-
+ net/netfilter/xt_set.c | 222 +-
+ net/netfilter/xt_socket.c | 2 +-
+ net/netlabel/netlabel_kapi.c | 2 +-
+ net/openvswitch/Makefile | 2 +
+ net/openvswitch/datapath.c | 668 +--
+ net/openvswitch/datapath.h | 9 +-
+ net/openvswitch/flow.c | 1605 +------
+ net/openvswitch/flow.h | 132 +-
+ net/openvswitch/flow_netlink.c | 1630 +++++++
+ net/openvswitch/flow_netlink.h | 60 +
+ net/openvswitch/flow_table.c | 592 +++
+ net/openvswitch/flow_table.h | 81 +
+ net/openvswitch/vport-gre.c | 2 -
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ net/openvswitch/vport-vxlan.c | 3 +-
+ net/rds/connection.c | 12 +-
+ net/rds/rds.h | 2 +-
+ net/rxrpc/ar-internal.h | 150 +-
+ net/sched/Kconfig | 10 +
+ net/sched/Makefile | 1 +
+ net/sched/act_police.c | 4 +-
+ net/sched/cls_basic.c | 2 +-
+ net/sched/cls_bpf.c | 385 ++
+ net/sched/cls_cgroup.c | 4 +-
+ net/sched/em_ipset.c | 7 +-
+ net/sched/em_meta.c | 4 +-
+ net/sched/sch_api.c | 3 +
+ net/sched/sch_generic.c | 11 +-
+ net/sched/sch_htb.c | 17 +-
+ net/sched/sch_netem.c | 1 -
+ net/sched/sch_tbf.c | 4 +-
+ net/sctp/associola.c | 4 +-
+ net/sctp/auth.c | 14 +-
+ net/sctp/chunk.c | 2 +-
+ net/sctp/ipv6.c | 22 +-
+ net/sctp/output.c | 9 +-
+ net/sctp/sm_make_chunk.c | 29 +-
+ net/sctp/socket.c | 2 +-
+ net/sunrpc/svcsock.c | 4 +-
+ net/tipc/bearer.c | 18 +-
+ net/tipc/bearer.h | 10 +-
+ net/tipc/core.h | 28 +-
+ net/tipc/eth_media.c | 68 +-
+ net/tipc/ib_media.c | 58 +-
+ net/tipc/link.c | 340 +-
+ net/tipc/link.h | 4 +-
+ net/tipc/msg.c | 27 +-
+ net/tipc/msg.h | 3 +-
+ net/tipc/port.c | 66 +-
+ net/tipc/port.h | 16 +-
+ net/tipc/socket.c | 12 +-
+ net/wimax/wimax-internal.h | 18 +-
+ net/wireless/chan.c | 1 +
+ net/wireless/core.h | 15 +-
+ net/wireless/debugfs.c | 24 +-
+ net/wireless/genregdb.awk | 6 +
+ net/wireless/nl80211.c | 52 +-
+ net/wireless/reg.c | 14 +-
+ net/wireless/sysfs.h | 4 +-
+ net/wireless/util.c | 9 +
+ net/xfrm/xfrm_hash.h | 4 +-
+ net/xfrm/xfrm_ipcomp.c | 6 +-
+ net/xfrm/xfrm_policy.c | 7 +
+ net/xfrm/xfrm_state.c | 6 +-
+ security/lsm_audit.c | 7 +-
+ security/selinux/hooks.c | 12 +-
+ 1098 files changed, 58104 insertions(+), 25545 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
+ create mode 100644 drivers/net/bonding/bond_netlink.c
+ create mode 100644 drivers/net/bonding/bond_options.c
+ create mode 100644 drivers/net/ethernet/ti/cpsw-phy-sel.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/Kconfig
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/Makefile
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/debug.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/debug.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/dxe.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/dxe.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/hal.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/main.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/pmc.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/pmc.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/smd.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/smd.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/txrx.c
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/txrx.h
+ create mode 100644 drivers/net/wireless/ath/wcn36xx/wcn36xx.h
+ create mode 100644 include/linux/netfilter/ipset/ip_set_comment.h
+ create mode 100644 include/net/netfilter/nf_tables.h
+ create mode 100644 include/net/netfilter/nf_tables_core.h
+ create mode 100644 include/net/netfilter/nf_tables_ipv4.h
+ create mode 100644 include/net/netfilter/nf_tables_ipv6.h
+ create mode 100644 include/net/netns/nftables.h
+ create mode 100644 include/uapi/linux/hsr_netlink.h
+ create mode 100644 include/uapi/linux/netfilter/nf_tables.h
+ create mode 100644 include/uapi/linux/netfilter/nf_tables_compat.h
+ create mode 100644 net/batman-adv/fragmentation.c
+ create mode 100644 net/batman-adv/fragmentation.h
+ delete mode 100644 net/batman-adv/unicast.c
+ delete mode 100644 net/batman-adv/unicast.h
+ delete mode 100644 net/batman-adv/vis.c
+ delete mode 100644 net/batman-adv/vis.h
+ create mode 100644 net/bridge/netfilter/nf_tables_bridge.c
+ create mode 100644 net/hsr/Kconfig
+ create mode 100644 net/hsr/Makefile
+ create mode 100644 net/hsr/hsr_device.c
+ create mode 100644 net/hsr/hsr_device.h
+ create mode 100644 net/hsr/hsr_framereg.c
+ create mode 100644 net/hsr/hsr_framereg.h
+ create mode 100644 net/hsr/hsr_main.c
+ create mode 100644 net/hsr/hsr_main.h
+ create mode 100644 net/hsr/hsr_netlink.c
+ create mode 100644 net/hsr/hsr_netlink.h
+ create mode 100644 net/ipv4/netfilter/nf_tables_arp.c
+ create mode 100644 net/ipv4/netfilter/nf_tables_ipv4.c
+ create mode 100644 net/ipv4/netfilter/nft_chain_nat_ipv4.c
+ create mode 100644 net/ipv4/netfilter/nft_chain_route_ipv4.c
+ create mode 100644 net/ipv4/netfilter/nft_reject_ipv4.c
+ create mode 100644 net/ipv6/ip6_vti.c
+ create mode 100644 net/ipv6/netfilter/nf_tables_ipv6.c
+ create mode 100644 net/ipv6/netfilter/nft_chain_nat_ipv6.c
+ create mode 100644 net/ipv6/netfilter/nft_chain_route_ipv6.c
+ create mode 100644 net/netfilter/ipset/ip_set_hash_netnet.c
+ create mode 100644 net/netfilter/ipset/ip_set_hash_netportnet.c
+ create mode 100644 net/netfilter/nf_tables_api.c
+ create mode 100644 net/netfilter/nf_tables_core.c
+ create mode 100644 net/netfilter/nft_bitwise.c
+ create mode 100644 net/netfilter/nft_byteorder.c
+ create mode 100644 net/netfilter/nft_cmp.c
+ create mode 100644 net/netfilter/nft_compat.c
+ create mode 100644 net/netfilter/nft_counter.c
+ create mode 100644 net/netfilter/nft_ct.c
+ create mode 100644 net/netfilter/nft_expr_template.c
+ create mode 100644 net/netfilter/nft_exthdr.c
+ create mode 100644 net/netfilter/nft_hash.c
+ create mode 100644 net/netfilter/nft_immediate.c
+ create mode 100644 net/netfilter/nft_limit.c
+ create mode 100644 net/netfilter/nft_log.c
+ create mode 100644 net/netfilter/nft_lookup.c
+ create mode 100644 net/netfilter/nft_meta.c
+ create mode 100644 net/netfilter/nft_meta_target.c
+ create mode 100644 net/netfilter/nft_nat.c
+ create mode 100644 net/netfilter/nft_payload.c
+ create mode 100644 net/netfilter/nft_rbtree.c
+ create mode 100644 net/openvswitch/flow_netlink.c
+ create mode 100644 net/openvswitch/flow_netlink.h
+ create mode 100644 net/openvswitch/flow_table.c
+ create mode 100644 net/openvswitch/flow_table.h
+ create mode 100644 net/sched/cls_bpf.c
+Merging ipsec-next/master (1c5ad13f7c2b net: esp{4,6}: get rid of struct esp_data)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-next/master (01925efdf7e0 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
+$ git merge wireless-next/master
+Resolved 'drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h' using previous resolution.
+Auto-merging include/net/bluetooth/rfcomm.h
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging include/net/bluetooth/bluetooth.h
+Auto-merging drivers/net/wireless/iwlwifi/mvm/rs.h
+Auto-merging drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+CONFLICT (content): Merge conflict in drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+Auto-merging drivers/net/wireless/atmel.c
+Auto-merging drivers/net/wireless/ath/dfs_pri_detector.h
+Auto-merging drivers/net/wireless/ath/dfs_pri_detector.c
+Auto-merging drivers/net/wireless/ath/dfs_pattern_detector.h
+Auto-merging drivers/net/wireless/ath/dfs_pattern_detector.c
+Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h
+Auto-merging drivers/net/wireless/ath/ath10k/wmi.c
+Auto-merging drivers/net/wireless/ath/ath10k/debug.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c861fe061b93] Merge remote-tracking branch 'wireless-next/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/bluetooth/ath3k.c | 4 +-
+ drivers/bluetooth/bfusb.c | 31 +-
+ drivers/bluetooth/bluecard_cs.c | 30 +-
+ drivers/bluetooth/bpa10x.c | 11 +-
+ drivers/bluetooth/bt3c_cs.c | 30 +-
+ drivers/bluetooth/btmrvl_main.c | 26 +-
+ drivers/bluetooth/btmrvl_sdio.c | 8 +-
+ drivers/bluetooth/btsdio.c | 6 +-
+ drivers/bluetooth/btuart_cs.c | 30 +-
+ drivers/bluetooth/btusb.c | 21 +-
+ drivers/bluetooth/btwilink.c | 9 +-
+ drivers/bluetooth/dtl1_cs.c | 30 +-
+ drivers/bluetooth/hci_bcsp.c | 5 +-
+ drivers/bluetooth/hci_h4.c | 24 -
+ drivers/bluetooth/hci_h5.c | 2 +-
+ drivers/bluetooth/hci_ldisc.c | 12 +-
+ drivers/bluetooth/hci_ll.c | 14 +-
+ drivers/bluetooth/hci_vhci.c | 15 +-
+ drivers/net/wireless/ath/Kconfig | 17 +
+ drivers/net/wireless/ath/Makefile | 4 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 35 +-
+ drivers/net/wireless/ath/ath10k/ce.h | 16 +-
+ drivers/net/wireless/ath/ath10k/core.c | 285 +++-
+ drivers/net/wireless/ath/ath10k/core.h | 47 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 15 +-
+ drivers/net/wireless/ath/ath10k/debug.h | 5 +
+ drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +-
+ drivers/net/wireless/ath/ath10k/hw.h | 56 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 512 ++++---
+ drivers/net/wireless/ath/ath10k/mac.h | 2 +
+ drivers/net/wireless/ath/ath10k/pci.c | 25 +-
+ drivers/net/wireless/ath/ath10k/pci.h | 3 -
+ drivers/net/wireless/ath/ath10k/wmi.c | 1087 +++++++++++++-
+ drivers/net/wireless/ath/ath10k/wmi.h | 968 ++++++++++++-
+ drivers/net/wireless/ath/ath6kl/htc.h | 2 +-
+ drivers/net/wireless/ath/ath9k/Kconfig | 20 +
+ drivers/net/wireless/ath/ath9k/Makefile | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 22 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 95 ++
+ drivers/net/wireless/ath/ath9k/ath9k.h | 39 +
+ drivers/net/wireless/ath/ath9k/calib.c | 10 +-
+ drivers/net/wireless/ath/ath9k/calib.h | 3 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 118 ++
+ drivers/net/wireless/ath/ath9k/dfs.h | 2 +-
+ drivers/net/wireless/ath/ath9k/dfs_debug.c | 9 +-
+ drivers/net/wireless/ath/ath9k/dfs_debug.h | 16 -
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 16 +
+ drivers/net/wireless/ath/ath9k/hw.c | 2 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 4 +
+ drivers/net/wireless/ath/ath9k/init.c | 30 +-
+ drivers/net/wireless/ath/ath9k/link.c | 15 +-
+ drivers/net/wireless/ath/ath9k/main.c | 160 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 149 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 56 +-
+ .../ath/{ath9k => }/dfs_pattern_detector.c | 23 +-
+ .../ath/{ath9k => }/dfs_pattern_detector.h | 28 +-
+ .../wireless/ath/{ath9k => }/dfs_pri_detector.c | 8 +-
+ .../wireless/ath/{ath9k => }/dfs_pri_detector.h | 2 +
+ drivers/net/wireless/ath/regd.c | 140 +-
+ drivers/net/wireless/atmel.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 186 ++-
+ .../net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 17 +
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 111 +-
+ .../net/wireless/brcm80211/brcmfmac/sdio_host.h | 7 +-
+ .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 21 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 14 +
+ drivers/net/wireless/iwlwifi/iwl-config.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 32 +
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 37 +
+ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 4 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 26 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +
+ drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 632 +++++---
+ drivers/net/wireless/iwlwifi/mvm/constants.h | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 515 ++++++-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 206 ++-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 149 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 69 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 11 +
+ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 29 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 21 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 34 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 55 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 16 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 23 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 75 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 242 +++-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 88 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 101 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 60 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 70 +-
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 42 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 793 +++++-----
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 154 +-
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 21 +
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 456 +++++-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 206 ++-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 4 -
+ drivers/net/wireless/iwlwifi/mvm/testmode.h | 95 ++
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/time-event.h | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 49 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 8 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 127 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 3 +
+ drivers/net/wireless/libertas/firmware.c | 5 +
+ drivers/net/wireless/libertas/if_cs.c | 8 +-
+ drivers/net/wireless/libertas/if_sdio.c | 8 +-
+ drivers/net/wireless/libertas/if_spi.c | 4 -
+ drivers/net/wireless/libertas/if_usb.c | 17 +-
+ drivers/net/wireless/rt2x00/Kconfig | 27 +-
+ drivers/net/wireless/rt2x00/Makefile | 2 +
+ drivers/net/wireless/rt2x00/rt2800lib.c | 73 +-
+ drivers/net/wireless/rt2x00/rt2800mmio.c | 873 +++++++++++
+ drivers/net/wireless/rt2x00/rt2800mmio.h | 165 +++
+ drivers/net/wireless/rt2x00/rt2800pci.c | 951 +-----------
+ drivers/net/wireless/rt2x00/rt2800pci.h | 97 --
+ drivers/net/wireless/rt2x00/rt2800soc.c | 263 ++++
+ drivers/nfc/Kconfig | 10 +
+ drivers/nfc/Makefile | 1 +
+ drivers/nfc/mei_phy.c | 6 +-
+ drivers/nfc/microread/i2c.c | 32 +-
+ drivers/nfc/microread/mei.c | 4 +-
+ drivers/nfc/microread/microread.c | 7 +-
+ drivers/nfc/nfcsim.c | 38 +-
+ drivers/nfc/nfcwilink.c | 97 +-
+ drivers/nfc/pn533.c | 604 +++++---
+ drivers/nfc/pn544/i2c.c | 42 +-
+ drivers/nfc/pn544/pn544.c | 129 +-
+ drivers/nfc/port100.c | 1529 ++++++++++++++++++++
+ include/net/bluetooth/bluetooth.h | 5 +-
+ include/net/bluetooth/hci.h | 49 +-
+ include/net/bluetooth/hci_core.h | 79 +-
+ include/net/bluetooth/l2cap.h | 14 +-
+ include/net/bluetooth/mgmt.h | 7 +
+ include/net/bluetooth/rfcomm.h | 2 +
+ include/net/bluetooth/sco.h | 5 +-
+ include/net/cfg80211.h | 9 +
+ include/net/nfc/digital.h | 227 +++
+ include/net/nfc/hci.h | 6 -
+ include/net/nfc/nci.h | 4 +
+ include/net/nfc/nci_core.h | 46 +-
+ include/net/nfc/nfc.h | 25 +-
+ include/uapi/linux/nfc.h | 4 +
+ net/bluetooth/a2mp.c | 63 +-
+ {include/net => net}/bluetooth/a2mp.h | 0
+ net/bluetooth/af_bluetooth.c | 23 +-
+ net/bluetooth/amp.c | 10 +-
+ {include/net => net}/bluetooth/amp.h | 0
+ net/bluetooth/bnep/core.c | 18 +-
+ net/bluetooth/cmtp/core.c | 6 +-
+ net/bluetooth/hci_conn.c | 156 +-
+ net/bluetooth/hci_core.c | 156 +-
+ net/bluetooth/hci_event.c | 103 +-
+ net/bluetooth/hci_sock.c | 10 +-
+ net/bluetooth/hidp/core.c | 18 +-
+ net/bluetooth/l2cap_core.c | 221 +--
+ net/bluetooth/l2cap_sock.c | 86 +-
+ net/bluetooth/mgmt.c | 550 ++++---
+ net/bluetooth/rfcomm/core.c | 19 +-
+ net/bluetooth/rfcomm/sock.c | 28 +-
+ net/bluetooth/sco.c | 44 +-
+ net/bluetooth/smp.c | 81 +-
+ {include/net => net}/bluetooth/smp.h | 0
+ net/nfc/Kconfig | 14 +
+ net/nfc/Makefile | 2 +
+ net/nfc/core.c | 22 +-
+ net/nfc/digital.h | 170 +++
+ net/nfc/digital_core.c | 737 ++++++++++
+ net/nfc/digital_dep.c | 729 ++++++++++
+ net/nfc/digital_technology.c | 770 ++++++++++
+ net/nfc/nci/spi.c | 239 ++-
+ net/nfc/netlink.c | 91 ++
+ net/nfc/rawsock.c | 7 +-
+ net/wireless/reg.c | 27 +-
+ 176 files changed, 14927 insertions(+), 4138 deletions(-)
+ rename drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.c (95%)
+ rename drivers/net/wireless/ath/{ath9k => }/dfs_pattern_detector.h (87%)
+ rename drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.c (98%)
+ rename drivers/net/wireless/ath/{ath9k => }/dfs_pri_detector.h (97%)
+ create mode 100644 drivers/net/wireless/iwlwifi/mvm/testmode.h
+ create mode 100644 drivers/net/wireless/rt2x00/rt2800mmio.c
+ create mode 100644 drivers/net/wireless/rt2x00/rt2800mmio.h
+ create mode 100644 drivers/net/wireless/rt2x00/rt2800soc.c
+ create mode 100644 drivers/nfc/port100.c
+ create mode 100644 include/net/nfc/digital.h
+ rename {include/net => net}/bluetooth/a2mp.h (100%)
+ rename {include/net => net}/bluetooth/amp.h (100%)
+ rename {include/net => net}/bluetooth/smp.h (100%)
+ create mode 100644 net/nfc/digital.h
+ create mode 100644 net/nfc/digital_core.c
+ create mode 100644 net/nfc/digital_dep.c
+ create mode 100644 net/nfc/digital_technology.c
+Merging bluetooth/master (cca34b785a21 Bluetooth: Remove link type check in hci_disconn_complete_evt())
+$ git merge bluetooth/master
+Auto-merging include/net/bluetooth/hci_core.h
+Auto-merging include/net/bluetooth/bluetooth.h
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/btmrvl_drv.h | 25 +-
+ drivers/bluetooth/btmrvl_main.c | 130 ++----
+ drivers/bluetooth/btmrvl_sdio.c | 9 +-
+ drivers/bluetooth/btmrvl_sdio.h | 2 -
+ include/net/bluetooth/bluetooth.h | 1 +
+ include/net/bluetooth/hci.h | 35 +-
+ include/net/bluetooth/hci_core.h | 89 ++---
+ include/net/bluetooth/l2cap.h | 20 +-
+ net/bluetooth/a2mp.c | 9 +-
+ net/bluetooth/af_bluetooth.c | 9 +-
+ net/bluetooth/hci_conn.c | 48 +--
+ net/bluetooth/hci_core.c | 805 +++++++++++++++++++++++++++++++++-----
+ net/bluetooth/hci_event.c | 73 ++--
+ net/bluetooth/hci_sock.c | 4 +-
+ net/bluetooth/hci_sysfs.c | 373 ------------------
+ net/bluetooth/l2cap_core.c | 227 ++++-------
+ net/bluetooth/l2cap_sock.c | 120 +++++-
+ net/bluetooth/mgmt.c | 652 +++++++++++++++++++++---------
+ net/bluetooth/rfcomm/core.c | 14 +-
+ net/bluetooth/rfcomm/sock.c | 20 +-
+ net/bluetooth/sco.c | 13 +-
+ net/bluetooth/smp.c | 4 +-
+ 22 files changed, 1576 insertions(+), 1106 deletions(-)
+Merging infiniband/for-next (a78fc816b361 Merge branches 'cma', 'ipoib', 'misc', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next)
+$ git merge infiniband/for-next
+Auto-merging drivers/infiniband/core/cma.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/sysfs-driver-ib_srp | 13 +
+ Documentation/ABI/stable/sysfs-transport-srp | 39 ++
+ drivers/infiniband/core/cma.c | 65 +--
+ drivers/infiniband/core/netlink.c | 2 +-
+ drivers/infiniband/core/uverbs_cmd.c | 3 +
+ drivers/infiniband/hw/ipath/ipath_user_sdma.c | 7 +-
+ drivers/infiniband/hw/mlx5/cq.c | 23 +-
+ drivers/infiniband/hw/mlx5/main.c | 3 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 6 +
+ drivers/infiniband/hw/mlx5/mr.c | 173 +++++--
+ drivers/infiniband/hw/mlx5/qp.c | 21 +-
+ drivers/infiniband/hw/mlx5/srq.c | 8 +-
+ drivers/infiniband/hw/ocrdma/ocrdma.h | 53 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 2 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_main.c | 7 +-
+ drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 11 +-
+ drivers/infiniband/hw/qib/qib_mad.h | 14 +-
+ drivers/infiniband/hw/qib/qib_user_sdma.c | 6 +-
+ drivers/infiniband/hw/qib/qib_verbs.h | 10 +-
+ drivers/infiniband/ulp/ipoib/ipoib.h | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_cm.c | 14 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ib.c | 24 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 12 +-
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 29 +-
+ drivers/infiniband/ulp/ipoib/ipoib_netlink.c | 4 +-
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 10 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 426 ++++++++++++----
+ drivers/infiniband/ulp/srp/ib_srp.h | 21 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 106 ++--
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 8 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 35 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 32 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 195 +++++---
+ drivers/scsi/scsi_transport_srp.c | 540 ++++++++++++++++++++-
+ include/linux/mlx5/device.h | 13 +-
+ include/linux/mlx5/driver.h | 18 +-
+ include/scsi/scsi_transport_srp.h | 83 +++-
+ 39 files changed, 1634 insertions(+), 414 deletions(-)
+Merging mtd/master (d255c59aab2a Merge tag 'for-linus-20131025' of git://git.infradead.org/linux-mtd)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (5da88a315175 mtd: nand_bbt: kill NAND_BBT_SCANALLPAGES)
+$ git merge l2-mtd/master
+Auto-merging arch/arm/mach-omap2/gpmc.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-mtd | 2 +-
+ Documentation/DocBook/mtdnand.tmpl | 2 -
+ .../devicetree/bindings/mtd/gpmc-nand.txt | 16 +-
+ arch/arm/mach-omap2/board-flash.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 48 +-
+ arch/powerpc/include/asm/fsl_ifc.h | 2 +
+ drivers/mtd/bcm47xxpart.c | 23 +
+ drivers/mtd/devices/Kconfig | 7 -
+ drivers/mtd/devices/block2mtd.c | 1 +
+ drivers/mtd/devices/docg3.c | 2 +-
+ drivers/mtd/devices/m25p80.c | 82 ++-
+ drivers/mtd/devices/mtd_dataflash.c | 2 -
+ drivers/mtd/devices/phram.c | 66 +--
+ drivers/mtd/devices/sst25l.c | 13 +-
+ drivers/mtd/inftlcore.c | 2 +-
+ drivers/mtd/lpddr/lpddr_cmds.c | 2 +-
+ drivers/mtd/maps/intel_vr_nor.c | 1 -
+ drivers/mtd/maps/pci.c | 1 -
+ drivers/mtd/maps/plat-ram.c | 18 +-
+ drivers/mtd/maps/scb2_flash.c | 1 -
+ drivers/mtd/mtdblock.c | 3 +-
+ drivers/mtd/mtdblock_ro.c | 3 +-
+ drivers/mtd/mtdchar.c | 1 +
+ drivers/mtd/mtdcore.c | 3 +
+ drivers/mtd/mtdsuper.c | 1 +
+ drivers/mtd/nand/Kconfig | 40 +-
+ drivers/mtd/nand/atmel_nand.c | 66 +--
+ drivers/mtd/nand/bcm47xxnflash/main.c | 38 +-
+ drivers/mtd/nand/denali.c | 4 +-
+ drivers/mtd/nand/denali_pci.c | 1 -
+ drivers/mtd/nand/diskonchip.c | 2 +-
+ drivers/mtd/nand/docg4.c | 16 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 2 -
+ drivers/mtd/nand/fsl_ifc_nand.c | 134 ++++-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 13 +
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 44 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-regs.h | 3 +
+ drivers/mtd/nand/lpc32xx_mlc.c | 2 +-
+ drivers/mtd/nand/lpc32xx_slc.c | 10 +-
+ drivers/mtd/nand/mxc_nand.c | 1 +
+ drivers/mtd/nand/nand_base.c | 92 ++-
+ drivers/mtd/nand/nand_bbt.c | 38 +-
+ drivers/mtd/nand/nandsim.c | 2 +-
+ drivers/mtd/nand/omap2.c | 641 +++++++++------------
+ drivers/mtd/nand/pxa3xx_nand.c | 53 +-
+ drivers/mtd/nand/socrates_nand.c | 14 +-
+ drivers/mtd/nftlcore.c | 2 +-
+ drivers/mtd/onenand/omap2.c | 22 -
+ drivers/mtd/onenand/onenand_base.c | 17 +-
+ drivers/mtd/ssfdc.c | 2 +-
+ drivers/mtd/tests/nandbiterrs.c | 2 +-
+ drivers/mtd/tests/oobtest.c | 2 +-
+ drivers/mtd/tests/pagetest.c | 2 +-
+ drivers/mtd/tests/subpagetest.c | 2 +-
+ drivers/mtd/ubi/build.c | 1 +
+ fs/jffs2/fs.c | 4 +
+ include/linux/mtd/bbm.h | 2 -
+ include/linux/mtd/map.h | 4 +-
+ include/linux/mtd/mtd.h | 8 +-
+ include/linux/mtd/nand.h | 16 +-
+ include/linux/of_mtd.h | 21 +-
+ include/linux/platform_data/mtd-nand-omap2.h | 18 +-
+ include/uapi/linux/major.h | 2 +
+ include/uapi/mtd/mtd-abi.h | 9 +-
+ 64 files changed, 803 insertions(+), 853 deletions(-)
+Merging crypto/master (8ed49c7675e1 crypto: omap-aes - Fix CTR mode counter length)
+$ git merge crypto/master
+Auto-merging drivers/crypto/ixp4xx_crypto.c
+Auto-merging drivers/char/hw_random/pseries-rng.c
+Auto-merging drivers/char/hw_random/Makefile
+Auto-merging drivers/char/hw_random/Kconfig
+Auto-merging crypto/ablk_helper.c
+Auto-merging crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging arch/arm/mach-tegra/fuse.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rng/qcom,prng.txt | 17 +
+ arch/arm/mach-tegra/fuse.c | 10 -
+ arch/x86/crypto/Makefile | 3 +-
+ arch/x86/crypto/aesni-intel_glue.c | 2 +-
+ arch/x86/crypto/camellia_aesni_avx2_glue.c | 2 +-
+ arch/x86/crypto/camellia_aesni_avx_glue.c | 2 +-
+ arch/x86/crypto/cast5_avx_glue.c | 2 +-
+ arch/x86/crypto/cast6_avx_glue.c | 2 +-
+ arch/x86/crypto/serpent_avx2_glue.c | 2 +-
+ arch/x86/crypto/serpent_avx_glue.c | 2 +-
+ arch/x86/crypto/serpent_sse2_glue.c | 2 +-
+ arch/x86/crypto/sha256_ssse3_glue.c | 4 +-
+ arch/x86/crypto/twofish_avx_glue.c | 2 +-
+ arch/x86/include/asm/simd.h | 11 +
+ crypto/Kconfig | 23 +-
+ crypto/Makefile | 8 +-
+ {arch/x86/crypto => crypto}/ablk_helper.c | 13 +-
+ crypto/ablkcipher.c | 21 +-
+ crypto/ansi_cprng.c | 4 +-
+ crypto/asymmetric_keys/rsa.c | 5 +-
+ crypto/authenc.c | 54 +--
+ crypto/authencesn.c | 34 +-
+ crypto/ccm.c | 4 +-
+ crypto/gcm.c | 2 +-
+ crypto/memneq.c | 138 +++++++
+ drivers/char/hw_random/Kconfig | 25 ++
+ drivers/char/hw_random/Makefile | 2 +
+ drivers/char/hw_random/msm-rng.c | 197 ++++++++++
+ drivers/char/hw_random/omap3-rom-rng.c | 141 +++++++
+ drivers/char/hw_random/pseries-rng.c | 5 +-
+ drivers/char/hw_random/via-rng.c | 2 +-
+ drivers/crypto/caam/Kconfig | 25 +-
+ drivers/crypto/caam/Makefile | 4 +-
+ drivers/crypto/caam/caamalg.c | 83 +---
+ drivers/crypto/caam/caamhash.c | 88 ++---
+ drivers/crypto/caam/caamrng.c | 29 +-
+ drivers/crypto/caam/ctrl.c | 418 ++++++++++++++++-----
+ drivers/crypto/caam/desc.h | 17 +-
+ drivers/crypto/caam/intern.h | 20 +-
+ drivers/crypto/caam/jr.c | 339 +++++++++++------
+ drivers/crypto/caam/jr.h | 5 +-
+ drivers/crypto/caam/regs.h | 14 +-
+ drivers/crypto/caam/sg_sw_sec4.h | 34 +-
+ drivers/crypto/dcp.c | 49 +--
+ drivers/crypto/ixp4xx_crypto.c | 26 +-
+ drivers/crypto/mv_cesa.c | 14 +-
+ drivers/crypto/omap-aes.c | 6 +-
+ drivers/crypto/omap-sham.c | 1 +
+ drivers/crypto/picoxcell_crypto.c | 32 +-
+ drivers/crypto/sahara.c | 2 +-
+ drivers/crypto/talitos.c | 35 +-
+ drivers/crypto/tegra-aes.c | 26 +-
+ include/asm-generic/simd.h | 14 +
+ .../include/asm => include}/crypto/ablk_helper.h | 0
+ include/crypto/algapi.h | 18 +-
+ include/crypto/authenc.h | 12 +-
+ include/linux/padata.h | 3 +-
+ kernel/padata.c | 9 +-
+ 58 files changed, 1431 insertions(+), 633 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rng/qcom,prng.txt
+ create mode 100644 arch/x86/include/asm/simd.h
+ rename {arch/x86/crypto => crypto}/ablk_helper.c (95%)
+ create mode 100644 crypto/memneq.c
+ create mode 100644 drivers/char/hw_random/msm-rng.c
+ create mode 100644 drivers/char/hw_random/omap3-rom-rng.c
+ create mode 100644 include/asm-generic/simd.h
+ rename {arch/x86/include/asm => include}/crypto/ablk_helper.h (100%)
+Merging drm/drm-next (9d6104e0174b drm/sysfs: Do not drop device reference twice)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/i915_dma.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_crt.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_ddi.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_dp.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_drv.h' using previous resolution.
+Auto-merging include/uapi/drm/drm_mode.h
+Auto-merging include/linux/cpufreq.h
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
+Auto-merging drivers/gpu/drm/radeon/atombios_encoders.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_lvds.c
+Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_ddi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ddi.c
+Auto-merging drivers/gpu/drm/i915/intel_crt.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_crt.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
+Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/gpu/drm/drm_edid.c
+Auto-merging drivers/gpu/drm/drm_drv.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4706777e9ee3] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/Kconfig | 71 +-
+ drivers/gpu/drm/Makefile | 4 +-
+ drivers/gpu/drm/armada/Kconfig | 24 +
+ drivers/gpu/drm/armada/Makefile | 7 +
+ drivers/gpu/drm/armada/armada_510.c | 87 ++
+ drivers/gpu/drm/armada/armada_crtc.c | 1098 ++++++++++++++
+ drivers/gpu/drm/armada/armada_crtc.h | 83 ++
+ drivers/gpu/drm/armada/armada_debugfs.c | 183 +++
+ drivers/gpu/drm/armada/armada_drm.h | 113 ++
+ drivers/gpu/drm/armada/armada_drv.c | 421 ++++++
+ drivers/gpu/drm/armada/armada_fb.c | 170 +++
+ drivers/gpu/drm/armada/armada_fb.h | 24 +
+ drivers/gpu/drm/armada/armada_fbdev.c | 202 +++
+ drivers/gpu/drm/armada/armada_gem.c | 611 ++++++++
+ drivers/gpu/drm/armada/armada_gem.h | 52 +
+ drivers/gpu/drm/armada/armada_hw.h | 318 ++++
+ drivers/gpu/drm/armada/armada_ioctlP.h | 18 +
+ drivers/gpu/drm/armada/armada_output.c | 158 ++
+ drivers/gpu/drm/armada/armada_output.h | 39 +
+ drivers/gpu/drm/armada/armada_overlay.c | 477 ++++++
+ drivers/gpu/drm/armada/armada_slave.c | 139 ++
+ drivers/gpu/drm/armada/armada_slave.h | 26 +
+ drivers/gpu/drm/ast/Kconfig | 1 +
+ drivers/gpu/drm/ast/ast_drv.c | 1 -
+ drivers/gpu/drm/ast/ast_drv.h | 1 -
+ drivers/gpu/drm/ast/ast_main.c | 6 -
+ drivers/gpu/drm/cirrus/Kconfig | 1 +
+ drivers/gpu/drm/cirrus/cirrus_drv.c | 1 -
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 1 -
+ drivers/gpu/drm/cirrus/cirrus_main.c | 6 -
+ drivers/gpu/drm/drm_context.c | 2 -
+ drivers/gpu/drm/drm_crtc.c | 104 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 24 +-
+ drivers/gpu/drm/drm_dp_helper.c | 16 +-
+ drivers/gpu/drm/drm_drv.c | 72 +-
+ drivers/gpu/drm/drm_edid.c | 277 +++-
+ drivers/gpu/drm/drm_edid_load.c | 108 +-
+ drivers/gpu/drm/drm_fb_helper.c | 17 +-
+ drivers/gpu/drm/drm_fops.c | 68 +-
+ drivers/gpu/drm/drm_gem.c | 29 -
+ drivers/gpu/drm/drm_global.c | 2 -
+ drivers/gpu/drm/drm_info.c | 6 +-
+ drivers/gpu/drm/drm_ioctl.c | 21 +
+ drivers/gpu/drm/drm_irq.c | 152 +-
+ drivers/gpu/drm/drm_lock.c | 3 -
+ drivers/gpu/drm/drm_modes.c | 43 +-
+ drivers/gpu/drm/drm_pci.c | 65 +-
+ drivers/gpu/drm/drm_platform.c | 59 +-
+ drivers/gpu/drm/drm_prime.c | 3 +-
+ drivers/gpu/drm/drm_stub.c | 301 ++--
+ drivers/gpu/drm/drm_sysfs.c | 92 +-
+ drivers/gpu/drm/drm_usb.c | 57 +-
+ drivers/gpu/drm/exynos/Kconfig | 1 +
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 5 -
+ drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 -
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 16 +-
+ drivers/gpu/drm/gma500/Kconfig | 1 +
+ drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +-
+ drivers/gpu/drm/gma500/gem.c | 5 -
+ drivers/gpu/drm/gma500/psb_drv.c | 3 +-
+ drivers/gpu/drm/gma500/psb_drv.h | 9 +-
+ drivers/gpu/drm/gma500/psb_irq.c | 22 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 3 +
+ drivers/gpu/drm/i810/i810_dma.c | 11 -
+ drivers/gpu/drm/i915/Kconfig | 67 +
+ drivers/gpu/drm/i915/Makefile | 6 +-
+ drivers/gpu/drm/i915/dvo.h | 11 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 807 ++++++++---
+ drivers/gpu/drm/i915/i915_dma.c | 117 +-
+ drivers/gpu/drm/i915/i915_drv.c | 152 +-
+ drivers/gpu/drm/i915/i915_drv.h | 329 +++--
+ drivers/gpu/drm/i915/i915_gem.c | 553 ++++---
+ drivers/gpu/drm/i915/i915_gem_context.c | 61 +-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 50 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 366 +++--
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +-
+ drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 8 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 40 +-
+ drivers/gpu/drm/i915/i915_irq.c | 505 +++++--
+ drivers/gpu/drm/i915/i915_reg.h | 622 +++++++-
+ drivers/gpu/drm/i915/i915_suspend.c | 15 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 152 +-
+ drivers/gpu/drm/i915/i915_trace.h | 62 +-
+ drivers/gpu/drm/i915/intel_bios.c | 195 ++-
+ drivers/gpu/drm/i915/intel_bios.h | 87 +-
+ drivers/gpu/drm/i915/intel_crt.c | 18 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 127 +-
+ drivers/gpu/drm/i915/intel_display.c | 1528 ++++++++++++--------
+ drivers/gpu/drm/i915/intel_dp.c | 634 +++++---
+ drivers/gpu/drm/i915/intel_drv.h | 560 +++----
+ drivers/gpu/drm/i915/intel_dsi.c | 620 ++++++++
+ drivers/gpu/drm/i915/intel_dsi.h | 102 ++
+ drivers/gpu/drm/i915/intel_dsi_cmd.c | 427 ++++++
+ drivers/gpu/drm/i915/intel_dsi_cmd.h | 109 ++
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 317 ++++
+ drivers/gpu/drm/i915/intel_dvo.c | 12 +-
+ drivers/gpu/drm/i915/{intel_fb.c => intel_fbdev.c} | 29 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 81 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 64 +
+ drivers/gpu/drm/i915/intel_lvds.c | 16 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 434 +++++-
+ drivers/gpu/drm/i915/intel_overlay.c | 9 +-
+ drivers/gpu/drm/i915/intel_panel.c | 209 +--
+ drivers/gpu/drm/i915/intel_pm.c | 1057 +++++++++-----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 81 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 52 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 79 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 192 ++-
+ drivers/gpu/drm/i915/intel_tv.c | 21 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 377 +++--
+ drivers/gpu/drm/mga/mga_dma.c | 5 -
+ drivers/gpu/drm/mga/mga_irq.c | 2 +-
+ drivers/gpu/drm/mgag200/Kconfig | 1 +
+ drivers/gpu/drm/mgag200/mgag200_drv.c | 1 -
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 1 -
+ drivers/gpu/drm/mgag200/mgag200_main.c | 6 -
+ drivers/gpu/drm/msm/Kconfig | 1 +
+ drivers/gpu/drm/nouveau/Kconfig | 1 +
+ drivers/gpu/drm/nouveau/dispnv04/arb.c | 8 +-
+ drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 -
+ drivers/gpu/drm/nouveau/dispnv04/dfp.c | 4 +-
+ drivers/gpu/drm/nouveau/dispnv04/disp.h | 6 +-
+ drivers/gpu/drm/nouveau/dispnv04/hw.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_abi16.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.h | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_display.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 1 -
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 42 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 10 +-
+ drivers/gpu/drm/omapdrm/Kconfig | 1 +
+ drivers/gpu/drm/omapdrm/omap_drv.c | 1 -
+ drivers/gpu/drm/omapdrm/omap_drv.h | 1 -
+ drivers/gpu/drm/omapdrm/omap_gem.c | 5 -
+ drivers/gpu/drm/omapdrm/omap_irq.c | 17 +-
+ drivers/gpu/drm/qxl/Kconfig | 1 +
+ drivers/gpu/drm/qxl/qxl_display.c | 33 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 1 -
+ drivers/gpu/drm/qxl/qxl_drv.h | 1 -
+ drivers/gpu/drm/qxl/qxl_gem.c | 6 -
+ drivers/gpu/drm/radeon/atombios_dp.c | 3 +-
+ drivers/gpu/drm/radeon/atombios_encoders.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_bios.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 -
+ drivers/gpu/drm/radeon/radeon_gem.c | 7 -
+ drivers/gpu/drm/radeon/radeon_kms.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +-
+ drivers/gpu/drm/rcar-du/Kconfig | 1 +
+ drivers/gpu/drm/shmobile/Kconfig | 1 +
+ drivers/gpu/drm/tilcdc/Kconfig | 1 +
+ drivers/gpu/drm/udl/Kconfig | 1 +
+ drivers/gpu/drm/udl/udl_drv.c | 1 -
+ drivers/gpu/drm/udl/udl_drv.h | 1 -
+ drivers/gpu/drm/udl/udl_gem.c | 7 -
+ drivers/gpu/drm/via/via_mm.c | 2 +-
+ drivers/gpu/host1x/drm/Kconfig | 1 +
+ drivers/gpu/host1x/drm/drm.c | 2 +-
+ drivers/staging/imx-drm/Kconfig | 1 +
+ drivers/staging/imx-drm/imx-drm-core.c | 8 +-
+ include/drm/drmP.h | 62 +-
+ include/drm/drm_crtc.h | 37 +-
+ include/drm/drm_crtc_helper.h | 2 +-
+ include/drm/drm_dp_helper.h | 31 +-
+ include/linux/cpufreq.h | 8 +
+ include/uapi/drm/armada_drm.h | 45 +
+ include/uapi/drm/drm.h | 37 +-
+ include/uapi/drm/drm_mode.h | 45 +-
+ include/uapi/drm/i915_drm.h | 8 +-
+ 177 files changed, 13841 insertions(+), 4026 deletions(-)
+ create mode 100644 drivers/gpu/drm/armada/Kconfig
+ create mode 100644 drivers/gpu/drm/armada/Makefile
+ create mode 100644 drivers/gpu/drm/armada/armada_510.c
+ create mode 100644 drivers/gpu/drm/armada/armada_crtc.c
+ create mode 100644 drivers/gpu/drm/armada/armada_crtc.h
+ create mode 100644 drivers/gpu/drm/armada/armada_debugfs.c
+ create mode 100644 drivers/gpu/drm/armada/armada_drm.h
+ create mode 100644 drivers/gpu/drm/armada/armada_drv.c
+ create mode 100644 drivers/gpu/drm/armada/armada_fb.c
+ create mode 100644 drivers/gpu/drm/armada/armada_fb.h
+ create mode 100644 drivers/gpu/drm/armada/armada_fbdev.c
+ create mode 100644 drivers/gpu/drm/armada/armada_gem.c
+ create mode 100644 drivers/gpu/drm/armada/armada_gem.h
+ create mode 100644 drivers/gpu/drm/armada/armada_hw.h
+ create mode 100644 drivers/gpu/drm/armada/armada_ioctlP.h
+ create mode 100644 drivers/gpu/drm/armada/armada_output.c
+ create mode 100644 drivers/gpu/drm/armada/armada_output.h
+ create mode 100644 drivers/gpu/drm/armada/armada_overlay.c
+ create mode 100644 drivers/gpu/drm/armada/armada_slave.c
+ create mode 100644 drivers/gpu/drm/armada/armada_slave.h
+ create mode 100644 drivers/gpu/drm/i915/Kconfig
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi.h
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_cmd.h
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_pll.c
+ rename drivers/gpu/drm/i915/{intel_fb.c => intel_fbdev.c} (91%)
+ create mode 100644 include/uapi/drm/armada_drm.h
+$ git am -3 ../patches/0001-drm-i915-Resolve-interaction-with-drm-fixes-tree.patch
+Applying: drm/i915: Resolve interaction with drm-fixes tree
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/intel_pm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 40c4266c7db2] Merge remote-tracking branch 'drm/drm-next'
+Merging drm-intel/for-linux-next (3608b98d0b83 drm/i915/dvo: call ->mode_set callback only when the port is running)
+$ git merge drm-intel/for-linux-next
+Recorded preimage for 'drivers/gpu/drm/i915/i915_dma.c'
+Recorded preimage for 'drivers/gpu/drm/i915/i915_drv.c'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_dp.c'
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_drv.h
+Auto-merging drivers/gpu/drm/i915/intel_dp.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_dp.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_dma.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/i915_dma.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/i915_drv.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_dp.c'.
+[master 50b13b8ad191] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/i915/i915_debugfs.c | 357 ++++++++++++++++++++++++++++++----
+ drivers/gpu/drm/i915/i915_dma.c | 13 +-
+ drivers/gpu/drm/i915/i915_drv.c | 7 +-
+ drivers/gpu/drm/i915/i915_drv.h | 79 ++++----
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-
+ drivers/gpu/drm/i915/i915_irq.c | 209 ++++++++++++--------
+ drivers/gpu/drm/i915/i915_reg.h | 85 +++++---
+ drivers/gpu/drm/i915/intel_display.c | 106 +++++++---
+ drivers/gpu/drm/i915/intel_dp.c | 59 +++---
+ drivers/gpu/drm/i915/intel_drv.h | 8 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 16 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 4 +-
+ drivers/gpu/drm/i915/intel_pm.c | 267 ++++++++++++-------------
+ 14 files changed, 810 insertions(+), 406 deletions(-)
+Merging drm-tegra/drm/for-next (977386a04bae drm/tegra: Reserve syncpoint base for gr3d)
+$ git merge drm-tegra/drm/for-next
+Resolved 'MAINTAINERS' using previous resolution.
+Auto-merging include/drm/drmP.h
+Removing drivers/gpu/host1x/hw/Makefile
+Removing drivers/gpu/host1x/host1x_bo.h
+Removing drivers/gpu/host1x/host1x.h
+Removing drivers/gpu/host1x/drm/gr2d.c
+Auto-merging drivers/gpu/host1x/bus.h
+Auto-merging drivers/gpu/drm/tegra/rgb.c
+Auto-merging drivers/gpu/drm/tegra/output.c
+Auto-merging drivers/gpu/drm/tegra/hdmi.h
+Auto-merging drivers/gpu/drm/tegra/hdmi.c
+Auto-merging drivers/gpu/drm/tegra/gem.h
+Auto-merging drivers/gpu/drm/tegra/gem.c
+Auto-merging drivers/gpu/drm/tegra/fb.c
+Auto-merging drivers/gpu/drm/tegra/drm.h
+Auto-merging drivers/gpu/drm/tegra/drm.c
+Auto-merging drivers/gpu/drm/tegra/dc.h
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Auto-merging drivers/gpu/drm/tegra/Kconfig
+Auto-merging drivers/gpu/drm/drm_drv.c
+Auto-merging drivers/gpu/drm/drm_crtc_helper.c
+Auto-merging drivers/gpu/drm/Makefile
+Auto-merging drivers/gpu/drm/Kconfig
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 36753aaf7758] Merge remote-tracking branch 'drm-tegra/drm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +
+ drivers/gpu/drm/Kconfig | 2 +
+ drivers/gpu/drm/Makefile | 1 +
+ drivers/gpu/drm/drm_crtc_helper.c | 8 +
+ drivers/gpu/drm/drm_drv.c | 2 +-
+ drivers/gpu/{host1x/drm => drm/tegra}/Kconfig | 12 +-
+ drivers/gpu/drm/tegra/Makefile | 15 +
+ drivers/gpu/drm/tegra/bus.c | 76 ++++
+ drivers/gpu/{host1x/drm => drm/tegra}/dc.c | 108 ++++-
+ drivers/gpu/{host1x/drm => drm/tegra}/dc.h | 5 +
+ drivers/gpu/{host1x/drm => drm/tegra}/drm.c | 593 ++++++++++++++-----------
+ drivers/gpu/{host1x/drm => drm/tegra}/drm.h | 101 +++--
+ drivers/gpu/{host1x/drm => drm/tegra}/fb.c | 38 +-
+ drivers/gpu/{host1x/drm => drm/tegra}/gem.c | 44 +-
+ drivers/gpu/{host1x/drm => drm/tegra}/gem.h | 16 +-
+ drivers/gpu/drm/tegra/gr2d.c | 227 ++++++++++
+ drivers/gpu/drm/tegra/gr2d.h | 28 ++
+ drivers/gpu/drm/tegra/gr3d.c | 338 ++++++++++++++
+ drivers/gpu/drm/tegra/gr3d.h | 27 ++
+ drivers/gpu/{host1x/drm => drm/tegra}/hdmi.c | 257 ++++++++---
+ drivers/gpu/{host1x/drm => drm/tegra}/hdmi.h | 152 ++++++-
+ drivers/gpu/{host1x/drm => drm/tegra}/output.c | 64 +--
+ drivers/gpu/{host1x/drm => drm/tegra}/rgb.c | 19 +-
+ drivers/gpu/host1x/Kconfig | 2 -
+ drivers/gpu/host1x/Makefile | 13 +-
+ drivers/gpu/host1x/bus.c | 550 +++++++++++++++++++++++
+ drivers/gpu/host1x/{host1x_client.h => bus.h} | 24 +-
+ drivers/gpu/host1x/cdma.c | 2 +-
+ drivers/gpu/host1x/channel.h | 6 -
+ drivers/gpu/host1x/dev.c | 82 ++--
+ drivers/gpu/host1x/dev.h | 11 +-
+ drivers/gpu/host1x/drm/gr2d.c | 343 --------------
+ drivers/gpu/host1x/host1x.h | 30 --
+ drivers/gpu/host1x/host1x_bo.h | 87 ----
+ drivers/gpu/host1x/hw/Makefile | 6 -
+ drivers/gpu/host1x/hw/cdma_hw.c | 8 +-
+ drivers/gpu/host1x/hw/channel_hw.c | 32 +-
+ drivers/gpu/host1x/hw/debug_hw.c | 16 +-
+ drivers/gpu/host1x/hw/host1x01.c | 16 +-
+ drivers/gpu/host1x/hw/host1x02.c | 42 ++
+ drivers/gpu/host1x/hw/host1x02.h | 26 ++
+ drivers/gpu/host1x/hw/hw_host1x01_uclass.h | 6 +
+ drivers/gpu/host1x/hw/hw_host1x02_channel.h | 121 +++++
+ drivers/gpu/host1x/hw/hw_host1x02_sync.h | 243 ++++++++++
+ drivers/gpu/host1x/hw/hw_host1x02_uclass.h | 175 ++++++++
+ drivers/gpu/host1x/hw/intr_hw.c | 4 +-
+ drivers/gpu/host1x/hw/syncpt_hw.c | 4 +-
+ drivers/gpu/host1x/job.c | 73 +--
+ drivers/gpu/host1x/job.h | 108 -----
+ drivers/gpu/host1x/syncpt.c | 92 +++-
+ drivers/gpu/host1x/syncpt.h | 46 +-
+ drivers/video/Kconfig | 4 +-
+ include/drm/drmP.h | 1 +
+ include/linux/host1x.h | 284 ++++++++++++
+ include/uapi/drm/tegra_drm.h | 29 +-
+ 55 files changed, 3362 insertions(+), 1259 deletions(-)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/Kconfig (90%)
+ create mode 100644 drivers/gpu/drm/tegra/Makefile
+ create mode 100644 drivers/gpu/drm/tegra/bus.c
+ rename drivers/gpu/{host1x/drm => drm/tegra}/dc.c (93%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/dc.h (98%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/drm.c (50%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/drm.h (72%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/fb.c (92%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/gem.c (86%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/gem.h (84%)
+ create mode 100644 drivers/gpu/drm/tegra/gr2d.c
+ create mode 100644 drivers/gpu/drm/tegra/gr2d.h
+ create mode 100644 drivers/gpu/drm/tegra/gr3d.c
+ create mode 100644 drivers/gpu/drm/tegra/gr3d.h
+ rename drivers/gpu/{host1x/drm => drm/tegra}/hdmi.c (83%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/hdmi.h (72%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/output.c (91%)
+ rename drivers/gpu/{host1x/drm => drm/tegra}/rgb.c (96%)
+ create mode 100644 drivers/gpu/host1x/bus.c
+ rename drivers/gpu/host1x/{host1x_client.h => bus.h} (60%)
+ delete mode 100644 drivers/gpu/host1x/drm/gr2d.c
+ delete mode 100644 drivers/gpu/host1x/host1x.h
+ delete mode 100644 drivers/gpu/host1x/host1x_bo.h
+ delete mode 100644 drivers/gpu/host1x/hw/Makefile
+ create mode 100644 drivers/gpu/host1x/hw/host1x02.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x02.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x02_channel.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x02_sync.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x02_uclass.h
+ create mode 100644 include/linux/host1x.h
+Merging sound/for-next (24eff328f65c ALSA: hda - Enable SPDIF for Acer TravelMate 6293)
+$ git merge sound/for-next
+Auto-merging sound/soc/kirkwood/kirkwood-dma.c
+Auto-merging sound/soc/fsl/imx-wm8962.c
+Auto-merging sound/soc/atmel/atmel-pcm.c
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/cs42l73.txt | 22 +
+ .../bindings/sound/davinci-evm-audio.txt | 42 +
+ .../bindings/sound/davinci-mcasp-audio.txt | 41 +-
+ .../devicetree/bindings/sound/tlv320aic3x.txt | 26 +
+ .../devicetree/bindings/sound/tpa6130a2.txt | 27 +
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/laptops/thinkpad-acpi.txt | 7 +-
+ Documentation/sound/alsa/ALSA-Configuration.txt | 2 +-
+ Documentation/sound/alsa/Audiophile-Usb.txt | 2 +-
+ Documentation/sound/alsa/CMIPCI.txt | 2 +-
+ Documentation/sound/alsa/compress_offload.txt | 6 +-
+ Documentation/sound/alsa/soc/DPCM.txt | 380 +++++
+ Documentation/sound/alsa/soc/codec.txt | 46 +-
+ Documentation/sound/alsa/soc/dapm.txt | 73 +-
+ Documentation/sound/alsa/soc/machine.txt | 6 +-
+ Documentation/sound/alsa/soc/platform.txt | 19 +-
+ drivers/base/regmap/internal.h | 8 +-
+ drivers/base/regmap/regcache.c | 3 +-
+ drivers/base/regmap/regmap.c | 294 +++-
+ drivers/mfd/mc13xxx-core.c | 5 -
+ drivers/mfd/mc13xxx-spi.c | 5 +
+ drivers/platform/x86/thinkpad_acpi.c | 92 +-
+ include/linux/mfd/mc13xxx.h | 7 +
+ include/linux/platform_data/davinci_asp.h | 2 +
+ include/linux/regmap.h | 44 +
+ include/linux/thinkpad_acpi.h | 15 +
+ include/sound/ak4114.h | 4 +-
+ include/sound/compress_driver.h | 12 +
+ include/sound/cs42l52.h | 2 +
+ include/sound/cs42l73.h | 22 +
+ include/sound/dmaengine_pcm.h | 8 +
+ include/sound/memalloc.h | 5 +
+ include/sound/rcar_snd.h | 1 -
+ include/sound/soc-dai.h | 17 +
+ include/sound/soc-dapm.h | 4 +
+ include/sound/soc.h | 100 +-
+ include/trace/events/asoc.h | 1 +
+ include/uapi/sound/Kbuild | 1 +
+ include/uapi/sound/asound.h | 3 +-
+ include/uapi/sound/firewire.h | 51 +
+ sound/arm/pxa2xx-ac97-lib.c | 27 +-
+ sound/arm/pxa2xx-ac97.c | 2 +-
+ sound/core/compress_offload.c | 41 +-
+ sound/core/init.c | 4 +-
+ sound/core/memalloc.c | 61 +
+ sound/core/pcm_dmaengine.c | 22 +-
+ sound/core/pcm_native.c | 10 +
+ sound/drivers/opl3/opl3_midi.c | 5 +
+ sound/drivers/pcsp/pcsp.c | 3 +-
+ sound/firewire/Kconfig | 15 +
+ sound/firewire/Makefile | 2 +
+ sound/firewire/amdtp.c | 213 ++-
+ sound/firewire/amdtp.h | 46 +-
+ sound/firewire/cmp.c | 50 +-
+ sound/firewire/dice-interface.h | 371 +++++
+ sound/firewire/dice.c | 1494 ++++++++++++++++++++
+ sound/firewire/fcp.c | 2 +-
+ sound/firewire/isight.c | 43 +-
+ sound/firewire/lib.c | 24 +-
+ sound/firewire/lib.h | 7 +-
+ sound/firewire/scs1x.c | 8 +-
+ sound/firewire/speakers.c | 16 +-
+ sound/i2c/other/ak4114.c | 8 +-
+ sound/i2c/other/ak4xxx-adda.c | 2 +-
+ sound/oss/sb_ess.c | 2 +-
+ sound/pci/ad1889.c | 2 +-
+ sound/pci/ali5451/ali5451.c | 2 -
+ sound/pci/asihpi/asihpi.c | 9 +-
+ sound/pci/au88x0/au88x0_pcm.c | 2 +-
+ sound/pci/au88x0/au88x0_synth.c | 29 +-
+ sound/pci/azt3328.c | 14 +-
+ sound/pci/cs5535audio/cs5535audio_olpc.c | 4 +-
+ sound/pci/ctxfi/ctdaio.c | 4 +-
+ sound/pci/emu10k1/emufx.c | 76 +-
+ sound/pci/hda/hda_auto_parser.c | 2 +-
+ sound/pci/hda/hda_beep.c | 5 +-
+ sound/pci/hda/hda_codec.c | 24 +-
+ sound/pci/hda/hda_codec.h | 1 +
+ sound/pci/hda/hda_eld.c | 199 ++-
+ sound/pci/hda/hda_intel.c | 7 +-
+ sound/pci/hda/hda_local.h | 27 +-
+ sound/pci/hda/patch_analog.c | 5 +-
+ sound/pci/hda/patch_ca0132.c | 2 +-
+ sound/pci/hda/patch_conexant.c | 92 +-
+ sound/pci/hda/patch_hdmi.c | 994 ++++++++++---
+ sound/pci/hda/patch_realtek.c | 61 +-
+ sound/pci/hda/patch_sigmatel.c | 4 +-
+ sound/pci/ice1712/psc724.c | 4 +-
+ sound/pci/ice1712/wm8766.c | 3 +-
+ sound/pci/ice1712/wm8776.c | 5 +-
+ sound/pci/lola/lola.c | 2 +-
+ sound/pci/rme96.c | 10 +-
+ sound/pci/rme9652/hdspm.c | 7 +-
+ sound/soc/Makefile | 2 +-
+ sound/soc/atmel/atmel-pcm.c | 2 +-
+ sound/soc/atmel/atmel_ssc_dai.c | 2 +-
+ sound/soc/atmel/atmel_wm8904.c | 8 -
+ sound/soc/atmel/sam9g20_wm8731.c | 1 +
+ sound/soc/cirrus/Kconfig | 2 +-
+ sound/soc/cirrus/ep93xx-pcm.c | 13 +
+ sound/soc/codecs/88pm860x-codec.c | 75 +-
+ sound/soc/codecs/88pm860x-codec.h | 117 +-
+ sound/soc/codecs/ab8500-codec.c | 92 +-
+ sound/soc/codecs/adau1373.c | 298 +++-
+ sound/soc/codecs/adav80x.c | 147 +-
+ sound/soc/codecs/ak4104.c | 11 +-
+ sound/soc/codecs/ak4641.c | 2 +-
+ sound/soc/codecs/ak4642.c | 4 +-
+ sound/soc/codecs/arizona.c | 23 +-
+ sound/soc/codecs/cq93vc.c | 46 +-
+ sound/soc/codecs/cs4271.c | 1 +
+ sound/soc/codecs/cs42l52.c | 93 +-
+ sound/soc/codecs/cs42l52.h | 2 +-
+ sound/soc/codecs/cs42l73.c | 114 +-
+ sound/soc/codecs/cs42l73.h | 105 +-
+ sound/soc/codecs/max98088.c | 624 ++++----
+ sound/soc/codecs/max98095.c | 466 +++---
+ sound/soc/codecs/max9850.c | 39 +-
+ sound/soc/codecs/mc13783.c | 137 +-
+ sound/soc/codecs/ml26124.c | 2 +
+ sound/soc/codecs/pcm1681.c | 1 +
+ sound/soc/codecs/pcm1792a.c | 1 +
+ sound/soc/codecs/rt5640.c | 31 +-
+ sound/soc/codecs/si476x.c | 64 +-
+ sound/soc/codecs/sn95031.c | 35 +-
+ sound/soc/codecs/tas5086.c | 173 ++-
+ sound/soc/codecs/tlv320aic23.c | 84 +-
+ sound/soc/codecs/tlv320aic26.c | 139 +-
+ sound/soc/codecs/tlv320aic26.h | 5 +-
+ sound/soc/codecs/tlv320aic32x4.c | 101 +-
+ sound/soc/codecs/tlv320aic3x.c | 234 ++-
+ sound/soc/codecs/tpa6130a2.c | 32 +-
+ sound/soc/codecs/twl4030.c | 80 +-
+ sound/soc/codecs/twl6040.c | 26 +-
+ sound/soc/codecs/wm0010.c | 8 +-
+ sound/soc/codecs/wm5110.c | 12 +
+ sound/soc/codecs/wm8400.c | 95 +-
+ sound/soc/codecs/wm8962.c | 226 +--
+ sound/soc/codecs/wm8996.c | 2 +
+ sound/soc/codecs/wm_adsp.c | 27 +-
+ sound/soc/davinci/Kconfig | 18 +-
+ sound/soc/davinci/Makefile | 1 +
+ sound/soc/davinci/davinci-evm.c | 188 ++-
+ sound/soc/davinci/davinci-mcasp.c | 169 ++-
+ sound/soc/davinci/davinci-mcasp.h | 12 +
+ sound/soc/fsl/eukrea-tlv320.c | 15 +-
+ sound/soc/fsl/fsl_spdif.c | 22 +-
+ sound/soc/fsl/fsl_ssi.c | 22 +-
+ sound/soc/fsl/imx-audmux.c | 9 +-
+ sound/soc/fsl/imx-mc13783.c | 1 +
+ sound/soc/fsl/imx-pcm-dma.c | 4 +-
+ sound/soc/fsl/imx-sgtl5000.c | 4 +-
+ sound/soc/fsl/imx-spdif.c | 4 +-
+ sound/soc/fsl/imx-ssi.c | 3 -
+ sound/soc/fsl/imx-wm8962.c | 4 +-
+ sound/soc/generic/simple-card.c | 5 +
+ sound/soc/kirkwood/kirkwood-dma.c | 6 +-
+ sound/soc/kirkwood/kirkwood-i2s.c | 108 +-
+ sound/soc/kirkwood/kirkwood-openrd.c | 2 +-
+ sound/soc/kirkwood/kirkwood-t5325.c | 2 +-
+ sound/soc/kirkwood/kirkwood.h | 4 +-
+ sound/soc/mid-x86/mfld_machine.c | 10 +-
+ sound/soc/mxs/mxs-saif.c | 42 +-
+ sound/soc/mxs/mxs-saif.h | 5 +
+ sound/soc/mxs/mxs-sgtl5000.c | 20 +-
+ sound/soc/omap/omap-mcpdm.c | 12 +-
+ sound/soc/omap/omap-twl4030.c | 5 +-
+ sound/soc/pxa/brownstone.c | 1 +
+ sound/soc/pxa/corgi.c | 1 +
+ sound/soc/pxa/e740_wm9705.c | 1 +
+ sound/soc/pxa/e750_wm9705.c | 1 +
+ sound/soc/pxa/e800_wm9712.c | 1 +
+ sound/soc/pxa/imote2.c | 1 +
+ sound/soc/pxa/mioa701_wm9713.c | 1 +
+ sound/soc/pxa/mmp-sspa.c | 5 +-
+ sound/soc/pxa/palm27x.c | 1 +
+ sound/soc/pxa/poodle.c | 1 +
+ sound/soc/pxa/pxa2xx-ac97.c | 56 +-
+ sound/soc/pxa/tosa.c | 1 +
+ sound/soc/pxa/ttc-dkb.c | 1 +
+ sound/soc/samsung/bells.c | 1 +
+ sound/soc/samsung/i2s.c | 25 +-
+ sound/soc/samsung/smdk_wm8994.c | 14 +-
+ sound/soc/sh/rcar/adg.c | 11 +-
+ sound/soc/sh/rcar/core.c | 81 +-
+ sound/soc/sh/rcar/gen.c | 261 ++--
+ sound/soc/sh/rcar/rsnd.h | 5 +-
+ sound/soc/sh/rcar/scu.c | 12 +-
+ sound/soc/sh/rcar/ssi.c | 52 +-
+ sound/soc/soc-cache.c | 263 +---
+ sound/soc/soc-core.c | 343 +++--
+ sound/soc/soc-dapm.c | 120 +-
+ sound/soc/soc-devres.c | 86 ++
+ sound/soc/soc-generic-dmaengine-pcm.c | 103 +-
+ sound/soc/soc-io.c | 26 -
+ sound/soc/soc-jack.c | 7 +-
+ sound/soc/soc-pcm.c | 60 +-
+ sound/soc/soc-utils.c | 6 +-
+ sound/soc/spear/spdif_in.c | 12 +-
+ sound/soc/spear/spdif_out.c | 14 +-
+ sound/soc/tegra/tegra20_i2s.c | 6 +-
+ sound/soc/tegra/tegra20_spdif.c | 6 +-
+ sound/soc/tegra/tegra30_ahub.c | 119 +-
+ sound/soc/tegra/tegra30_ahub.h | 38 +-
+ sound/soc/tegra/tegra30_i2s.c | 55 +-
+ sound/soc/tegra/tegra30_i2s.h | 7 +
+ sound/soc/tegra/tegra_asoc_utils.c | 2 +
+ sound/soc/tegra/tegra_asoc_utils.h | 1 +
+ sound/soc/tegra/tegra_pcm.c | 1 -
+ sound/usb/6fire/chip.c | 2 +-
+ sound/usb/caiaq/control.c | 92 ++
+ sound/usb/caiaq/device.c | 25 +
+ sound/usb/caiaq/device.h | 5 +
+ sound/usb/card.c | 22 +-
+ sound/usb/card.h | 12 +-
+ sound/usb/endpoint.c | 139 +-
+ sound/usb/endpoint.h | 4 +-
+ sound/usb/helper.c | 1 +
+ sound/usb/mixer.c | 4 +-
+ sound/usb/pcm.c | 40 +-
+ sound/usb/usbaudio.h | 1 -
+ 221 files changed, 8314 insertions(+), 3825 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/cs42l73.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/tpa6130a2.txt
+ create mode 100644 Documentation/sound/alsa/soc/DPCM.txt
+ create mode 100644 include/linux/thinkpad_acpi.h
+ create mode 100644 include/sound/cs42l73.h
+ create mode 100644 include/uapi/sound/firewire.h
+ create mode 100644 sound/firewire/dice-interface.h
+ create mode 100644 sound/firewire/dice.c
+ create mode 100644 sound/soc/soc-devres.c
+Merging sound-asoc/for-next (e98209dda4b1 Merge remote-tracking branch 'asoc/fix/ak4642' into asoc-linus)
+$ git merge sound-asoc/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging modules/modules-next (08746a65c296 init: fix in-place parameter modification regression)
+$ git merge modules/modules-next
+Auto-merging init/main.c
+Merge made by the 'recursive' strategy.
+ include/asm-generic/vmlinux.lds.h | 1 +
+ include/linux/export.h | 4 +--
+ include/linux/module.h | 3 --
+ init/main.c | 7 +++--
+ kernel/module.c | 66 +++++++++++++++------------------------
+ scripts/Makefile.modpost | 4 ++-
+ scripts/mod/modpost.c | 15 +++++++--
+ 7 files changed, 50 insertions(+), 50 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at 7cdd92985969 Merge remote-tracking branch 'sound-asoc/for-next'
+Merging next-20131101 version of modules
+$ git merge -m next-20131101/modules eb3057df732c304622aee77c450761746939a2dc
+Merge made by the 'recursive' strategy.
+ include/asm-generic/vmlinux.lds.h | 1 +
+ include/linux/module.h | 3 --
+ kernel/module.c | 66 +++++++++++++++------------------------
+ scripts/Makefile.modpost | 4 ++-
+ scripts/mod/modpost.c | 13 +++++++-
+ 5 files changed, 42 insertions(+), 45 deletions(-)
+Merging virtio/virtio-next (047b9b94951d virtio_net: verify if queue is broken after virtqueue_get_buf())
+$ git merge virtio/virtio-next
+Auto-merging drivers/net/virtio_net.c
+Merge made by the 'recursive' strategy.
+ drivers/block/virtio_blk.c | 83 ++++++++---------
+ drivers/char/hw_random/virtio-rng.c | 4 +-
+ drivers/char/virtio_console.c | 25 +++--
+ drivers/lguest/lguest_device.c | 3 +-
+ drivers/net/caif/caif_virtio.c | 23 ++---
+ drivers/net/virtio_net.c | 44 +++++----
+ drivers/remoteproc/remoteproc_virtio.c | 3 +-
+ drivers/s390/kvm/kvm_virtio.c | 8 +-
+ drivers/s390/kvm/virtio_ccw.c | 5 +-
+ drivers/scsi/virtio_scsi.c | 16 ++--
+ drivers/virtio/virtio_balloon.c | 14 ++-
+ drivers/virtio/virtio_mmio.c | 3 +-
+ drivers/virtio/virtio_pci.c | 3 +-
+ drivers/virtio/virtio_ring.c | 34 +++++--
+ include/linux/virtio.h | 6 +-
+ include/linux/virtio_config.h | 161 +++++++++++++++++++++++++++------
+ include/linux/virtio_ring.h | 2 +-
+ net/9p/trans_virtio.c | 9 +-
+ tools/virtio/virtio_test.c | 6 +-
+ tools/virtio/vringh_test.c | 13 ++-
+ 20 files changed, 302 insertions(+), 163 deletions(-)
+Merging input/next (c6d81bd7237b Input: add driver for Neonode zForce based touchscreens)
+$ git merge input/next
+Auto-merging drivers/input/tablet/wacom_wac.c
+Auto-merging drivers/input/tablet/wacom_sys.c
+Auto-merging drivers/input/serio/Kconfig
+Auto-merging drivers/input/mouse/alps.c
+Auto-merging drivers/input/keyboard/pxa27x_keypad.c
+Auto-merging drivers/input/input.c
+Merge made by the 'recursive' strategy.
+ Documentation/input/gamepad.txt | 3 +
+ drivers/input/Kconfig | 2 +-
+ drivers/input/evdev.c | 16 +-
+ drivers/input/input.c | 2 +-
+ drivers/input/keyboard/Kconfig | 6 +-
+ drivers/input/keyboard/gpio_keys.c | 1 +
+ drivers/input/keyboard/gpio_keys_polled.c | 1 +
+ drivers/input/keyboard/lpc32xx-keys.c | 2 +-
+ drivers/input/keyboard/nspire-keypad.c | 6 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 1 +
+ drivers/input/keyboard/tegra-kbc.c | 2 +-
+ drivers/input/misc/Kconfig | 4 +-
+ drivers/input/misc/ad714x-spi.c | 1 -
+ drivers/input/misc/cobalt_btns.c | 2 -
+ drivers/input/misc/pwm-beeper.c | 1 +
+ drivers/input/misc/rb532_button.c | 1 -
+ drivers/input/misc/rotary_encoder.c | 1 +
+ drivers/input/misc/sirfsoc-onkey.c | 2 +-
+ drivers/input/misc/uinput.c | 26 +-
+ drivers/input/mouse/alps.c | 2 +-
+ drivers/input/mouse/cypress_ps2.c | 29 +-
+ drivers/input/serio/Kconfig | 16 +-
+ drivers/input/serio/Makefile | 1 +
+ drivers/input/serio/hyperv-keyboard.c | 437 ++++++++++++++++
+ drivers/input/serio/i8042-x86ia64io.h | 2 +
+ drivers/input/tablet/wacom_sys.c | 96 ++--
+ drivers/input/tablet/wacom_wac.c | 114 +++-
+ drivers/input/tablet/wacom_wac.h | 8 +-
+ drivers/input/touchscreen/Kconfig | 13 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/ad7877.c | 2 -
+ drivers/input/touchscreen/ad7879-spi.c | 1 -
+ drivers/input/touchscreen/cyttsp4_core.c | 2 -
+ drivers/input/touchscreen/egalax_ts.c | 2 +-
+ drivers/input/touchscreen/htcpen.c | 2 -
+ drivers/input/touchscreen/st1232.c | 1 +
+ drivers/input/touchscreen/ti_am335x_tsc.c | 2 +-
+ drivers/input/touchscreen/tsc2005.c | 2 -
+ drivers/input/touchscreen/zforce_ts.c | 836 ++++++++++++++++++++++++++++++
+ include/linux/platform_data/zforce_ts.h | 26 +
+ 40 files changed, 1558 insertions(+), 117 deletions(-)
+ create mode 100644 drivers/input/serio/hyperv-keyboard.c
+ create mode 100644 drivers/input/touchscreen/zforce_ts.c
+ create mode 100644 include/linux/platform_data/zforce_ts.h
+Merging input-mt/for-next (ad81f0545ef0 Linux 3.11-rc1)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging cgroup/for-next (0d60e6cd793e Merge branch 'for-3.13' into for-next)
+$ git merge cgroup/for-next
+Resolved 'mm/memcontrol.c' using previous resolution.
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f09c27617cce] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/cgroup.h | 37 -------
+ kernel/cgroup.c | 248 +----------------------------------------------
+ mm/memcontrol.c | 66 ++++++++-----
+ security/device_cgroup.c | 11 ---
+ 4 files changed, 41 insertions(+), 321 deletions(-)
+Merging block/for-next (b8159eb3571e Merge branch 'for-3.13/core' into for-next)
+$ git merge block/for-next
+Resolved 'drivers/md/raid5.c' using previous resolution.
+Resolved 'fs/f2fs/segment.c' using previous resolution.
+Auto-merging include/trace/events/f2fs.h
+Auto-merging fs/xfs/xfs_buf.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/fscache/object.c
+Auto-merging fs/f2fs/segment.c
+CONFLICT (content): Merge conflict in fs/f2fs/segment.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/page-io.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/s390/block/dasd.c
+Auto-merging drivers/md/raid5.c
+CONFLICT (content): Merge conflict in drivers/md/raid5.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/bcache/request.c
+Auto-merging drivers/block/virtio_blk.c
+Auto-merging drivers/block/nvme-core.c
+Auto-merging drivers/block/Kconfig
+Auto-merging block/blk-settings.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 67b89a119b28] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/block/biodoc.txt | 7 +-
+ Documentation/block/biovecs.txt | 111 +
+ arch/m68k/emu/nfblock.c | 13 +-
+ arch/powerpc/sysdev/axonram.c | 21 +-
+ block/Makefile | 5 +-
+ block/blk-core.c | 207 +-
+ block/blk-exec.c | 14 +-
+ block/blk-flush.c | 156 +-
+ block/blk-integrity.c | 40 +-
+ block/blk-iopoll.c | 6 +-
+ block/blk-lib.c | 22 +-
+ block/blk-map.c | 6 +-
+ block/blk-merge.c | 66 +-
+ block/blk-mq-cpu.c | 93 +
+ block/blk-mq-cpumap.c | 108 +
+ block/blk-mq-sysfs.c | 384 ++
+ block/blk-mq-tag.c | 204 +
+ block/blk-mq-tag.h | 27 +
+ block/blk-mq.c | 1500 ++++++++
+ block/blk-mq.h | 52 +
+ block/blk-settings.c | 1 +
+ block/blk-softirq.c | 8 +-
+ block/blk-sysfs.c | 13 +
+ block/blk-throttle.c | 14 +-
+ block/blk-timeout.c | 74 +-
+ block/blk.h | 17 +
+ block/elevator.c | 24 +-
+ block/scsi_ioctl.c | 39 +-
+ drivers/block/Kconfig | 15 +-
+ drivers/block/Makefile | 3 +
+ drivers/block/aoe/aoe.h | 10 +-
+ drivers/block/aoe/aoecmd.c | 153 +-
+ drivers/block/brd.c | 18 +-
+ drivers/block/cciss.c | 2 +-
+ drivers/block/drbd/drbd_actlog.c | 2 +-
+ drivers/block/drbd/drbd_bitmap.c | 2 +-
+ drivers/block/drbd/drbd_int.h | 3 +-
+ drivers/block/drbd/drbd_main.c | 46 +-
+ drivers/block/drbd/drbd_nl.c | 6 +-
+ drivers/block/drbd/drbd_receiver.c | 64 +-
+ drivers/block/drbd/drbd_req.c | 9 +-
+ drivers/block/drbd/drbd_req.h | 2 +-
+ drivers/block/drbd/drbd_worker.c | 8 +-
+ drivers/block/floppy.c | 20 +-
+ drivers/block/loop.c | 48 +-
+ drivers/block/mg_disk.c | 2 +-
+ drivers/block/mtip32xx/mtip32xx.c | 520 ++-
+ drivers/block/mtip32xx/mtip32xx.h | 18 +-
+ drivers/block/nbd.c | 14 +-
+ drivers/block/null_blk.c | 635 ++++
+ drivers/block/nvme-core.c | 142 +-
+ drivers/block/pktcdvd.c | 182 +-
+ drivers/block/ps3disk.c | 17 +-
+ drivers/block/ps3vram.c | 10 +-
+ drivers/block/rbd.c | 91 +-
+ drivers/block/rsxx/core.c | 8 +-
+ drivers/block/rsxx/dev.c | 14 +-
+ drivers/block/rsxx/dma.c | 134 +-
+ drivers/block/rsxx/rsxx_priv.h | 11 +-
+ drivers/block/skd_main.c | 5473 +++++++++++++++++++++++++++
+ drivers/block/skd_s1120.h | 354 ++
+ drivers/block/umem.c | 53 +-
+ drivers/block/virtio_blk.c | 4 +-
+ drivers/block/xen-blkback/blkback.c | 5 +-
+ drivers/block/xen-blkfront.c | 99 +-
+ drivers/md/bcache/Kconfig | 11 +-
+ drivers/md/bcache/alloc.c | 383 +-
+ drivers/md/bcache/bcache.h | 329 +-
+ drivers/md/bcache/bset.c | 289 +-
+ drivers/md/bcache/bset.h | 93 +-
+ drivers/md/bcache/btree.c | 1393 +++----
+ drivers/md/bcache/btree.h | 195 +-
+ drivers/md/bcache/closure.c | 103 +-
+ drivers/md/bcache/closure.h | 183 +-
+ drivers/md/bcache/debug.c | 199 +-
+ drivers/md/bcache/debug.h | 50 +-
+ drivers/md/bcache/io.c | 196 +-
+ drivers/md/bcache/journal.c | 305 +-
+ drivers/md/bcache/journal.h | 52 +-
+ drivers/md/bcache/movinggc.c | 89 +-
+ drivers/md/bcache/request.c | 1170 +++---
+ drivers/md/bcache/request.h | 43 +-
+ drivers/md/bcache/stats.c | 26 +-
+ drivers/md/bcache/stats.h | 13 +-
+ drivers/md/bcache/super.c | 210 +-
+ drivers/md/bcache/sysfs.c | 42 +-
+ drivers/md/bcache/trace.c | 1 -
+ drivers/md/bcache/util.c | 16 +-
+ drivers/md/bcache/util.h | 15 +-
+ drivers/md/bcache/writeback.c | 461 ++-
+ drivers/md/bcache/writeback.h | 46 +-
+ drivers/md/dm-bio-record.h | 37 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-cache-policy-mq.c | 4 +-
+ drivers/md/dm-cache-target.c | 26 +-
+ drivers/md/dm-crypt.c | 64 +-
+ drivers/md/dm-delay.c | 7 +-
+ drivers/md/dm-flakey.c | 7 +-
+ drivers/md/dm-io.c | 37 +-
+ drivers/md/dm-linear.c | 3 +-
+ drivers/md/dm-raid1.c | 20 +-
+ drivers/md/dm-region-hash.c | 3 +-
+ drivers/md/dm-snap.c | 19 +-
+ drivers/md/dm-stripe.c | 13 +-
+ drivers/md/dm-switch.c | 4 +-
+ drivers/md/dm-thin.c | 30 +-
+ drivers/md/dm-verity.c | 61 +-
+ drivers/md/dm.c | 185 +-
+ drivers/md/faulty.c | 19 +-
+ drivers/md/linear.c | 96 +-
+ drivers/md/md.c | 50 +-
+ drivers/md/md.h | 1 -
+ drivers/md/multipath.c | 13 +-
+ drivers/md/raid0.c | 79 +-
+ drivers/md/raid1.c | 67 +-
+ drivers/md/raid10.c | 202 +-
+ drivers/md/raid5.c | 84 +-
+ drivers/message/fusion/mptsas.c | 8 +-
+ drivers/s390/block/dasd.c | 8 +-
+ drivers/s390/block/dcssblk.c | 19 +-
+ drivers/s390/block/xpram.c | 19 +-
+ drivers/scsi/libsas/sas_expander.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 41 +-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 39 +-
+ drivers/scsi/osd/osd_initiator.c | 2 +-
+ drivers/scsi/scsi_lib.c | 4 +-
+ drivers/scsi/sd.c | 4 +-
+ drivers/scsi/sd_dif.c | 30 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 26 +-
+ drivers/staging/zram/zram_drv.c | 33 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ fs/bio-integrity.c | 191 +-
+ fs/bio.c | 437 +--
+ fs/btrfs/check-integrity.c | 8 +-
+ fs/btrfs/compression.c | 17 +-
+ fs/btrfs/extent_io.c | 16 +-
+ fs/btrfs/file-item.c | 19 +-
+ fs/btrfs/inode.c | 22 +-
+ fs/btrfs/raid56.c | 22 +-
+ fs/btrfs/scrub.c | 12 +-
+ fs/btrfs/volumes.c | 12 +-
+ fs/buffer.c | 12 +-
+ fs/char_dev.c | 3 +-
+ fs/direct-io.c | 4 +-
+ fs/ext4/page-io.c | 4 +-
+ fs/f2fs/data.c | 2 +-
+ fs/f2fs/segment.c | 2 +-
+ fs/fscache/object.c | 2 +-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/hfsplus/wrapper.c | 2 +-
+ fs/jfs/jfs_logmgr.c | 12 +-
+ fs/jfs/jfs_metapage.c | 9 +-
+ fs/logfs/dev_bdev.c | 20 +-
+ fs/mpage.c | 2 +-
+ fs/nfs/blocklayout/blocklayout.c | 9 +-
+ fs/nilfs2/segbuf.c | 3 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/xfs/xfs_aops.c | 2 +-
+ fs/xfs/xfs_buf.c | 4 +-
+ include/linux/backing-dev.h | 4 +-
+ include/linux/bio.h | 282 +-
+ include/linux/blk-mq.h | 183 +
+ include/linux/blk_types.h | 102 +-
+ include/linux/blkdev.h | 69 +-
+ include/linux/blktrace_api.h | 4 +-
+ include/linux/ceph/messenger.h | 4 +-
+ include/linux/dm-io.h | 4 +-
+ include/linux/percpu_ida.h | 23 +-
+ include/scsi/scsi_device.h | 4 +-
+ include/trace/events/bcache.h | 73 +-
+ include/trace/events/block.h | 26 +-
+ include/trace/events/f2fs.h | 4 +-
+ include/uapi/linux/bcache.h | 373 ++
+ kernel/power/block_io.c | 2 +-
+ kernel/smp.c | 7 +-
+ kernel/trace/blktrace.c | 51 +-
+ lib/percpu_counter.c | 15 +-
+ lib/percpu_ida.c | 89 +-
+ mm/bounce.c | 45 +-
+ mm/page_io.c | 10 +-
+ mm/swap.c | 3 +-
+ net/ceph/messenger.c | 43 +-
+ 183 files changed, 15004 insertions(+), 5988 deletions(-)
+ create mode 100644 Documentation/block/biovecs.txt
+ create mode 100644 block/blk-mq-cpu.c
+ create mode 100644 block/blk-mq-cpumap.c
+ create mode 100644 block/blk-mq-sysfs.c
+ create mode 100644 block/blk-mq-tag.c
+ create mode 100644 block/blk-mq-tag.h
+ create mode 100644 block/blk-mq.c
+ create mode 100644 block/blk-mq.h
+ create mode 100644 drivers/block/null_blk.c
+ create mode 100644 drivers/block/skd_main.c
+ create mode 100644 drivers/block/skd_s1120.h
+ create mode 100644 include/linux/blk-mq.h
+ create mode 100644 include/uapi/linux/bcache.h
+Merging aio-direct/for-next (bb6f7be48318 tmpfs: add support for read_iter and write_iter)
+$ git merge aio-direct/for-next
+Resolved 'drivers/block/loop.c' using previous resolution.
+Resolved 'fs/nfs/direct.c' using previous resolution.
+Resolved 'fs/nfs/file.c' using previous resolution.
+Resolved 'include/linux/blk_types.h' using previous resolution.
+Auto-merging mm/page_io.c
+Auto-merging mm/filemap.c
+Auto-merging include/linux/nfs_fs.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/blk_types.h
+CONFLICT (content): Merge conflict in include/linux/blk_types.h
+Auto-merging include/linux/bio.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/file.c
+CONFLICT (content): Merge conflict in fs/nfs/file.c
+Auto-merging fs/nfs/direct.c
+CONFLICT (content): Merge conflict in fs/nfs/direct.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/fuse/fuse_i.h
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fuse/cuse.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/direct-io.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/9p/vfs_file.c
+Auto-merging fs/9p/vfs_addr.c
+Auto-merging drivers/mtd/nand/nandsim.c
+Auto-merging drivers/block/loop.c
+CONFLICT (content): Merge conflict in drivers/block/loop.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 87b5e688c2ea] Merge remote-tracking branch 'aio-direct/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 6 +-
+ Documentation/filesystems/vfs.txt | 12 +-
+ drivers/block/loop.c | 165 ++++++++++----
+ drivers/char/raw.c | 4 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/usb/gadget/storage_common.c | 4 +-
+ fs/9p/vfs_addr.c | 12 +-
+ fs/9p/vfs_file.c | 8 +-
+ fs/Makefile | 2 +-
+ fs/adfs/file.c | 4 +-
+ fs/affs/file.c | 4 +-
+ fs/afs/file.c | 4 +-
+ fs/afs/internal.h | 3 +-
+ fs/afs/write.c | 9 +-
+ fs/aio.c | 136 ++++++++++-
+ fs/bad_inode.c | 14 ++
+ fs/bfs/file.c | 4 +-
+ fs/block_dev.c | 27 ++-
+ fs/btrfs/file.c | 42 ++--
+ fs/btrfs/inode.c | 63 +++---
+ fs/ceph/addr.c | 3 +-
+ fs/cifs/file.c | 4 +-
+ fs/direct-io.c | 223 +++++++++++++------
+ fs/ecryptfs/file.c | 15 +-
+ fs/exofs/file.c | 4 +-
+ fs/ext2/file.c | 4 +-
+ fs/ext2/inode.c | 8 +-
+ fs/ext3/file.c | 4 +-
+ fs/ext3/inode.c | 15 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/file.c | 34 +--
+ fs/ext4/indirect.c | 16 +-
+ fs/ext4/inode.c | 23 +-
+ fs/f2fs/data.c | 4 +-
+ fs/f2fs/file.c | 4 +-
+ fs/fat/file.c | 4 +-
+ fs/fat/inode.c | 10 +-
+ fs/fuse/cuse.c | 10 +-
+ fs/fuse/file.c | 90 ++++----
+ fs/fuse/fuse_i.h | 5 +-
+ fs/gfs2/aops.c | 7 +-
+ fs/gfs2/file.c | 21 +-
+ fs/hfs/inode.c | 11 +-
+ fs/hfsplus/inode.c | 10 +-
+ fs/hostfs/hostfs_kern.c | 4 +-
+ fs/hpfs/file.c | 4 +-
+ fs/internal.h | 4 +
+ fs/iov-iter.c | 411 ++++++++++++++++++++++++++++++++++
+ fs/jffs2/file.c | 8 +-
+ fs/jfs/file.c | 4 +-
+ fs/jfs/inode.c | 7 +-
+ fs/logfs/file.c | 4 +-
+ fs/minix/file.c | 4 +-
+ fs/nfs/direct.c | 301 ++++++++++++++++---------
+ fs/nfs/file.c | 33 ++-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/nfs4file.c | 4 +-
+ fs/nilfs2/file.c | 4 +-
+ fs/nilfs2/inode.c | 8 +-
+ fs/ocfs2/aops.c | 8 +-
+ fs/ocfs2/aops.h | 2 +-
+ fs/ocfs2/file.c | 55 ++---
+ fs/ocfs2/ocfs2_trace.h | 6 +-
+ fs/omfs/file.c | 4 +-
+ fs/ramfs/file-mmu.c | 4 +-
+ fs/ramfs/file-nommu.c | 4 +-
+ fs/read_write.c | 78 +++++--
+ fs/reiserfs/file.c | 4 +-
+ fs/reiserfs/inode.c | 7 +-
+ fs/romfs/mmap-nommu.c | 2 +-
+ fs/sysv/file.c | 4 +-
+ fs/ubifs/file.c | 12 +-
+ fs/udf/file.c | 13 +-
+ fs/udf/inode.c | 10 +-
+ fs/ufs/file.c | 4 +-
+ fs/xfs/xfs_aops.c | 13 +-
+ fs/xfs/xfs_file.c | 51 ++---
+ include/linux/aio.h | 25 ++-
+ include/linux/bio.h | 8 +
+ include/linux/blk_types.h | 2 -
+ include/linux/fs.h | 165 ++++++++++++--
+ include/linux/nfs_fs.h | 13 +-
+ include/uapi/linux/loop.h | 1 +
+ mm/filemap.c | 433 ++++++++++++++----------------------
+ mm/page_io.c | 15 +-
+ mm/shmem.c | 61 ++---
+ 86 files changed, 1864 insertions(+), 1003 deletions(-)
+ create mode 100644 fs/iov-iter.c
+$ git am -3 ../patches/0001-ceph-fix-up-for-iov_iter-changes.patch
+Applying: ceph: Fix up for iov_iter changes
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/ceph/file.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 7c872a1c915b] Merge remote-tracking branch 'aio-direct/for-next'
+Merging device-mapper/for-next (55b4206003ec dm: allow remove to be deferred)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-crypt.c
+Auto-merging drivers/md/dm-cache-target.c
+Auto-merging drivers/md/dm-cache-policy-mq.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/cache-policies.txt | 6 +-
+ Documentation/device-mapper/dm-crypt.txt | 11 +-
+ drivers/md/Kconfig | 62 +-
+ drivers/md/Makefile | 7 +-
+ drivers/md/dm-cache-metadata.c | 207 ++++++-
+ drivers/md/dm-cache-metadata.h | 28 +-
+ drivers/md/dm-cache-policy-cleaner.c | 10 +-
+ drivers/md/dm-cache-policy-era.c | 511 ++++++++++++++++
+ drivers/md/dm-cache-policy-hints.c | 774 +++++++++++++++++++++++++
+ drivers/md/dm-cache-policy-internal.h | 29 +-
+ drivers/md/dm-cache-policy-mq.c | 348 ++++++++---
+ drivers/md/dm-cache-policy.c | 70 ++-
+ drivers/md/dm-cache-policy.h | 77 ++-
+ drivers/md/dm-cache-shim-utils.c | 217 +++++++
+ drivers/md/dm-cache-shim-utils.h | 73 +++
+ drivers/md/dm-cache-stack-utils.c | 241 ++++++++
+ drivers/md/dm-cache-stack-utils.h | 34 ++
+ drivers/md/dm-cache-target.c | 630 ++++++++++++++++----
+ drivers/md/dm-crypt.c | 214 ++++++-
+ drivers/md/dm-ioctl.c | 36 +-
+ drivers/md/dm-mpath.c | 31 +-
+ drivers/md/dm-table.c | 23 +-
+ drivers/md/dm.c | 47 +-
+ drivers/md/dm.h | 13 +-
+ drivers/md/persistent-data/dm-array.c | 5 +-
+ drivers/md/persistent-data/dm-space-map-disk.c | 18 +-
+ include/uapi/linux/dm-ioctl.h | 15 +-
+ 27 files changed, 3430 insertions(+), 307 deletions(-)
+ create mode 100644 drivers/md/dm-cache-policy-era.c
+ create mode 100644 drivers/md/dm-cache-policy-hints.c
+ create mode 100644 drivers/md/dm-cache-shim-utils.c
+ create mode 100644 drivers/md/dm-cache-shim-utils.h
+ create mode 100644 drivers/md/dm-cache-stack-utils.c
+ create mode 100644 drivers/md/dm-cache-stack-utils.h
+$ git am -3 ../patches/0001-dm_cache-fix-up-for-bvec-iterator-abstraction.patch
+Applying: dm_cache: fix up for bvec iterator abstraction
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/md/dm-cache-target.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 6a4301423d1c] Merge remote-tracking branch 'device-mapper/for-next'
+Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence)
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3)
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage)
+$ git merge pcmcia/master
+Already up-to-date.
+Merging mmc/mmc-next (4d22378221bd mmc: core: Add MMC_CAP_RUNTIME_RESUME to resume at runtime_resume)
+$ git merge mmc/mmc-next
+Auto-merging drivers/mmc/host/mmci.c
+Auto-merging Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 5 +
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 9 +
+ arch/mips/configs/db1235_defconfig | 1 -
+ arch/sh/boards/mach-ecovec24/setup.c | 1 +
+ drivers/mmc/card/block.c | 2 -
+ drivers/mmc/core/bus.c | 2 +-
+ drivers/mmc/core/core.c | 154 ++----
+ drivers/mmc/core/core.h | 6 +-
+ drivers/mmc/core/mmc.c | 127 +++--
+ drivers/mmc/core/mmc_ops.c | 94 ++--
+ drivers/mmc/core/sd.c | 118 ++--
+ drivers/mmc/core/sdio.c | 82 +--
+ drivers/mmc/host/atmel-mci.c | 82 +--
+ drivers/mmc/host/au1xmmc.c | 7 +-
+ drivers/mmc/host/bfin_sdh.c | 15 +-
+ drivers/mmc/host/cb710-mmc.c | 10 +-
+ drivers/mmc/host/davinci_mmc.c | 26 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 294 +++++++++-
+ drivers/mmc/host/dw_mmc-pltfm.c | 7 -
+ drivers/mmc/host/dw_mmc-socfpga.c | 34 +-
+ drivers/mmc/host/dw_mmc.c | 604 ++++++++++++++-------
+ drivers/mmc/host/dw_mmc.h | 55 ++
+ drivers/mmc/host/jz4740_mmc.c | 4 -
+ drivers/mmc/host/mmci.c | 17 +-
+ drivers/mmc/host/msm_sdcc.c | 27 +-
+ drivers/mmc/host/mvsdio.c | 35 +-
+ drivers/mmc/host/mxcmmc.c | 12 +-
+ drivers/mmc/host/mxs-mmc.c | 12 +-
+ drivers/mmc/host/omap.c | 53 --
+ drivers/mmc/host/omap_hsmmc.c | 112 ++--
+ drivers/mmc/host/pxamci.c | 32 --
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 35 +-
+ drivers/mmc/host/s3cmci.c | 29 -
+ drivers/mmc/host/sdhci-bcm-kona.c | 14 +-
+ drivers/mmc/host/sdhci-bcm2835.c | 8 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 550 +++++++++++++++++--
+ drivers/mmc/host/sdhci-esdhc.h | 37 --
+ drivers/mmc/host/sdhci-of-esdhc.c | 35 +-
+ drivers/mmc/host/sdhci-pci.c | 76 +++
+ drivers/mmc/host/sdhci.c | 36 +-
+ drivers/mmc/host/sdhci.h | 3 +
+ drivers/mmc/host/sdricoh_cs.c | 3 -
+ drivers/mmc/host/sh_mmcif.c | 10 +-
+ drivers/mmc/host/tifm_sd.c | 4 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 9 +-
+ drivers/mmc/host/via-sdmmc.c | 7 +-
+ drivers/mmc/host/vub300.c | 18 +-
+ drivers/mmc/host/wbsd.c | 33 +-
+ drivers/mmc/host/wmt-sdmmc.c | 57 +-
+ include/linux/mmc/card.h | 7 +-
+ include/linux/mmc/core.h | 4 +-
+ include/linux/mmc/dw_mmc.h | 4 +
+ include/linux/mmc/host.h | 5 +-
+ include/linux/platform_data/mmc-esdhc-imx.h | 5 +
+ 54 files changed, 1801 insertions(+), 1227 deletions(-)
+Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (139f3f1863de Merge branch 'slab/struct-page' into for-next)
+$ git merge slab/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/mm_types.h | 24 +-
+ include/linux/slab.h | 9 +-
+ include/linux/slab_def.h | 4 +-
+ mm/slab.c | 571 ++++++++++++++++++-----------------------------
+ mm/slub.c | 35 ++-
+ 5 files changed, 274 insertions(+), 369 deletions(-)
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (555c28a5b0c1 raid1: Add some macros to make code clearly.)
+$ git merge md/for-next
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 66 +++++++----
+ drivers/md/raid1.c | 31 +++--
+ drivers/md/raid1.h | 1 +
+ drivers/md/raid5.c | 326 +++++++++++++++++++++++++++++++++++++++------------
+ drivers/md/raid5.h | 16 ++-
+ include/linux/wait.h | 36 ++++++
+ 6 files changed, 365 insertions(+), 111 deletions(-)
+Merging mfd/master (5e90169c5a02 mfd: lpc_ich: Add Device IDs for Intel Wildcat Point-LP PCH)
+$ git merge mfd/master
+Resolved 'sound/soc/codecs/mc13783.c' using previous resolution.
+Auto-merging sound/soc/codecs/mc13783.c
+CONFLICT (content): Merge conflict in sound/soc/codecs/mc13783.c
+Auto-merging include/linux/regmap.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 32c92c19746b] Merge remote-tracking branch 'mfd/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mfd/as3722.txt | 194 ++++++++++
+ drivers/mfd/88pm860x-core.c | 2 +-
+ drivers/mfd/Kconfig | 22 ++
+ drivers/mfd/Makefile | 2 +
+ drivers/mfd/aat2870-core.c | 2 +-
+ drivers/mfd/arizona-core.c | 6 +-
+ drivers/mfd/arizona-i2c.c | 1 +
+ drivers/mfd/arizona-spi.c | 1 +
+ drivers/mfd/as3711.c | 1 +
+ drivers/mfd/as3722.c | 449 +++++++++++++++++++++++
+ drivers/mfd/da9052-i2c.c | 12 +-
+ drivers/mfd/ezx-pcap.c | 8 +-
+ drivers/mfd/lpc_ich.c | 15 +-
+ drivers/mfd/lpc_sch.c | 3 +
+ drivers/mfd/max77686.c | 1 +
+ drivers/mfd/max77693-irq.c | 3 +-
+ drivers/mfd/max77693.c | 19 +-
+ drivers/mfd/max8907.c | 1 +
+ drivers/mfd/max8925-i2c.c | 2 +-
+ drivers/mfd/max8997.c | 1 +
+ drivers/mfd/mc13xxx-i2c.c | 1 -
+ drivers/mfd/omap-usb-host.c | 18 +-
+ drivers/mfd/omap-usb-tll.c | 6 +-
+ drivers/mfd/palmas.c | 30 +-
+ drivers/mfd/rts5249.c | 48 ++-
+ drivers/mfd/rtsx_pcr.c | 5 +-
+ drivers/mfd/sec-core.c | 1 +
+ drivers/mfd/sm501.c | 4 +-
+ drivers/mfd/stw481x.c | 250 +++++++++++++
+ drivers/mfd/tc3589x.c | 37 +-
+ drivers/mfd/ti-ssp.c | 1 -
+ drivers/mfd/ti_am335x_tscadc.c | 24 +-
+ drivers/mfd/timberdale.c | 6 +-
+ drivers/mfd/tps6507x.c | 1 +
+ drivers/mfd/tps65217.c | 2 +-
+ drivers/mfd/tps6586x.c | 19 +-
+ drivers/mfd/tps65910.c | 5 +-
+ drivers/mfd/twl6040.c | 18 +-
+ drivers/mfd/ucb1x00-core.c | 1 +
+ drivers/mfd/wm5102-tables.c | 1 -
+ drivers/mfd/wm5110-tables.c | 39 +-
+ drivers/mfd/wm8994-core.c | 78 ----
+ include/dt-bindings/mfd/as3722.h | 52 +++
+ include/linux/mfd/arizona/registers.h | 2 +-
+ include/linux/mfd/as3722.h | 423 +++++++++++++++++++++
+ include/linux/mfd/da9052/da9052.h | 20 +-
+ include/linux/mfd/max77693-private.h | 1 -
+ include/linux/mfd/max77693.h | 2 -
+ include/linux/mfd/rtsx_pci.h | 53 +++
+ include/linux/mfd/stw481x.h | 56 +++
+ include/linux/mfd/syscon.h | 25 ++
+ include/linux/mfd/ti_am335x_tscadc.h | 20 +-
+ include/linux/mfd/wm8994/core.h | 47 ++-
+ include/linux/regmap.h | 2 +
+ 54 files changed, 1833 insertions(+), 210 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/as3722.txt
+ create mode 100644 drivers/mfd/as3722.c
+ create mode 100644 drivers/mfd/stw481x.c
+ create mode 100644 include/dt-bindings/mfd/as3722.h
+ create mode 100644 include/linux/mfd/as3722.h
+ create mode 100644 include/linux/mfd/stw481x.h
+Merging mfd-lj/for-mfd-next (6bfd1e63de34 mfd: lpc_sch: Ignore resource conflicts when adding mfd cells)
+$ git merge mfd-lj/for-mfd-next
+Already up-to-date.
+Merging battery/master (588bd5918bac power_supply: Fix documentation for TEMP_*ALERT* properties)
+$ git merge battery/master
+Merge made by the 'recursive' strategy.
+ .../bindings/power_supply/ti,bq24735.txt | 32 ++
+ Documentation/power/power_supply_class.txt | 8 +-
+ drivers/power/Kconfig | 6 +
+ drivers/power/Makefile | 1 +
+ drivers/power/ab8500_charger.c | 17 +-
+ drivers/power/bq2415x_charger.c | 6 +-
+ drivers/power/bq24735-charger.c | 419 +++++++++++++++++++++
+ drivers/power/charger-manager.c | 85 ++---
+ drivers/power/isp1704_charger.c | 91 ++---
+ drivers/power/max17042_battery.c | 373 +++++++++---------
+ drivers/power/pm2301_charger.c | 10 +-
+ drivers/power/tps65090-charger.c | 30 +-
+ include/linux/power/bq24735-charger.h | 39 ++
+ 13 files changed, 780 insertions(+), 337 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power_supply/ti,bq24735.txt
+ create mode 100644 drivers/power/bq24735-charger.c
+ create mode 100644 include/linux/power/bq24735-charger.h
+Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
+$ git merge fbdev/for-next
+Auto-merging drivers/video/s3fb.c
+Removing drivers/video/omap2/dss/ti_hdmi.h
+Auto-merging drivers/video/omap2/dss/hdmi4_core.h
+Auto-merging drivers/video/omap2/dss/hdmi4_core.c
+Removing drivers/video/omap2/dss/hdmi.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/neofb.c
+Auto-merging drivers/video/mmp/hw/mmp_ctrl.c
+Auto-merging drivers/video/cyber2000fb.c
+Auto-merging drivers/video/au1200fb.c
+Auto-merging drivers/video/au1100fb.c
+Auto-merging drivers/video/amba-clcd.c
+Auto-merging drivers/video/Kconfig
+Auto-merging arch/arm/mach-at91/board-sam9263ek.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/video/atmel,lcdc.txt | 75 ++
+ arch/arm/mach-at91/at91sam9261_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl_devices.c | 6 +-
+ arch/arm/mach-at91/board-sam9261ek.c | 10 +-
+ arch/arm/mach-at91/board-sam9263ek.c | 6 +-
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 4 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 6 +-
+ arch/arm/mach-at91/board.h | 4 +-
+ arch/arm/mach-mmp/ttc_dkb.c | 4 +-
+ arch/avr32/boards/atngw100/evklcd10x.c | 8 +-
+ arch/avr32/boards/atngw100/mrmt.c | 4 +-
+ arch/avr32/boards/atstk1000/atstk1000.h | 2 +-
+ arch/avr32/boards/atstk1000/setup.c | 2 +-
+ arch/avr32/boards/favr-32/setup.c | 2 +-
+ arch/avr32/boards/hammerhead/setup.c | 2 +-
+ arch/avr32/boards/merisc/display.c | 2 +-
+ arch/avr32/boards/mimc200/setup.c | 4 +-
+ arch/avr32/mach-at32ap/at32ap700x.c | 8 +-
+ arch/avr32/mach-at32ap/include/mach/board.h | 4 +-
+ drivers/video/Kconfig | 2 +
+ drivers/video/amba-clcd.c | 4 +-
+ drivers/video/amifb.c | 2 -
+ drivers/video/arkfb.c | 3 +-
+ drivers/video/atmel_lcdfb.c | 344 ++++--
+ drivers/video/aty/aty128fb.c | 4 +-
+ drivers/video/aty/atyfb_base.c | 1 -
+ drivers/video/aty/radeon_base.c | 5 -
+ drivers/video/aty/radeon_pm.c | 22 +-
+ drivers/video/aty/radeonfb.h | 1 -
+ drivers/video/au1100fb.c | 16 +-
+ drivers/video/au1200fb.c | 16 +-
+ drivers/video/backlight/l4f00242t03.c | 1 -
+ drivers/video/backlight/tosa_lcd.c | 6 +-
+ drivers/video/bf54x-lq043fb.c | 14 +-
+ drivers/video/bfin-t350mcqb-fb.c | 14 +-
+ drivers/video/broadsheetfb.c | 14 +-
+ drivers/video/bw2.c | 2 -
+ drivers/video/carminefb.c | 1 -
+ drivers/video/cg14.c | 2 -
+ drivers/video/cg3.c | 2 -
+ drivers/video/cg6.c | 2 -
+ drivers/video/cirrusfb.c | 6 -
+ drivers/video/cobalt_lcdfb.c | 14 +-
+ drivers/video/cyber2000fb.c | 5 -
+ drivers/video/da8xx-fb.c | 20 +-
+ drivers/video/ep93xx-fb.c | 2 +-
+ drivers/video/ffb.c | 2 -
+ drivers/video/geode/gx1fb_core.c | 1 -
+ drivers/video/geode/gxfb_core.c | 1 -
+ drivers/video/geode/lxfb_core.c | 1 -
+ drivers/video/grvga.c | 16 +-
+ drivers/video/hecubafb.c | 14 +-
+ drivers/video/hyperv_fb.c | 45 +-
+ drivers/video/i740fb.c | 1 -
+ drivers/video/i810/i810_main.c | 1 -
+ drivers/video/imxfb.c | 6 +-
+ drivers/video/intelfb/intelfbdrv.c | 2 -
+ drivers/video/jz4740_fb.c | 29 +-
+ drivers/video/kyro/fbdev.c | 2 -
+ drivers/video/leo.c | 2 -
+ drivers/video/matrox/matroxfb_maven.c | 14 +-
+ drivers/video/mb862xx/mb862xxfbdrv.c | 3 -
+ drivers/video/mbx/mbxfb.c | 2 +-
+ drivers/video/metronomefb.c | 14 +-
+ drivers/video/mmp/fb/mmpfb.c | 34 +-
+ drivers/video/mmp/hw/mmp_ctrl.c | 71 +-
+ drivers/video/mmp/hw/mmp_ctrl.h | 5 +
+ drivers/video/mx3fb.c | 4 +-
+ drivers/video/neofb.c | 6 -
+ drivers/video/nuc900fb.c | 6 +-
+ drivers/video/omap/hwa742.c | 2 +-
+ drivers/video/omap/omapfb_main.c | 4 +-
+ drivers/video/omap2/dss/Makefile | 3 +-
+ drivers/video/omap2/dss/core.c | 4 +-
+ drivers/video/omap2/dss/dispc.c | 8 +-
+ drivers/video/omap2/dss/dss.h | 4 +-
+ drivers/video/omap2/dss/dss_features.c | 44 -
+ drivers/video/omap2/dss/dss_features.h | 8 -
+ drivers/video/omap2/dss/hdmi.c | 1184 --------------------
+ drivers/video/omap2/dss/hdmi.h | 444 ++++++++
+ drivers/video/omap2/dss/hdmi4.c | 696 ++++++++++++
+ .../omap2/dss/{ti_hdmi_4xxx_ip.c => hdmi4_core.c} | 771 ++++---------
+ .../omap2/dss/{ti_hdmi_4xxx_ip.h => hdmi4_core.h} | 303 ++---
+ drivers/video/omap2/dss/hdmi_common.c | 423 +++++++
+ drivers/video/omap2/dss/hdmi_phy.c | 160 +++
+ drivers/video/omap2/dss/hdmi_pll.c | 230 ++++
+ drivers/video/omap2/dss/hdmi_wp.c | 271 +++++
+ drivers/video/omap2/dss/ti_hdmi.h | 187 ----
+ drivers/video/p9100.c | 2 -
+ drivers/video/platinumfb.c | 1 -
+ drivers/video/pm2fb.c | 1 -
+ drivers/video/pm3fb.c | 1 -
+ drivers/video/pxa168fb.c | 6 +-
+ drivers/video/pxafb.c | 16 +-
+ drivers/video/riva/fbdev.c | 5 -
+ drivers/video/s1d13xxxfb.c | 12 +-
+ drivers/video/s3c-fb.c | 2 +-
+ drivers/video/s3c2410fb.c | 6 +-
+ drivers/video/s3fb.c | 1 -
+ drivers/video/sa1100fb.c | 4 +-
+ drivers/video/savage/savagefb_driver.c | 6 -
+ drivers/video/sh_mobile_hdmi.c | 13 +-
+ drivers/video/simplefb.c | 12 +-
+ drivers/video/sis/sis_main.c | 4 -
+ drivers/video/smscufx.c | 2 +-
+ drivers/video/ssd1307fb.c | 2 +-
+ drivers/video/sunxvr1000.c | 2 -
+ drivers/video/tcx.c | 2 -
+ drivers/video/tdfxfb.c | 1 -
+ drivers/video/tmiofb.c | 10 +-
+ drivers/video/tridentfb.c | 1 -
+ drivers/video/udlfb.c | 2 +-
+ drivers/video/uvesafb.c | 19 +-
+ drivers/video/vfb.c | 5 +-
+ drivers/video/vt8623fb.c | 1 -
+ drivers/video/w100fb.c | 2 +-
+ drivers/video/wm8505fb.c | 2 +-
+ drivers/video/wmt_ge_rops.c | 4 +-
+ drivers/video/xilinxfb.c | 53 +-
+ include/video/atmel_lcdc.h | 25 +-
+ include/video/mmp_disp.h | 6 +
+ 123 files changed, 3143 insertions(+), 2812 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/atmel,lcdc.txt
+ delete mode 100644 drivers/video/omap2/dss/hdmi.c
+ create mode 100644 drivers/video/omap2/dss/hdmi.h
+ create mode 100644 drivers/video/omap2/dss/hdmi4.c
+ rename drivers/video/omap2/dss/{ti_hdmi_4xxx_ip.c => hdmi4_core.c} (55%)
+ rename drivers/video/omap2/dss/{ti_hdmi_4xxx_ip.h => hdmi4_core.h} (51%)
+ create mode 100644 drivers/video/omap2/dss/hdmi_common.c
+ create mode 100644 drivers/video/omap2/dss/hdmi_phy.c
+ create mode 100644 drivers/video/omap2/dss/hdmi_pll.c
+ create mode 100644 drivers/video/omap2/dss/hdmi_wp.c
+ delete mode 100644 drivers/video/omap2/dss/ti_hdmi.h
+$ git am -3 ../patches/0001-video-xilinxfb-Fix-for-Use-standard-variable-name-co.patch
+Applying: video: xilinxfb: Fix for "Use standard variable name convention"
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/video/xilinxfb.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 063d45ae41ea] Merge remote-tracking branch 'fbdev/for-next'
+Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par)
+$ git merge viafb/viafb-next
+Already up-to-date.
+Merging omap_dss2/for-next (8623ec220b9c omapdss: Add new panel driver for Topolly td028ttec1 LCD.)
+$ git merge omap_dss2/for-next
+Auto-merging drivers/video/s3fb.c
+Auto-merging drivers/video/omap2/dss/dispc.c
+Auto-merging drivers/video/omap2/displays-new/connector-dvi.c
+Auto-merging drivers/video/omap2/displays-new/Kconfig
+Auto-merging drivers/video/neofb.c
+Merge made by the 'recursive' strategy.
+ drivers/auxdisplay/cfag12864bfb.c | 3 +-
+ drivers/video/68328fb.c | 9 +-
+ drivers/video/amifb.c | 4 +-
+ drivers/video/arcfb.c | 8 +-
+ drivers/video/arkfb.c | 46 +-
+ drivers/video/asiliantfb.c | 4 +-
+ drivers/video/atafb.c | 7 +-
+ drivers/video/aty/aty128fb.c | 4 +-
+ drivers/video/broadsheetfb.c | 5 +-
+ drivers/video/carminefb.c | 3 +-
+ drivers/video/cfbimgblt.c | 2 +-
+ drivers/video/cg14.c | 4 +-
+ drivers/video/cg6.c | 2 +-
+ drivers/video/cobalt_lcdfb.c | 3 +-
+ drivers/video/controlfb.c | 4 +-
+ drivers/video/da8xx-fb.c | 1 -
+ drivers/video/efifb.c | 7 +-
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 3 +-
+ drivers/video/fb-puv3.c | 5 +-
+ drivers/video/fm2fb.c | 2 +-
+ drivers/video/fsl-diu-fb.c | 2 +-
+ drivers/video/gbefb.c | 6 +-
+ drivers/video/geode/gx1fb_core.c | 2 +-
+ drivers/video/geode/gxfb_core.c | 2 +-
+ drivers/video/geode/lxfb_core.c | 3 +-
+ drivers/video/gxt4500.c | 3 +-
+ drivers/video/hecubafb.c | 5 +-
+ drivers/video/hgafb.c | 3 +-
+ drivers/video/hitfb.c | 3 +-
+ drivers/video/hpfb.c | 3 +-
+ drivers/video/i740fb.c | 8 +-
+ drivers/video/igafb.c | 5 +-
+ drivers/video/imsttfb.c | 4 +-
+ drivers/video/kyro/fbdev.c | 8 +-
+ drivers/video/leo.c | 2 +-
+ drivers/video/macfb.c | 3 +-
+ drivers/video/matrox/matroxfb_DAC1064.c | 4 +-
+ drivers/video/matrox/matroxfb_Ti3026.c | 2 +-
+ drivers/video/matrox/matroxfb_base.c | 6 +-
+ drivers/video/mbx/mbxfb.c | 2 +-
+ drivers/video/metronomefb.c | 3 +-
+ drivers/video/neofb.c | 3 +-
+ drivers/video/nuc900fb.c | 3 +-
+ drivers/video/nvidia/nv_hw.c | 2 +-
+ drivers/video/offb.c | 3 +-
+ drivers/video/omap2/displays-new/Kconfig | 6 +
+ drivers/video/omap2/displays-new/Makefile | 1 +
+ drivers/video/omap2/displays-new/connector-dvi.c | 7 +
+ drivers/video/omap2/displays-new/panel-dsi-cm.c | 2 +-
+ .../omap2/displays-new/panel-tpo-td028ttec1.c | 480 +++++++++++++++++++++
+ drivers/video/omap2/dss/dispc.c | 2 +-
+ drivers/video/omap2/dss/display.c | 2 +-
+ drivers/video/omap2/dss/dsi.c | 12 +-
+ drivers/video/platinumfb.c | 2 +-
+ drivers/video/pm2fb.c | 4 +-
+ drivers/video/pm3fb.c | 3 +-
+ drivers/video/pmag-ba-fb.c | 4 +-
+ drivers/video/pmagb-b-fb.c | 9 +-
+ drivers/video/pvr2fb.c | 25 +-
+ drivers/video/q40fb.c | 3 +-
+ drivers/video/s1d13xxxfb.c | 3 +-
+ drivers/video/s3fb.c | 62 +--
+ drivers/video/sbuslib.c | 2 +-
+ drivers/video/sgivwfb.c | 4 +-
+ drivers/video/simplefb.c | 12 +-
+ drivers/video/sis/sis_main.c | 4 +-
+ drivers/video/skeletonfb.c | 3 +-
+ drivers/video/sstfb.c | 8 +-
+ drivers/video/stifb.c | 4 +-
+ drivers/video/svgalib.c | 4 +-
+ drivers/video/sysimgblt.c | 2 +-
+ drivers/video/tcx.c | 4 +-
+ drivers/video/tgafb.c | 4 +-
+ drivers/video/tmiofb.c | 3 +-
+ drivers/video/uvesafb.c | 6 +-
+ drivers/video/valkyriefb.c | 2 +-
+ drivers/video/vesafb.c | 3 +-
+ drivers/video/vfb.c | 5 +-
+ drivers/video/vga16fb.c | 3 +-
+ drivers/video/vt8500lcdfb.c | 2 +-
+ drivers/video/vt8623fb.c | 40 +-
+ drivers/video/w100fb.c | 5 +-
+ drivers/video/wm8505fb.c | 12 +-
+ include/linux/fb.h | 12 +
+ include/video/omap-panel-data.h | 13 +
+ 85 files changed, 745 insertions(+), 255 deletions(-)
+ create mode 100644 drivers/video/omap2/displays-new/panel-tpo-td028ttec1.c
+Merging regulator/for-next (4445d0094e75 Merge remote-tracking branch 'regulator/topic/tps65910' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/mfd/arizona-core.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/as3722-regulator.txt | 91 +++
+ .../devicetree/bindings/regulator/da9210.txt | 21 +
+ .../devicetree/bindings/regulator/palmas-pmic.txt | 12 +-
+ .../devicetree/bindings/regulator/regulator.txt | 5 +
+ Documentation/driver-model/devres.txt | 1 +
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 12 -
+ drivers/mfd/arizona-core.c | 32 +-
+ drivers/mfd/mfd-core.c | 22 +-
+ drivers/regulator/88pm800.c | 12 +-
+ drivers/regulator/88pm8607.c | 12 +-
+ drivers/regulator/Kconfig | 26 +-
+ drivers/regulator/Makefile | 4 +-
+ drivers/regulator/aat2870-regulator.c | 11 +-
+ drivers/regulator/ab3100.c | 3 +-
+ drivers/regulator/ab8500-ext.c | 26 +-
+ drivers/regulator/ad5398.c | 19 +-
+ drivers/regulator/anatop-regulator.c | 7 +-
+ drivers/regulator/arizona-ldo1.c | 12 +-
+ drivers/regulator/arizona-micsupp.c | 14 +-
+ drivers/regulator/as3711-regulator.c | 43 +-
+ drivers/regulator/as3722-regulator.c | 908 +++++++++++++++++++++
+ drivers/regulator/core.c | 455 ++++++-----
+ drivers/regulator/da903x.c | 17 +-
+ drivers/regulator/da9052-regulator.c | 55 +-
+ drivers/regulator/da9055-regulator.c | 24 +-
+ drivers/regulator/da9063-regulator.c | 23 +-
+ drivers/regulator/da9210-regulator.c | 19 +-
+ drivers/regulator/devres.c | 415 ++++++++++
+ drivers/regulator/fan53555.c | 12 +-
+ drivers/regulator/fixed.c | 38 +-
+ drivers/regulator/gpio-regulator.c | 1 -
+ drivers/regulator/helpers.c | 6 +-
+ drivers/regulator/internal.h | 38 +
+ drivers/regulator/isl6271a-regulator.c | 24 +-
+ drivers/regulator/lp3971.c | 4 +-
+ drivers/regulator/lp872x.c | 33 +-
+ drivers/regulator/lp8788-buck.c | 12 +-
+ drivers/regulator/lp8788-ldo.c | 24 +-
+ drivers/regulator/max1586.c | 26 +-
+ drivers/regulator/max77686.c | 23 +-
+ drivers/regulator/max77693.c | 29 +-
+ drivers/regulator/max8649.c | 14 +-
+ drivers/regulator/max8660.c | 30 +-
+ drivers/regulator/max8907-regulator.c | 23 +-
+ drivers/regulator/max8925-regulator.c | 12 +-
+ drivers/regulator/max8973-regulator.c | 11 +-
+ drivers/regulator/max8997.c | 44 +-
+ drivers/regulator/max8998.c | 35 +-
+ drivers/regulator/mc13783-regulator.c | 53 +-
+ drivers/regulator/mc13892-regulator.c | 22 +-
+ drivers/regulator/of_regulator.c | 6 +
+ drivers/regulator/palmas-regulator.c | 208 ++++-
+ drivers/regulator/pcap-regulator.c | 13 +-
+ drivers/regulator/pcf50633-regulator.c | 13 +-
+ drivers/regulator/rc5t583-regulator.c | 22 +-
+ drivers/regulator/s2mps11.c | 23 +-
+ drivers/regulator/s5m8767.c | 24 +-
+ drivers/regulator/stw481x-vmmc.c | 111 +++
+ drivers/regulator/ti-abb-regulator.c | 86 +-
+ drivers/regulator/tps51632-regulator.c | 11 +-
+ drivers/regulator/tps6105x-regulator.c | 15 +-
+ drivers/regulator/tps62360-regulator.c | 17 +-
+ drivers/regulator/tps65023-regulator.c | 25 +-
+ drivers/regulator/tps6507x-regulator.c | 23 +-
+ drivers/regulator/tps65090-regulator.c | 37 +-
+ drivers/regulator/tps65217-regulator.c | 50 +-
+ drivers/regulator/tps6524x-regulator.c | 32 +-
+ drivers/regulator/tps6586x-regulator.c | 33 +-
+ drivers/regulator/tps65910-regulator.c | 33 +-
+ drivers/regulator/tps65912-regulator.c | 33 +-
+ drivers/regulator/tps80031-regulator.c | 30 +-
+ drivers/regulator/twl-regulator.c | 3 +-
+ drivers/regulator/vexpress.c | 3 +-
+ drivers/regulator/wm831x-dcdc.c | 118 +--
+ drivers/regulator/wm831x-isink.c | 25 +-
+ drivers/regulator/wm831x-ldo.c | 75 +-
+ drivers/regulator/wm8350-regulator.c | 12 +-
+ drivers/regulator/wm8400-regulator.c | 19 +-
+ drivers/regulator/wm8994-regulator.c | 14 +-
+ include/linux/mfd/core.h | 6 +
+ include/linux/regulator/consumer.h | 79 ++
+ include/linux/regulator/driver.h | 18 +-
+ include/linux/regulator/machine.h | 7 +-
+ 83 files changed, 2542 insertions(+), 1497 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/as3722-regulator.txt
+ create mode 100644 Documentation/devicetree/bindings/regulator/da9210.txt
+ create mode 100644 drivers/regulator/as3722-regulator.c
+ create mode 100644 drivers/regulator/devres.c
+ create mode 100644 drivers/regulator/internal.h
+ create mode 100644 drivers/regulator/stw481x-vmmc.c
+Merging security/next (217091dd7a7a ima: define '_ima' as a builtin 'trusted' keyring)
+$ git merge security/next
+Resolved 'crypto/Makefile' using previous resolution.
+Auto-merging security/selinux/hooks.c
+Removing kernel/modsign_pubkey.c
+Removing kernel/modsign_certificate.S
+Auto-merging init/Kconfig
+Auto-merging drivers/char/tpm/xen-tpmfront.c
+Auto-merging drivers/char/tpm/tpm-interface.c
+Auto-merging crypto/asymmetric_keys/rsa.c
+Auto-merging crypto/Makefile
+CONFLICT (content): Merge conflict in crypto/Makefile
+Auto-merging crypto/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master db940e6e9ac7] Merge remote-tracking branch 'security/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/assoc_array.txt | 574 +++++++
+ .../devicetree/bindings/i2c/trivial-devices.txt | 3 +
+ Documentation/kernel-parameters.txt | 11 +-
+ Documentation/security/00-INDEX | 2 +
+ Documentation/security/IMA-templates.txt | 87 +
+ Documentation/security/keys.txt | 20 +-
+ MAINTAINERS | 4 +-
+ crypto/Kconfig | 3 +
+ crypto/Makefile | 1 +
+ crypto/asymmetric_keys/Kconfig | 3 +-
+ crypto/asymmetric_keys/asymmetric_type.c | 1 +
+ crypto/asymmetric_keys/public_key.c | 66 +-
+ crypto/asymmetric_keys/public_key.h | 6 +
+ crypto/asymmetric_keys/rsa.c | 14 +-
+ crypto/asymmetric_keys/x509_cert_parser.c | 35 +-
+ crypto/asymmetric_keys/x509_parser.h | 18 +-
+ crypto/asymmetric_keys/x509_public_key.c | 232 ++-
+ crypto/hash_info.c | 56 +
+ drivers/char/tpm/Kconfig | 37 +-
+ drivers/char/tpm/Makefile | 11 +-
+ drivers/char/tpm/{tpm.c => tpm-interface.c} | 138 +-
+ drivers/char/tpm/tpm.h | 3 +-
+ drivers/char/tpm/tpm_atmel.c | 2 +-
+ drivers/char/tpm/tpm_eventlog.c | 3 -
+ drivers/char/tpm/tpm_i2c_atmel.c | 284 ++++
+ drivers/char/tpm/tpm_i2c_infineon.c | 4 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 710 ++++++++
+ drivers/char/tpm/tpm_i2c_stm_st33.c | 12 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 6 +-
+ drivers/char/tpm/tpm_ppi.c | 4 -
+ drivers/char/tpm/tpm_tis.c | 2 +-
+ drivers/char/tpm/xen-tpmfront.c | 2 -
+ include/crypto/hash_info.h | 40 +
+ include/crypto/public_key.h | 25 +-
+ include/keys/big_key-type.h | 25 +
+ include/keys/keyring-type.h | 17 +-
+ include/keys/system_keyring.h | 23 +
+ include/linux/assoc_array.h | 92 ++
+ include/linux/assoc_array_priv.h | 182 ++
+ include/linux/key-type.h | 6 +
+ include/linux/key.h | 52 +-
+ include/linux/security.h | 26 +-
+ include/linux/user_namespace.h | 6 +
+ include/uapi/linux/hash_info.h | 37 +
+ include/uapi/linux/keyctl.h | 1 +
+ init/Kconfig | 13 +
+ kernel/Makefile | 50 +-
+ kernel/modsign_certificate.S | 12 -
+ kernel/modsign_pubkey.c | 104 --
+ kernel/module-internal.h | 2 -
+ kernel/module_signing.c | 11 +-
+ kernel/system_certificates.S | 10 +
+ kernel/system_keyring.c | 105 ++
+ kernel/user.c | 4 +
+ kernel/user_namespace.c | 6 +
+ lib/Kconfig | 14 +
+ lib/Makefile | 1 +
+ lib/assoc_array.c | 1746 ++++++++++++++++++++
+ lib/mpi/mpiutil.c | 3 +
+ scripts/asn1_compiler.c | 2 +
+ security/Makefile | 1 -
+ security/apparmor/audit.c | 14 +-
+ security/apparmor/capability.c | 15 +-
+ security/apparmor/domain.c | 16 +-
+ security/apparmor/include/audit.h | 1 -
+ security/apparmor/include/capability.h | 5 +-
+ security/apparmor/include/ipc.h | 4 +-
+ security/apparmor/ipc.c | 9 +-
+ security/apparmor/lsm.c | 2 +-
+ security/capability.c | 15 +-
+ security/integrity/digsig.c | 37 +-
+ security/integrity/digsig_asymmetric.c | 11 -
+ security/integrity/evm/evm_main.c | 4 +-
+ security/integrity/evm/evm_posix_acl.c | 3 +-
+ security/integrity/iint.c | 2 +
+ security/integrity/ima/Kconfig | 72 +
+ security/integrity/ima/Makefile | 2 +-
+ security/integrity/ima/ima.h | 101 +-
+ security/integrity/ima/ima_api.c | 136 +-
+ security/integrity/ima/ima_appraise.c | 117 +-
+ security/integrity/ima/ima_crypto.c | 134 +-
+ security/integrity/ima/ima_fs.c | 67 +-
+ security/integrity/ima/ima_init.c | 37 +-
+ security/integrity/ima/ima_main.c | 63 +-
+ security/integrity/ima/ima_policy.c | 1 -
+ security/integrity/ima/ima_queue.c | 10 +-
+ security/integrity/ima/ima_template.c | 178 ++
+ security/integrity/ima/ima_template_lib.c | 347 ++++
+ security/integrity/ima/ima_template_lib.h | 49 +
+ security/integrity/integrity.h | 47 +-
+ security/keys/Kconfig | 29 +
+ security/keys/Makefile | 2 +
+ security/keys/big_key.c | 206 +++
+ security/keys/compat.c | 3 +
+ security/keys/gc.c | 33 +-
+ security/keys/internal.h | 74 +-
+ security/keys/key.c | 102 +-
+ security/keys/keyctl.c | 3 +
+ security/keys/keyring.c | 1505 +++++++++--------
+ security/keys/persistent.c | 169 ++
+ security/keys/proc.c | 17 +-
+ security/keys/process_keys.c | 141 +-
+ security/keys/request_key.c | 60 +-
+ security/keys/request_key_auth.c | 31 +-
+ security/keys/sysctl.c | 11 +
+ security/keys/user_defined.c | 18 +-
+ security/security.c | 13 +-
+ security/selinux/hooks.c | 146 +-
+ security/selinux/include/objsec.h | 4 +-
+ security/selinux/include/security.h | 13 +-
+ security/selinux/include/xfrm.h | 45 +-
+ security/selinux/netlabel.c | 6 +-
+ security/selinux/netnode.c | 2 +
+ security/selinux/selinuxfs.c | 4 +-
+ security/selinux/ss/ebitmap.c | 20 +-
+ security/selinux/ss/ebitmap.h | 10 +-
+ security/selinux/ss/mls.c | 22 +-
+ security/selinux/ss/mls_types.h | 2 +-
+ security/selinux/ss/policydb.c | 3 +-
+ security/selinux/ss/services.c | 66 +-
+ security/selinux/xfrm.c | 453 +++--
+ security/smack/smack.h | 12 +-
+ security/smack/smack_access.c | 10 +
+ security/smack/smack_lsm.c | 11 +-
+ security/smack/smackfs.c | 10 +-
+ 125 files changed, 7697 insertions(+), 2028 deletions(-)
+ create mode 100644 Documentation/assoc_array.txt
+ create mode 100644 Documentation/security/IMA-templates.txt
+ create mode 100644 crypto/hash_info.c
+ rename drivers/char/tpm/{tpm.c => tpm-interface.c} (93%)
+ create mode 100644 drivers/char/tpm/tpm_i2c_atmel.c
+ create mode 100644 drivers/char/tpm/tpm_i2c_nuvoton.c
+ create mode 100644 include/crypto/hash_info.h
+ create mode 100644 include/keys/big_key-type.h
+ create mode 100644 include/keys/system_keyring.h
+ create mode 100644 include/linux/assoc_array.h
+ create mode 100644 include/linux/assoc_array_priv.h
+ create mode 100644 include/uapi/linux/hash_info.h
+ delete mode 100644 kernel/modsign_certificate.S
+ delete mode 100644 kernel/modsign_pubkey.c
+ create mode 100644 kernel/system_certificates.S
+ create mode 100644 kernel/system_keyring.c
+ create mode 100644 lib/assoc_array.c
+ create mode 100644 security/integrity/ima/ima_template.c
+ create mode 100644 security/integrity/ima/ima_template_lib.c
+ create mode 100644 security/integrity/ima/ima_template_lib.h
+ create mode 100644 security/keys/big_key.c
+ create mode 100644 security/keys/persistent.c
+Merging selinux/master (42d64e1add3a selinux: correct locking in selinux_netlbl_socket_connect))
+$ git merge selinux/master
+Already up-to-date.
+Merging lblnet/master (07bc9dc1b01b Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc)
+$ git merge lblnet/master
+Already up-to-date.
+Merging watchdog/master (ec1a1a17a211 watchdog: rt2880_wdt: fix return value check in rt288x_wdt_probe())
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Makefile
+Auto-merging drivers/watchdog/Kconfig
+Auto-merging arch/arm/boot/dts/sama5d3.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9x5.dtsi
+Auto-merging arch/arm/boot/dts/at91sam9n12.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/atmel-wdt.txt | 30 +-
+ .../devicetree/bindings/watchdog/dw_wdt.txt | 21 ++
+ .../bindings/{gpio => watchdog}/men-a021-wdt.txt | 0
+ .../bindings/watchdog/moxa,moxart-watchdog.txt | 15 +
+ .../devicetree/bindings/watchdog/rt2880-wdt.txt | 19 ++
+ .../devicetree/bindings/watchdog/sirfsoc_wdt.txt | 14 +
+ arch/arm/boot/dts/at91sam9260.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9263.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9n12.dtsi | 5 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 5 +
+ arch/arm/boot/dts/kizbox.dts | 6 +
+ arch/arm/boot/dts/sama5d3.dtsi | 5 +
+ arch/arm/configs/prima2_defconfig | 1 +
+ drivers/watchdog/Kconfig | 26 ++
+ drivers/watchdog/Makefile | 3 +
+ drivers/watchdog/acquirewdt.c | 4 +-
+ drivers/watchdog/advantechwdt.c | 1 -
+ drivers/watchdog/alim1535_wdt.c | 1 -
+ drivers/watchdog/alim7101_wdt.c | 1 -
+ drivers/watchdog/ar7_wdt.c | 1 -
+ drivers/watchdog/at32ap700x_wdt.c | 1 -
+ drivers/watchdog/at91rm9200_wdt.c | 3 +-
+ drivers/watchdog/at91sam9_wdt.c | 309 +++++++++++++++------
+ drivers/watchdog/ath79_wdt.c | 1 -
+ drivers/watchdog/bcm2835_wdt.c | 1 -
+ drivers/watchdog/bcm63xx_wdt.c | 1 -
+ drivers/watchdog/bfin_wdt.c | 1 -
+ drivers/watchdog/cpu5wdt.c | 1 -
+ drivers/watchdog/davinci_wdt.c | 1 -
+ drivers/watchdog/dw_wdt.c | 36 +--
+ drivers/watchdog/ep93xx_wdt.c | 1 -
+ drivers/watchdog/eurotechwdt.c | 1 -
+ drivers/watchdog/gef_wdt.c | 1 -
+ drivers/watchdog/geodewdt.c | 1 -
+ drivers/watchdog/hpwdt.c | 1 -
+ drivers/watchdog/i6300esb.c | 1 -
+ drivers/watchdog/iTCO_wdt.c | 5 +-
+ drivers/watchdog/ib700wdt.c | 1 -
+ drivers/watchdog/ibmasr.c | 1 -
+ drivers/watchdog/ie6xx_wdt.c | 1 -
+ drivers/watchdog/imx2_wdt.c | 2 +-
+ drivers/watchdog/indydog.c | 1 -
+ drivers/watchdog/intel_scu_watchdog.c | 1 -
+ drivers/watchdog/iop_wdt.c | 1 -
+ drivers/watchdog/it8712f_wdt.c | 1 -
+ drivers/watchdog/it87_wdt.c | 1 -
+ drivers/watchdog/ixp4xx_wdt.c | 2 -
+ drivers/watchdog/jz4740_wdt.c | 1 -
+ drivers/watchdog/kempld_wdt.c | 5 +-
+ drivers/watchdog/ks8695_wdt.c | 1 -
+ drivers/watchdog/lantiq_wdt.c | 1 -
+ drivers/watchdog/m54xx_wdt.c | 1 -
+ drivers/watchdog/machzwd.c | 1 -
+ drivers/watchdog/max63xx_wdt.c | 1 -
+ drivers/watchdog/mixcomwd.c | 1 -
+ drivers/watchdog/moxart_wdt.c | 165 +++++++++++
+ drivers/watchdog/mpc8xxx_wdt.c | 1 -
+ drivers/watchdog/mtx-1_wdt.c | 1 -
+ drivers/watchdog/mv64x60_wdt.c | 3 +-
+ drivers/watchdog/nuc900_wdt.c | 1 -
+ drivers/watchdog/nv_tco.c | 1 -
+ drivers/watchdog/of_xilinx_wdt.c | 1 -
+ drivers/watchdog/omap_wdt.c | 2 +-
+ drivers/watchdog/orion_wdt.c | 3 +-
+ drivers/watchdog/pc87413_wdt.c | 2 -
+ drivers/watchdog/pcwd.c | 4 +-
+ drivers/watchdog/pcwd_pci.c | 4 +-
+ drivers/watchdog/pcwd_usb.c | 12 +-
+ drivers/watchdog/pika_wdt.c | 2 -
+ drivers/watchdog/pnx4008_wdt.c | 1 -
+ drivers/watchdog/pnx833x_wdt.c | 1 -
+ drivers/watchdog/rc32434_wdt.c | 4 +-
+ drivers/watchdog/rdc321x_wdt.c | 3 +-
+ drivers/watchdog/rt2880_wdt.c | 207 ++++++++++++++
+ drivers/watchdog/s3c2410_wdt.c | 2 -
+ drivers/watchdog/sa1100_wdt.c | 1 -
+ drivers/watchdog/sb_wdog.c | 1 -
+ drivers/watchdog/sbc60xxwdt.c | 1 -
+ drivers/watchdog/sbc7240_wdt.c | 2 -
+ drivers/watchdog/sbc8360.c | 1 -
+ drivers/watchdog/sbc_epx_c3.c | 1 -
+ drivers/watchdog/sbc_fitpc2_wdt.c | 2 -
+ drivers/watchdog/sc1200wdt.c | 1 -
+ drivers/watchdog/sc520_wdt.c | 1 -
+ drivers/watchdog/sch311x_wdt.c | 5 +-
+ drivers/watchdog/scx200_wdt.c | 1 -
+ drivers/watchdog/shwdt.c | 1 -
+ drivers/watchdog/sirfsoc_wdt.c | 224 +++++++++++++++
+ drivers/watchdog/smsc37b787_wdt.c | 2 -
+ drivers/watchdog/softdog.c | 1 -
+ drivers/watchdog/sp5100_tco.c | 1 -
+ drivers/watchdog/sp805_wdt.c | 1 -
+ drivers/watchdog/stmp3xxx_rtc_wdt.c | 5 +-
+ drivers/watchdog/sunxi_wdt.c | 2 +-
+ drivers/watchdog/ts72xx_wdt.c | 38 ++-
+ drivers/watchdog/txx9wdt.c | 1 -
+ drivers/watchdog/ux500_wdt.c | 3 +-
+ drivers/watchdog/w83627hf_wdt.c | 1 -
+ drivers/watchdog/w83697hf_wdt.c | 1 -
+ drivers/watchdog/w83697ug_wdt.c | 1 -
+ drivers/watchdog/w83877f_wdt.c | 1 -
+ drivers/watchdog/w83977f_wdt.c | 1 -
+ drivers/watchdog/wafer5823wdt.c | 1 -
+ drivers/watchdog/watchdog_core.c | 2 +-
+ drivers/watchdog/wdrtas.c | 2 -
+ drivers/watchdog/wdt.c | 2 -
+ drivers/watchdog/wdt285.c | 1 -
+ drivers/watchdog/wdt977.c | 1 -
+ drivers/watchdog/wdt_pci.c | 2 -
+ drivers/watchdog/wm831x_wdt.c | 8 +-
+ drivers/watchdog/xen_wdt.c | 1 -
+ 112 files changed, 1049 insertions(+), 255 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/dw_wdt.txt
+ rename Documentation/devicetree/bindings/{gpio => watchdog}/men-a021-wdt.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/watchdog/moxa,moxart-watchdog.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/rt2880-wdt.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/sirfsoc_wdt.txt
+ create mode 100644 drivers/watchdog/moxart_wdt.c
+ create mode 100644 drivers/watchdog/rt2880_wdt.c
+ create mode 100644 drivers/watchdog/sirfsoc_wdt.c
+Merging dwmw2-iommu/master (e5d0c874391a Merge tag 'iommu-updates-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging iommu/next (e6ca48d995e4 Merge branches 'iommu/fixes', 'tracing', 'core', 'arm/tegra' and 'x86/vt-d' into next)
+$ git merge iommu/next
+Auto-merging drivers/iommu/intel_irq_remapping.c
+Merge made by the 'recursive' strategy.
+ drivers/iommu/Makefile | 1 +
+ drivers/iommu/intel_irq_remapping.c | 13 +--
+ drivers/iommu/iommu-traces.c | 27 ++++++
+ drivers/iommu/iommu.c | 21 ++++-
+ drivers/iommu/tegra-gart.c | 25 ++----
+ drivers/iommu/tegra-smmu.c | 2 +-
+ include/linux/iommu.h | 2 +
+ include/trace/events/iommu.h | 162 ++++++++++++++++++++++++++++++++++++
+ 8 files changed, 222 insertions(+), 31 deletions(-)
+ create mode 100644 drivers/iommu/iommu-traces.c
+ create mode 100644 include/trace/events/iommu.h
+Merging vfio/next (15c03dd4859a Linux 3.12-rc3)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (861d66601acd 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 (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (2bb9936beac2 doc: usb: Fix typo in Documentation/usb/gadget_configs.txt)
+$ git merge trivial/for-next
+Resolved 'net/netfilter/xt_set.c' using previous resolution.
+Auto-merging net/netfilter/xt_set.c
+CONFLICT (content): Merge conflict in net/netfilter/xt_set.c
+Auto-merging mm/slub.c
+Auto-merging mm/Kconfig
+Auto-merging kernel/time/timekeeping.c
+Auto-merging kernel/kexec.c
+Auto-merging init/Kconfig
+Auto-merging include/net/bluetooth/l2cap.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/linux/devfreq.h
+Auto-merging fs/btrfs/Kconfig
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/hpsa.c
+Auto-merging drivers/scsi/fnic/fnic_main.c
+Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c
+Auto-merging drivers/scsi/bfa/bfad.c
+Auto-merging drivers/regulator/tps65910-regulator.c
+Auto-merging drivers/net/wireless/ath/ath10k/pci.c
+Auto-merging drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
+Auto-merging drivers/mtd/nand/docg4.c
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/media/i2c/s5c73m3/s5c73m3-core.c
+Auto-merging drivers/media/i2c/Kconfig
+Auto-merging drivers/md/raid5.h
+Auto-merging drivers/input/serio/i8042.c
+Auto-merging drivers/gpu/drm/drm_irq.c
+Auto-merging drivers/dma/Kconfig
+Auto-merging drivers/cpufreq/exynos-cpufreq.c
+Auto-merging drivers/cpufreq/Kconfig.x86
+Auto-merging drivers/clk/clk-fixed-factor.c
+Auto-merging drivers/base/dma-contiguous.c
+Auto-merging drivers/acpi/acpica/utobject.c
+Auto-merging arch/s390/kernel/kprobes.c
+Auto-merging arch/powerpc/platforms/pseries/nvram.c
+Auto-merging arch/arc/kernel/kprobes.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0a77dc92b781] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DMA-attributes.txt | 6 +++---
+ Documentation/timers/00-INDEX | 4 ++++
+ Documentation/usb/gadget_configfs.txt | 6 +++---
+ Documentation/virtual/kvm/cpuid.txt | 7 +++++++
+ Documentation/vm/00-INDEX | 20 ++++++++++++--------
+ arch/arc/kernel/kprobes.c | 2 +-
+ arch/arm/mach-sti/Kconfig | 4 ++--
+ arch/ia64/kernel/kprobes.c | 2 +-
+ arch/m32r/include/asm/mmu_context.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pip.h | 4 ++--
+ arch/mn10300/include/asm/mmu_context.h | 2 +-
+ arch/powerpc/kernel/kprobes.c | 2 +-
+ arch/powerpc/platforms/pseries/nvram.c | 2 +-
+ arch/s390/kernel/kprobes.c | 2 +-
+ arch/sh/include/asm/mmu_context.h | 2 +-
+ arch/sparc/kernel/kprobes.c | 2 +-
+ arch/x86/kernel/cpu/amd.c | 2 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +-
+ arch/x86/kernel/cpu/scattered.c | 2 +-
+ drivers/acpi/acpica/utobject.c | 2 +-
+ drivers/base/dma-contiguous.c | 2 +-
+ drivers/clk/clk-fixed-factor.c | 2 +-
+ drivers/cpufreq/Kconfig.x86 | 2 +-
+ drivers/cpufreq/exynos-cpufreq.c | 2 +-
+ drivers/dma/Kconfig | 2 +-
+ drivers/fmc/Kconfig | 2 +-
+ drivers/gpu/drm/drm_irq.c | 4 ++--
+ drivers/infiniband/ulp/isert/Kconfig | 4 ++--
+ drivers/input/serio/i8042.c | 2 +-
+ drivers/md/raid5.h | 2 +-
+ drivers/media/i2c/Kconfig | 2 +-
+ drivers/media/i2c/adv7183.c | 2 +-
+ drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
+ drivers/media/rc/keymaps/rc-dib0700-nec.c | 2 +-
+ drivers/media/rc/keymaps/rc-dib0700-rc5.c | 2 +-
+ drivers/mfd/Kconfig | 4 ++--
+ drivers/mtd/nand/docg4.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +-
+ drivers/net/irda/ali-ircc.c | 2 +-
+ drivers/net/irda/nsc-ircc.c | 2 +-
+ drivers/net/wireless/ath/ath10k/pci.c | 2 +-
+ drivers/net/wireless/ath/ath5k/dma.c | 2 +-
+ drivers/regulator/tps65910-regulator.c | 2 +-
+ drivers/s390/scsi/zfcp_dbf.c | 6 +++---
+ drivers/scsi/arcmsr/arcmsr_hba.c | 1 -
+ drivers/scsi/atp870u.c | 2 --
+ drivers/scsi/bfa/bfad.c | 1 -
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 16 ++++++++--------
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 14 +++++++-------
+ drivers/scsi/csiostor/csio_init.c | 2 --
+ drivers/scsi/dc395x.c | 1 -
+ drivers/scsi/fnic/fnic_main.c | 1 -
+ drivers/scsi/gdth.c | 2 --
+ drivers/scsi/hpsa.c | 1 -
+ drivers/scsi/lpfc/lpfc_init.c | 3 ---
+ drivers/scsi/megaraid/megaraid_mbox.c | 6 ------
+ drivers/scsi/megaraid/megaraid_sas_base.c | 5 -----
+ drivers/scsi/mvsas/mv_init.c | 1 -
+ drivers/scsi/mvsas/mv_sas.c | 2 +-
+ drivers/scsi/mvumi.c | 2 --
+ drivers/scsi/ncr53c8xx.c | 2 +-
+ drivers/scsi/pm8001/pm8001_init.c | 1 -
+ drivers/scsi/pmcraid.c | 1 -
+ drivers/scsi/qla2xxx/qla_os.c | 1 -
+ drivers/scsi/qla4xxx/ql4_os.c | 1 -
+ drivers/scsi/stex.c | 2 --
+ drivers/scsi/sym53c8xx_2/sym_glue.h | 2 +-
+ drivers/scsi/tmscsim.c | 1 -
+ drivers/scsi/ufs/ufshcd-pci.c | 1 -
+ drivers/scsi/vmw_pvscsi.c | 2 --
+ drivers/staging/iio/adc/ad7606.h | 2 +-
+ drivers/usb/core/Kconfig | 2 +-
+ fs/btrfs/Kconfig | 3 ++-
+ include/asm-generic/memory_model.h | 2 +-
+ include/linux/amba/serial.h | 2 +-
+ include/linux/devfreq.h | 2 +-
+ include/linux/mfd/si476x-core.h | 2 +-
+ include/linux/netdevice.h | 2 +-
+ include/net/bluetooth/l2cap.h | 2 +-
+ init/Kconfig | 4 ++--
+ kernel/irq/chip.c | 2 +-
+ kernel/irq/manage.c | 2 +-
+ kernel/kexec.c | 2 +-
+ kernel/time/timekeeping.c | 3 ++-
+ mm/Kconfig | 2 +-
+ mm/slub.c | 2 +-
+ net/can/af_can.c | 2 +-
+ net/netfilter/xt_set.c | 4 ++--
+ net/vmw_vsock/Kconfig | 2 +-
+ sound/soc/codecs/alc5632.c | 2 +-
+ 91 files changed, 118 insertions(+), 139 deletions(-)
+Merging audit/for-next (dcd6c9226715 Linux 3.3-rc1)
+$ git merge audit/for-next
+Already up-to-date.
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (355e62f5ad12 of/irq: Fix potential buffer overflow)
+$ git merge devicetree/devicetree/next
+Resolved 'arch/arm/mach-integrator/pci_v3.c' using previous resolution.
+Resolved 'drivers/crypto/caam/jr.c' using previous resolution.
+Resolved 'drivers/pci/host/pci-mvebu.c' using previous resolution.
+Auto-merging include/linux/of.h
+Auto-merging include/linux/cpu.h
+Auto-merging drivers/pci/host/pci-mvebu.c
+CONFLICT (content): Merge conflict in drivers/pci/host/pci-mvebu.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/net/ethernet/arc/emac_main.c
+Auto-merging drivers/crypto/omap-sham.c
+Auto-merging drivers/crypto/caam/jr.c
+CONFLICT (content): Merge conflict in drivers/crypto/caam/jr.c
+Auto-merging drivers/crypto/caam/ctrl.c
+Auto-merging arch/arm/mach-integrator/pci_v3.c
+CONFLICT (content): Merge conflict in arch/arm/mach-integrator/pci_v3.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5d7fcc094271] Merge remote-tracking branch 'devicetree/devicetree/next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/interrupt-controller/interrupts.txt | 29 +++-
+ arch/arm/boot/dts/testcases/tests-interrupts.dtsi | 58 ++++++++
+ arch/arm/boot/dts/testcases/tests.dtsi | 1 +
+ arch/arm/boot/dts/versatile-ab.dts | 2 +-
+ arch/arm/boot/dts/versatile-pb.dts | 2 +-
+ arch/arm/mach-integrator/pci_v3.c | 18 +--
+ arch/arm/mach-u300/timer.c | 9 +-
+ arch/microblaze/include/asm/pci.h | 2 -
+ arch/microblaze/pci/pci-common.c | 72 +--------
+ arch/mips/pci/fixup-lantiq.c | 13 +-
+ arch/mips/pci/pci-rt3883.c | 24 +--
+ arch/powerpc/kernel/pci-common.c | 11 +-
+ arch/powerpc/platforms/cell/celleb_scc_pciex.c | 6 +-
+ arch/powerpc/platforms/cell/celleb_scc_sio.c | 7 +-
+ arch/powerpc/platforms/cell/spider-pic.c | 7 +-
+ arch/powerpc/platforms/cell/spu_manage.c | 13 +-
+ arch/powerpc/platforms/fsl_uli1575.c | 12 +-
+ arch/powerpc/platforms/powermac/pic.c | 10 +-
+ arch/powerpc/platforms/pseries/event_sources.c | 8 +-
+ arch/powerpc/sysdev/fsl_gtm.c | 9 +-
+ arch/powerpc/sysdev/mpic_msgr.c | 6 +-
+ arch/powerpc/sysdev/mpic_msi.c | 8 +-
+ arch/sparc/kernel/prom_64.c | 53 +++++++
+ arch/x86/kernel/devicetree.c | 8 +-
+ drivers/crypto/caam/ctrl.c | 2 +-
+ drivers/crypto/caam/jr.c | 2 +-
+ drivers/crypto/omap-sham.c | 2 +-
+ drivers/i2c/busses/i2c-cpm.c | 2 +-
+ drivers/input/serio/xilinx_ps2.c | 7 +-
+ drivers/net/ethernet/arc/emac_main.c | 10 +-
+ drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +-
+ drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +-
+ drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +-
+ drivers/of/address.c | 10 +-
+ drivers/of/base.c | 58 +++++---
+ drivers/of/irq.c | 164 ++++++++++++---------
+ drivers/of/of_pci_irq.c | 40 ++++-
+ drivers/of/selftest.c | 161 +++++++++++++++++++-
+ drivers/pci/host/pci-mvebu.c | 15 +-
+ drivers/spi/spi-fsl-espi.c | 6 +-
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +-
+ include/linux/cpu.h | 3 +
+ include/linux/of.h | 1 +
+ include/linux/of_irq.h | 37 +----
+ include/linux/of_pci.h | 5 +-
+ kernel/irq/irqdomain.c | 13 +-
+ 46 files changed, 554 insertions(+), 380 deletions(-)
+ create mode 100644 arch/arm/boot/dts/testcases/tests-interrupts.dtsi
+Merging dt-rh/for-next (7f60466de9a4 mips: re-order DT init scan)
+$ git merge dt-rh/for-next
+Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution.
+Resolved 'arch/powerpc/include/asm/prom.h' using previous resolution.
+Auto-merging sound/soc/fsl/mpc5200_dma.c
+Auto-merging sound/soc/fsl/fsl_dma.c
+Auto-merging include/linux/of.h
+Auto-merging drivers/watchdog/mpc8xxx_wdt.c
+Auto-merging drivers/watchdog/gef_wdt.c
+Auto-merging drivers/video/fsl-diu-fb.c
+Auto-merging drivers/tty/serial/cpm_uart/cpm_uart_core.c
+Auto-merging drivers/spi/spi-mpc512x-psc.c
+Auto-merging drivers/spi/spi-fsl-espi.c
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/of_pci_irq.c
+Auto-merging drivers/of/fdt.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/address.c
+Auto-merging drivers/net/ethernet/xilinx/ll_temac_main.c
+Auto-merging drivers/net/ethernet/ibm/emac/mal.c
+Auto-merging drivers/net/ethernet/ibm/emac/core.c
+Auto-merging drivers/net/ethernet/freescale/ucc_geth.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/net/ethernet/freescale/fs_enet/mac-scc.c
+Auto-merging drivers/net/ethernet/freescale/fs_enet/mac-fec.c
+Auto-merging drivers/net/ethernet/freescale/fs_enet/mac-fcc.c
+Auto-merging drivers/mtd/nand/fsl_ifc_nand.c
+Auto-merging drivers/mtd/nand/fsl_elbc_nand.c
+Auto-merging drivers/input/serio/xilinx_ps2.c
+Auto-merging drivers/crypto/talitos.c
+Auto-merging drivers/crypto/caam/jr.c
+Auto-merging drivers/crypto/caam/ctrl.c
+Auto-merging drivers/cpufreq/pasemi-cpufreq.c
+Removing arch/xtensa/include/asm/prom.h
+Auto-merging arch/x86/kernel/devicetree.c
+Auto-merging arch/powerpc/sysdev/mpic.c
+Auto-merging arch/powerpc/sysdev/fsl_gtm.c
+Auto-merging arch/powerpc/platforms/powernv/opal.c
+Auto-merging arch/powerpc/platforms/embedded6xx/hlwd-pic.c
+Auto-merging arch/powerpc/platforms/8xx/tqm8xx_setup.c
+Auto-merging arch/powerpc/kernel/prom.c
+Auto-merging arch/powerpc/include/asm/prom.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/prom.h
+Removing arch/openrisc/include/asm/prom.h
+Auto-merging arch/mips/ralink/of.c
+Auto-merging arch/mips/kernel/setup.c
+Auto-merging arch/microblaze/pci/pci-common.c
+Removing arch/metag/include/asm/prom.h
+Removing arch/c6x/include/asm/prom.h
+Auto-merging arch/arm64/kernel/setup.c
+Removing arch/arm64/include/asm/prom.h
+Auto-merging arch/arm/mm/init.c
+Auto-merging arch/arc/kernel/setup.c
+Removing arch/arc/include/asm/prom.h
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c320d64f16f3] Merge remote-tracking branch 'dt-rh/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/vendor-prefixes.txt | 6 +-
+ arch/arc/include/asm/mach_desc.h | 17 +--
+ arch/arc/include/asm/prom.h | 14 ---
+ arch/arc/kernel/devtree.c | 97 +++------------
+ arch/arc/kernel/setup.c | 6 +-
+ arch/arc/mm/init.c | 7 --
+ arch/arm/include/asm/prom.h | 2 -
+ arch/arm/kernel/devtree.c | 57 +++------
+ arch/arm/mach-keystone/platsmp.c | 1 -
+ arch/arm/mm/init.c | 13 +-
+ arch/arm64/include/asm/prom.h | 1 -
+ arch/arm64/kernel/setup.c | 60 +--------
+ arch/arm64/mm/init.c | 25 +---
+ arch/c6x/include/asm/prom.h | 1 -
+ arch/c6x/include/asm/setup.h | 2 -
+ arch/c6x/kernel/devicetree.c | 29 -----
+ arch/c6x/kernel/setup.c | 13 +-
+ arch/c6x/kernel/vmlinux.lds.S | 6 -
+ arch/hexagon/kernel/setup.c | 3 -
+ arch/metag/include/asm/mach/arch.h | 2 +-
+ arch/metag/include/asm/prom.h | 23 ----
+ arch/metag/include/asm/setup.h | 1 +
+ arch/metag/kernel/devtree.c | 83 +++----------
+ arch/metag/kernel/setup.c | 7 +-
+ arch/metag/mm/init.c | 9 --
+ arch/microblaze/include/asm/prom.h | 39 +-----
+ arch/microblaze/kernel/prom.c | 32 +----
+ arch/microblaze/kernel/setup.c | 3 +-
+ arch/microblaze/kernel/timer.c | 1 +
+ arch/microblaze/pci/pci-common.c | 1 +
+ arch/mips/include/asm/prom.h | 14 ---
+ arch/mips/kernel/prom.c | 60 +--------
+ arch/mips/kernel/setup.c | 3 +-
+ arch/mips/lantiq/prom.c | 1 +
+ arch/mips/mti-sead3/sead3-setup.c | 2 +
+ arch/mips/netlogic/xlp/setup.c | 3 -
+ arch/mips/ralink/of.c | 1 +
+ arch/openrisc/include/asm/prom.h | 22 ----
+ arch/openrisc/kernel/prom.c | 70 +----------
+ arch/openrisc/kernel/setup.c | 6 +-
+ arch/powerpc/include/asm/prom.h | 33 +----
+ arch/powerpc/kernel/epapr_paravirt.c | 1 +
+ arch/powerpc/kernel/prom.c | 9 --
+ arch/powerpc/platforms/512x/clock.c | 1 +
+ arch/powerpc/platforms/512x/pdm360ng.c | 2 +
+ arch/powerpc/platforms/82xx/mpc8272_ads.c | 2 +
+ arch/powerpc/platforms/82xx/pq2fads.c | 2 +
+ arch/powerpc/platforms/83xx/suspend.c | 2 +
+ arch/powerpc/platforms/85xx/c293pcie.c | 1 +
+ arch/powerpc/platforms/85xx/common.c | 2 +
+ arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +
+ arch/powerpc/platforms/86xx/pic.c | 1 +
+ arch/powerpc/platforms/8xx/ep88xc.c | 2 +
+ arch/powerpc/platforms/8xx/mpc86xads_setup.c | 2 +
+ arch/powerpc/platforms/8xx/mpc885ads_setup.c | 2 +
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 1 +
+ arch/powerpc/platforms/embedded6xx/flipper-pic.c | 1 +
+ arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 2 +
+ arch/powerpc/platforms/pasemi/gpio_mdio.c | 1 +
+ arch/powerpc/platforms/powermac/pfunc_base.c | 1 +
+ arch/powerpc/platforms/powernv/opal-lpc.c | 1 +
+ arch/powerpc/platforms/powernv/opal.c | 1 +
+ arch/powerpc/platforms/powernv/setup.c | 1 +
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 2 +
+ arch/powerpc/sysdev/cpm_common.c | 1 +
+ arch/powerpc/sysdev/fsl_gtm.c | 2 +
+ arch/powerpc/sysdev/fsl_pmc.c | 1 +
+ arch/powerpc/sysdev/fsl_rio.c | 2 +
+ arch/powerpc/sysdev/fsl_rmu.c | 1 +
+ arch/powerpc/sysdev/mpic.c | 8 +-
+ arch/powerpc/sysdev/mpic_timer.c | 2 +
+ arch/powerpc/sysdev/of_rtc.c | 1 +
+ arch/powerpc/sysdev/ppc4xx_soc.c | 1 +
+ arch/powerpc/sysdev/xilinx_intc.c | 1 +
+ arch/sparc/include/asm/prom.h | 12 --
+ arch/x86/include/asm/prom.h | 5 -
+ arch/x86/kernel/devicetree.c | 43 ++-----
+ arch/xtensa/include/asm/prom.h | 6 -
+ arch/xtensa/kernel/setup.c | 55 +++-----
+ drivers/ata/sata_fsl.c | 2 +
+ drivers/char/bsr.c | 1 +
+ drivers/char/hw_random/pasemi-rng.c | 1 +
+ drivers/cpufreq/pasemi-cpufreq.c | 1 +
+ drivers/crypto/caam/ctrl.c | 3 +
+ drivers/crypto/caam/jr.c | 2 +
+ drivers/crypto/talitos.c | 2 +
+ drivers/dma/bestcomm/sram.c | 1 +
+ drivers/dma/fsldma.c | 2 +
+ drivers/dma/mpc512x_dma.c | 2 +
+ drivers/edac/cell_edac.c | 1 +
+ drivers/gpio/gpio-mpc8xxx.c | 1 +
+ drivers/i2c/busses/i2c-ibm_iic.c | 2 +
+ drivers/i2c/busses/i2c-mpc.c | 2 +
+ drivers/i2c/busses/i2c-powermac.c | 1 +
+ drivers/input/serio/xilinx_ps2.c | 1 +
+ drivers/macintosh/macio_asic.c | 2 +
+ drivers/macintosh/rack-meter.c | 2 +
+ drivers/macintosh/smu.c | 1 +
+ drivers/macintosh/via-pmu.c | 2 +
+ drivers/media/platform/fsl-viu.c | 2 +
+ drivers/misc/carma/carma-fpga-program.c | 2 +
+ drivers/misc/carma/carma-fpga.c | 2 +
+ drivers/mtd/nand/fsl_elbc_nand.c | 1 +
+ drivers/mtd/nand/fsl_ifc_nand.c | 1 +
+ drivers/mtd/nand/fsl_upm.c | 1 +
+ drivers/mtd/nand/mpc5121_nfc.c | 2 +
+ drivers/mtd/nand/ndfc.c | 1 +
+ drivers/mtd/nand/pasemi_nand.c | 2 +
+ drivers/net/can/grcan.c | 3 -
+ drivers/net/can/sja1000/sja1000_of_platform.c | 1 -
+ drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 2 +
+ drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +
+ drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +
+ .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 1 +
+ drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 1 +
+ drivers/net/ethernet/freescale/gianfar.c | 2 +
+ drivers/net/ethernet/freescale/ucc_geth.c | 2 +
+ drivers/net/ethernet/freescale/xgmac_mdio.c | 1 +
+ drivers/net/ethernet/ibm/emac/core.c | 2 +
+ drivers/net/ethernet/ibm/emac/mal.c | 1 +
+ drivers/net/ethernet/ibm/emac/rgmii.c | 1 +
+ drivers/net/ethernet/ibm/emac/tah.c | 1 +
+ drivers/net/ethernet/ibm/emac/zmii.c | 1 +
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 1 +
+ drivers/of/address.c | 8 ++
+ drivers/of/base.c | 7 ++
+ drivers/of/fdt.c | 138 ++++++++++++++++++++-
+ drivers/of/of_pci.c | 1 -
+ drivers/of/of_pci_irq.c | 1 -
+ drivers/of/pdt.c | 1 -
+ drivers/of/platform.c | 2 +
+ drivers/pcmcia/electra_cf.c | 2 +
+ drivers/rtc/rtc-mpc5121.c | 2 +
+ drivers/spi/spi-fsl-cpm.c | 1 +
+ drivers/spi/spi-fsl-espi.c | 2 +
+ drivers/spi/spi-mpc512x-psc.c | 1 +
+ drivers/tty/ehv_bytechan.c | 1 +
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 +
+ drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 1 +
+ drivers/tty/serial/pmac_zilog.c | 2 +
+ drivers/tty/serial/ucc_uart.c | 2 +
+ drivers/usb/gadget/fsl_qe_udc.c | 1 +
+ drivers/usb/host/ehci-ppc-of.c | 2 +
+ drivers/usb/host/fhci-hcd.c | 2 +
+ drivers/usb/host/ohci-ppc-of.c | 2 +
+ drivers/video/fsl-diu-fb.c | 2 +
+ drivers/virt/fsl_hypervisor.c | 1 +
+ drivers/watchdog/gef_wdt.c | 1 +
+ drivers/watchdog/mpc8xxx_wdt.c | 1 +
+ fs/proc/proc_devtree.c | 3 -
+ include/linux/of.h | 16 +--
+ include/linux/of_address.h | 39 +++---
+ include/linux/of_fdt.h | 19 ++-
+ sound/aoa/core/gpio-feature.c | 3 +-
+ sound/aoa/soundbus/i2sbus/core.c | 2 +
+ sound/ppc/pmac.c | 2 +
+ sound/ppc/tumbler.c | 1 +
+ sound/soc/fsl/fsl_dma.c | 2 +
+ sound/soc/fsl/mpc5200_dma.c | 2 +
+ sound/soc/fsl/mpc5200_psc_ac97.c | 2 +-
+ sound/soc/fsl/mpc8610_hpcd.c | 1 +
+ sound/soc/fsl/p1022_ds.c | 1 +
+ sound/soc/fsl/p1022_rdk.c | 1 +
+ 163 files changed, 489 insertions(+), 820 deletions(-)
+ delete mode 100644 arch/arc/include/asm/prom.h
+ delete mode 100644 arch/arm64/include/asm/prom.h
+ delete mode 100644 arch/c6x/include/asm/prom.h
+ delete mode 100644 arch/metag/include/asm/prom.h
+ delete mode 100644 arch/openrisc/include/asm/prom.h
+ delete mode 100644 arch/xtensa/include/asm/prom.h
+Merging spi/for-next (f8ce25620cdc Merge remote-tracking branch 'spi/topic/wr' into spi-next)
+$ git merge spi/for-next
+Resolved 'drivers/spi/spi.c' using previous resolution.
+Auto-merging drivers/spi/spi.c
+CONFLICT (content): Merge conflict in drivers/spi/spi.c
+Auto-merging drivers/spi/spi-mpc512x-psc.c
+Auto-merging drivers/spi/spi-fsl-espi.c
+Auto-merging drivers/spi/spi-fsl-cpm.c
+Auto-merging Documentation/driver-model/devres.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ddb758d5bb04] Merge remote-tracking branch 'spi/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/driver-model/devres.txt | 3 +
+ drivers/hwmon/adt7310.c | 7 +-
+ drivers/spi/Kconfig | 5 +-
+ drivers/spi/spi-altera.c | 2 +-
+ drivers/spi/spi-ath79.c | 2 +-
+ drivers/spi/spi-atmel.c | 50 +++----
+ drivers/spi/spi-au1550.c | 5 +-
+ drivers/spi/spi-bcm2835.c | 4 +-
+ drivers/spi/spi-bcm63xx.c | 6 +-
+ drivers/spi/spi-bfin-sport.c | 29 ++--
+ drivers/spi/spi-bfin-v3.c | 3 +-
+ drivers/spi/spi-bfin5xx.c | 48 +++---
+ drivers/spi/spi-bitbang.c | 25 +++-
+ drivers/spi/spi-butterfly.c | 15 +-
+ drivers/spi/spi-clps711x.c | 7 +-
+ drivers/spi/spi-davinci.c | 13 +-
+ drivers/spi/spi-dw-mmio.c | 5 +-
+ drivers/spi/spi-dw-pci.c | 3 +-
+ drivers/spi/spi-dw.c | 4 +-
+ drivers/spi/spi-efm32.c | 12 +-
+ drivers/spi/spi-ep93xx.c | 7 +-
+ drivers/spi/spi-fsl-cpm.c | 2 +-
+ drivers/spi/spi-fsl-dspi.c | 10 +-
+ drivers/spi/spi-fsl-espi.c | 4 +-
+ drivers/spi/spi-gpio.c | 6 +-
+ drivers/spi/spi-imx.c | 35 ++++-
+ drivers/spi/spi-lm70llp.c | 2 +-
+ drivers/spi/spi-mpc512x-psc.c | 4 +-
+ drivers/spi/spi-mpc52xx-psc.c | 4 +-
+ drivers/spi/spi-mxs.c | 193 ++++++++++--------------
+ drivers/spi/spi-nuc900.c | 3 +-
+ drivers/spi/spi-oc-tiny.c | 2 +-
+ drivers/spi/spi-octeon.c | 4 +-
+ drivers/spi/spi-omap-100k.c | 4 +-
+ drivers/spi/spi-omap-uwire.c | 5 +-
+ drivers/spi/spi-omap2-mcspi.c | 19 ++-
+ drivers/spi/spi-orion.c | 10 +-
+ drivers/spi/spi-pl022.c | 10 +-
+ drivers/spi/spi-ppc4xx.c | 3 +-
+ drivers/spi/spi-pxa2xx.c | 41 +++---
+ drivers/spi/spi-rspi.c | 270 +++++++++++++++++++++++++++++-----
+ drivers/spi/spi-s3c24xx.c | 4 +-
+ drivers/spi/spi-s3c64xx.c | 260 ++++++++++++++++----------------
+ drivers/spi/spi-sh-hspi.c | 5 +-
+ drivers/spi/spi-sh-sci.c | 2 +-
+ drivers/spi/spi-sirf.c | 2 +-
+ drivers/spi/spi-tegra114.c | 90 +++++++++---
+ drivers/spi/spi-tegra20-sflash.c | 5 +-
+ drivers/spi/spi-tegra20-slink.c | 144 +++++++++---------
+ drivers/spi/spi-ti-qspi.c | 46 ++----
+ drivers/spi/spi-topcliff-pch.c | 17 ++-
+ drivers/spi/spi-txx9.c | 11 +-
+ drivers/spi/spi-xilinx.c | 2 +-
+ drivers/spi/spi.c | 244 ++++++++++++++++++++++++------
+ drivers/spi/spidev.c | 7 +-
+ drivers/staging/iio/meter/ade7753.c | 3 +-
+ drivers/staging/iio/meter/ade7754.c | 3 +-
+ drivers/staging/iio/meter/ade7759.c | 3 +-
+ include/linux/spi/rspi.h | 2 +
+ include/linux/spi/spi.h | 61 +++++++-
+ include/trace/events/spi.h | 156 ++++++++++++++++++++
+ 61 files changed, 1252 insertions(+), 701 deletions(-)
+ create mode 100644 include/trace/events/spi.h
+Merging tip/auto-latest (f497c33a9489 Merge branch 'x86/uaccess')
+$ git merge tip/auto-latest
+Resolved 'include/linux/acpi.h' using previous resolution.
+Resolved 'include/linux/wait.h' using previous resolution.
+Resolved 'tools/perf/config/Makefile' using previous resolution.
+CONFLICT (modify/delete): tools/perf/config/feature-tests.mak deleted in tip/auto-latest and modified in HEAD. Version HEAD of tools/perf/config/feature-tests.mak left in tree.
+Auto-merging tools/perf/config/Makefile
+CONFLICT (content): Merge conflict in tools/perf/config/Makefile
+Auto-merging kernel/smp.c
+Auto-merging kernel/rcu/update.c
+Auto-merging kernel/rcu/tree_trace.c
+Auto-merging kernel/rcu/tree_plugin.h
+Auto-merging kernel/rcu/tree.h
+Auto-merging kernel/rcu/tree.c
+Auto-merging kernel/rcu/torture.c
+Auto-merging kernel/rcu/tiny.c
+Auto-merging kernel/rcu/rcu.h
+Auto-merging kernel/irq/manage.c
+Auto-merging kernel/Makefile
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/wait.h
+CONFLICT (content): Merge conflict in include/linux/wait.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/bitops.h
+Auto-merging include/linux/acpi.h
+CONFLICT (content): Merge conflict in include/linux/acpi.h
+Auto-merging drivers/watchdog/intel_scu_watchdog.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging drivers/firmware/efi/cper.c
+Auto-merging drivers/acpi/processor_idle.c
+Auto-merging drivers/acpi/bus.c
+Auto-merging drivers/acpi/Makefile
+Auto-merging drivers/acpi/Kconfig
+Removing arch/x86/platform/mrst/mrst.c
+Removing arch/x86/platform/mrst/Makefile
+Auto-merging arch/x86/platform/intel-mid/intel_mid_vrtc.c
+Auto-merging arch/x86/platform/intel-mid/early_printk_intel_mid.c
+Auto-merging arch/x86/pci/intel_mid_pci.c
+Auto-merging arch/x86/kernel/smpboot.c
+Auto-merging arch/x86/kernel/cpu/amd.c
+Removing arch/x86/include/asm/mrst.h
+Auto-merging arch/x86/include/asm/intel_mid_vrtc.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/Kconfig
+CONFLICT (modify/delete): arch/h8300/include/asm/Kbuild deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of arch/h8300/include/asm/Kbuild left in tree.
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/include/asm/Kbuild
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/h8300/include/asm/Kbuild
+arch/h8300/include/asm/Kbuild: needs merge
+rm 'arch/h8300/include/asm/Kbuild'
+$ git rm -f tools/perf/config/feature-tests.mak
+tools/perf/config/feature-tests.mak: needs merge
+rm 'tools/perf/config/feature-tests.mak'
+$ git commit -v -a
+[master bb7161f7008f] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/device-drivers.tmpl | 5 +-
+ Documentation/DocBook/genericirq.tmpl | 64 +-
+ Documentation/RCU/checklist.txt | 4 +-
+ Documentation/RCU/stallwarn.txt | 22 +-
+ .../devicetree/bindings/timer/efm32,timer.txt | 23 +
+ Documentation/{x86 => }/efi-stub.txt | 0
+ Documentation/kernel-parameters.txt | 113 +-
+ Documentation/kernel-per-CPU-kthreads.txt | 17 +-
+ Documentation/lockstat.txt | 123 +-
+ Documentation/sysctl/kernel.txt | 76 ++
+ MAINTAINERS | 13 +-
+ arch/Kconfig | 22 +
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/arc/include/asm/Kbuild | 1 +
+ arch/arm/Kconfig | 1 +
+ arch/arm/boot/dts/zynq-7000.dtsi | 8 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/arch_timer.h | 36 +-
+ arch/arm/include/uapi/asm/hwcap.h | 1 +
+ arch/arm/kernel/arch_timer.c | 14 -
+ arch/arm/kernel/setup.c | 1 +
+ arch/arm/mach-msm/timer.c | 1 -
+ arch/arm/mach-zynq/Kconfig | 1 +
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/arch_timer.h | 42 +-
+ arch/arm64/include/asm/hwcap.h | 11 +-
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/kernel/setup.c | 11 +
+ arch/arm64/kernel/time.c | 10 -
+ arch/avr32/include/asm/Kbuild | 1 +
+ arch/blackfin/include/asm/Kbuild | 1 +
+ arch/c6x/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/hexagon/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/io.h | 1 +
+ arch/ia64/kernel/efi.c | 54 +-
+ arch/ia64/kernel/setup.c | 1 +
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/metag/include/asm/Kbuild | 1 +
+ arch/metag/include/asm/topology.h | 2 +
+ arch/metag/kernel/irq.c | 52 +-
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/mips/include/asm/Kbuild | 1 +
+ arch/mips/kernel/rtlx.c | 19 +-
+ arch/mips/mm/init.c | 5 +-
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/openrisc/include/asm/Kbuild | 1 +
+ arch/parisc/include/asm/Kbuild | 1 +
+ arch/parisc/kernel/irq.c | 17 +-
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/kernel/irq.c | 17 +-
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/s390/kernel/irq.c | 52 +-
+ arch/score/include/asm/Kbuild | 1 +
+ arch/sh/include/asm/Kbuild | 1 +
+ arch/sh/kernel/irq.c | 57 +-
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/kernel/irq_64.c | 31 +-
+ arch/tile/include/asm/Kbuild | 1 +
+ arch/um/include/asm/Kbuild | 1 +
+ arch/unicore32/include/asm/Kbuild | 1 +
+ arch/x86/Kconfig | 84 +-
+ arch/x86/Kconfig.debug | 10 +
+ arch/x86/boot/Makefile | 5 +-
+ arch/x86/boot/boot.h | 10 +-
+ arch/x86/boot/compressed/Makefile | 2 +-
+ arch/x86/boot/compressed/aslr.c | 267 ++++
+ arch/x86/boot/compressed/cmdline.c | 2 +-
+ arch/x86/boot/compressed/cpuflags.c | 12 +
+ arch/x86/boot/compressed/eboot.c | 789 +++---------
+ arch/x86/boot/compressed/eboot.h | 9 -
+ arch/x86/boot/compressed/head_32.S | 10 +-
+ arch/x86/boot/compressed/head_64.S | 16 +-
+ arch/x86/boot/compressed/misc.c | 18 +-
+ arch/x86/boot/compressed/misc.h | 37 +-
+ arch/x86/boot/compressed/mkpiggy.c | 16 +-
+ arch/x86/boot/cpucheck.c | 100 +-
+ arch/x86/boot/cpuflags.c | 104 ++
+ arch/x86/boot/cpuflags.h | 19 +
+ arch/x86/boot/tools/build.c | 40 +-
+ arch/x86/include/asm/archrandom.h | 21 +
+ arch/x86/include/asm/atomic.h | 29 +-
+ arch/x86/include/asm/atomic64_64.h | 28 +-
+ arch/x86/include/asm/bitops.h | 24 +-
+ arch/x86/include/asm/calling.h | 50 +
+ arch/x86/include/asm/efi.h | 2 +
+ arch/x86/include/asm/intel-mid.h | 113 ++
+ .../include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} | 4 +-
+ arch/x86/include/asm/kdebug.h | 2 +-
+ arch/x86/include/asm/local.h | 28 +-
+ arch/x86/include/asm/mce.h | 1 +
+ arch/x86/include/asm/misc.h | 6 +
+ arch/x86/include/asm/mrst.h | 81 --
+ arch/x86/include/asm/page_64_types.h | 15 +-
+ arch/x86/include/asm/pgtable_64_types.h | 2 +-
+ arch/x86/include/asm/preempt.h | 100 ++
+ arch/x86/include/asm/rmwcc.h | 41 +
+ arch/x86/include/asm/setup.h | 4 +-
+ arch/x86/include/asm/thread_info.h | 5 +-
+ arch/x86/include/asm/uaccess.h | 98 ++
+ arch/x86/include/asm/uaccess_32.h | 29 -
+ arch/x86/include/asm/uaccess_64.h | 52 +-
+ arch/x86/include/asm/uv/uv.h | 10 +
+ arch/x86/include/asm/uv/uv_hub.h | 57 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 31 +
+ arch/x86/include/uapi/asm/bootparam.h | 2 +-
+ arch/x86/include/uapi/asm/hyperv.h | 19 +
+ arch/x86/kernel/Makefile | 2 +
+ arch/x86/kernel/alternative.c | 11 -
+ arch/x86/kernel/apb_timer.c | 10 +-
+ arch/x86/kernel/apic/x2apic_uv_x.c | 70 +-
+ arch/x86/kernel/asm-offsets.c | 1 -
+ arch/x86/kernel/cpu/amd.c | 6 +-
+ arch/x86/kernel/cpu/centaur.c | 8 +-
+ arch/x86/kernel/cpu/common.c | 17 +-
+ arch/x86/kernel/cpu/cpu.h | 20 +-
+ arch/x86/kernel/cpu/intel.c | 12 +-
+ arch/x86/kernel/cpu/mcheck/mce-apei.c | 3 +-
+ arch/x86/kernel/cpu/mshyperv.c | 27 +
+ arch/x86/kernel/cpu/perf_event.h | 6 +
+ arch/x86/kernel/cpu/perf_event_intel.c | 78 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 203 +--
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 29 +-
+ arch/x86/kernel/cpu/rdrand.c | 14 -
+ arch/x86/kernel/cpu/umc.c | 4 +-
+ arch/x86/kernel/dumpstack.c | 11 +-
+ arch/x86/kernel/early_printk.c | 9 +-
+ arch/x86/kernel/entry_32.S | 7 +-
+ arch/x86/kernel/entry_64.S | 8 +-
+ arch/x86/kernel/head32.c | 4 +-
+ arch/x86/kernel/i386_ksyms_32.c | 7 +
+ arch/x86/kernel/i8259.c | 3 +-
+ arch/x86/kernel/irq_32.c | 34 +-
+ arch/x86/kernel/irq_64.c | 21 -
+ arch/x86/kernel/msr.c | 2 +-
+ arch/x86/kernel/preempt.S | 25 +
+ arch/x86/kernel/process.c | 6 +-
+ arch/x86/kernel/process_32.c | 8 +
+ arch/x86/kernel/process_64.c | 10 +-
+ arch/x86/kernel/reboot.c | 279 ++--
+ arch/x86/kernel/rtc.c | 12 +-
+ arch/x86/kernel/setup.c | 27 +
+ arch/x86/kernel/smpboot.c | 37 +-
+ arch/x86/kernel/traps.c | 4 +-
+ arch/x86/kernel/vmlinux.lds.S | 9 +
+ arch/x86/kernel/x8664_ksyms_64.c | 7 +
+ arch/x86/lib/Makefile | 2 +-
+ arch/x86/lib/misc.c | 21 +
+ arch/x86/lib/usercopy.c | 43 +-
+ arch/x86/lib/usercopy_32.c | 8 +-
+ arch/x86/mm/fault.c | 43 +-
+ arch/x86/mm/init.c | 23 +-
+ arch/x86/mm/init_32.c | 3 +
+ arch/x86/pci/Makefile | 2 +-
+ arch/x86/pci/{mrst.c => intel_mid_pci.c} | 20 +-
+ arch/x86/platform/Makefile | 2 +-
+ arch/x86/platform/efi/Makefile | 1 +
+ arch/x86/platform/efi/early_printk.c | 191 +++
+ arch/x86/platform/efi/efi.c | 126 +-
+ arch/x86/platform/geode/alix.c | 2 +-
+ arch/x86/platform/geode/geos.c | 2 +-
+ arch/x86/platform/geode/net5501.c | 2 +-
+ arch/x86/platform/intel-mid/Makefile | 7 +
+ arch/x86/platform/intel-mid/device_libs/Makefile | 22 +
+ .../intel-mid/device_libs/platform_bma023.c | 20 +
+ .../intel-mid/device_libs/platform_emc1403.c | 41 +
+ .../intel-mid/device_libs/platform_gpio_keys.c | 83 ++
+ .../platform/intel-mid/device_libs/platform_ipc.c | 68 +
+ .../platform/intel-mid/device_libs/platform_ipc.h | 17 +
+ .../intel-mid/device_libs/platform_lis331.c | 39 +
+ .../intel-mid/device_libs/platform_max3111.c | 35 +
+ .../intel-mid/device_libs/platform_max7315.c | 79 ++
+ .../intel-mid/device_libs/platform_mpu3050.c | 36 +
+ .../platform/intel-mid/device_libs/platform_msic.c | 87 ++
+ .../platform/intel-mid/device_libs/platform_msic.h | 19 +
+ .../intel-mid/device_libs/platform_msic_audio.c | 47 +
+ .../intel-mid/device_libs/platform_msic_battery.c | 37 +
+ .../intel-mid/device_libs/platform_msic_gpio.c | 48 +
+ .../intel-mid/device_libs/platform_msic_ocd.c | 49 +
+ .../device_libs/platform_msic_power_btn.c | 36 +
+ .../intel-mid/device_libs/platform_msic_thermal.c | 37 +
+ .../intel-mid/device_libs/platform_pmic_gpio.c | 54 +
+ .../intel-mid/device_libs/platform_tc35876x.c | 36 +
+ .../intel-mid/device_libs/platform_tca6416.c | 57 +
+ .../early_printk_intel_mid.c} | 11 +-
+ arch/x86/platform/intel-mid/intel-mid.c | 213 +++
+ .../{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} | 19 +-
+ arch/x86/platform/intel-mid/sfi.c | 488 +++++++
+ arch/x86/platform/mrst/Makefile | 3 -
+ arch/x86/platform/mrst/mrst.c | 1052 ---------------
+ arch/x86/platform/uv/Makefile | 2 +-
+ arch/x86/platform/uv/uv_nmi.c | 711 ++++++++++
+ arch/x86/tools/relocs.c | 20 +-
+ arch/xtensa/include/asm/Kbuild | 1 +
+ drivers/acpi/Kconfig | 21 +
+ drivers/acpi/Makefile | 2 +
+ drivers/acpi/acpi_extlog.c | 327 +++++
+ drivers/acpi/apei/Kconfig | 2 +
+ drivers/acpi/apei/Makefile | 2 +-
+ drivers/acpi/apei/apei-internal.h | 12 +-
+ drivers/acpi/apei/ghes.c | 58 +-
+ drivers/acpi/bus.c | 3 +-
+ drivers/acpi/processor_idle.c | 46 +-
+ drivers/clocksource/Kconfig | 24 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/arm_arch_timer.c | 55 +-
+ drivers/clocksource/arm_global_timer.c | 3 +-
+ drivers/clocksource/bcm2835_timer.c | 4 +-
+ drivers/clocksource/clksrc-dbx500-prcmu.c | 5 +-
+ drivers/clocksource/clksrc-of.c | 1 +
+ drivers/clocksource/dw_apb_timer_of.c | 16 +-
+ drivers/clocksource/mxs_timer.c | 4 +-
+ drivers/clocksource/nomadik-mtu.c | 4 +-
+ drivers/clocksource/samsung_pwm_timer.c | 4 +-
+ drivers/clocksource/sun4i_timer.c | 12 +-
+ drivers/clocksource/tcb_clksrc.c | 61 +-
+ drivers/clocksource/tegra20_timer.c | 8 +-
+ drivers/clocksource/time-armada-370-xp.c | 4 +-
+ drivers/clocksource/time-efm32.c | 275 ++++
+ drivers/clocksource/timer-prima2.c | 6 +-
+ drivers/clocksource/vf_pit_timer.c | 4 +-
+ drivers/clocksource/vt8500_timer.c | 2 -
+ drivers/edac/amd64_edac.c | 46 +-
+ drivers/edac/amd64_edac.h | 8 -
+ drivers/edac/ghes_edac.c | 16 +-
+ drivers/edac/sb_edac.c | 2 +-
+ drivers/firmware/dmi_scan.c | 60 +
+ drivers/firmware/efi/Kconfig | 3 +
+ drivers/firmware/efi/Makefile | 1 +
+ drivers/{acpi/apei => firmware/efi}/cper.c | 132 +-
+ drivers/firmware/efi/efi-stub-helper.c | 636 +++++++++
+ drivers/firmware/efi/efi.c | 140 ++
+ drivers/firmware/efi/efivars.c | 2 +-
+ drivers/gpu/drm/gma500/mdfld_dsi_output.h | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_device.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +-
+ drivers/idle/intel_idle.c | 2 +-
+ drivers/platform/x86/intel_scu_ipc.c | 4 +-
+ drivers/rtc/interface.c | 13 +-
+ drivers/rtc/rtc-mrst.c | 4 +-
+ drivers/rtc/rtc-pl031.c | 3 +-
+ drivers/video/sis/init.c | 5 +-
+ drivers/watchdog/intel_scu_watchdog.c | 4 +-
+ fs/exec.c | 1 +
+ fs/proc/array.c | 2 +
+ include/acpi/actbl1.h | 14 +-
+ include/acpi/ghes.h | 2 +-
+ include/asm-generic/preempt.h | 105 ++
+ include/clocksource/arm_arch_timer.h | 10 +
+ include/linux/acpi.h | 1 +
+ include/linux/bitops.h | 8 +
+ include/linux/clockchips.h | 1 +
+ include/linux/clocksource.h | 2 +
+ include/linux/cper.h | 13 +-
+ include/linux/dmi.h | 5 +
+ include/linux/edac.h | 2 +-
+ include/linux/efi.h | 58 +-
+ include/linux/hardirq.h | 8 +-
+ include/linux/interrupt.h | 11 +
+ include/linux/kdb.h | 1 +
+ include/linux/kgdb.h | 1 +
+ include/linux/mempolicy.h | 1 +
+ include/linux/migrate.h | 7 +-
+ include/linux/mm.h | 118 +-
+ include/linux/mm_types.h | 17 +-
+ include/linux/page-flags-layout.h | 28 +-
+ include/linux/perf_event.h | 5 +
+ include/linux/preempt.h | 112 +-
+ include/linux/rculist.h | 23 +-
+ include/linux/rcupdate.h | 24 +-
+ include/linux/rcutiny.h | 17 +
+ include/linux/rcutree.h | 2 +
+ include/linux/sched.h | 167 ++-
+ include/linux/sched/sysctl.h | 3 +-
+ include/linux/sched_clock.h | 4 +-
+ include/linux/sfi.h | 3 +
+ include/linux/stop_machine.h | 1 +
+ include/linux/thread_info.h | 17 +-
+ include/linux/topology.h | 6 +
+ include/linux/tty.h | 28 +-
+ include/linux/uaccess.h | 8 +-
+ include/linux/uprobes.h | 6 +-
+ include/linux/wait.h | 374 ++----
+ include/trace/events/rcu.h | 80 +-
+ include/trace/events/sched.h | 21 +-
+ include/uapi/linux/perf_event.h | 25 +-
+ init/Kconfig | 3 +-
+ init/main.c | 2 +-
+ kernel/Makefile | 11 +-
+ kernel/bounds.c | 4 +
+ kernel/context_tracking.c | 2 +-
+ kernel/cpu.c | 17 +
+ kernel/cpu/idle.c | 16 +-
+ kernel/debug/debug_core.c | 32 +-
+ kernel/debug/debug_core.h | 3 +
+ kernel/debug/kdb/kdb_debugger.c | 5 +-
+ kernel/debug/kdb/kdb_main.c | 3 +
+ kernel/events/core.c | 132 +-
+ kernel/events/uprobes.c | 156 ++-
+ kernel/fork.c | 7 +-
+ kernel/hung_task.c | 6 +-
+ kernel/irq/manage.c | 2 +-
+ kernel/lockdep.c | 4 +-
+ kernel/lockdep_proc.c | 15 +-
+ kernel/rcu/Makefile | 6 +
+ kernel/{ => rcu}/rcu.h | 7 +
+ kernel/{ => rcu}/srcu.c | 0
+ kernel/{rcutiny.c => rcu/tiny.c} | 37 +-
+ kernel/{rcutiny_plugin.h => rcu/tiny_plugin.h} | 0
+ kernel/{rcutorture.c => rcu/torture.c} | 6 +
+ kernel/{rcutree.c => rcu/tree.c} | 200 ++-
+ kernel/{rcutree.h => rcu/tree.h} | 2 +
+ kernel/{rcutree_plugin.h => rcu/tree_plugin.h} | 84 +-
+ kernel/{rcutree_trace.c => rcu/tree_trace.c} | 2 +-
+ kernel/{rcupdate.c => rcu/update.c} | 10 +-
+ kernel/sched/core.c | 290 ++++-
+ kernel/sched/debug.c | 68 +-
+ kernel/sched/fair.c | 1359 +++++++++++++++++---
+ kernel/sched/features.h | 19 +-
+ kernel/sched/idle_task.c | 2 +-
+ kernel/sched/rt.c | 22 +-
+ kernel/sched/sched.h | 52 +-
+ kernel/sched/stats.h | 46 +-
+ kernel/sched/stop_task.c | 2 +-
+ kernel/smp.c | 7 +-
+ kernel/softirq.c | 53 +-
+ kernel/stop_machine.c | 288 +++--
+ kernel/sysctl.c | 27 +-
+ kernel/time/Kconfig | 2 +-
+ kernel/time/alarmtimer.c | 4 +-
+ kernel/time/clockevents.c | 2 +-
+ kernel/time/clocksource.c | 52 +-
+ kernel/time/ntp.c | 3 +-
+ kernel/time/sched_clock.c | 114 +-
+ kernel/time/tick-broadcast.c | 1 +
+ kernel/time/tick-internal.h | 2 +-
+ kernel/time/timer_stats.c | 8 +-
+ kernel/timer.c | 8 +-
+ kernel/wait.c | 24 +
+ lib/locking-selftest.c | 2 +-
+ lib/smp_processor_id.c | 3 +-
+ mm/huge_memory.c | 55 +-
+ mm/memory.c | 139 +-
+ mm/mempolicy.c | 82 +-
+ mm/migrate.c | 30 +-
+ mm/mm_init.c | 18 +-
+ mm/mmzone.c | 14 +-
+ mm/mprotect.c | 65 +-
+ mm/page_alloc.c | 4 +-
+ net/irda/af_irda.c | 5 +-
+ net/netfilter/ipvs/ip_vs_sync.c | 7 +-
+ tools/lib/traceevent/Makefile | 18 +-
+ tools/perf/.gitignore | 1 +
+ tools/perf/Documentation/Makefile | 79 +-
+ tools/perf/Documentation/perf-buildid-cache.txt | 13 +
+ tools/perf/Documentation/perf-kvm.txt | 4 +-
+ tools/perf/Documentation/perf-lock.txt | 2 +-
+ tools/perf/Documentation/perf-record.txt | 11 +-
+ tools/perf/Documentation/perf-report.txt | 16 +-
+ tools/perf/Documentation/perf-stat.txt | 5 +
+ tools/perf/Documentation/perf-timechart.txt | 15 +-
+ tools/perf/Documentation/perf-top.txt | 15 +-
+ tools/perf/Documentation/perf-trace.txt | 31 +-
+ tools/perf/Makefile | 848 +-----------
+ tools/perf/Makefile.perf | 889 +++++++++++++
+ tools/perf/arch/x86/include/perf_regs.h | 6 +-
+ tools/perf/arch/x86/util/unwind.c | 4 +-
+ tools/perf/bash_completion | 106 +-
+ tools/perf/bench/mem-memcpy-arch.h | 2 +-
+ tools/perf/bench/mem-memcpy.c | 2 +-
+ tools/perf/bench/mem-memset-arch.h | 2 +-
+ tools/perf/bench/mem-memset.c | 2 +-
+ tools/perf/bench/numa.c | 38 +-
+ tools/perf/bench/sched-pipe.c | 115 +-
+ tools/perf/builtin-annotate.c | 45 +-
+ tools/perf/builtin-bench.c | 245 ++--
+ tools/perf/builtin-buildid-cache.c | 156 ++-
+ tools/perf/builtin-buildid-list.c | 11 +-
+ tools/perf/builtin-diff.c | 30 +-
+ tools/perf/builtin-evlist.c | 7 +-
+ tools/perf/builtin-inject.c | 36 +-
+ tools/perf/builtin-kmem.c | 7 +-
+ tools/perf/builtin-kvm.c | 18 +-
+ tools/perf/builtin-lock.c | 131 +-
+ tools/perf/builtin-mem.c | 9 +-
+ tools/perf/builtin-probe.c | 14 +-
+ tools/perf/builtin-record.c | 111 +-
+ tools/perf/builtin-report.c | 82 +-
+ tools/perf/builtin-sched.c | 50 +-
+ tools/perf/builtin-script.c | 59 +-
+ tools/perf/builtin-stat.c | 169 ++-
+ tools/perf/builtin-timechart.c | 10 +-
+ tools/perf/builtin-top.c | 33 +-
+ tools/perf/builtin-trace.c | 1204 ++++++++++++++---
+ tools/perf/config/Makefile | 370 ++++--
+ tools/perf/config/feature-checks/Makefile | 144 +++
+ tools/perf/config/feature-checks/test-all.c | 106 ++
+ tools/perf/config/feature-checks/test-backtrace.c | 13 +
+ tools/perf/config/feature-checks/test-bionic.c | 6 +
+ .../config/feature-checks/test-cplus-demangle.c | 14 +
+ tools/perf/config/feature-checks/test-dwarf.c | 10 +
+ .../config/feature-checks/test-fortify-source.c | 6 +
+ tools/perf/config/feature-checks/test-glibc.c | 8 +
+ .../perf/config/feature-checks/test-gtk2-infobar.c | 11 +
+ tools/perf/config/feature-checks/test-gtk2.c | 10 +
+ tools/perf/config/feature-checks/test-hello.c | 6 +
+ tools/perf/config/feature-checks/test-libaudit.c | 10 +
+ tools/perf/config/feature-checks/test-libbfd.c | 15 +
+ .../config/feature-checks/test-libelf-getphdrnum.c | 8 +
+ .../perf/config/feature-checks/test-libelf-mmap.c | 8 +
+ tools/perf/config/feature-checks/test-libelf.c | 8 +
+ tools/perf/config/feature-checks/test-libnuma.c | 9 +
+ tools/perf/config/feature-checks/test-libperl.c | 9 +
+ .../config/feature-checks/test-libpython-version.c | 10 +
+ tools/perf/config/feature-checks/test-libpython.c | 8 +
+ tools/perf/config/feature-checks/test-libslang.c | 6 +
+ tools/perf/config/feature-checks/test-libunwind.c | 27 +
+ tools/perf/config/feature-checks/test-on-exit.c | 16 +
+ .../feature-checks/test-stackprotector-all.c | 6 +
+ .../config/feature-checks/test-stackprotector.c | 6 +
+ .../feature-checks/test-volatile-register-var.c | 6 +
+ tools/perf/config/feature-tests.mak | 265 ----
+ tools/perf/config/utilities.mak | 17 +-
+ tools/perf/perf.c | 14 +-
+ tools/perf/perf.h | 6 +-
+ tools/perf/tests/dso-data.c | 1 +
+ tools/perf/tests/hists_link.c | 8 +-
+ tools/perf/tests/perf-record.c | 12 +-
+ tools/perf/tests/sample-parsing.c | 4 +-
+ tools/perf/tests/task-exit.c | 14 +-
+ tools/perf/ui/browsers/annotate.c | 24 +-
+ tools/perf/ui/gtk/annotate.c | 13 +-
+ tools/perf/ui/gtk/browser.c | 2 +-
+ tools/perf/ui/gtk/gtk.h | 22 +-
+ tools/perf/ui/gtk/progress.c | 20 +-
+ tools/perf/ui/gtk/setup.c | 2 +-
+ tools/perf/ui/gtk/util.c | 4 +-
+ tools/perf/ui/progress.c | 32 +-
+ tools/perf/ui/progress.h | 19 +-
+ tools/perf/ui/setup.c | 61 +-
+ tools/perf/ui/tui/progress.c | 15 +-
+ tools/perf/ui/tui/setup.c | 3 +-
+ tools/perf/ui/tui/tui.h | 6 +
+ tools/perf/ui/ui.h | 14 +-
+ tools/perf/util/PERF-VERSION-GEN | 2 +-
+ tools/perf/util/annotate.c | 76 +-
+ tools/perf/util/annotate.h | 26 +-
+ tools/perf/util/build-id.c | 6 +-
+ tools/perf/util/cache.h | 3 +-
+ tools/perf/util/callchain.c | 147 ++-
+ tools/perf/util/callchain.h | 11 +-
+ tools/perf/util/data.c | 120 ++
+ tools/perf/util/data.h | 48 +
+ tools/perf/util/dso.c | 50 +-
+ tools/perf/util/dso.h | 3 +
+ tools/perf/util/event.h | 11 +
+ tools/perf/util/evlist.c | 245 +++-
+ tools/perf/util/evlist.h | 12 +-
+ tools/perf/util/evsel.c | 14 +
+ tools/perf/util/evsel.h | 6 +
+ tools/perf/util/generate-cmdlist.sh | 4 +-
+ tools/perf/util/header.c | 22 +-
+ tools/perf/util/hist.c | 35 +-
+ tools/perf/util/hist.h | 26 +-
+ tools/perf/util/include/dwarf-regs.h | 2 +-
+ tools/perf/util/include/linux/compiler.h | 19 +-
+ tools/perf/util/intlist.c | 23 +-
+ tools/perf/util/intlist.h | 2 +
+ tools/perf/util/machine.c | 127 +-
+ tools/perf/util/machine.h | 8 +-
+ tools/perf/util/map.c | 50 +-
+ tools/perf/util/map.h | 7 +
+ tools/perf/util/parse-events.c | 4 +-
+ tools/perf/util/parse-events.l | 63 +-
+ tools/perf/util/path.c | 10 +-
+ tools/perf/util/perf_regs.h | 4 +-
+ tools/perf/util/pmu.c | 16 +
+ tools/perf/util/pmu.h | 1 +
+ tools/perf/util/probe-event.c | 5 +-
+ tools/perf/util/probe-finder.c | 133 +-
+ tools/perf/util/probe-finder.h | 5 +-
+ tools/perf/util/python.c | 8 +-
+ tools/perf/util/rblist.c | 27 +-
+ tools/perf/util/rblist.h | 1 +
+ tools/perf/util/session.c | 179 ++-
+ tools/perf/util/session.h | 11 +-
+ tools/perf/util/sort.c | 302 +++--
+ tools/perf/util/sort.h | 4 +
+ tools/perf/util/srcline.c | 265 ++++
+ tools/perf/util/strfilter.c | 46 +-
+ tools/perf/util/symbol-elf.c | 607 ++++++++-
+ tools/perf/util/symbol-minimal.c | 15 +
+ tools/perf/util/symbol.c | 449 ++++++-
+ tools/perf/util/symbol.h | 29 +-
+ tools/perf/util/thread.c | 72 +-
+ tools/perf/util/top.h | 1 +
+ tools/perf/util/trace-event-parse.c | 36 -
+ tools/perf/util/trace-event.h | 9 -
+ tools/perf/util/unwind.h | 4 +-
+ tools/perf/util/util.c | 66 +-
+ tools/perf/util/util.h | 26 +
+ tools/scripts/Makefile.include | 23 +-
+ 507 files changed, 17488 insertions(+), 7548 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/timer/efm32,timer.txt
+ rename Documentation/{x86 => }/efi-stub.txt (100%)
+ create mode 100644 arch/x86/boot/compressed/aslr.c
+ create mode 100644 arch/x86/boot/compressed/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.c
+ create mode 100644 arch/x86/boot/cpuflags.h
+ create mode 100644 arch/x86/include/asm/intel-mid.h
+ rename arch/x86/include/asm/{mrst-vrtc.h => intel_mid_vrtc.h} (81%)
+ create mode 100644 arch/x86/include/asm/misc.h
+ delete mode 100644 arch/x86/include/asm/mrst.h
+ create mode 100644 arch/x86/include/asm/preempt.h
+ create mode 100644 arch/x86/include/asm/rmwcc.h
+ create mode 100644 arch/x86/kernel/preempt.S
+ create mode 100644 arch/x86/lib/misc.c
+ rename arch/x86/pci/{mrst.c => intel_mid_pci.c} (96%)
+ create mode 100644 arch/x86/platform/efi/early_printk.c
+ create mode 100644 arch/x86/platform/intel-mid/Makefile
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/Makefile
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_bma023.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_emc1403.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_gpio_keys.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_lis331.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max3111.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_max7315.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mpu3050.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic.h
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_audio.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_battery.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_gpio.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_ocd.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_power_btn.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_msic_thermal.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tc35876x.c
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_tca6416.c
+ rename arch/x86/platform/{mrst/early_printk_mrst.c => intel-mid/early_printk_intel_mid.c} (97%)
+ create mode 100644 arch/x86/platform/intel-mid/intel-mid.c
+ rename arch/x86/platform/{mrst/vrtc.c => intel-mid/intel_mid_vrtc.c} (90%)
+ create mode 100644 arch/x86/platform/intel-mid/sfi.c
+ delete mode 100644 arch/x86/platform/mrst/Makefile
+ delete mode 100644 arch/x86/platform/mrst/mrst.c
+ create mode 100644 arch/x86/platform/uv/uv_nmi.c
+ create mode 100644 drivers/acpi/acpi_extlog.c
+ create mode 100644 drivers/clocksource/time-efm32.c
+ rename drivers/{acpi/apei => firmware/efi}/cper.c (76%)
+ create mode 100644 drivers/firmware/efi/efi-stub-helper.c
+ create mode 100644 include/asm-generic/preempt.h
+ create mode 100644 kernel/rcu/Makefile
+ rename kernel/{ => rcu}/rcu.h (94%)
+ rename kernel/{ => rcu}/srcu.c (100%)
+ rename kernel/{rcutiny.c => rcu/tiny.c} (90%)
+ rename kernel/{rcutiny_plugin.h => rcu/tiny_plugin.h} (100%)
+ rename kernel/{rcutorture.c => rcu/torture.c} (99%)
+ rename kernel/{rcutree.c => rcu/tree.c} (94%)
+ rename kernel/{rcutree.h => rcu/tree.h} (99%)
+ rename kernel/{rcutree_plugin.h => rcu/tree_plugin.h} (97%)
+ rename kernel/{rcutree_trace.c => rcu/tree_trace.c} (99%)
+ rename kernel/{rcupdate.c => rcu/update.c} (97%)
+ create mode 100644 tools/perf/Makefile.perf
+ create mode 100644 tools/perf/config/feature-checks/Makefile
+ create mode 100644 tools/perf/config/feature-checks/test-all.c
+ create mode 100644 tools/perf/config/feature-checks/test-backtrace.c
+ create mode 100644 tools/perf/config/feature-checks/test-bionic.c
+ create mode 100644 tools/perf/config/feature-checks/test-cplus-demangle.c
+ create mode 100644 tools/perf/config/feature-checks/test-dwarf.c
+ create mode 100644 tools/perf/config/feature-checks/test-fortify-source.c
+ create mode 100644 tools/perf/config/feature-checks/test-glibc.c
+ create mode 100644 tools/perf/config/feature-checks/test-gtk2-infobar.c
+ create mode 100644 tools/perf/config/feature-checks/test-gtk2.c
+ create mode 100644 tools/perf/config/feature-checks/test-hello.c
+ create mode 100644 tools/perf/config/feature-checks/test-libaudit.c
+ create mode 100644 tools/perf/config/feature-checks/test-libbfd.c
+ create mode 100644 tools/perf/config/feature-checks/test-libelf-getphdrnum.c
+ create mode 100644 tools/perf/config/feature-checks/test-libelf-mmap.c
+ create mode 100644 tools/perf/config/feature-checks/test-libelf.c
+ create mode 100644 tools/perf/config/feature-checks/test-libnuma.c
+ create mode 100644 tools/perf/config/feature-checks/test-libperl.c
+ create mode 100644 tools/perf/config/feature-checks/test-libpython-version.c
+ create mode 100644 tools/perf/config/feature-checks/test-libpython.c
+ create mode 100644 tools/perf/config/feature-checks/test-libslang.c
+ create mode 100644 tools/perf/config/feature-checks/test-libunwind.c
+ create mode 100644 tools/perf/config/feature-checks/test-on-exit.c
+ create mode 100644 tools/perf/config/feature-checks/test-stackprotector-all.c
+ create mode 100644 tools/perf/config/feature-checks/test-stackprotector.c
+ create mode 100644 tools/perf/config/feature-checks/test-volatile-register-var.c
+ delete mode 100644 tools/perf/config/feature-tests.mak
+ create mode 100644 tools/perf/ui/tui/tui.h
+ create mode 100644 tools/perf/util/data.c
+ create mode 100644 tools/perf/util/data.h
+ create mode 100644 tools/perf/util/srcline.c
+$ git am -3 ../patches/0001-tip-extra-fixes-for-perf-changes.patch
+Applying: tip: extra fixes for perf changes
+$ git reset HEAD^
+Unstaged changes after reset:
+M tools/perf/config/feature-checks/Makefile
+M tools/perf/config/feature-checks/test-all.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 7f1546329db7] Merge remote-tracking branch 'tip/auto-latest'
+Merging edac/linux_next (de4772c62148 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 (c3e511e4c4d9 amd64_edac: Remove superfluous condition check.)
+$ git merge edac-amd/for-next
+Auto-merging drivers/edac/amd64_edac.c
+Merge made by the 'recursive' strategy.
+ drivers/edac/amd64_edac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging ftrace/for-next (29ad23b00474 ftrace: Add set_graph_notrace filter)
+$ git merge ftrace/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/ftrace.h | 1 +
+ kernel/trace/ftrace.c | 140 ++++++++++++++++++++++++++---------
+ kernel/trace/trace.c | 7 +-
+ kernel/trace/trace.h | 25 ++++++-
+ kernel/trace/trace_functions_graph.c | 56 +++++++++++++-
+ 5 files changed, 186 insertions(+), 43 deletions(-)
+Merging rcu/rcu/next (4102adab9189 rcu: Move RCU-related source code to kernel/rcu directory)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (81e87e267967 kvm_host: typo fix)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging arch/x86/include/uapi/asm/msr-index.h
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kvm/interrupt.c
+Auto-merging arch/arm/kvm/arm.c
+Auto-merging arch/arm/include/asm/pgtable-3level.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/00-INDEX | 24 +++
+ Documentation/virtual/kvm/api.txt | 108 +++++++++++-
+ Documentation/virtual/kvm/devices/vfio.txt | 22 +++
+ Documentation/virtual/kvm/locking.txt | 19 ++-
+ MAINTAINERS | 3 +-
+ arch/arm/include/asm/kvm_arm.h | 9 +-
+ arch/arm/include/asm/kvm_asm.h | 2 +-
+ arch/arm/include/asm/kvm_host.h | 6 +-
+ arch/arm/include/asm/kvm_mmu.h | 17 +-
+ arch/arm/include/asm/pgtable-3level.h | 2 +
+ arch/arm/include/uapi/asm/kvm.h | 3 +-
+ arch/arm/kvm/Kconfig | 1 +
+ arch/arm/kvm/Makefile | 2 +-
+ arch/arm/kvm/arm.c | 13 ++
+ arch/arm/kvm/coproc.c | 114 +++++++++++++
+ arch/arm/kvm/coproc_a15.c | 117 +------------
+ arch/arm/kvm/coproc_a7.c | 54 ++++++
+ arch/arm/kvm/emulate.c | 2 +-
+ arch/arm/kvm/guest.c | 24 ++-
+ arch/arm/kvm/handle_exit.c | 20 ++-
+ arch/arm/kvm/mmu.c | 223 +++++++++++++++++++-----
+ arch/arm/kvm/reset.c | 15 +-
+ arch/arm64/include/asm/kvm_host.h | 6 +-
+ arch/arm64/include/asm/kvm_mmu.h | 12 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +
+ arch/arm64/kvm/guest.c | 20 +++
+ arch/ia64/include/asm/kvm_host.h | 6 +-
+ arch/mips/include/asm/kvm_host.h | 7 -
+ arch/powerpc/include/asm/kvm_host.h | 5 -
+ arch/s390/include/asm/kvm_host.h | 8 -
+ arch/s390/kvm/diag.c | 4 +-
+ arch/s390/kvm/gaccess.h | 21 ++-
+ arch/s390/kvm/intercept.c | 6 -
+ arch/s390/kvm/interrupt.c | 3 +
+ arch/s390/kvm/kvm-s390.c | 91 ++++++----
+ arch/s390/kvm/kvm-s390.h | 9 +-
+ arch/s390/kvm/priv.c | 61 +++++++
+ arch/x86/include/asm/kvm_emulate.h | 10 +-
+ arch/x86/include/asm/kvm_host.h | 20 ++-
+ arch/x86/include/uapi/asm/kvm.h | 6 +-
+ arch/x86/include/uapi/asm/msr-index.h | 1 +
+ arch/x86/kvm/Kconfig | 1 +
+ arch/x86/kvm/Makefile | 2 +-
+ arch/x86/kvm/cpuid.c | 111 +++++++++++-
+ arch/x86/kvm/cpuid.h | 5 +-
+ arch/x86/kvm/emulate.c | 109 ++++++++++--
+ arch/x86/kvm/mmu.c | 115 ++++---------
+ arch/x86/kvm/mmu.h | 4 +-
+ arch/x86/kvm/svm.c | 8 +-
+ arch/x86/kvm/vmx.c | 155 ++++++++++++-----
+ arch/x86/kvm/x86.c | 96 ++++++++---
+ arch/x86/kvm/x86.h | 1 +
+ include/linux/kvm_host.h | 37 ++--
+ include/trace/events/kvm.h | 10 +-
+ include/uapi/linux/kvm.h | 7 +
+ virt/kvm/Kconfig | 3 +
+ virt/kvm/async_pf.c | 22 +--
+ virt/kvm/iommu.c | 34 ++--
+ virt/kvm/kvm_main.c | 88 +++++-----
+ virt/kvm/vfio.c | 264 +++++++++++++++++++++++++++++
+ 60 files changed, 1604 insertions(+), 566 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/00-INDEX
+ create mode 100644 Documentation/virtual/kvm/devices/vfio.txt
+ create mode 100644 arch/arm/kvm/coproc_a7.c
+ create mode 100644 virt/kvm/vfio.c
+Merging kvm-arm/kvm-arm-next (79c648806f90 arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU)
+$ git merge kvm-arm/kvm-arm-next
+Resolved 'arch/arm/kvm/reset.c' using previous resolution.
+Auto-merging arch/arm/kvm/reset.c
+CONFLICT (content): Merge conflict in arch/arm/kvm/reset.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 56c4f90eb596] Merge remote-tracking branch 'kvm-arm/kvm-arm-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/include/asm/kvm_emulate.h | 5 +++++
+ arch/arm/kvm/coproc.c | 14 ++++++++++----
+ arch/arm/kvm/psci.c | 17 +++++++++++++----
+ arch/arm/kvm/reset.c | 4 ----
+ arch/arm64/include/asm/kvm_emulate.h | 5 +++++
+ 5 files changed, 33 insertions(+), 12 deletions(-)
+Merging kvm-ppc/kvm-ppc-next (a78b55d1c021 kvm: powerpc: book3s: drop is_hv_enabled)
+$ git merge kvm-ppc/kvm-ppc-next
+Resolved 'arch/powerpc/include/asm/processor.h' using previous resolution.
+Resolved 'arch/powerpc/kernel/ptrace.c' using previous resolution.
+Resolved 'arch/powerpc/kernel/traps.c' using previous resolution.
+Auto-merging virt/kvm/kvm_main.c
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging include/linux/kvm_host.h
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/powerpc/kvm/e500_mmu_host.c
+Auto-merging arch/powerpc/kvm/booke.c
+Auto-merging arch/powerpc/kvm/book3s_pr.c
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/kvm/Kconfig
+Auto-merging arch/powerpc/kernel/traps.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/traps.c
+Auto-merging arch/powerpc/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/ptrace.c
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/powerpc/include/asm/reg.h
+Auto-merging arch/powerpc/include/asm/processor.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/processor.h
+Auto-merging arch/arm/kvm/arm.c
+Auto-merging Documentation/virtual/kvm/api.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8e1c98f7c35c] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/virtual/kvm/api.txt | 44 +++
+ arch/arm/kvm/arm.c | 5 +-
+ arch/ia64/kvm/kvm-ia64.c | 5 +-
+ arch/mips/kvm/kvm_mips.c | 5 +-
+ arch/powerpc/include/asm/disassemble.h | 4 +
+ arch/powerpc/include/asm/exception-64s.h | 21 +-
+ arch/powerpc/include/asm/kvm_asm.h | 4 +
+ arch/powerpc/include/asm/kvm_book3s.h | 232 +----------
+ arch/powerpc/include/asm/kvm_book3s_32.h | 2 +-
+ arch/powerpc/include/asm/kvm_book3s_64.h | 8 +-
+ arch/powerpc/include/asm/kvm_book3s_asm.h | 9 +-
+ arch/powerpc/include/asm/kvm_booke.h | 7 +-
+ arch/powerpc/include/asm/kvm_host.h | 52 ++-
+ arch/powerpc/include/asm/kvm_ppc.h | 107 ++++--
+ arch/powerpc/include/asm/paca.h | 2 +-
+ arch/powerpc/include/asm/pte-book3e.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 15 +
+ arch/powerpc/include/uapi/asm/kvm.h | 86 ++++-
+ arch/powerpc/kernel/asm-offsets.c | 21 +-
+ arch/powerpc/kernel/exceptions-64s.S | 30 +-
+ arch/powerpc/kernel/idle_power7.S | 2 +-
+ arch/powerpc/kvm/44x.c | 58 ++-
+ arch/powerpc/kvm/44x_emulate.c | 8 +-
+ arch/powerpc/kvm/44x_tlb.c | 2 +-
+ arch/powerpc/kvm/Kconfig | 28 +-
+ arch/powerpc/kvm/Makefile | 29 +-
+ arch/powerpc/kvm/book3s.c | 257 ++++++++++++-
+ arch/powerpc/kvm/book3s.h | 34 ++
+ arch/powerpc/kvm/book3s_32_mmu.c | 73 ++--
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 16 +-
+ arch/powerpc/kvm/book3s_64_mmu.c | 181 +++++++--
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 106 +++--
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 24 +-
+ arch/powerpc/kvm/book3s_64_vio_hv.c | 1 +
+ arch/powerpc/kvm/book3s_emulate.c | 18 +-
+ arch/powerpc/kvm/book3s_exports.c | 5 +-
+ arch/powerpc/kvm/book3s_hv.c | 389 +++++++++++++++----
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 3 -
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 618 +++++++++++++++++-------------
+ arch/powerpc/kvm/book3s_interrupts.S | 32 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 66 +++-
+ arch/powerpc/kvm/book3s_pr.c | 498 +++++++++++++++++-------
+ arch/powerpc/kvm/book3s_pr_papr.c | 52 ++-
+ arch/powerpc/kvm/book3s_rmhandlers.S | 32 +-
+ arch/powerpc/kvm/book3s_rtas.c | 1 +
+ arch/powerpc/kvm/book3s_segment.S | 4 +-
+ arch/powerpc/kvm/book3s_xics.c | 7 +-
+ arch/powerpc/kvm/booke.c | 337 ++++++++++++++--
+ arch/powerpc/kvm/booke.h | 29 ++
+ arch/powerpc/kvm/e500.c | 59 ++-
+ arch/powerpc/kvm/e500.h | 2 +-
+ arch/powerpc/kvm/e500_emulate.c | 34 +-
+ arch/powerpc/kvm/e500_mmu.c | 4 +-
+ arch/powerpc/kvm/e500_mmu_host.c | 6 +-
+ arch/powerpc/kvm/e500mc.c | 58 ++-
+ arch/powerpc/kvm/emulate.c | 12 +-
+ arch/powerpc/kvm/powerpc.c | 171 +++++----
+ arch/powerpc/kvm/trace.h | 429 ---------------------
+ arch/powerpc/kvm/trace_booke.h | 177 +++++++++
+ arch/powerpc/kvm/trace_pr.h | 297 ++++++++++++++
+ arch/s390/kvm/kvm-s390.c | 5 +-
+ arch/x86/kvm/x86.c | 5 +-
+ include/linux/kvm_host.h | 5 +-
+ include/uapi/linux/kvm.h | 4 +
+ virt/kvm/kvm_main.c | 16 +-
+ 65 files changed, 3258 insertions(+), 1597 deletions(-)
+ create mode 100644 arch/powerpc/kvm/book3s.h
+ create mode 100644 arch/powerpc/kvm/trace_booke.h
+ create mode 100644 arch/powerpc/kvm/trace_pr.h
+Merging oprofile/for-next (9b415b3a3c4e edac, highbank: Moving error injection to sysfs for edac)
+$ git merge oprofile/for-next
+Auto-merging arch/arm/boot/dts/ecx-common.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/calxeda/mem-ctrlr.txt | 4 +-
+ MAINTAINERS | 8 +
+ arch/arm/boot/dts/ecx-2000.dts | 6 +
+ arch/arm/boot/dts/ecx-common.dtsi | 6 -
+ arch/arm/boot/dts/highbank.dts | 6 +
+ drivers/edac/edac_device.c | 9 +-
+ drivers/edac/edac_mc.c | 6 +-
+ drivers/edac/edac_pci.c | 8 +-
+ drivers/edac/highbank_l2_edac.c | 33 ++--
+ drivers/edac/highbank_mc_edac.c | 175 ++++++++++++---------
+ 10 files changed, 151 insertions(+), 110 deletions(-)
+Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work)
+$ git merge fw-nohz/nohz/next
+Already up-to-date.
+Merging xen-tip/linux-next (af8bdd968a7e Merge branch 'swiotlb-xen' into xentip/linux-next)
+$ git merge xen-tip/linux-next
+Resolved 'arch/arm/include/asm/dma-mapping.h' using previous resolution.
+Auto-merging arch/arm64/include/asm/io.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/include/asm/dma-mapping.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/dma-mapping.h
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 823aeaa35c4d] Merge remote-tracking branch 'xen-tip/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 7 +
+ arch/arm/include/asm/dma-mapping.h | 50 ++++++-
+ arch/arm/include/asm/io.h | 8 ++
+ arch/arm/include/asm/xen/hypervisor.h | 2 +
+ arch/arm/include/asm/xen/page-coherent.h | 50 +++++++
+ arch/arm/include/asm/xen/page.h | 50 ++++++-
+ arch/arm/xen/Makefile | 2 +-
+ arch/arm/xen/mm.c | 65 +++++++++
+ arch/arm/xen/p2m.c | 208 +++++++++++++++++++++++++++++
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/include/asm/dma-mapping.h | 14 +-
+ arch/arm64/include/asm/io.h | 9 ++
+ arch/arm64/include/asm/xen/page-coherent.h | 47 +++++++
+ arch/arm64/xen/Makefile | 2 +-
+ arch/ia64/include/asm/xen/page-coherent.h | 38 ++++++
+ arch/x86/include/asm/xen/page-coherent.h | 38 ++++++
+ arch/x86/xen/mmu.c | 15 ++-
+ arch/x86/xen/p2m.c | 6 +-
+ drivers/tty/hvc/hvc_xen.c | 19 ++-
+ drivers/xen/Kconfig | 1 -
+ drivers/xen/grant-table.c | 19 ++-
+ drivers/xen/swiotlb-xen.c | 118 ++++++++++++----
+ include/trace/events/swiotlb.h | 46 +++++++
+ include/xen/swiotlb-xen.h | 2 +
+ include/xen/xen-ops.h | 7 +-
+ lib/swiotlb.c | 6 +
+ 26 files changed, 777 insertions(+), 53 deletions(-)
+ create mode 100644 arch/arm/include/asm/xen/page-coherent.h
+ create mode 100644 arch/arm/xen/mm.c
+ create mode 100644 arch/arm/xen/p2m.c
+ create mode 100644 arch/arm64/include/asm/xen/page-coherent.h
+ create mode 100644 arch/ia64/include/asm/xen/page-coherent.h
+ create mode 100644 arch/x86/include/asm/xen/page-coherent.h
+ create mode 100644 include/trace/events/swiotlb.h
+Merging percpu/for-next (90f2492cf9c8 x86: remove this_cpu_xor() implementation)
+$ git merge percpu/for-next
+Auto-merging include/linux/percpu.h
+Auto-merging arch/x86/include/asm/percpu.h
+Merge made by the 'recursive' strategy.
+ arch/x86/include/asm/percpu.h | 8 --------
+ include/linux/percpu.h | 32 --------------------------------
+ mm/percpu.c | 5 +++--
+ 3 files changed, 3 insertions(+), 42 deletions(-)
+Merging workqueues/for-next (016564d41b35 workqueue: fix pool ID allocation leakage and remove BUILD_BUG_ON() in init_workqueues)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ kernel/workqueue.c | 41 ++++++++++++++++++++++++++++++++---------
+ 1 file changed, 32 insertions(+), 9 deletions(-)
+Merging drivers-x86/linux-next (5c07eae979df platform/x86: panasonic-laptop: reuse module_acpi_driver)
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away)
+$ git merge sysctl/master
+Already up-to-date.
+Merging regmap/for-next (04bc9ac163a2 Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/Kconfig | 5 +-
+ drivers/base/regmap/Makefile | 1 +
+ drivers/base/regmap/regcache.c | 16 ++++++-
+ drivers/base/regmap/regmap-debugfs.c | 57 +++++++++++++++++++++--
+ drivers/base/regmap/regmap-irq.c | 16 +++++++
+ drivers/base/regmap/regmap-spi.c | 3 +-
+ drivers/base/regmap/regmap-spmi.c | 90 ++++++++++++++++++++++++++++++++++++
+ drivers/base/regmap/regmap.c | 72 ++++++++++++++++++++++++-----
+ include/linux/regmap.h | 7 +++
+ 9 files changed, 247 insertions(+), 20 deletions(-)
+ create mode 100644 drivers/base/regmap/regmap-spmi.c
+Merging hsi/for-next (43139a61fc68 HSI: hsi_char: Update ioctl-number.txt)
+$ git merge hsi/for-next
+Already up-to-date.
+Merging leds/for-next (30dae2f98612 leds: lp55xx: handle enable pin in driver)
+$ git merge leds/for-next
+Resolved 'arch/arm/mach-ux500/board-mop500.c' using previous resolution.
+Resolved 'include/linux/of.h' using previous resolution.
+Auto-merging include/linux/of.h
+CONFLICT (content): Merge conflict in include/linux/of.h
+Auto-merging arch/arm/mach-ux500/board-mop500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/board-mop500.c
+Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 33f839f5fb99] Merge remote-tracking branch 'leds/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/leds/leds-lp55xx.txt | 11 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 20 +-
+ drivers/leds/Kconfig | 10 +
+ drivers/leds/Makefile | 1 +
+ drivers/leds/leds-blinkm.c | 3 -
+ drivers/leds/leds-dac124s085.c | 3 -
+ drivers/leds/leds-gpio.c | 7 +-
+ drivers/leds/leds-lp5523.c | 1 +
+ drivers/leds/leds-lp5562.c | 1 +
+ drivers/leds/leds-lp55xx-common.c | 28 +--
+ drivers/leds/leds-lp8501.c | 1 +
+ drivers/leds/leds-ns2.c | 1 +
+ drivers/leds/leds-pca9685.c | 213 +++++++++++++++++++++
+ drivers/leds/leds-pwm.c | 2 +-
+ include/linux/of.h | 16 ++
+ include/linux/platform_data/leds-lp55xx.h | 7 +-
+ include/linux/platform_data/leds-pca9685.h | 35 ++++
+ 17 files changed, 312 insertions(+), 48 deletions(-)
+ create mode 100644 drivers/leds/leds-pca9685.c
+ create mode 100644 include/linux/platform_data/leds-pca9685.h
+Merging driver-core/driver-core-next (0cae60f91494 sysfs: rename sysfs_assoc_lock and explain what it's about)
+$ git merge driver-core/driver-core-next
+Resolved 'drivers/mmc/host/mvsdio.c' using previous resolution.
+Resolved 'drivers/pci/pci-driver.c' using previous resolution.
+Resolved 'drivers/pci/pci-sysfs.c' using previous resolution.
+Resolved 'include/linux/netdevice.h' using previous resolution.
+Auto-merging net/core/net-sysfs.c
+Auto-merging kernel/events/core.c
+Auto-merging include/linux/netdevice.h
+CONFLICT (content): Merge conflict in include/linux/netdevice.h
+Removing fs/sysfs/bin.c
+Auto-merging drivers/pci/pci-sysfs.c
+CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c
+Auto-merging drivers/pci/pci-driver.c
+CONFLICT (content): Merge conflict in drivers/pci/pci-driver.c
+Auto-merging drivers/net/bonding/bond_sysfs.c
+Auto-merging drivers/mtd/nand/atmel_nand.c
+Auto-merging drivers/mmc/host/mvsdio.c
+CONFLICT (content): Merge conflict in drivers/mmc/host/mvsdio.c
+Auto-merging drivers/mmc/core/bus.c
+Auto-merging drivers/md/md.h
+Auto-merging drivers/md/md.c
+Auto-merging arch/powerpc/kernel/vio.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 93ae1a8e0e4e] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/filesystems.tmpl | 1 -
+ arch/powerpc/kernel/ibmebus.c | 14 +-
+ arch/powerpc/kernel/vio.c | 66 ++-
+ drivers/base/bus.c | 82 +--
+ drivers/base/class.c | 29 +-
+ drivers/base/core.c | 88 +--
+ drivers/base/devres.c | 31 +-
+ drivers/base/firmware_class.c | 38 +-
+ drivers/base/platform.c | 17 +-
+ drivers/bcma/main.c | 23 +-
+ drivers/gpio/gpiolib.c | 2 +-
+ drivers/hsi/hsi.c | 10 +-
+ drivers/ide/ide-sysfs.c | 35 +-
+ drivers/ide/ide.c | 2 +-
+ drivers/input/gameport/gameport.c | 17 +-
+ drivers/input/serio/serio.c | 70 ++-
+ drivers/ipack/ipack.c | 22 +-
+ drivers/md/bitmap.c | 4 +-
+ drivers/md/md.c | 2 +-
+ drivers/md/md.h | 2 +-
+ drivers/memstick/core/memstick.c | 18 +-
+ drivers/message/i2o/core.h | 2 +-
+ drivers/message/i2o/device.c | 32 +-
+ drivers/message/i2o/driver.c | 2 +-
+ drivers/misc/tifm_core.c | 10 +-
+ drivers/mmc/core/bus.c | 12 +-
+ drivers/mmc/core/sdio_bus.c | 21 +-
+ drivers/mmc/host/mvsdio.c | 11 +-
+ drivers/mtd/nand/atmel_nand.c | 13 +-
+ drivers/net/bonding/bond_sysfs.c | 14 +-
+ drivers/net/phy/mdio_bus.c | 10 +-
+ drivers/pcmcia/at91_cf.c | 11 +-
+ drivers/pcmcia/ds.c | 65 ++-
+ drivers/pnp/base.h | 2 +-
+ drivers/pnp/driver.c | 2 +-
+ drivers/pnp/interface.c | 43 +-
+ drivers/rapidio/rio-driver.c | 4 +-
+ drivers/rapidio/rio-sysfs.c | 54 +-
+ drivers/rapidio/rio.h | 4 +-
+ drivers/scsi/fcoe/fcoe_sysfs.c | 14 +-
+ drivers/ssb/main.c | 25 +-
+ drivers/uwb/umc-bus.c | 13 +-
+ drivers/video/backlight/atmel-pwm-bl.c | 9 +-
+ drivers/virtio/virtio.c | 27 +-
+ drivers/xen/xenbus/xenbus_probe.c | 24 +-
+ drivers/xen/xenbus/xenbus_probe.h | 2 +-
+ drivers/xen/xenbus/xenbus_probe_backend.c | 2 +-
+ drivers/xen/xenbus/xenbus_probe_frontend.c | 2 +-
+ fs/sysfs/Makefile | 3 +-
+ fs/sysfs/bin.c | 502 -----------------
+ fs/sysfs/dir.c | 424 ++++++++------
+ fs/sysfs/file.c | 872 +++++++++++++++++++----------
+ fs/sysfs/group.c | 33 +-
+ fs/sysfs/inode.c | 30 +-
+ fs/sysfs/mount.c | 24 +-
+ fs/sysfs/symlink.c | 71 +--
+ fs/sysfs/sysfs.h | 96 ++--
+ include/linux/debugfs.h | 12 +
+ include/linux/device.h | 64 ++-
+ include/linux/ide.h | 2 +-
+ include/linux/kobj_completion.h | 18 +
+ include/linux/kobject.h | 1 +
+ include/linux/netdevice.h | 16 +-
+ include/linux/platform_device.h | 1 +
+ include/linux/sysfs.h | 88 ++-
+ kernel/events/core.c | 13 +-
+ lib/kobject.c | 93 ++-
+ net/core/net-sysfs.c | 14 +-
+ 68 files changed, 1688 insertions(+), 1692 deletions(-)
+ delete mode 100644 fs/sysfs/bin.c
+ create mode 100644 include/linux/kobj_completion.h
+Merging tty/tty-next (80d8611dd076 serial: omap: fix missing comma)
+$ git merge tty/tty-next
+Resolved 'drivers/tty/serial/atmel_serial.c' using previous resolution.
+Resolved 'drivers/tty/serial/imx.c' using previous resolution.
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging include/linux/tty.h
+Auto-merging drivers/tty/serial/ucc_uart.c
+Auto-merging drivers/tty/serial/pmac_zilog.c
+Auto-merging drivers/tty/serial/imx.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/imx.c
+Auto-merging drivers/tty/serial/atmel_serial.c
+CONFLICT (content): Merge conflict in drivers/tty/serial/atmel_serial.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3e7f74cd52ee] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/serial/driver | 4 -
+ Documentation/sysrq.txt | 28 +-
+ drivers/tty/bfin_jtag_comm.c | 2 +-
+ drivers/tty/hvc/hvc_dcc.c | 21 ++
+ drivers/tty/hvc/hvc_vio.c | 5 +-
+ drivers/tty/n_tty.c | 13 +-
+ drivers/tty/nozomi.c | 6 +-
+ drivers/tty/serial/8250/8250_core.c | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 76 +++--
+ drivers/tty/serial/8250/8250_pci.c | 347 ++++++++++++++++++++--
+ drivers/tty/serial/Kconfig | 3 +-
+ drivers/tty/serial/amba-pl010.c | 3 -
+ drivers/tty/serial/amba-pl011.c | 3 -
+ drivers/tty/serial/arc_uart.c | 2 +-
+ drivers/tty/serial/atmel_serial.c | 19 +-
+ drivers/tty/serial/bfin_sport_uart.c | 11 +-
+ drivers/tty/serial/bfin_uart.c | 21 +-
+ drivers/tty/serial/clps711x.c | 2 -
+ drivers/tty/serial/ifx6x60.c | 2 +-
+ drivers/tty/serial/imx.c | 82 +++---
+ drivers/tty/serial/ip22zilog.c | 2 +-
+ drivers/tty/serial/max310x.c | 2 +-
+ drivers/tty/serial/mfd.c | 13 +-
+ drivers/tty/serial/mpc52xx_uart.c | 5 +-
+ drivers/tty/serial/mpsc.c | 2 +-
+ drivers/tty/serial/mrst_max3110.c | 45 +--
+ drivers/tty/serial/mxs-auart.c | 9 +-
+ drivers/tty/serial/omap-serial.c | 141 ++++++---
+ drivers/tty/serial/pch_uart.c | 3 +-
+ drivers/tty/serial/pmac_zilog.c | 2 +-
+ drivers/tty/serial/sa1100.c | 5 +-
+ drivers/tty/serial/samsung.c | 22 +-
+ drivers/tty/serial/samsung.h | 2 +-
+ drivers/tty/serial/sccnxp.c | 1 +
+ drivers/tty/serial/serial-tegra.c | 2 +-
+ drivers/tty/serial/serial_txx9.c | 2 -
+ drivers/tty/serial/sirfsoc_uart.c | 11 +-
+ drivers/tty/serial/sirfsoc_uart.h | 12 -
+ drivers/tty/serial/sunsab.c | 2 +-
+ drivers/tty/serial/sunsu.c | 2 +-
+ drivers/tty/serial/sunzilog.c | 6 +-
+ drivers/tty/serial/ucc_uart.c | 2 +-
+ drivers/tty/serial/xilinx_uartps.c | 551 ++++++++++++++++++++++++++++++-----
+ drivers/tty/sysrq.c | 2 +-
+ drivers/tty/tty_port.c | 10 +-
+ drivers/tty/vt/vt.c | 33 ++-
+ include/linux/atmel_serial.h | 1 +
+ include/linux/serial_core.h | 1 -
+ include/linux/sysrq.h | 3 -
+ include/linux/tty.h | 1 -
+ kernel/sysctl.c | 2 +-
+ lib/Kconfig.debug | 9 +
+ 52 files changed, 1197 insertions(+), 361 deletions(-)
+Merging usb/usb-next (7d49f0bac41e USB: Maintainers change for usb serial drivers)
+$ git merge usb/usb-next
+Resolved 'arch/arm/boot/dts/omap3-evm.dts' using previous resolution.
+Resolved 'drivers/Kconfig' using previous resolution.
+Resolved 'drivers/usb/musb/davinci.c' using previous resolution.
+Removing include/video/exynos_dp.h
+Removing include/linux/usb/intel_mid_otg.h
+Removing include/linux/platform_data/usb-ohci-exynos.h
+Removing include/linux/platform_data/usb-ehci-s5p.h
+Auto-merging drivers/usb/serial/ftdi_sio.c
+Auto-merging drivers/usb/musb/ux500.c
+Auto-merging drivers/usb/musb/davinci.c
+CONFLICT (content): Merge conflict in drivers/usb/musb/davinci.c
+Auto-merging drivers/usb/musb/am35x.c
+Auto-merging drivers/usb/host/uhci-platform.c
+Auto-merging drivers/usb/host/ohci-spear.c
+Auto-merging drivers/usb/host/ohci-s3c2410.c
+Auto-merging drivers/usb/host/ohci-pxa27x.c
+Auto-merging drivers/usb/host/ohci-omap3.c
+Auto-merging drivers/usb/host/ohci-nxp.c
+Auto-merging drivers/usb/host/ohci-exynos.c
+Removing drivers/usb/host/ohci-ep93xx.c
+Auto-merging drivers/usb/host/ohci-at91.c
+Auto-merging drivers/usb/host/ehci-tegra.c
+Auto-merging drivers/usb/host/ehci-ppc-of.c
+Auto-merging drivers/usb/host/ehci-octeon.c
+Auto-merging drivers/usb/host/ehci-exynos.c
+Auto-merging drivers/usb/host/ehci-atmel.c
+Auto-merging drivers/usb/gadget/storage_common.c
+Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
+Auto-merging drivers/phy/phy-twl4030-usb.c
+Auto-merging drivers/phy/phy-omap-usb2.c
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+CONFLICT (content): Merge conflict in drivers/Kconfig
+Removing arch/arm/plat-samsung/setup-mipiphy.c
+Auto-merging arch/arm/plat-samsung/devs.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Auto-merging arch/arm/mach-ep93xx/core.c
+Auto-merging arch/arm/boot/dts/twl4030.dtsi
+Auto-merging arch/arm/boot/dts/omap5.dtsi
+Auto-merging arch/arm/boot/dts/omap4.dtsi
+Auto-merging arch/arm/boot/dts/omap3-evm.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/omap3-evm.dts
+Auto-merging arch/arm/boot/dts/omap3-beagle-xm.dts
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5d379900c79d] Merge remote-tracking branch 'usb/usb-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/configfs-usb-gadget-mass-storage | 31 +
+ .../devicetree/bindings/phy/phy-bindings.txt | 66 +
+ .../devicetree/bindings/phy/samsung-phy.txt | 22 +
+ .../devicetree/bindings/usb/msm-hsusb.txt | 17 +
+ Documentation/devicetree/bindings/usb/omap-usb.txt | 39 +-
+ .../devicetree/bindings/usb/usb-nop-xceiv.txt | 7 +-
+ Documentation/devicetree/bindings/usb/usb-phy.txt | 6 +
+ .../devicetree/bindings/video/exynos_dp.txt | 17 +-
+ Documentation/phy.txt | 166 +++
+ Documentation/pps/pps.txt | 15 +
+ MAINTAINERS | 8 +
+ arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +
+ arch/arm/boot/dts/omap3-overo.dtsi | 2 +
+ arch/arm/boot/dts/omap4.dtsi | 23 +-
+ arch/arm/boot/dts/omap5.dtsi | 20 +-
+ arch/arm/boot/dts/twl4030.dtsi | 1 +
+ arch/arm/configs/ep93xx_defconfig | 17 +-
+ arch/arm/mach-ep93xx/clock.c | 2 +-
+ arch/arm/mach-ep93xx/core.c | 39 +-
+ arch/arm/mach-exynos/include/mach/regs-pmu.h | 5 -
+ arch/arm/mach-omap2/board-omap3beagle.c | 6 -
+ arch/arm/mach-omap2/twl-common.c | 11 +
+ arch/arm/mach-omap2/usb-host.c | 18 +-
+ arch/arm/mach-omap2/usb.h | 1 -
+ arch/arm/mach-s5pv210/include/mach/regs-clock.h | 4 -
+ arch/arm/plat-samsung/Kconfig | 10 -
+ arch/arm/plat-samsung/Makefile | 1 -
+ arch/arm/plat-samsung/devs.c | 34 -
+ arch/arm/plat-samsung/include/plat/devs.h | 1 -
+ arch/arm/plat-samsung/setup-mipiphy.c | 60 -
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 2 +
+ drivers/media/platform/exynos4-is/Kconfig | 2 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 13 +-
+ drivers/phy/Kconfig | 54 +
+ drivers/phy/Makefile | 9 +
+ drivers/phy/phy-core.c | 698 +++++++++++
+ drivers/phy/phy-exynos-dp-video.c | 111 ++
+ drivers/phy/phy-exynos-mipi-video.c | 176 +++
+ drivers/{usb => }/phy/phy-omap-usb2.c | 72 +-
+ drivers/{usb => }/phy/phy-twl4030-usb.c | 71 +-
+ drivers/usb/atm/usbatm.h | 14 +-
+ drivers/usb/chipidea/bits.h | 1 +
+ drivers/usb/chipidea/ci_hdrc_imx.c | 21 +-
+ drivers/usb/chipidea/core.c | 123 +-
+ drivers/usb/chipidea/host.c | 6 +-
+ drivers/usb/chipidea/udc.c | 56 +-
+ drivers/usb/class/cdc-wdm.c | 42 +-
+ drivers/usb/core/devio.c | 38 +-
+ drivers/usb/core/driver.c | 7 +-
+ drivers/usb/core/file.c | 8 +-
+ drivers/usb/core/hcd-pci.c | 3 +
+ drivers/usb/core/hcd.c | 122 +-
+ drivers/usb/core/hub.c | 182 +--
+ drivers/usb/core/message.c | 4 +
+ drivers/usb/core/quirks.c | 37 +
+ drivers/usb/core/sysfs.c | 64 +-
+ drivers/usb/core/urb.c | 44 +-
+ drivers/usb/core/usb.c | 2 +-
+ drivers/usb/core/usb.h | 1 +
+ drivers/usb/dwc3/core.c | 3 +-
+ drivers/usb/dwc3/dwc3-pci.c | 2 -
+ drivers/usb/dwc3/ep0.c | 6 +-
+ drivers/usb/early/ehci-dbgp.c | 4 -
+ drivers/usb/gadget/Kconfig | 34 +-
+ drivers/usb/gadget/Makefile | 5 +-
+ drivers/usb/gadget/acm_ms.c | 125 +-
+ drivers/usb/gadget/amd5536udc.c | 2 -
+ drivers/usb/gadget/composite.c | 2 +-
+ drivers/usb/gadget/configfs.c | 10 +-
+ drivers/usb/gadget/configfs.h | 6 +
+ drivers/usb/gadget/dummy_hcd.c | 6 +-
+ drivers/usb/gadget/f_mass_storage.c | 1254 ++++++++++++++-----
+ drivers/usb/gadget/f_mass_storage.h | 166 +++
+ drivers/usb/gadget/g_ffs.c | 2 +
+ drivers/usb/gadget/goku_udc.c | 3 +-
+ drivers/usb/gadget/mass_storage.c | 125 +-
+ drivers/usb/gadget/multi.c | 247 +++-
+ drivers/usb/gadget/mv_u3d_core.c | 4 +-
+ drivers/usb/gadget/net2280.c | 5 +-
+ drivers/usb/gadget/pch_udc.c | 1 -
+ drivers/usb/gadget/rndis.c | 2 +-
+ drivers/usb/gadget/s3c-hsotg.c | 167 ++-
+ drivers/usb/gadget/storage_common.c | 430 ++-----
+ drivers/usb/gadget/storage_common.h | 229 ++++
+ drivers/usb/gadget/tcm_usb_gadget.c | 4 +-
+ drivers/usb/gadget/udc-core.c | 3 +-
+ drivers/usb/gadget/zero.c | 25 +-
+ drivers/usb/host/Kconfig | 59 +-
+ drivers/usb/host/Makefile | 11 +-
+ drivers/usb/host/ehci-atmel.c | 16 +-
+ drivers/usb/host/ehci-dbg.c | 113 +-
+ drivers/usb/host/{ehci-s5p.c => ehci-exynos.c} | 164 ++-
+ drivers/usb/host/ehci-fsl.c | 4 +-
+ drivers/usb/host/ehci-grlib.c | 2 +-
+ drivers/usb/host/ehci-hcd.c | 42 +-
+ drivers/usb/host/ehci-mem.c | 4 +-
+ drivers/usb/host/ehci-msm.c | 20 +-
+ drivers/usb/host/ehci-mv.c | 2 +-
+ drivers/usb/host/ehci-octeon.c | 2 +-
+ drivers/usb/host/ehci-pci.c | 24 +-
+ drivers/usb/host/ehci-pmcmsp.c | 2 +-
+ drivers/usb/host/ehci-ppc-of.c | 2 +-
+ drivers/usb/host/ehci-ps3.c | 2 +-
+ drivers/usb/host/ehci-q.c | 64 +-
+ drivers/usb/host/ehci-sched.c | 1033 +++++++++-------
+ drivers/usb/host/ehci-sead3.c | 2 +-
+ drivers/usb/host/ehci-sh.c | 2 +-
+ drivers/usb/host/ehci-sysfs.c | 15 +-
+ drivers/usb/host/ehci-tegra.c | 4 +-
+ drivers/usb/host/ehci-tilegx.c | 2 +-
+ drivers/usb/host/ehci-w90x900.c | 89 +-
+ drivers/usb/host/ehci-xilinx-of.c | 2 +-
+ drivers/usb/host/ehci.h | 81 +-
+ drivers/usb/host/fotg210-hcd.c | 2 +-
+ drivers/usb/host/fusbh200-hcd.c | 2 +-
+ drivers/usb/host/hwa-hc.c | 33 +-
+ drivers/usb/host/isp1362-hcd.c | 2 +-
+ drivers/usb/host/ohci-at91.c | 156 ++-
+ drivers/usb/host/ohci-dbg.c | 2 +-
+ drivers/usb/host/ohci-ep93xx.c | 184 ---
+ drivers/usb/host/ohci-exynos.c | 184 ++-
+ drivers/usb/host/ohci-hcd.c | 159 +--
+ drivers/usb/host/ohci-hub.c | 9 +-
+ drivers/usb/host/ohci-nxp.c | 123 +-
+ drivers/usb/host/ohci-omap.c | 169 +--
+ drivers/usb/host/ohci-omap3.c | 118 +-
+ drivers/usb/host/ohci-pci.c | 15 +-
+ drivers/usb/host/ohci-platform.c | 11 +-
+ drivers/usb/host/ohci-pxa27x.c | 249 ++--
+ drivers/usb/host/ohci-s3c2410.c | 128 +-
+ drivers/usb/host/ohci-sm501.c | 11 +-
+ drivers/usb/host/ohci-spear.c | 140 +--
+ drivers/usb/host/pci-quirks.c | 137 ++-
+ drivers/usb/host/pci-quirks.h | 2 +
+ drivers/usb/host/sl811-hcd.c | 4 +-
+ drivers/usb/host/uhci-debug.c | 16 +-
+ drivers/usb/host/uhci-hub.c | 40 +-
+ drivers/usb/host/uhci-pci.c | 19 +-
+ drivers/usb/host/uhci-platform.c | 3 +-
+ drivers/usb/host/whci/hcd.c | 4 +-
+ drivers/usb/host/xhci-hub.c | 5 +-
+ drivers/usb/host/xhci-mem.c | 10 -
+ drivers/usb/host/xhci-ring.c | 324 ++---
+ drivers/usb/host/xhci.c | 182 +--
+ drivers/usb/host/xhci.h | 3 +-
+ drivers/usb/misc/usbtest.c | 172 ++-
+ drivers/usb/musb/Kconfig | 5 +-
+ drivers/usb/musb/am35x.c | 13 +-
+ drivers/usb/musb/blackfin.c | 13 +-
+ drivers/usb/musb/davinci.c | 11 +-
+ drivers/usb/musb/musb_am335x.c | 2 +-
+ drivers/usb/musb/musb_core.c | 19 +-
+ drivers/usb/musb/musb_core.h | 2 +
+ drivers/usb/musb/musb_cppi41.c | 8 +-
+ drivers/usb/musb/musb_dsps.c | 96 +-
+ drivers/usb/musb/musb_gadget.c | 2 +-
+ drivers/usb/musb/musb_host.c | 2 +-
+ drivers/usb/musb/musb_virthub.c | 19 +-
+ drivers/usb/musb/omap2430.c | 54 +-
+ drivers/usb/musb/ux500.c | 13 +-
+ drivers/usb/phy/Kconfig | 35 +-
+ drivers/usb/phy/Makefile | 3 +-
+ drivers/usb/phy/phy-am335x-control.c | 44 +-
+ drivers/usb/phy/phy-am335x.c | 44 +-
+ drivers/usb/phy/phy-fsl-usb.c | 96 +-
+ drivers/usb/phy/phy-fsl-usb.h | 4 +-
+ drivers/usb/phy/phy-fsm-usb.c | 72 +-
+ drivers/usb/phy/phy-fsm-usb.h | 179 ++-
+ drivers/usb/phy/phy-generic.c | 108 +-
+ drivers/usb/phy/phy-generic.h | 7 +-
+ drivers/usb/phy/phy-omap-control.c | 208 ++--
+ drivers/usb/phy/phy-omap-usb3.c | 32 +-
+ drivers/usb/phy/phy-rcar-gen2-usb.c | 248 ++++
+ drivers/usb/phy/phy-samsung-usb2.c | 3 +-
+ drivers/usb/phy/phy-samsung-usb3.c | 3 +-
+ drivers/usb/phy/phy-tegra-usb.c | 2 +-
+ drivers/usb/phy/phy-twl6030-usb.c | 1 +
+ drivers/usb/phy/phy-ulpi-viewport.c | 2 +-
+ drivers/usb/phy/phy.c | 2 +-
+ drivers/usb/serial/cyberjack.c | 2 +-
+ drivers/usb/serial/ftdi_sio.c | 10 +-
+ drivers/usb/serial/generic.c | 82 +-
+ drivers/usb/serial/mos7840.c | 4 +
+ drivers/usb/serial/option.c | 17 +
+ drivers/usb/wusbcore/cbaf.c | 7 +-
+ drivers/usb/wusbcore/devconnect.c | 2 +-
+ drivers/usb/wusbcore/wa-hc.c | 18 +-
+ drivers/usb/wusbcore/wa-hc.h | 42 +-
+ drivers/usb/wusbcore/wa-rpipe.c | 22 +-
+ drivers/usb/wusbcore/wa-xfer.c | 1261 +++++++++++++++-----
+ drivers/uwb/lc-dev.c | 16 +-
+ drivers/video/exynos/Kconfig | 3 +-
+ drivers/video/exynos/exynos_dp_core.c | 132 +-
+ drivers/video/exynos/exynos_dp_core.h | 110 ++
+ drivers/video/exynos/exynos_dp_reg.c | 2 -
+ drivers/video/exynos/exynos_mipi_dsi.c | 19 +-
+ include/linux/i2c/twl.h | 2 +
+ include/linux/phy/phy.h | 270 +++++
+ include/linux/platform_data/mipi-csis.h | 9 -
+ include/linux/platform_data/usb-ehci-s5p.h | 21 -
+ include/linux/platform_data/usb-ohci-exynos.h | 21 -
+ include/linux/platform_data/usb-rcar-gen2-phy.h | 22 +
+ include/linux/printk.h | 16 +-
+ include/linux/usb.h | 10 +-
+ include/linux/usb/hcd.h | 16 +-
+ include/linux/usb/intel_mid_otg.h | 180 ---
+ include/linux/usb/musb.h | 2 -
+ include/linux/usb/omap_control_usb.h | 33 +-
+ include/linux/usb/serial.h | 2 +
+ include/linux/usb/usb_phy_gen_xceiv.h | 3 +-
+ include/linux/usb/wusb-wa.h | 51 +-
+ include/video/exynos_dp.h | 131 --
+ include/video/exynos_mipi_dsim.h | 5 +-
+ 214 files changed, 8962 insertions(+), 4822 deletions(-)
+ create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-mass-storage
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-bindings.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/samsung-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/usb/msm-hsusb.txt
+ create mode 100644 Documentation/phy.txt
+ delete mode 100644 arch/arm/plat-samsung/setup-mipiphy.c
+ create mode 100644 drivers/phy/Kconfig
+ create mode 100644 drivers/phy/Makefile
+ create mode 100644 drivers/phy/phy-core.c
+ create mode 100644 drivers/phy/phy-exynos-dp-video.c
+ create mode 100644 drivers/phy/phy-exynos-mipi-video.c
+ rename drivers/{usb => }/phy/phy-omap-usb2.c (81%)
+ rename drivers/{usb => }/phy/phy-twl4030-usb.c (94%)
+ create mode 100644 drivers/usb/gadget/configfs.h
+ create mode 100644 drivers/usb/gadget/f_mass_storage.h
+ create mode 100644 drivers/usb/gadget/storage_common.h
+ rename drivers/usb/host/{ehci-s5p.c => ehci-exynos.c} (55%)
+ delete mode 100644 drivers/usb/host/ohci-ep93xx.c
+ create mode 100644 drivers/usb/phy/phy-rcar-gen2-usb.c
+ create mode 100644 include/linux/phy/phy.h
+ delete mode 100644 include/linux/platform_data/usb-ehci-s5p.h
+ delete mode 100644 include/linux/platform_data/usb-ohci-exynos.h
+ create mode 100644 include/linux/platform_data/usb-rcar-gen2-phy.h
+ delete mode 100644 include/linux/usb/intel_mid_otg.h
+ delete mode 100644 include/video/exynos_dp.h
+Merging usb-gadget/next (80d7d8a768cd usb: phy: twl6030-usb: Include linux/of.h header)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging staging/staging-next (ed5d6ca0038f staging: drm/imx: fix return value check in ipu_add_subdevice_pdata())
+$ git merge staging/staging-next
+Recorded preimage for 'drivers/staging/lustre/lustre/llite/lloop.c'
+Auto-merging include/linux/mfd/ti_am335x_tscadc.h
+Auto-merging drivers/staging/zram/zram_drv.c
+Auto-merging drivers/staging/sb105x/sb_pci_mp.c
+Removing drivers/staging/rtl8192u/r8180_pm.h
+Removing drivers/staging/rtl8192u/r8180_pm.c
+Removing drivers/staging/rtl8192u/ieee80211_crypt.h
+Removing drivers/staging/rtl8192u/dot11d.h
+Removing drivers/staging/rtl8188eu/include/Hal8188EFWImg_CE.h
+Removing drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+Auto-merging drivers/staging/octeon-usb/octeon-hcd.h
+Removing drivers/staging/octeon-usb/cvmx-usbnx-defs.h
+Removing drivers/staging/octeon-usb/cvmx-usb.h
+Removing drivers/staging/octeon-usb/cvmx-usb.c
+Auto-merging drivers/staging/media/lirc/lirc_bt829.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/lloop.c
+Auto-merging drivers/staging/imx-drm/ipuv3-crtc.c
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/staging/iio/meter/ade7759.c
+Auto-merging drivers/staging/iio/meter/ade7754.c
+Auto-merging drivers/staging/iio/meter/ade7753.c
+Auto-merging drivers/staging/et131x/et131x.c
+Auto-merging drivers/staging/dwc2/platform.c
+Auto-merging drivers/staging/bcm/Bcmchar.c
+Auto-merging drivers/input/touchscreen/ti_am335x_tsc.c
+Auto-merging drivers/hid/hid-sensor-hub.c
+Auto-merging arch/arm/boot/dts/imx28.dtsi
+Auto-merging arch/arm/boot/dts/imx28-evk.dts
+Auto-merging arch/arm/boot/dts/imx23.dtsi
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/staging/lustre/lustre/llite/lloop.c'.
+[master f32dbc348b60] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 71 +-
+ .../devicetree/bindings/arm/atmel-adc.txt | 8 +-
+ .../devicetree/bindings/iio/light/cm36651.txt | 26 +
+ .../devicetree/bindings/iio/light/gp2ap020a00f.txt | 21 +
+ .../bindings/staging/iio/adc/mxs-lradc.txt | 36 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 11 +-
+ arch/arm/boot/dts/imx23.dtsi | 1 +
+ arch/arm/boot/dts/imx28-evk.dts | 4 +
+ arch/arm/boot/dts/imx28.dtsi | 1 +
+ arch/arm/mach-at91/include/mach/at91_adc.h | 34 +
+ drivers/hid/hid-sensor-hub.c | 45 +-
+ drivers/iio/accel/bma180.c | 7 +-
+ drivers/iio/accel/hid-sensor-accel-3d.c | 7 +-
+ drivers/iio/accel/kxsd9.c | 7 +-
+ drivers/iio/accel/st_accel_buffer.c | 11 +-
+ drivers/iio/accel/st_accel_core.c | 30 +-
+ drivers/iio/adc/Kconfig | 12 +
+ drivers/iio/adc/Makefile | 1 +
+ drivers/iio/adc/ad7266.c | 46 +-
+ drivers/iio/adc/ad7298.c | 10 +-
+ drivers/iio/adc/ad7476.c | 16 +-
+ drivers/iio/adc/ad7791.c | 18 +-
+ drivers/iio/adc/ad7887.c | 15 +-
+ drivers/iio/adc/ad7923.c | 10 +-
+ drivers/iio/adc/ad_sigma_delta.c | 7 +-
+ drivers/iio/adc/at91_adc.c | 469 ++-
+ drivers/iio/adc/max1363.c | 299 +-
+ drivers/iio/adc/mcp3422.c | 410 +++
+ drivers/iio/adc/nau7802.c | 3 +-
+ drivers/iio/adc/ti-adc081c.c | 1 +
+ drivers/iio/adc/ti_am335x_adc.c | 225 +-
+ drivers/iio/adc/twl6030-gpadc.c | 6 +-
+ drivers/iio/buffer_cb.c | 27 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 6 +
+ drivers/iio/common/st_sensors/st_sensors_buffer.c | 7 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 70 +-
+ drivers/iio/dac/Kconfig | 2 +-
+ drivers/iio/dac/ad5064.c | 10 +-
+ drivers/iio/dac/ad5360.c | 11 +-
+ drivers/iio/dac/ad5380.c | 44 +-
+ drivers/iio/dac/ad5421.c | 86 +-
+ drivers/iio/dac/ad5446.c | 18 +-
+ drivers/iio/dac/ad5449.c | 7 +-
+ drivers/iio/dac/ad5504.c | 13 +-
+ drivers/iio/dac/ad5624r_spi.c | 13 +-
+ drivers/iio/dac/ad5686.c | 14 +-
+ drivers/iio/dac/ad5755.c | 26 +-
+ drivers/iio/dac/ad5764.c | 10 +-
+ drivers/iio/dac/ad5791.c | 11 +-
+ drivers/iio/dac/ad7303.c | 1 +
+ drivers/iio/dac/max517.c | 17 +-
+ drivers/iio/dac/mcp4725.c | 19 +-
+ drivers/iio/frequency/adf4350.c | 1 +
+ drivers/iio/gyro/adis16080.c | 7 +-
+ drivers/iio/gyro/adis16130.c | 8 +-
+ drivers/iio/gyro/adis16260.c | 1 -
+ drivers/iio/gyro/adxrs450.c | 13 +-
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 7 +-
+ drivers/iio/gyro/itg3200_buffer.c | 5 +-
+ drivers/iio/gyro/st_gyro_buffer.c | 11 +-
+ drivers/iio/gyro/st_gyro_core.c | 30 +-
+ drivers/iio/iio_core.h | 8 +-
+ drivers/iio/imu/adis16400_buffer.c | 9 +-
+ drivers/iio/imu/adis_buffer.c | 9 +-
+ drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 6 +-
+ drivers/iio/industrialio-buffer.c | 242 +-
+ drivers/iio/industrialio-core.c | 275 +-
+ drivers/iio/industrialio-event.c | 232 +-
+ drivers/iio/industrialio-triggered-buffer.c | 8 +-
+ drivers/iio/kfifo_buf.c | 49 +-
+ drivers/iio/light/Kconfig | 43 +
+ drivers/iio/light/Makefile | 4 +
+ drivers/iio/light/adjd_s311.c | 77 +-
+ drivers/iio/light/apds9300.c | 53 +-
+ drivers/iio/light/cm36651.c | 708 +++++
+ drivers/iio/light/gp2ap020a00f.c | 1654 ++++++++++
+ drivers/iio/light/hid-sensor-als.c | 7 +-
+ drivers/iio/light/tcs3472.c | 367 +++
+ drivers/iio/light/tsl2563.c | 53 +-
+ drivers/iio/light/tsl4531.c | 258 ++
+ drivers/iio/light/vcnl4000.c | 6 +-
+ drivers/iio/magnetometer/Kconfig | 10 +
+ drivers/iio/magnetometer/Makefile | 1 +
+ drivers/iio/magnetometer/ak8975.c | 2 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 7 +-
+ drivers/iio/magnetometer/mag3110.c | 401 +++
+ drivers/iio/magnetometer/st_magn_buffer.c | 11 +-
+ drivers/iio/magnetometer/st_magn_core.c | 31 +-
+ drivers/iio/pressure/Kconfig | 2 +-
+ drivers/iio/pressure/st_pressure.h | 1 +
+ drivers/iio/pressure/st_pressure_buffer.c | 11 +-
+ drivers/iio/pressure/st_pressure_core.c | 307 +-
+ drivers/iio/pressure/st_pressure_i2c.c | 1 +
+ drivers/iio/pressure/st_pressure_spi.c | 1 +
+ drivers/iio/temperature/tmp006.c | 57 +-
+ drivers/iio/trigger/iio-trig-sysfs.c | 14 +-
+ drivers/input/touchscreen/ti_am335x_tsc.c | 12 +-
+ drivers/rtc/rtc-hid-sensor-time.c | 15 +-
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/staging/android/Kconfig | 7 +-
+ drivers/staging/android/alarm-dev.c | 8 +-
+ drivers/staging/android/ashmem.c | 139 +-
+ drivers/staging/android/binder.c | 9 +-
+ drivers/staging/android/timed_output.h | 4 +-
+ drivers/staging/bcm/Adapter.h | 128 +-
+ drivers/staging/bcm/Bcmchar.c | 49 +-
+ drivers/staging/bcm/Bcmnet.c | 5 +-
+ drivers/staging/bcm/CmHost.c | 70 +-
+ drivers/staging/bcm/CmHost.h | 2 +-
+ drivers/staging/bcm/DDRInit.c | 2 +-
+ drivers/staging/bcm/HandleControlPacket.c | 12 +-
+ drivers/staging/bcm/IPv6Protocol.c | 30 +-
+ drivers/staging/bcm/InterfaceDld.c | 8 +-
+ drivers/staging/bcm/InterfaceIdleMode.c | 4 +-
+ drivers/staging/bcm/InterfaceInit.c | 20 +-
+ drivers/staging/bcm/InterfaceIsr.c | 12 +-
+ drivers/staging/bcm/InterfaceMisc.c | 10 +-
+ drivers/staging/bcm/InterfaceRx.c | 22 +-
+ drivers/staging/bcm/InterfaceRx.h | 2 +-
+ drivers/staging/bcm/InterfaceTx.c | 28 +-
+ drivers/staging/bcm/LeakyBucket.c | 8 +-
+ drivers/staging/bcm/Misc.c | 68 +-
+ drivers/staging/bcm/PHSModule.c | 46 +-
+ drivers/staging/bcm/PHSModule.h | 4 +-
+ drivers/staging/bcm/Prototypes.h | 12 +-
+ drivers/staging/bcm/Qos.c | 102 +-
+ drivers/staging/bcm/Transmit.c | 4 +-
+ drivers/staging/bcm/Typedefs.h | 4 +-
+ drivers/staging/bcm/led_control.c | 38 +-
+ drivers/staging/bcm/nvm.c | 160 +-
+ drivers/staging/bcm/vendorspecificextn.c | 2 +-
+ drivers/staging/bcm/vendorspecificextn.h | 2 +-
+ drivers/staging/btmtk_usb/btmtk_usb.c | 317 +-
+ drivers/staging/ced1401/ced_ioc.c | 5 +-
+ drivers/staging/comedi/Kconfig | 3 +-
+ drivers/staging/comedi/comedi_buf.c | 8 +-
+ drivers/staging/comedi/comedi_fops.c | 52 +-
+ drivers/staging/comedi/comedidev.h | 32 +-
+ drivers/staging/comedi/drivers.c | 29 +
+ drivers/staging/comedi/drivers/8253.h | 9 +
+ drivers/staging/comedi/drivers/8255.c | 27 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 2 -
+ .../staging/comedi/drivers/addi-data/addi_common.h | 2 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 7 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 19 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 7 +-
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 11 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 -
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 17 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 137 +-
+ drivers/staging/comedi/drivers/adl_pci7x3x.c | 13 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 24 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 46 +-
+ drivers/staging/comedi/drivers/adq12b.c | 32 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 39 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 15 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 33 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 4 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 33 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 17 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 40 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 21 +-
+ drivers/staging/comedi/drivers/amplc_pci263.c | 17 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 21 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 49 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 27 +-
+ drivers/staging/comedi/drivers/comedi_fc.h | 2 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 380 ++-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 12 +-
+ drivers/staging/comedi/drivers/das08.c | 46 +-
+ drivers/staging/comedi/drivers/das08.h | 1 -
+ drivers/staging/comedi/drivers/das16.c | 46 +-
+ drivers/staging/comedi/drivers/das16m1.c | 46 +-
+ drivers/staging/comedi/drivers/das1800.c | 75 +-
+ drivers/staging/comedi/drivers/das800.c | 16 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 70 +-
+ drivers/staging/comedi/drivers/dt2801.c | 21 +-
+ drivers/staging/comedi/drivers/dt2811.c | 8 +-
+ drivers/staging/comedi/drivers/dt2817.c | 51 +-
+ drivers/staging/comedi/drivers/dt282x.c | 22 +-
+ drivers/staging/comedi/drivers/dt3000.c | 11 +-
+ drivers/staging/comedi/drivers/dt9812.c | 19 +-
+ drivers/staging/comedi/drivers/dyna_pci10xx.c | 20 +-
+ drivers/staging/comedi/drivers/fl512.c | 3 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 18 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 7 +-
+ drivers/staging/comedi/drivers/me4000.c | 41 +-
+ drivers/staging/comedi/drivers/me_daq.c | 9 +-
+ drivers/staging/comedi/drivers/multiq3.c | 8 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 473 +--
+ drivers/staging/comedi/drivers/ni_660x.c | 1 -
+ drivers/staging/comedi/drivers/ni_670x.c | 11 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 11 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 538 ++--
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 9 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 19 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 35 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 63 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 21 +-
+ drivers/staging/comedi/drivers/ni_stc.h | 2 +-
+ drivers/staging/comedi/drivers/pcl711.c | 704 ++---
+ drivers/staging/comedi/drivers/pcl726.c | 592 ++--
+ drivers/staging/comedi/drivers/pcl730.c | 13 +-
+ drivers/staging/comedi/drivers/pcl812.c | 57 +-
+ drivers/staging/comedi/drivers/pcl816.c | 25 +-
+ drivers/staging/comedi/drivers/pcl818.c | 44 +-
+ drivers/staging/comedi/drivers/pcmad.c | 8 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 7 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 4 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 11 +-
+ drivers/staging/comedi/drivers/rtd520.c | 62 +-
+ drivers/staging/comedi/drivers/rti800.c | 8 +-
+ drivers/staging/comedi/drivers/s526.c | 9 +-
+ drivers/staging/comedi/drivers/s626.c | 2844 ++++++++++--------
+ drivers/staging/comedi/drivers/s626.h | 1384 +++++----
+ drivers/staging/comedi/drivers/skel.c | 46 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 48 +-
+ drivers/staging/comedi/drivers/usbdux.c | 41 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 26 +-
+ drivers/staging/comedi/drivers/vmk80xx.c | 35 +-
+ drivers/staging/cptm1217/clearpad_tm1217.c | 2 -
+ drivers/staging/crystalhd/crystalhd_hw.c | 8 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 15 +-
+ drivers/staging/cxt1e1/comet.c | 10 +-
+ drivers/staging/cxt1e1/comet.h | 2 +-
+ drivers/staging/cxt1e1/hwprobe.c | 14 +-
+ drivers/staging/cxt1e1/linux.c | 28 +-
+ drivers/staging/cxt1e1/musycc.c | 32 +-
+ drivers/staging/cxt1e1/pmcc4_drv.c | 16 +-
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 4 +-
+ drivers/staging/cxt1e1/sbecrc.c | 4 +-
+ drivers/staging/cxt1e1/sbeid.c | 2 +-
+ drivers/staging/cxt1e1/sbeproc.c | 2 +-
+ drivers/staging/cxt1e1/sbew_ioc.h | 24 +-
+ drivers/staging/dgap/Makefile | 2 -
+ drivers/staging/dgap/dgap_downld.h | 2 +-
+ drivers/staging/dgap/dgap_driver.c | 13 +-
+ drivers/staging/dgap/dgap_driver.h | 5 +-
+ drivers/staging/dgap/dgap_fep5.c | 53 +-
+ drivers/staging/dgap/dgap_fep5.h | 2 +-
+ drivers/staging/dgap/dgap_kcompat.h | 29 -
+ drivers/staging/dgap/dgap_parse.c | 10 +-
+ drivers/staging/dgap/dgap_sysfs.c | 22 +-
+ drivers/staging/dgap/dgap_tty.c | 41 +-
+ drivers/staging/dgap/digi.h | 4 +-
+ drivers/staging/dgap/downld.c | 4 +-
+ drivers/staging/dgnc/dgnc_cls.c | 45 +-
+ drivers/staging/dgnc/dgnc_driver.c | 145 +-
+ drivers/staging/dgnc/dgnc_driver.h | 12 +-
+ drivers/staging/dgnc/dgnc_kcompat.h | 29 -
+ drivers/staging/dgnc/dgnc_mgmt.c | 26 +-
+ drivers/staging/dgnc/dgnc_neo.c | 32 +-
+ drivers/staging/dgnc/dgnc_neo.h | 2 +-
+ drivers/staging/dgnc/dgnc_sysfs.c | 188 +-
+ drivers/staging/dgnc/dgnc_sysfs.h | 6 +-
+ drivers/staging/dgnc/dgnc_tty.c | 337 +--
+ drivers/staging/dgnc/dgnc_tty.h | 6 +-
+ drivers/staging/dgnc/digi.h | 4 +-
+ drivers/staging/dgrp/dgrp_sysfs.c | 30 +-
+ drivers/staging/dwc2/TODO | 33 +
+ drivers/staging/dwc2/core.c | 27 +-
+ drivers/staging/dwc2/core.h | 9 +-
+ drivers/staging/dwc2/hcd.c | 54 +-
+ drivers/staging/dwc2/hcd.h | 3 +
+ drivers/staging/dwc2/hcd_ddma.c | 13 +-
+ drivers/staging/dwc2/hcd_intr.c | 46 +-
+ drivers/staging/dwc2/hcd_queue.c | 203 +-
+ drivers/staging/dwc2/pci.c | 1 +
+ drivers/staging/dwc2/platform.c | 2 +-
+ drivers/staging/et131x/Module.symvers | 0
+ drivers/staging/et131x/README | 7 +-
+ drivers/staging/et131x/et131x.c | 22 +-
+ drivers/staging/ft1000/ft1000-pcmcia/boot.h | 2 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 2 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 4 +-
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 574 ++--
+ drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 457 ++-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 6 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 +-
+ drivers/staging/fwserial/fwserial.c | 3 +-
+ drivers/staging/gdm724x/gdm_lte.c | 6 +-
+ drivers/staging/gdm724x/gdm_mux.c | 14 +-
+ drivers/staging/gdm724x/gdm_tty.c | 12 +-
+ drivers/staging/gdm724x/gdm_usb.c | 6 +-
+ drivers/staging/iio/Documentation/iio_utils.h | 2 +-
+ drivers/staging/iio/TODO | 11 +
+ drivers/staging/iio/accel/adis16220_core.c | 6 +-
+ drivers/staging/iio/accel/lis3l02dq_core.c | 66 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 14 +-
+ drivers/staging/iio/accel/sca3000_core.c | 66 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 19 +-
+ drivers/staging/iio/adc/Kconfig | 8 +-
+ drivers/staging/iio/adc/ad7192.c | 15 +-
+ drivers/staging/iio/adc/ad7280a.c | 21 +-
+ drivers/staging/iio/adc/ad7291.c | 246 +-
+ drivers/staging/iio/adc/ad7606_core.c | 35 +-
+ drivers/staging/iio/adc/ad7606_ring.c | 8 +-
+ drivers/staging/iio/adc/ad7780.c | 37 +-
+ drivers/staging/iio/adc/ad7816.c | 59 +-
+ drivers/staging/iio/adc/ad799x.h | 16 +-
+ drivers/staging/iio/adc/ad799x_core.c | 297 +-
+ drivers/staging/iio/adc/ad799x_ring.c | 10 +-
+ drivers/staging/iio/adc/lpc32xx_adc.c | 51 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 996 ++++--
+ drivers/staging/iio/adc/spear_adc.c | 12 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 3 +-
+ drivers/staging/iio/addac/adt7316-spi.c | 3 +-
+ drivers/staging/iio/addac/adt7316.c | 86 +-
+ drivers/staging/iio/cdc/ad7150.c | 165 +-
+ drivers/staging/iio/cdc/ad7746.c | 13 +-
+ drivers/staging/iio/frequency/ad5930.c | 16 +-
+ drivers/staging/iio/frequency/ad9832.c | 36 +-
+ drivers/staging/iio/frequency/ad9834.c | 33 +-
+ drivers/staging/iio/frequency/ad9850.c | 16 +-
+ drivers/staging/iio/frequency/ad9852.c | 62 +-
+ drivers/staging/iio/frequency/ad9910.c | 98 +-
+ drivers/staging/iio/frequency/ad9951.c | 43 +-
+ drivers/staging/iio/iio_simple_dummy.c | 49 +-
+ drivers/staging/iio/iio_simple_dummy.h | 22 +-
+ drivers/staging/iio/iio_simple_dummy_buffer.c | 17 +-
+ drivers/staging/iio/iio_simple_dummy_events.c | 49 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 44 +-
+ drivers/staging/iio/light/isl29018.c | 18 +-
+ drivers/staging/iio/light/tsl2583.c | 48 +-
+ drivers/staging/iio/light/tsl2x7x_core.c | 168 +-
+ drivers/staging/iio/magnetometer/hmc5843.c | 669 ++---
+ drivers/staging/iio/meter/ade7753.c | 31 +-
+ drivers/staging/iio/meter/ade7754.c | 31 +-
+ drivers/staging/iio/meter/ade7758_core.c | 32 +-
+ drivers/staging/iio/meter/ade7758_ring.c | 18 +-
+ drivers/staging/iio/meter/ade7759.c | 30 +-
+ drivers/staging/iio/meter/ade7854-i2c.c | 4 +-
+ drivers/staging/iio/meter/ade7854-spi.c | 4 +-
+ drivers/staging/iio/meter/ade7854.c | 22 +-
+ drivers/staging/iio/resolver/ad2s1200.c | 28 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 34 +-
+ drivers/staging/iio/resolver/ad2s90.c | 16 +-
+ drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 25 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 4 +-
+ drivers/staging/imx-drm/Makefile | 2 +-
+ drivers/staging/imx-drm/TODO | 1 -
+ drivers/staging/imx-drm/imx-drm-core.c | 45 +-
+ drivers/staging/imx-drm/imx-drm.h | 2 +
+ drivers/staging/imx-drm/imx-ldb.c | 9 +-
+ drivers/staging/imx-drm/imx-tve.c | 6 +-
+ drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 4 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 175 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 13 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 8 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 2 +-
+ drivers/staging/imx-drm/ipuv3-crtc.c | 211 +-
+ drivers/staging/imx-drm/ipuv3-plane.c | 375 +++
+ drivers/staging/imx-drm/ipuv3-plane.h | 55 +
+ drivers/staging/keucr/usb.c | 4 +-
+ drivers/staging/line6/driver.c | 8 +-
+ drivers/staging/line6/midi.c | 4 +-
+ drivers/staging/line6/playback.c | 5 +-
+ drivers/staging/line6/toneport.c | 14 +-
+ .../staging/lustre/include/linux/libcfs/bitmap.h | 110 -
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 8 +-
+ .../lustre/include/linux/libcfs/libcfs_hash.h | 264 +-
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 90 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 5 +-
+ drivers/staging/lustre/lnet/lnet/acceptor.c | 92 +-
+ drivers/staging/lustre/lnet/lnet/config.c | 102 +-
+ drivers/staging/lustre/lnet/lnet/lib-move.c | 352 +--
+ drivers/staging/lustre/lnet/lnet/lo.c | 20 +-
+ drivers/staging/lustre/lnet/lnet/module.c | 10 +-
+ drivers/staging/lustre/lnet/lnet/router_proc.c | 22 +-
+ drivers/staging/lustre/lnet/selftest/brw_test.c | 91 +-
+ drivers/staging/lustre/lnet/selftest/conrpc.c | 90 +-
+ drivers/staging/lustre/lnet/selftest/console.c | 2 +-
+ drivers/staging/lustre/lnet/selftest/timer.c | 34 +-
+ drivers/staging/lustre/lustre/Kconfig | 2 +-
+ drivers/staging/lustre/lustre/fid/fid_request.c | 4 +-
+ drivers/staging/lustre/lustre/fld/fld_cache.c | 2 +-
+ drivers/staging/lustre/lustre/fld/fld_request.c | 5 -
+ drivers/staging/lustre/lustre/include/cl_object.h | 12 +-
+ drivers/staging/lustre/lustre/include/lclient.h | 4 +-
+ .../lustre/lustre/include/linux/lustre_compat25.h | 3 -
+ drivers/staging/lustre/lustre/include/lu_object.h | 4 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 42 +-
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 4 +-
+ .../staging/lustre/lustre/include/lustre_export.h | 4 +-
+ drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +-
+ .../staging/lustre/lustre/include/lustre_lite.h | 6 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 6 +-
+ drivers/staging/lustre/lustre/include/obd.h | 12 +-
+ .../staging/lustre/lustre/include/obd_support.h | 18 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/interval_tree.c | 20 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 6 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 6 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 6 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 12 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 34 +-
+ drivers/staging/lustre/lustre/libcfs/hash.c | 250 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 6 +-
+ .../lustre/lustre/libcfs/linux/linux-debug.c | 2 +-
+ drivers/staging/lustre/lustre/libcfs/prng.c | 4 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 2 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 2 +-
+ drivers/staging/lustre/lustre/llite/file.c | 10 +-
+ drivers/staging/lustre/lustre/llite/llite_close.c | 2 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 6 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 6 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 2 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 7 +-
+ drivers/staging/lustre/lustre/llite/statahead.c | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 2 +-
+ .../staging/lustre/lustre/lov/lov_cl_internal.h | 36 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 30 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 4 +-
+ drivers/staging/lustre/lustre/lov/lov_io.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c | 10 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 36 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 4 +-
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 10 +-
+ drivers/staging/lustre/lustre/lov/lov_pool.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 10 +-
+ drivers/staging/lustre/lustre/lvfs/fsfilt.c | 12 +-
+ drivers/staging/lustre/lustre/lvfs/lvfs_lib.c | 5 +-
+ drivers/staging/lustre/lustre/lvfs/lvfs_linux.c | 72 +-
+ drivers/staging/lustre/lustre/obdclass/cl_io.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +-
+ drivers/staging/lustre/lustre/obdclass/genops.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/llog_test.c | 6 +-
+ .../lustre/lustre/obdclass/lprocfs_status.c | 8 +-
+ drivers/staging/lustre/lustre/obdclass/lu_object.c | 53 +-
+ .../staging/lustre/lustre/obdclass/obd_config.c | 22 +-
+ drivers/staging/lustre/lustre/obdclass/uuid.c | 4 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 2 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 4 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_page.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_quota.c | 8 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/connection.c | 10 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 8 +-
+ drivers/staging/media/go7007/go7007-usb.c | 109 +-
+ drivers/staging/media/lirc/lirc_bt829.c | 4 +-
+ drivers/staging/media/lirc/lirc_imon.c | 2 +-
+ drivers/staging/mt29f_spinand/Kconfig | 16 +
+ drivers/staging/mt29f_spinand/Makefile | 1 +
+ drivers/staging/mt29f_spinand/TODO | 13 +
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 947 ++++++
+ drivers/staging/mt29f_spinand/mt29f_spinand.h | 107 +
+ drivers/staging/netlogic/xlr_net.c | 34 +-
+ drivers/staging/netlogic/xlr_net.h | 2 +-
+ drivers/staging/nvec/Kconfig | 2 +-
+ drivers/staging/nvec/nvec.c | 2 +-
+ drivers/staging/octeon-usb/Makefile | 4 +-
+ drivers/staging/octeon-usb/cvmx-usb.c | 3158 --------------------
+ drivers/staging/octeon-usb/cvmx-usb.h | 542 ----
+ drivers/staging/octeon-usb/cvmx-usbnx-defs.h | 885 ------
+ drivers/staging/octeon-usb/octeon-hcd.c | 3155 +++++++++++++++++--
+ .../octeon-usb/{cvmx-usbcx-defs.h => octeon-hcd.h} | 331 +-
+ drivers/staging/octeon/ethernet-rx.c | 15 +-
+ drivers/staging/octeon/ethernet-spi.c | 92 +-
+ drivers/staging/octeon/ethernet-tx.c | 71 +-
+ drivers/staging/octeon/ethernet.c | 24 +-
+ drivers/staging/olpc_dcon/Kconfig | 3 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 2 +-
+ drivers/staging/quickstart/quickstart.c | 4 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 2 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 17 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 232 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 5 +-
+ drivers/staging/rtl8187se/r8180_core.c | 112 +-
+ drivers/staging/rtl8187se/r8180_dm.c | 98 +-
+ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 6 +-
+ drivers/staging/rtl8187se/r8180_wx.c | 13 +-
+ drivers/staging/rtl8187se/r8185b_init.c | 428 ++-
+ drivers/staging/rtl8188eu/Makefile | 5 +-
+ drivers/staging/rtl8188eu/TODO | 1 -
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_br_ext.c | 5 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_efuse.c | 12 +-
+ drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 20 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 47 +-
+ drivers/staging/rtl8188eu/core/rtw_p2p.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 25 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 7 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 26 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 7 +-
+ drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c | 1761 -----------
+ drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 429 +--
+ drivers/staging/rtl8188eu/hal/HalPwrSeqCmd.c | 2 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 16 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 66 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 8 +-
+ drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 10 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +-
+ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 98 +-
+ .../staging/rtl8188eu/include/Hal8188EFWImg_CE.h | 28 -
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 2 +-
+ drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 2 +-
+ drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 -
+ drivers/staging/rtl8188eu/include/ieee80211.h | 16 +-
+ drivers/staging/rtl8188eu/include/odm.h | 4 +-
+ drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 +-
+ drivers/staging/rtl8188eu/include/odm_debug.h | 2 +-
+ drivers/staging/rtl8188eu/include/odm_precomp.h | 5 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_led.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 12 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 2 +-
+ .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_rf.h | 2 +-
+ drivers/staging/rtl8188eu/include/sta_info.h | 2 +-
+ drivers/staging/rtl8188eu/include/wifi.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 23 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 7 +-
+ drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 6 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.c | 2 +-
+ drivers/staging/rtl8192e/dot11d.h | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 6 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 32 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +-
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 9 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 46 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 17 +-
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 19 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 30 +-
+ drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ drivers/staging/rtl8192u/dot11d.h | 100 -
+ drivers/staging/rtl8192u/ieee80211/dot11d.h | 39 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 3 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 11 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 20 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +-
+ drivers/staging/rtl8192u/ieee80211_crypt.h | 86 -
+ drivers/staging/rtl8192u/r8180_pm.c | 48 -
+ drivers/staging/rtl8192u/r8180_pm.h | 28 -
+ drivers/staging/rtl8192u/r8190_rtl8256.h | 4 -
+ drivers/staging/rtl8192u/r8192U.h | 12 -
+ drivers/staging/rtl8192u/r8192U_core.c | 82 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 278 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 200 +-
+ drivers/staging/rtl8192u/r819xU_HTType.h | 411 ++-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 103 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.h | 230 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 23 +-
+ drivers/staging/rtl8192u/r819xU_phy.c | 8 +-
+ drivers/staging/rtl8192u/r819xU_phy.h | 2 +-
+ drivers/staging/rtl8712/os_intfs.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_cmd.c | 12 +-
+ drivers/staging/rtl8712/rtl8712_efuse.c | 2 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 8 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_mp.c | 8 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 6 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 4 +-
+ drivers/staging/rtl8712/usb_intf.c | 16 +-
+ drivers/staging/rtl8712/xmit_linux.c | 2 +-
+ drivers/staging/rts5139/rts51x_scsi.c | 4 +-
+ drivers/staging/sb105x/sb_mp_register.h | 4 +-
+ drivers/staging/sb105x/sb_pci_mp.c | 13 +-
+ drivers/staging/sbe-2t3e3/cpld.c | 2 +-
+ drivers/staging/sep/sep_crypto.c | 4 +-
+ drivers/staging/sep/sep_main.c | 32 +-
+ drivers/staging/silicom/bp_mod.h | 2 +-
+ drivers/staging/silicom/bpctl_mod.c | 188 +-
+ drivers/staging/slicoss/slicoss.c | 172 +-
+ drivers/staging/sm7xxfb/sm7xxfb.c | 16 +-
+ drivers/staging/speakup/Kconfig | 4 +
+ drivers/staging/speakup/kobjects.c | 80 +-
+ drivers/staging/speakup/main.c | 2 +-
+ drivers/staging/speakup/speakup_acntpc.c | 2 +-
+ drivers/staging/speakup/speakup_apollo.c | 2 +-
+ drivers/staging/speakup/speakup_audptr.c | 2 +-
+ drivers/staging/speakup/varhandlers.c | 8 +-
+ drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 2 -
+ drivers/staging/tidspbridge/rmgr/dspdrv.c | 4 +-
+ drivers/staging/usbip/stub_dev.c | 26 +-
+ drivers/staging/usbip/stub_main.c | 4 +-
+ drivers/staging/usbip/userspace/configure.ac | 1 -
+ drivers/staging/usbip/userspace/doc/usbip.8 | 8 +-
+ drivers/staging/usbip/userspace/doc/usbipd.8 | 27 +-
+ .../staging/usbip/userspace/src/usbip_network.c | 16 +
+ .../staging/usbip/userspace/src/usbip_network.h | 1 +
+ drivers/staging/usbip/userspace/src/usbipd.c | 69 +-
+ drivers/staging/usbip/vhci_hcd.c | 10 +-
+ drivers/staging/vt6655/80211mgr.c | 16 +-
+ drivers/staging/vt6655/aes_ccmp.c | 20 +-
+ drivers/staging/vt6655/baseband.c | 7 +-
+ drivers/staging/vt6655/bssdb.c | 11 +-
+ drivers/staging/vt6655/device_main.c | 4 -
+ drivers/staging/vt6655/dpc.c | 7 +-
+ drivers/staging/vt6655/hostap.c | 27 +-
+ drivers/staging/vt6655/iwctl.c | 6 +-
+ drivers/staging/vt6655/key.c | 10 +-
+ drivers/staging/vt6655/michael.h | 10 +-
+ drivers/staging/vt6655/rf.c | 56 +-
+ drivers/staging/vt6655/tkip.c | 4 +-
+ drivers/staging/vt6655/vntwifi.c | 22 -
+ drivers/staging/vt6655/wcmd.c | 2 +-
+ drivers/staging/vt6655/wctl.c | 8 +-
+ drivers/staging/vt6655/wmgr.c | 3 +-
+ drivers/staging/vt6655/wpa.c | 12 +-
+ drivers/staging/vt6655/wpactl.c | 2 +-
+ drivers/staging/vt6655/wroute.c | 2 +-
+ drivers/staging/vt6655/wroute.h | 2 +-
+ drivers/staging/vt6656/aes_ccmp.c | 18 +-
+ drivers/staging/vt6656/bssdb.c | 43 +-
+ drivers/staging/vt6656/bssdb.h | 2 +-
+ drivers/staging/vt6656/channel.c | 2 +-
+ drivers/staging/vt6656/datarate.c | 370 ++-
+ drivers/staging/vt6656/desc.h | 9 -
+ drivers/staging/vt6656/device.h | 18 +-
+ drivers/staging/vt6656/dpc.c | 31 +-
+ drivers/staging/vt6656/dpc.h | 4 +-
+ drivers/staging/vt6656/firmware.c | 92 +-
+ drivers/staging/vt6656/hostap.c | 4 +-
+ drivers/staging/vt6656/iwctl.c | 77 +-
+ drivers/staging/vt6656/key.c | 10 +-
+ drivers/staging/vt6656/main_usb.c | 52 +-
+ drivers/staging/vt6656/power.c | 11 +-
+ drivers/staging/vt6656/rxtx.c | 848 +++---
+ drivers/staging/vt6656/rxtx.h | 47 +-
+ drivers/staging/vt6656/usbpipe.c | 8 +-
+ drivers/staging/vt6656/wcmd.c | 78 +-
+ drivers/staging/vt6656/wcmd.h | 11 +-
+ drivers/staging/vt6656/wctl.c | 7 +-
+ drivers/staging/vt6656/wmgr.c | 34 +-
+ drivers/staging/vt6656/wmgr.h | 3 -
+ drivers/staging/vt6656/wpactl.c | 2 +-
+ drivers/staging/winbond/core.h | 8 +-
+ drivers/staging/winbond/mds.c | 4 +-
+ drivers/staging/winbond/mto.c | 7 +-
+ drivers/staging/winbond/mto.h | 8 +-
+ drivers/staging/winbond/phy_calibration.c | 369 +--
+ drivers/staging/winbond/reg.c | 121 +-
+ drivers/staging/winbond/wb35tx.c | 2 +-
+ drivers/staging/winbond/wbusb.c | 6 +-
+ drivers/staging/wlags49_h2/hcf.h | 22 +-
+ drivers/staging/wlags49_h2/sta_h2.c | 4 +-
+ drivers/staging/wlan-ng/cfg80211.c | 65 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 90 +-
+ drivers/staging/wlan-ng/p80211netdev.h | 2 +-
+ drivers/staging/wlan-ng/p80211wep.c | 6 +-
+ drivers/staging/xgifb/XGI_main_26.c | 1 -
+ drivers/staging/xgifb/vb_setmode.c | 11 +-
+ drivers/staging/xgifb/vb_table.h | 2 +-
+ drivers/staging/xillybus/Kconfig | 4 +-
+ drivers/staging/xillybus/xillybus_core.c | 153 +-
+ drivers/staging/xillybus/xillybus_of.c | 27 +-
+ drivers/staging/xillybus/xillybus_pcie.c | 27 +-
+ drivers/staging/zram/zram_drv.c | 15 +-
+ drivers/staging/zsmalloc/Kconfig | 1 +
+ include/linux/hid-sensor-hub.h | 18 +
+ include/linux/iio/buffer.h | 61 +-
+ include/linux/iio/common/st_sensors.h | 6 +
+ include/linux/iio/consumer.h | 2 +-
+ include/linux/iio/events.h | 14 -
+ include/linux/iio/iio.h | 93 +-
+ include/linux/iio/sysfs.h | 15 +
+ include/linux/iio/types.h | 20 +
+ include/linux/mfd/ti_am335x_tscadc.h | 9 +
+ 687 files changed, 24003 insertions(+), 22397 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/light/cm36651.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/gp2ap020a00f.txt
+ create mode 100644 drivers/iio/adc/mcp3422.c
+ create mode 100644 drivers/iio/light/cm36651.c
+ create mode 100644 drivers/iio/light/gp2ap020a00f.c
+ create mode 100644 drivers/iio/light/tcs3472.c
+ create mode 100644 drivers/iio/light/tsl4531.c
+ create mode 100644 drivers/iio/magnetometer/mag3110.c
+ create mode 100644 drivers/staging/dwc2/TODO
+ create mode 100644 drivers/staging/et131x/Module.symvers
+ create mode 100644 drivers/staging/imx-drm/ipuv3-plane.c
+ create mode 100644 drivers/staging/imx-drm/ipuv3-plane.h
+ create mode 100644 drivers/staging/mt29f_spinand/Kconfig
+ create mode 100644 drivers/staging/mt29f_spinand/Makefile
+ create mode 100644 drivers/staging/mt29f_spinand/TODO
+ create mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.c
+ create mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.h
+ delete mode 100644 drivers/staging/octeon-usb/cvmx-usb.c
+ delete mode 100644 drivers/staging/octeon-usb/cvmx-usb.h
+ delete mode 100644 drivers/staging/octeon-usb/cvmx-usbnx-defs.h
+ rename drivers/staging/octeon-usb/{cvmx-usbcx-defs.h => octeon-hcd.h} (83%)
+ delete mode 100644 drivers/staging/rtl8188eu/hal/Hal8188EFWImg_CE.c
+ delete mode 100644 drivers/staging/rtl8188eu/include/Hal8188EFWImg_CE.h
+ delete mode 100644 drivers/staging/rtl8192u/dot11d.h
+ delete mode 100644 drivers/staging/rtl8192u/ieee80211_crypt.h
+ delete mode 100644 drivers/staging/rtl8192u/r8180_pm.c
+ delete mode 100644 drivers/staging/rtl8192u/r8180_pm.h
+Merging char-misc/char-misc-next (425792266a40 misc: mic: Fixes for randconfig build errors and warnings.)
+$ git merge char-misc/char-misc-next
+Auto-merging drivers/uio/uio.c
+Auto-merging drivers/misc/eeprom/at24.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-mic.txt | 157 ++
+ Documentation/ABI/testing/sysfs-driver-sunxi-sid | 22 +
+ .../bindings/misc/allwinner,sunxi-sid.txt | 17 +
+ .../devicetree/bindings/misc/ti,dac7512.txt | 20 +
+ Documentation/extcon/porting-android-switch-class | 6 +-
+ Documentation/mic/mic_overview.txt | 51 +
+ Documentation/mic/mpssd/.gitignore | 1 +
+ Documentation/mic/mpssd/Makefile | 19 +
+ Documentation/mic/mpssd/micctrl | 173 ++
+ Documentation/mic/mpssd/mpss | 202 +++
+ Documentation/mic/mpssd/mpssd.c | 1721 ++++++++++++++++++++
+ Documentation/mic/mpssd/mpssd.h | 102 ++
+ Documentation/mic/mpssd/sysfs.c | 102 ++
+ drivers/char/hpet.c | 5 +-
+ drivers/char/misc.c | 8 +-
+ drivers/char/nwbutton.c | 2 +-
+ drivers/char/rtc.c | 5 +-
+ drivers/char/snsc.c | 3 +-
+ drivers/char/snsc_event.c | 3 +-
+ drivers/char/tlclk.c | 2 +-
+ drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +-
+ drivers/extcon/extcon-adc-jack.c | 27 +-
+ drivers/extcon/extcon-arizona.c | 55 +-
+ drivers/extcon/extcon-class.c | 102 +-
+ drivers/extcon/extcon-gpio.c | 19 +-
+ drivers/extcon/extcon-max77693.c | 136 +-
+ drivers/extcon/extcon-max8997.c | 11 +-
+ drivers/extcon/extcon-palmas.c | 5 +-
+ drivers/hv/channel.c | 50 +-
+ drivers/hv/channel_mgmt.c | 5 +-
+ drivers/hv/connection.c | 21 +-
+ drivers/hv/hv.c | 2 +-
+ drivers/hv/hv_util.c | 2 +-
+ drivers/hv/hyperv_vmbus.h | 9 +-
+ drivers/hv/vmbus_drv.c | 488 ++++--
+ drivers/misc/Kconfig | 1 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/arm-charlcd.c | 2 +-
+ drivers/misc/atmel_pwm.c | 6 +-
+ drivers/misc/bh1780gli.c | 11 +
+ drivers/misc/bmp085.c | 2 +-
+ drivers/misc/cb710/core.c | 2 +-
+ drivers/misc/eeprom/Kconfig | 13 +
+ drivers/misc/eeprom/Makefile | 1 +
+ drivers/misc/eeprom/at24.c | 3 +
+ drivers/misc/eeprom/at25.c | 7 +
+ drivers/misc/eeprom/eeprom_93xx46.c | 2 +-
+ drivers/misc/eeprom/sunxi_sid.c | 158 ++
+ drivers/misc/ibmasm/module.c | 4 +-
+ drivers/misc/lkdtm.c | 107 +-
+ drivers/misc/mei/amthif.c | 49 +-
+ drivers/misc/mei/bus.c | 2 +-
+ drivers/misc/mei/client.c | 129 +-
+ drivers/misc/mei/client.h | 9 +
+ drivers/misc/mei/hbm.c | 9 +-
+ drivers/misc/mei/hw-me-regs.h | 1 +
+ drivers/misc/mei/init.c | 21 +-
+ drivers/misc/mei/interrupt.c | 47 +-
+ drivers/misc/mei/main.c | 65 +-
+ drivers/misc/mei/mei_dev.h | 1 +
+ drivers/misc/mei/nfc.c | 10 +-
+ drivers/misc/mei/pci-me.c | 8 +-
+ drivers/misc/mei/wd.c | 12 +-
+ drivers/misc/mic/Kconfig | 39 +
+ drivers/misc/mic/Makefile | 6 +
+ drivers/misc/mic/card/Makefile | 11 +
+ drivers/misc/mic/card/mic_debugfs.c | 130 ++
+ drivers/misc/mic/card/mic_device.c | 305 ++++
+ drivers/misc/mic/card/mic_device.h | 133 ++
+ drivers/misc/mic/card/mic_virtio.c | 630 +++++++
+ drivers/misc/mic/card/mic_virtio.h | 77 +
+ drivers/misc/mic/card/mic_x100.c | 256 +++
+ drivers/misc/mic/card/mic_x100.h | 48 +
+ drivers/misc/mic/common/mic_dev.h | 51 +
+ drivers/misc/mic/host/Makefile | 14 +
+ drivers/misc/mic/host/mic_boot.c | 300 ++++
+ drivers/misc/mic/host/mic_debugfs.c | 491 ++++++
+ drivers/misc/mic/host/mic_device.h | 203 +++
+ drivers/misc/mic/host/mic_fops.c | 222 +++
+ drivers/misc/mic/host/mic_fops.h | 32 +
+ drivers/misc/mic/host/mic_intr.c | 630 +++++++
+ drivers/misc/mic/host/mic_intr.h | 137 ++
+ drivers/misc/mic/host/mic_main.c | 537 ++++++
+ drivers/misc/mic/host/mic_smpt.c | 442 +++++
+ drivers/misc/mic/host/mic_smpt.h | 98 ++
+ drivers/misc/mic/host/mic_sysfs.c | 459 ++++++
+ drivers/misc/mic/host/mic_virtio.c | 700 ++++++++
+ drivers/misc/mic/host/mic_virtio.h | 138 ++
+ drivers/misc/mic/host/mic_x100.c | 570 +++++++
+ drivers/misc/mic/host/mic_x100.h | 98 ++
+ drivers/misc/phantom.c | 2 +-
+ drivers/misc/pti.c | 1 -
+ drivers/misc/ti_dac7512.c | 23 +-
+ drivers/misc/tifm_7xx1.c | 7 +-
+ drivers/misc/vmw_vmci/vmci_guest.c | 2 +-
+ drivers/misc/vmw_vmci/vmci_host.c | 6 +-
+ drivers/misc/vmw_vmci/vmci_queue_pair.c | 21 +-
+ drivers/pcmcia/pd6729.c | 13 +-
+ drivers/pcmcia/yenta_socket.c | 16 +-
+ drivers/uio/uio.c | 38 +-
+ drivers/uio/uio_aec.c | 1 -
+ drivers/uio/uio_cif.c | 1 -
+ drivers/uio/uio_mf624.c | 5 +-
+ drivers/uio/uio_netx.c | 1 -
+ drivers/uio/uio_pdrv_genirq.c | 34 +-
+ drivers/uio/uio_sercos3.c | 1 -
+ drivers/w1/masters/ds1wm.c | 2 +-
+ drivers/w1/masters/omap_hdq.c | 3 +-
+ drivers/w1/masters/w1-gpio.c | 35 +-
+ include/linux/extcon.h | 72 +-
+ include/linux/extcon/extcon-adc-jack.h | 42 +-
+ include/linux/extcon/extcon-gpio.h | 20 +-
+ include/linux/hyperv.h | 37 -
+ include/uapi/linux/Kbuild | 2 +
+ include/uapi/linux/mic_common.h | 240 +++
+ include/uapi/linux/mic_ioctl.h | 76 +
+ tools/hv/hv_kvp_daemon.c | 29 +-
+ tools/hv/hv_vss_daemon.c | 8 +-
+ 118 files changed, 10904 insertions(+), 830 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-mic.txt
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-sunxi-sid
+ create mode 100644 Documentation/devicetree/bindings/misc/allwinner,sunxi-sid.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/ti,dac7512.txt
+ create mode 100644 Documentation/mic/mic_overview.txt
+ create mode 100644 Documentation/mic/mpssd/.gitignore
+ create mode 100644 Documentation/mic/mpssd/Makefile
+ create mode 100755 Documentation/mic/mpssd/micctrl
+ create mode 100755 Documentation/mic/mpssd/mpss
+ create mode 100644 Documentation/mic/mpssd/mpssd.c
+ create mode 100644 Documentation/mic/mpssd/mpssd.h
+ create mode 100644 Documentation/mic/mpssd/sysfs.c
+ create mode 100644 drivers/misc/eeprom/sunxi_sid.c
+ create mode 100644 drivers/misc/mic/Kconfig
+ create mode 100644 drivers/misc/mic/Makefile
+ create mode 100644 drivers/misc/mic/card/Makefile
+ create mode 100644 drivers/misc/mic/card/mic_debugfs.c
+ create mode 100644 drivers/misc/mic/card/mic_device.c
+ create mode 100644 drivers/misc/mic/card/mic_device.h
+ create mode 100644 drivers/misc/mic/card/mic_virtio.c
+ create mode 100644 drivers/misc/mic/card/mic_virtio.h
+ create mode 100644 drivers/misc/mic/card/mic_x100.c
+ create mode 100644 drivers/misc/mic/card/mic_x100.h
+ create mode 100644 drivers/misc/mic/common/mic_dev.h
+ create mode 100644 drivers/misc/mic/host/Makefile
+ create mode 100644 drivers/misc/mic/host/mic_boot.c
+ create mode 100644 drivers/misc/mic/host/mic_debugfs.c
+ create mode 100644 drivers/misc/mic/host/mic_device.h
+ create mode 100644 drivers/misc/mic/host/mic_fops.c
+ create mode 100644 drivers/misc/mic/host/mic_fops.h
+ create mode 100644 drivers/misc/mic/host/mic_intr.c
+ create mode 100644 drivers/misc/mic/host/mic_intr.h
+ create mode 100644 drivers/misc/mic/host/mic_main.c
+ create mode 100644 drivers/misc/mic/host/mic_smpt.c
+ create mode 100644 drivers/misc/mic/host/mic_smpt.h
+ create mode 100644 drivers/misc/mic/host/mic_sysfs.c
+ create mode 100644 drivers/misc/mic/host/mic_virtio.c
+ create mode 100644 drivers/misc/mic/host/mic_virtio.h
+ create mode 100644 drivers/misc/mic/host/mic_x100.c
+ create mode 100644 drivers/misc/mic/host/mic_x100.h
+ create mode 100644 include/uapi/linux/mic_common.h
+ create mode 100644 include/uapi/linux/mic_ioctl.h
+$ git am -3 ../patches/0001-Intel-MIC-Host-Driver-fix-for-sysfs_get_dirent-API-c.patch
+Applying: Intel MIC Host Driver: fix for sysfs_get_dirent API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/misc/mic/host/mic_main.c
+$ git add -A .
+$ git commit -v -a --amend
+[master a107d19430ab] Merge remote-tracking branch 'char-misc/char-misc-next'
+Merging scsi/for-next (2aee240c68ed Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/tmscsim.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/qla4xxx/ql4_os.c
+Auto-merging drivers/scsi/pm8001/pm8001_init.c
+Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/hpsa.c
+Auto-merging drivers/scsi/fnic/fnic_main.c
+Auto-merging drivers/scsi/fcoe/fcoe_sysfs.c
+Auto-merging drivers/scsi/dc395x.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ drivers/scsi/BusLogic.c | 36 +-
+ drivers/scsi/advansys.c | 8 +-
+ drivers/scsi/be2iscsi/be.h | 2 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 200 ++++-
+ drivers/scsi/be2iscsi/be_cmds.h | 65 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 175 +++-
+ drivers/scsi/be2iscsi/be_main.c | 1331 ++++++++++++++++++++--------
+ drivers/scsi/be2iscsi/be_main.h | 182 ++--
+ drivers/scsi/be2iscsi/be_mgmt.c | 290 ++++--
+ drivers/scsi/be2iscsi/be_mgmt.h | 13 +-
+ drivers/scsi/bnx2fc/bnx2fc.h | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 65 +-
+ drivers/scsi/bnx2fc/bnx2fc_io.c | 6 +
+ drivers/scsi/dc395x.c | 24 +-
+ drivers/scsi/device_handler/scsi_dh_alua.c | 31 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
+ drivers/scsi/dpt_i2o.c | 35 +-
+ drivers/scsi/dpti.h | 1 -
+ drivers/scsi/esas2r/esas2r.h | 132 ++-
+ drivers/scsi/esas2r/esas2r_disc.c | 55 +-
+ drivers/scsi/esas2r/esas2r_flash.c | 34 +-
+ drivers/scsi/esas2r/esas2r_init.c | 156 ++--
+ drivers/scsi/esas2r/esas2r_int.c | 97 +-
+ drivers/scsi/esas2r/esas2r_io.c | 73 +-
+ drivers/scsi/esas2r/esas2r_ioctl.c | 28 +-
+ drivers/scsi/esas2r/esas2r_main.c | 34 +-
+ drivers/scsi/esas2r/esas2r_targdb.c | 2 +-
+ drivers/scsi/esas2r/esas2r_vda.c | 12 +-
+ drivers/scsi/fcoe/fcoe.c | 25 +-
+ drivers/scsi/fcoe/fcoe_ctlr.c | 148 ++--
+ drivers/scsi/fcoe/fcoe_sysfs.c | 14 +-
+ drivers/scsi/fnic/fnic.h | 10 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 390 +++++++-
+ drivers/scsi/fnic/fnic_fcs.c | 18 +-
+ drivers/scsi/fnic/fnic_isr.c | 18 +
+ drivers/scsi/fnic/fnic_main.c | 19 +
+ drivers/scsi/fnic/fnic_scsi.c | 253 +++++-
+ drivers/scsi/fnic/fnic_stats.h | 116 +++
+ drivers/scsi/fnic/fnic_trace.c | 185 ++++
+ drivers/scsi/fnic/fnic_trace.h | 3 +-
+ drivers/scsi/hosts.c | 7 +
+ drivers/scsi/hpsa.c | 1 -
+ drivers/scsi/iscsi_tcp.c | 1 +
+ drivers/scsi/libfc/fc_exch.c | 251 ++++--
+ drivers/scsi/libfc/fc_fcp.c | 10 +-
+ drivers/scsi/libfc/fc_lport.c | 4 +-
+ drivers/scsi/libfc/fc_rport.c | 6 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 7 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 30 +-
+ drivers/scsi/lpfc/lpfc_init.c | 2 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 131 ++-
+ drivers/scsi/lpfc/lpfc_scsi.h | 1 +
+ drivers/scsi/lpfc/lpfc_sli.c | 183 +++-
+ drivers/scsi/lpfc/lpfc_sli4.h | 1 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 1 +
+ drivers/scsi/megaraid/megaraid_sas_base.c | 16 +-
+ drivers/scsi/pm8001/pm8001_ctl.c | 153 ++++
+ drivers/scsi/pm8001/pm8001_ctl.h | 6 +
+ drivers/scsi/pm8001/pm8001_defs.h | 8 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 152 +++-
+ drivers/scsi/pm8001/pm8001_hwi.h | 3 +
+ drivers/scsi/pm8001/pm8001_init.c | 65 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 9 +-
+ drivers/scsi/pm8001/pm8001_sas.h | 74 +-
+ drivers/scsi/pm8001/pm80xx_hwi.c | 523 ++++++++++-
+ drivers/scsi/pm8001/pm80xx_hwi.h | 15 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 1 +
+ drivers/scsi/qla4xxx/ql4_fw.h | 4 +
+ drivers/scsi/qla4xxx/ql4_glbl.h | 2 +
+ drivers/scsi/qla4xxx/ql4_inline.h | 12 +
+ drivers/scsi/qla4xxx/ql4_mbx.c | 34 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 471 +++++++++-
+ drivers/scsi/scsi.c | 28 -
+ drivers/scsi/scsi_debug.c | 137 +--
+ drivers/scsi/scsi_error.c | 146 ++-
+ drivers/scsi/scsi_pm.c | 3 +-
+ drivers/scsi/scsi_sysfs.c | 39 +
+ drivers/scsi/scsi_transport_iscsi.c | 26 +
+ drivers/scsi/sd.c | 83 +-
+ drivers/scsi/sd.h | 6 +-
+ drivers/scsi/tmscsim.c | 14 +-
+ drivers/scsi/tmscsim.h | 1 +
+ include/scsi/fc/fc_fc2.h | 2 +-
+ include/scsi/iscsi_if.h | 17 +
+ include/scsi/libfc.h | 9 +
+ include/scsi/libfcoe.h | 7 +-
+ include/scsi/scsi_host.h | 5 +-
+ include/scsi/scsi_transport_iscsi.h | 1 +
+ 92 files changed, 5591 insertions(+), 1420 deletions(-)
+ create mode 100644 drivers/scsi/fnic/fnic_stats.h
+Merging target-updates/for-next (2dd1d53fe004 iscsi-target: Implement demo_mode_discovery logic)
+$ git merge target-updates/for-next
+Auto-merging lib/percpu_ida.c
+Auto-merging drivers/vhost/scsi.c
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Auto-merging drivers/target/iscsi/iscsi_target_nego.c
+Auto-merging drivers/target/iscsi/iscsi_target.c
+Merge made by the 'recursive' strategy.
+ Documentation/target/tcm_mod_builder.py | 18 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 56 +++----
+ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 2 -
+ drivers/target/iscsi/iscsi_target.c | 41 +++--
+ drivers/target/iscsi/iscsi_target_auth.c | 2 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 70 ++++----
+ drivers/target/iscsi/iscsi_target_core.h | 15 +-
+ drivers/target/iscsi/iscsi_target_erl0.c | 10 +-
+ drivers/target/iscsi/iscsi_target_login.c | 16 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 8 +-
+ drivers/target/iscsi/iscsi_target_tpg.c | 24 ++-
+ drivers/target/iscsi/iscsi_target_tpg.h | 1 +
+ drivers/target/loopback/tcm_loop.c | 242 ++++++++++++++++++++++-----
+ drivers/target/loopback/tcm_loop.h | 6 +
+ drivers/target/sbp/sbp_target.c | 18 +-
+ drivers/target/target_core_configfs.c | 6 +-
+ drivers/target/target_core_fabric_configfs.c | 38 ++---
+ drivers/target/target_core_internal.h | 2 -
+ drivers/target/target_core_tpg.c | 1 +
+ drivers/target/tcm_fc/tcm_fc.h | 1 +
+ drivers/target/tcm_fc/tfc_cmd.c | 18 +-
+ drivers/target/tcm_fc/tfc_conf.c | 18 +-
+ drivers/target/tcm_fc/tfc_sess.c | 3 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 18 +-
+ drivers/vhost/scsi.c | 18 +-
+ include/target/target_core_base.h | 1 +
+ include/target/target_core_configfs.h | 1 -
+ include/target/target_core_fabric.h | 2 +
+ lib/percpu_ida.c | 5 +-
+ 29 files changed, 437 insertions(+), 224 deletions(-)
+Merging target-merge/for-next-merge (15c03dd4859a Linux 3.12-rc3)
+$ git merge target-merge/for-next-merge
+Already up-to-date.
+Merging writeback/writeback-for-next (a8855990e382 writeback: Do not sort b_io list only because of block device inode)
+$ git merge writeback/writeback-for-next
+Already up-to-date.
+Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries)
+$ git merge hwspinlock/linux-next
+Already up-to-date.
+Merging pinctrl/for-next (808e657c5c70 pinctrl: remove minor dead code)
+$ git merge pinctrl/for-next
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging arch/blackfin/Kconfig
+Auto-merging arch/arm/boot/dts/prima2.dtsi
+Auto-merging arch/arm/boot/dts/atlas6.dtsi
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/abilis,tb10x-gpio.txt | 36 +
+ Documentation/devicetree/bindings/gpio/gpio.txt | 40 +-
+ .../bindings/pinctrl/abilis,tb10x-iomux.txt | 80 +
+ .../bindings/pinctrl/atmel,at91-pinctrl.txt | 2 +-
+ .../bindings/pinctrl/fsl,imx-pinctrl.txt | 37 +-
+ .../bindings/pinctrl/fsl,imx27-pinctrl.txt | 99 +
+ .../devicetree/bindings/pinctrl/pinctrl-palmas.txt | 2 +-
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 46 +-
+ Documentation/pinctrl.txt | 7 +-
+ arch/arm/boot/dts/atlas6.dtsi | 12 +
+ arch/arm/boot/dts/prima2.dtsi | 42 +
+ arch/blackfin/Kconfig | 11 +
+ arch/blackfin/include/asm/gpio.h | 157 +-
+ arch/blackfin/include/asm/portmux.h | 19 +-
+ arch/blackfin/kernel/Makefile | 3 +-
+ arch/blackfin/mach-bf548/include/mach/portmux.h | 2 -
+ arch/blackfin/mach-bf609/include/mach/portmux.h | 2 -
+ drivers/gpio/Kconfig | 4 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/gpio-tb10x.c | 328 ++
+ drivers/gpio/gpiolib-of.c | 63 +-
+ drivers/gpio/gpiolib.c | 47 +
+ drivers/pinctrl/Kconfig | 46 +
+ drivers/pinctrl/Makefile | 7 +
+ drivers/pinctrl/core.c | 14 +
+ drivers/pinctrl/mvebu/pinctrl-armada-370.c | 2 +-
+ drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 2 +-
+ drivers/pinctrl/mvebu/pinctrl-dove.c | 4 +-
+ drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 2 +-
+ drivers/pinctrl/pinctrl-adi2-bf54x.c | 592 +++
+ drivers/pinctrl/pinctrl-adi2-bf60x.c | 521 +++
+ drivers/pinctrl/pinctrl-adi2.c | 1164 ++++++
+ drivers/pinctrl/pinctrl-adi2.h | 75 +
+ drivers/pinctrl/pinctrl-as3722.c | 630 +++
+ drivers/pinctrl/pinctrl-at91.c | 36 +-
+ drivers/pinctrl/pinctrl-exynos5440.c | 2 +-
+ drivers/pinctrl/pinctrl-imx.c | 6 +-
+ drivers/pinctrl/pinctrl-imx1-core.c | 653 +++
+ drivers/pinctrl/pinctrl-imx1.h | 73 +
+ drivers/pinctrl/pinctrl-imx27.c | 477 +++
+ drivers/pinctrl/pinctrl-imx35.c | 2 +-
+ drivers/pinctrl/pinctrl-imx51.c | 2 +-
+ drivers/pinctrl/pinctrl-imx53.c | 2 +-
+ drivers/pinctrl/pinctrl-imx6dl.c | 2 +-
+ drivers/pinctrl/pinctrl-imx6q.c | 2 +-
+ drivers/pinctrl/pinctrl-imx6sl.c | 2 +-
+ drivers/pinctrl/pinctrl-palmas.c | 20 -
+ drivers/pinctrl/pinctrl-rockchip.c | 292 +-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +-
+ drivers/pinctrl/pinctrl-tb10x.c | 875 ++++
+ drivers/pinctrl/pinctrl-vf610.c | 2 +-
+ drivers/pinctrl/pinmux.c | 4 +-
+ drivers/pinctrl/sh-pfc/Kconfig | 5 +
+ drivers/pinctrl/sh-pfc/Makefile | 1 +
+ drivers/pinctrl/sh-pfc/core.c | 9 +
+ drivers/pinctrl/sh-pfc/core.h | 1 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 180 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 110 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 4214 ++++++++++++++++++++
+ drivers/pinctrl/sirf/pinctrl-atlas6.c | 56 +
+ drivers/pinctrl/sirf/pinctrl-prima2.c | 115 +
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 8 +-
+ drivers/pinctrl/sirf/pinctrl-sirf.h | 6 +-
+ drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +-
+ include/asm-generic/gpio.h | 10 +
+ include/dt-bindings/pinctrl/at91.h | 2 +-
+ include/linux/gpio.h | 10 +
+ include/linux/pinctrl/pinctrl.h | 3 +
+ include/linux/platform_data/pinctrl-adi2.h | 40 +
+ 69 files changed, 11023 insertions(+), 302 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/abilis,tb10x-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/abilis,tb10x-iomux.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx27-pinctrl.txt
+ create mode 100644 drivers/gpio/gpio-tb10x.c
+ create mode 100644 drivers/pinctrl/pinctrl-adi2-bf54x.c
+ create mode 100644 drivers/pinctrl/pinctrl-adi2-bf60x.c
+ create mode 100644 drivers/pinctrl/pinctrl-adi2.c
+ create mode 100644 drivers/pinctrl/pinctrl-adi2.h
+ create mode 100644 drivers/pinctrl/pinctrl-as3722.c
+ create mode 100644 drivers/pinctrl/pinctrl-imx1-core.c
+ create mode 100644 drivers/pinctrl/pinctrl-imx1.h
+ create mode 100644 drivers/pinctrl/pinctrl-imx27.c
+ create mode 100644 drivers/pinctrl/pinctrl-tb10x.c
+ create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+ create mode 100644 include/linux/platform_data/pinctrl-adi2.h
+Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (b9777859ec01 remoteproc: fix kconfig dependencies for VIRTIO)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (afb3690c3cbd gpio: bcm-kona: add missing .owner to struct gpio_chip)
+$ git merge gpio/for-next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Auto-merging include/linux/gpio.h
+Auto-merging include/asm-generic/gpio.h
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/gpio/gpiolib-of.c
+Auto-merging drivers/gpio/gpiolib-acpi.c
+Auto-merging drivers/gpio/gpio-mpc8xxx.c
+Removing drivers/gpio/gpio-langwell.c
+Auto-merging drivers/gpio/gpio-iop.c
+Auto-merging drivers/gpio/Makefile
+Auto-merging drivers/gpio/Kconfig
+Removing arch/arm/mach-w90x900/include/mach/gpio.h
+Removing arch/arm/mach-pxa/include/mach/gpio.h
+Removing arch/arm/mach-mmp/include/mach/gpio.h
+Removing arch/arm/mach-iop33x/include/mach/gpio.h
+Removing arch/arm/mach-iop32x/include/mach/gpio.h
+Removing arch/arm/mach-gemini/include/mach/gpio.h
+Removing arch/arm/include/asm/hardware/iop3xx-gpio.h
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 322323bd80b7] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/acpi/enumeration.txt | 26 +-
+ .../devicetree/bindings/gpio/gpio-bcm-kona.txt | 52 ++
+ .../devicetree/bindings/gpio/gpio-pcf857x.txt | 71 ++
+ MAINTAINERS | 6 +
+ arch/arm/Kconfig | 7 +-
+ arch/arm/include/asm/hardware/iop3xx-gpio.h | 75 --
+ arch/arm/include/asm/hardware/iop3xx.h | 12 -
+ arch/arm/mach-gemini/gpio.c | 2 +-
+ arch/arm/mach-gemini/include/mach/gpio.h | 20 -
+ arch/arm/mach-iop32x/em7210.c | 2 +
+ arch/arm/mach-iop32x/glantank.c | 2 +
+ arch/arm/mach-iop32x/gpio-iop32x.h | 10 +
+ arch/arm/mach-iop32x/include/mach/gpio.h | 6 -
+ arch/arm/mach-iop32x/include/mach/iop32x.h | 1 -
+ arch/arm/mach-iop32x/iq31244.c | 2 +
+ arch/arm/mach-iop32x/iq80321.c | 2 +
+ arch/arm/mach-iop32x/n2100.c | 47 +-
+ arch/arm/mach-iop33x/include/mach/gpio.h | 6 -
+ arch/arm/mach-iop33x/include/mach/iop33x.h | 1 -
+ arch/arm/mach-iop33x/iq80331.c | 7 +
+ arch/arm/mach-iop33x/iq80332.c | 7 +
+ arch/arm/mach-ixp4xx/common.c | 49 +-
+ arch/arm/mach-ixp4xx/dsmg600-setup.c | 65 +-
+ arch/arm/mach-ixp4xx/include/mach/platform.h | 39 -
+ arch/arm/mach-ixp4xx/ixdp425-setup.c | 8 +-
+ arch/arm/mach-ixp4xx/nas100d-setup.c | 49 +-
+ arch/arm/mach-ixp4xx/nslu2-setup.c | 17 +-
+ arch/arm/mach-mmp/include/mach/gpio.h | 8 -
+ arch/arm/mach-pxa/include/mach/gpio.h | 32 -
+ arch/arm/mach-w90x900/include/mach/gpio.h | 30 -
+ arch/arm/plat-iop/Makefile | 2 -
+ drivers/gpio/Kconfig | 33 +-
+ drivers/gpio/Makefile | 4 +-
+ drivers/gpio/devres.c | 85 +++
+ drivers/gpio/gpio-74x164.c | 5 +-
+ drivers/gpio/gpio-adnp.c | 8 +-
+ drivers/gpio/gpio-arizona.c | 4 +
+ drivers/gpio/gpio-bcm-kona.c | 640 ++++++++++++++++
+ drivers/gpio/gpio-bt8xx.c | 2 -
+ drivers/gpio/gpio-clps711x.c | 2 +-
+ drivers/gpio/gpio-em.c | 13 +-
+ drivers/gpio/gpio-ep93xx.c | 18 +-
+ drivers/gpio/gpio-intel-mid.c | 471 ++++++++++++
+ .../arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c | 67 +-
+ drivers/gpio/gpio-langwell.c | 397 ----------
+ drivers/gpio/gpio-lpc32xx.c | 1 +
+ drivers/gpio/gpio-lynxpoint.c | 19 +-
+ drivers/gpio/gpio-mc33880.c | 3 -
+ drivers/gpio/gpio-mpc8xxx.c | 8 +-
+ drivers/gpio/gpio-omap.c | 20 +-
+ drivers/gpio/gpio-palmas.c | 104 ++-
+ drivers/gpio/gpio-pca953x.c | 11 -
+ drivers/gpio/gpio-pcf857x.c | 105 ++-
+ drivers/gpio/gpio-pl061.c | 10 +-
+ drivers/gpio/gpio-rcar.c | 13 +-
+ drivers/gpio/gpio-stmpe.c | 25 +-
+ drivers/gpio/gpio-tc3589x.c | 36 +-
+ drivers/gpio/gpio-tegra.c | 18 +
+ drivers/gpio/gpio-twl4030.c | 2 +-
+ drivers/gpio/gpiolib-acpi.c | 129 ++--
+ drivers/gpio/gpiolib-of.c | 28 +-
+ drivers/gpio/gpiolib.c | 828 +++++++++++++++------
+ drivers/input/misc/ixp4xx-beeper.c | 25 +-
+ drivers/pinctrl/pinctrl-coh901.c | 5 +
+ drivers/pinctrl/pinctrl-nomadik.c | 5 +
+ drivers/ptp/ptp_ixp46x.c | 9 +-
+ drivers/staging/media/lirc/lirc_serial.c | 16 +-
+ include/asm-generic/gpio.h | 225 ++----
+ include/linux/acpi_gpio.h | 31 +-
+ include/linux/gpio.h | 57 +-
+ include/linux/gpio/consumer.h | 253 +++++++
+ include/linux/gpio/driver.h | 184 +++++
+ include/linux/of_gpio.h | 29 +-
+ 73 files changed, 3188 insertions(+), 1423 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-pcf857x.txt
+ delete mode 100644 arch/arm/include/asm/hardware/iop3xx-gpio.h
+ delete mode 100644 arch/arm/mach-gemini/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h
+ delete mode 100644 arch/arm/mach-iop32x/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-iop33x/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-mmp/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-w90x900/include/mach/gpio.h
+ create mode 100644 drivers/gpio/gpio-bcm-kona.c
+ create mode 100644 drivers/gpio/gpio-intel-mid.c
+ rename arch/arm/plat-iop/gpio.c => drivers/gpio/gpio-iop.c (56%)
+ delete mode 100644 drivers/gpio/gpio-langwell.c
+ create mode 100644 include/linux/gpio/consumer.h
+ create mode 100644 include/linux/gpio/driver.h
+Merging dma-mapping/dma-mapping-next (0df651a0740c Merge branch 'parisc-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux)
+$ git merge dma-mapping/dma-mapping-next
+Already up-to-date.
+Merging pwm/for-next (702e304f198f Documentation/pwm: Fix trivial typos)
+$ git merge pwm/for-next
+Removing drivers/misc/ep93xx_pwm.c
+Auto-merging drivers/misc/Makefile
+Auto-merging drivers/misc/Kconfig
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
+Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c
+Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c
+Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
+CONFLICT (modify/delete): arch/arm/mach-omap2/board-zoom-peripherals.c deleted in HEAD and modified in pwm/for-next. Version pwm/for-next of arch/arm/mach-omap2/board-zoom-peripherals.c left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f arch/arm/mach-omap2/board-zoom-peripherals.c
+arch/arm/mach-omap2/board-zoom-peripherals.c: needs merge
+rm 'arch/arm/mach-omap2/board-zoom-peripherals.c'
+$ git commit -v -a
+[master 57e8fc45dcf8] Merge remote-tracking branch 'pwm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/video/backlight/pwm-backlight.txt | 7 +
+ Documentation/pwm.txt | 4 +-
+ arch/arm/mach-pxa/cm-x300.c | 1 +
+ arch/arm/mach-pxa/colibri-pxa270-income.c | 1 +
+ arch/arm/mach-pxa/ezx.c | 1 +
+ arch/arm/mach-pxa/hx4700.c | 1 +
+ arch/arm/mach-pxa/lpd270.c | 1 +
+ arch/arm/mach-pxa/magician.c | 1 +
+ arch/arm/mach-pxa/mainstone.c | 1 +
+ arch/arm/mach-pxa/mioa701.c | 1 +
+ arch/arm/mach-pxa/palm27x.c | 1 +
+ arch/arm/mach-pxa/palmtc.c | 35 +--
+ arch/arm/mach-pxa/palmte2.c | 1 +
+ arch/arm/mach-pxa/pcm990-baseboard.c | 1 +
+ arch/arm/mach-pxa/raumfeld.c | 1 +
+ arch/arm/mach-pxa/tavorevb.c | 2 +
+ arch/arm/mach-pxa/viper.c | 1 +
+ arch/arm/mach-pxa/z2.c | 2 +
+ arch/arm/mach-pxa/zylonite.c | 1 +
+ arch/arm/mach-s3c24xx/mach-h1940.c | 1 +
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 1 +
+ arch/arm/mach-s3c64xx/mach-crag6410.c | 1 +
+ arch/arm/mach-s3c64xx/mach-hmt.c | 1 +
+ arch/arm/mach-s3c64xx/mach-smartq.c | 1 +
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 +
+ arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 +
+ arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 +
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 1 +
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 1 +
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
+ arch/arm/plat-samsung/dev-backlight.c | 5 +
+ arch/unicore32/kernel/puv3-nb0916.c | 1 +
+ drivers/misc/Kconfig | 13 -
+ drivers/misc/Makefile | 1 -
+ drivers/misc/ep93xx_pwm.c | 286 ---------------------
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/pwm-atmel-tcb.c | 4 +-
+ drivers/pwm/pwm-ep93xx.c | 230 +++++++++++++++++
+ drivers/pwm/pwm-imx.c | 3 +-
+ drivers/pwm/pwm-lpc32xx.c | 2 +-
+ drivers/pwm/pwm-mxs.c | 2 +-
+ drivers/pwm/pwm-samsung.c | 1 +
+ drivers/pwm/pwm-tiecap.c | 6 -
+ drivers/pwm/pwm-tiehrpwm.c | 6 -
+ drivers/pwm/pwm-twl-led.c | 1 +
+ drivers/pwm/pwm-twl.c | 1 +
+ drivers/video/backlight/pwm_bl.c | 166 +++++++++---
+ include/linux/pwm_backlight.h | 5 +
+ 49 files changed, 430 insertions(+), 388 deletions(-)
+ delete mode 100644 drivers/misc/ep93xx_pwm.c
+ create mode 100644 drivers/pwm/pwm-ep93xx.c
+Merging dma-buf/for-next (19e8697ba45e dma-buf: Expose buffer size to userspace (v2))
+$ git merge dma-buf/for-next
+Already up-to-date.
+Merging userns/for-next (40216baa0101 vfs: Lazily remove mounts on unlinked files and directories. v2)
+$ git merge userns/for-next
+Resolved 'fs/fuse/dir.c' using previous resolution.
+Auto-merging include/linux/dcache.h
+Auto-merging fs/sysfs/dir.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/namespace.c
+Auto-merging fs/namei.c
+Auto-merging fs/fuse/dir.c
+CONFLICT (content): Merge conflict in fs/fuse/dir.c
+Auto-merging fs/dcache.c
+Auto-merging fs/afs/dir.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 96ac607c7fa0] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/afs/dir.c | 3 +-
+ fs/dcache.c | 80 +++++++++++++++++++++-----------------------------
+ fs/fuse/dir.c | 5 ++--
+ fs/gfs2/dentry.c | 4 +--
+ fs/mount.h | 3 ++
+ fs/namei.c | 55 +++++++++++++++++++++-------------
+ fs/namespace.c | 30 +++++++++++++++++++
+ fs/nfs/dir.c | 5 +---
+ fs/sysfs/dir.c | 9 +-----
+ include/linux/dcache.h | 3 +-
+ 10 files changed, 110 insertions(+), 87 deletions(-)
+Merging ktest/for-next (df5f7c66013c ktest: Reset grub menu cache with different machines)
+$ git merge ktest/for-next
+Already up-to-date.
+Merging signal/for-next (20b4fb485227 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 (f61027426a5b clk: of: helper for determining number of parent clocks)
+$ git merge clk/clk-next
+Resolved 'drivers/clk/Makefile' using previous resolution.
+Auto-merging drivers/clk/Makefile
+CONFLICT (content): Merge conflict in drivers/clk/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 31c4f3d228b2] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/clock/keystone-gate.txt | 29 ++
+ .../devicetree/bindings/clock/keystone-pll.txt | 84 ++++
+ Documentation/devicetree/bindings/clock/xgene.txt | 111 +++++
+ arch/arm64/boot/dts/apm-storm.dtsi | 75 +++
+ drivers/clk/Kconfig | 14 +
+ drivers/clk/Makefile | 2 +
+ drivers/clk/clk-wm831x.c | 6 -
+ drivers/clk/clk-xgene.c | 521 +++++++++++++++++++++
+ drivers/clk/clk.c | 56 ++-
+ drivers/clk/keystone/Makefile | 1 +
+ drivers/clk/keystone/gate.c | 264 +++++++++++
+ drivers/clk/keystone/pll.c | 305 ++++++++++++
+ drivers/clk/zynq/clkc.c | 16 +-
+ include/linux/clk-provider.h | 1 +
+ 14 files changed, 1456 insertions(+), 29 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/keystone-gate.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/keystone-pll.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/xgene.txt
+ create mode 100644 drivers/clk/clk-xgene.c
+ create mode 100644 drivers/clk/keystone/Makefile
+ create mode 100644 drivers/clk/keystone/gate.c
+ create mode 100644 drivers/clk/keystone/pll.c
+Merging random/dev (8aaa43c6f8dc random: don't zap entropy count in rand_initialize())
+$ git merge random/dev
+Resolved 'drivers/base/core.c' using previous resolution.
+Resolved 'drivers/char/random.c' using previous resolution.
+Auto-merging drivers/char/random.c
+CONFLICT (content): Merge conflict in drivers/char/random.c
+Auto-merging drivers/base/core.c
+CONFLICT (content): Merge conflict in drivers/base/core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4102921edef1] Merge remote-tracking branch 'random/dev'
+$ git diff -M --stat --summary HEAD^..
+ drivers/base/core.c | 3 +
+ drivers/char/random.c | 633 ++++++++++++++++++++++++++----------------
+ include/linux/random.h | 2 +
+ include/trace/events/random.h | 183 +++++++++++-
+ 4 files changed, 584 insertions(+), 237 deletions(-)
+Merging lzo-update/lzo-update (42b775abafaf 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 arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (13fd8a5dc3cf Merge branch 'aio-fix' of http://evilpiepirate.org/git/linux-bcache)
+$ git merge aio/master
+Auto-merging fs/aio.c
+Merge made by the 'recursive' strategy.
+ fs/aio.c | 129 ++++++++++++++++++++++++---------------------------------------
+ 1 file changed, 48 insertions(+), 81 deletions(-)
+Merging akpm-current/current (3cd43dcfaabf scripts/bloat-o-meter: use .startswith rather than fragile slicing)
+$ git merge --no-ff akpm-current/current
+Recorded preimage for 'drivers/net/wireless/rt2x00/rt2800pci.c'
+Recorded preimage for 'fs/bio-integrity.c'
+Recorded preimage for 'mm/bounce.c'
+Resolved 'arch/x86/mm/init.c' using previous resolution.
+Auto-merging sound/soc/davinci/davinci-pcm.c
+Auto-merging scripts/mod/modpost.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab.c
+Auto-merging mm/page_alloc.c
+Auto-merging mm/mempolicy.c
+Auto-merging mm/memory.c
+Auto-merging mm/memcontrol.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/bounce.c
+CONFLICT (content): Merge conflict in mm/bounce.c
+Auto-merging mm/Kconfig
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/timer.c
+Auto-merging kernel/time/sched_clock.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/module.c
+Auto-merging kernel/kexec.c
+Auto-merging kernel/cpu.c
+Auto-merging kernel/Makefile
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/sched.h
+Removing include/linux/platform_data/lm3630_bl.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/mempolicy.h
+Auto-merging include/linux/jump_label.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/cluster/heartbeat.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/fat/file.c
+Auto-merging fs/exec.c
+Auto-merging fs/bio-integrity.c
+CONFLICT (content): Merge conflict in fs/bio-integrity.c
+Auto-merging drivers/w1/masters/ds1wm.c
+Auto-merging drivers/video/backlight/pwm_bl.c
+Removing drivers/video/backlight/lm3630_bl.c
+Auto-merging drivers/video/backlight/l4f00242t03.c
+Auto-merging drivers/video/backlight/atmel-pwm-bl.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/hpsa.c
+Auto-merging drivers/rtc/rtc-pl031.c
+Auto-merging drivers/rtc/rtc-mrst.c
+Auto-merging drivers/pci/pci-driver.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800pci.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800pci.c
+Auto-merging drivers/net/irda/donauboe.c
+Auto-merging drivers/message/i2o/driver.c
+Auto-merging drivers/media/platform/coda.c
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/input/touchscreen/cyttsp4_core.c
+Auto-merging drivers/input/input.c
+Auto-merging drivers/input/Kconfig
+Auto-merging drivers/iio/industrialio-event.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_acpi.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/dma/mmp_tdma.c
+Auto-merging drivers/char/hpet.c
+Auto-merging drivers/block/cciss.c
+Auto-merging arch/x86/mm/init.c
+CONFLICT (content): Merge conflict in arch/x86/mm/init.c
+Auto-merging arch/x86/kernel/traps.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/process_64.c
+Auto-merging arch/x86/kernel/process_32.c
+Auto-merging arch/s390/mm/mmap.c
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging arch/metag/mm/init.c
+Auto-merging arch/arm/kernel/module.c
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/sysctl/kernel.txt
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging CREDITS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/wireless/rt2x00/rt2800pci.c'.
+Recorded resolution for 'fs/bio-integrity.c'.
+Recorded resolution for 'mm/bounce.c'.
+[master 36ced305e72d] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 5 +
+ Documentation/ABI/README | 13 +
+ Documentation/backlight/lp855x-driver.txt | 5 +-
+ Documentation/cgroups/memory.txt | 10 +-
+ .../devicetree/bindings/video/backlight/lp855x.txt | 29 +-
+ Documentation/filesystems/proc.txt | 1 +
+ Documentation/filesystems/vfat.txt | 2 +-
+ Documentation/gcov.txt | 4 +
+ Documentation/kernel-parameters.txt | 6 +
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/sysctl/kernel.txt | 25 +-
+ Documentation/sysctl/vm.txt | 15 +-
+ Documentation/trace/tracepoints.txt | 5 +
+ Documentation/vm/zswap.txt | 8 +-
+ MAINTAINERS | 3 +-
+ Makefile | 16 +
+ arch/alpha/include/uapi/asm/errno.h | 2 +-
+ arch/arm/kernel/module.c | 2 +-
+ arch/arm/mach-davinci/sram.c | 9 +-
+ arch/arm64/kernel/module.c | 2 +-
+ arch/cris/include/asm/io.h | 1 +
+ arch/ia64/include/asm/processor.h | 2 +-
+ arch/ia64/mm/init.c | 4 +-
+ arch/metag/kernel/dma.c | 4 +-
+ arch/metag/mm/init.c | 2 +-
+ arch/microblaze/mm/consistent.c | 7 +-
+ arch/mips/include/uapi/asm/errno.h | 2 +-
+ arch/parisc/include/uapi/asm/errno.h | 2 +-
+ arch/parisc/kernel/module.c | 2 +-
+ arch/powerpc/mm/dma-noncoherent.c | 4 +-
+ arch/powerpc/mm/hugetlbpage.c | 2 -
+ arch/powerpc/mm/numa.c | 3 +-
+ arch/s390/kernel/module.c | 2 +-
+ arch/s390/mm/mmap.c | 9 +-
+ arch/sh/include/asm/fpu.h | 2 +-
+ arch/sh/include/asm/processor_32.h | 10 +
+ arch/sh/include/asm/processor_64.h | 10 +
+ arch/sh/kernel/cpu/fpu.c | 2 +-
+ arch/sh/kernel/process_32.c | 6 +-
+ arch/sh/kernel/process_64.c | 4 +-
+ arch/sh/mm/init.c | 2 +-
+ arch/sparc/include/uapi/asm/errno.h | 2 +-
+ arch/sparc/kernel/module.c | 2 +-
+ arch/x86/include/asm/fpu-internal.h | 10 +-
+ arch/x86/include/asm/page.h | 1 +
+ arch/x86/include/asm/page_32.h | 4 -
+ arch/x86/include/asm/pgtable-2level.h | 100 ++--
+ arch/x86/include/asm/processor.h | 9 +
+ arch/x86/kernel/i387.c | 2 +-
+ arch/x86/kernel/module.c | 2 +-
+ arch/x86/kernel/process_32.c | 4 +-
+ arch/x86/kernel/process_64.c | 2 +-
+ arch/x86/kernel/setup.c | 9 +-
+ arch/x86/kernel/traps.c | 2 +-
+ arch/x86/mm/hugetlbpage.c | 9 +-
+ arch/x86/mm/init.c | 125 +++-
+ arch/x86/mm/numa.c | 11 +
+ arch/x86/mm/srat.c | 6 +-
+ block/genhd.c | 2 +-
+ drivers/block/cciss.c | 4 +-
+ drivers/block/paride/pg.c | 2 +-
+ drivers/block/sx8.c | 16 +-
+ drivers/cdrom/gdrom.c | 4 +-
+ drivers/char/Kconfig | 10 +-
+ drivers/char/hpet.c | 24 +-
+ drivers/dma/mmp_tdma.c | 7 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 4 +-
+ drivers/gpu/drm/drm_fb_helper.c | 8 +
+ drivers/gpu/drm/drm_flip_work.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 6 +
+ drivers/iio/industrialio-event.c | 2 +-
+ drivers/infiniband/core/cm.c | 5 +-
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 6 +
+ drivers/input/leds.c | 247 ++++++++
+ drivers/input/touchscreen/cyttsp4_core.c | 3 +-
+ drivers/iommu/omap-iopgtable.h | 2 +-
+ drivers/leds/Kconfig | 3 -
+ drivers/media/platform/coda.c | 5 +-
+ drivers/memstick/core/mspro_block.c | 4 +-
+ drivers/message/i2o/driver.c | 16 +-
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
+ drivers/pci/pci-driver.c | 12 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 2 +-
+ drivers/pps/clients/pps-gpio.c | 2 +-
+ drivers/pps/pps.c | 57 +-
+ drivers/rtc/Kconfig | 10 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-88pm80x.c | 8 +-
+ drivers/rtc/rtc-88pm860x.c | 2 +-
+ drivers/rtc/rtc-at91rm9200.c | 28 +-
+ drivers/rtc/rtc-cmos.c | 3 +-
+ drivers/rtc/rtc-da9055.c | 2 +-
+ drivers/rtc/rtc-ds1305.c | 2 +-
+ drivers/rtc/rtc-ds1307.c | 10 +-
+ drivers/rtc/rtc-ds2404.c | 2 +-
+ drivers/rtc/rtc-ep93xx.c | 6 +-
+ drivers/rtc/rtc-isl1208.c | 42 +-
+ drivers/rtc/rtc-m48t59.c | 20 +-
+ drivers/rtc/rtc-m48t86.c | 8 +-
+ drivers/rtc/rtc-max6900.c | 9 +-
+ drivers/rtc/rtc-mrst.c | 2 -
+ drivers/rtc/rtc-omap.c | 2 +-
+ drivers/rtc/rtc-pcf2123.c | 2 +-
+ drivers/rtc/rtc-pl030.c | 9 +-
+ drivers/rtc/rtc-pl031.c | 2 -
+ drivers/rtc/rtc-puv3.c | 22 +-
+ drivers/rtc/rtc-rs5c348.c | 4 +-
+ drivers/rtc/rtc-s5m.c | 635 +++++++++++++++++++++
+ drivers/rtc/rtc-sh.c | 5 +-
+ drivers/rtc/rtc-sirfsoc.c | 27 +-
+ drivers/rtc/rtc-snvs.c | 2 +-
+ drivers/rtc/rtc-stmp3xxx.c | 2 +-
+ drivers/rtc/rtc-tps65910.c | 1 -
+ drivers/rtc/rtc-v3020.c | 2 +-
+ drivers/rtc/rtc-vr41xx.c | 4 +-
+ drivers/rtc/rtc-vt8500.c | 4 +-
+ drivers/scsi/hpsa.c | 2 +-
+ drivers/scsi/sd.c | 2 +-
+ .../lustre/lustre/include/lustre/lustre_errno.h | 2 +-
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/vt/keyboard.c | 110 +++-
+ drivers/uio/uio_pruss.c | 6 +-
+ drivers/video/acornfb.c | 4 +-
+ drivers/video/backlight/88pm860x_bl.c | 18 +-
+ drivers/video/backlight/Kconfig | 10 +-
+ drivers/video/backlight/Makefile | 2 +-
+ drivers/video/backlight/aat2870_bl.c | 13 +-
+ drivers/video/backlight/adp5520_bl.c | 11 +-
+ drivers/video/backlight/adp8860_bl.c | 17 +-
+ drivers/video/backlight/adp8870_bl.c | 17 +-
+ drivers/video/backlight/ams369fg06.c | 24 +-
+ drivers/video/backlight/as3711_bl.c | 26 +-
+ drivers/video/backlight/atmel-pwm-bl.c | 96 ++--
+ drivers/video/backlight/bd6107.c | 6 +-
+ drivers/video/backlight/corgi_lcd.c | 30 +-
+ drivers/video/backlight/cr_bllcd.c | 13 +-
+ drivers/video/backlight/da903x_bl.c | 16 +-
+ drivers/video/backlight/da9052_bl.c | 6 +-
+ drivers/video/backlight/ep93xx_bl.c | 13 +-
+ drivers/video/backlight/generic_bl.c | 8 +-
+ drivers/video/backlight/gpio_backlight.c | 17 +-
+ drivers/video/backlight/hx8357.c | 20 +-
+ drivers/video/backlight/ili922x.c | 7 +-
+ drivers/video/backlight/ili9320.c | 15 +-
+ drivers/video/backlight/kb3886_bl.c | 20 +-
+ drivers/video/backlight/l4f00242t03.c | 6 +-
+ drivers/video/backlight/ld9040.c | 23 +-
+ drivers/video/backlight/ld9040_gamma.h | 4 +-
+ drivers/video/backlight/lm3533_bl.c | 12 +-
+ drivers/video/backlight/lm3630_bl.c | 475 ---------------
+ drivers/video/backlight/lm3630a_bl.c | 483 ++++++++++++++++
+ drivers/video/backlight/lm3639_bl.c | 13 +-
+ drivers/video/backlight/lms283gf05.c | 17 +-
+ drivers/video/backlight/lms501kf03.c | 8 +-
+ drivers/video/backlight/lp855x_bl.c | 41 +-
+ drivers/video/backlight/lp8788_bl.c | 2 +-
+ drivers/video/backlight/ltv350qv.c | 11 +-
+ drivers/video/backlight/lv5207lp.c | 9 +-
+ drivers/video/backlight/max8925_bl.c | 17 +-
+ drivers/video/backlight/omap1_bl.c | 2 +-
+ drivers/video/backlight/pandora_bl.c | 12 +-
+ drivers/video/backlight/pcf50633-backlight.c | 15 +-
+ drivers/video/backlight/platform_lcd.c | 22 +-
+ drivers/video/backlight/pwm_bl.c | 2 +-
+ drivers/video/backlight/s6e63m0.c | 22 +-
+ drivers/video/backlight/tdo24m.c | 14 +-
+ drivers/video/backlight/tosa_bl.c | 2 +-
+ drivers/video/backlight/tps65217_bl.c | 17 +-
+ drivers/video/backlight/wm831x_bl.c | 21 +-
+ drivers/w1/masters/ds1wm.c | 12 +-
+ drivers/w1/w1.c | 10 +-
+ drivers/w1/w1.h | 2 +-
+ fs/anon_inodes.c | 10 +-
+ fs/autofs4/autofs_i.h | 4 +-
+ fs/autofs4/dev-ioctl.c | 16 +-
+ fs/autofs4/inode.c | 33 +-
+ fs/autofs4/waitq.c | 16 +-
+ fs/binfmt_elf.c | 21 +-
+ fs/bio-integrity.c | 87 ++-
+ fs/cramfs/Kconfig | 5 +-
+ fs/devpts/inode.c | 1 +
+ fs/eventpoll.c | 145 +++--
+ fs/exec.c | 6 +
+ fs/fat/cache.c | 23 +-
+ fs/fat/fat.h | 3 +-
+ fs/fat/file.c | 93 ++-
+ fs/fat/inode.c | 38 +-
+ fs/fs-writeback.c | 33 +-
+ fs/hfsplus/btree.c | 112 ++++
+ fs/hfsplus/hfsplus_fs.h | 10 +
+ fs/hfsplus/hfsplus_raw.h | 3 +
+ fs/hfsplus/super.c | 2 +
+ fs/hfsplus/xattr.c | 207 ++++++-
+ fs/ocfs2/alloc.c | 4 +-
+ fs/ocfs2/aops.c | 13 +-
+ fs/ocfs2/buffer_head_io.c | 4 +-
+ fs/ocfs2/cluster/heartbeat.c | 40 +-
+ fs/ocfs2/cluster/masklog.h | 3 +-
+ fs/ocfs2/dir.c | 12 +-
+ fs/ocfs2/dlm/dlmmaster.c | 8 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 7 +
+ fs/ocfs2/dlmglue.c | 4 +-
+ fs/ocfs2/file.c | 65 ++-
+ fs/ocfs2/journal.h | 3 +-
+ fs/ocfs2/move_extents.c | 11 +-
+ fs/ocfs2/namei.c | 14 +-
+ fs/ocfs2/ocfs2.h | 1 +
+ fs/ocfs2/refcounttree.c | 20 +-
+ fs/ocfs2/resize.c | 12 +-
+ fs/ocfs2/stack_o2cb.c | 3 +-
+ fs/ocfs2/stack_user.c | 279 +++++++--
+ fs/ocfs2/stackglue.c | 16 +-
+ fs/ocfs2/stackglue.h | 13 +-
+ fs/ocfs2/suballoc.c | 4 +-
+ fs/ocfs2/super.c | 11 +-
+ fs/ocfs2/xattr.c | 28 +-
+ fs/posix_acl.c | 84 ++-
+ fs/proc/inode.c | 16 +-
+ fs/proc/kcore.c | 3 +-
+ fs/proc/task_mmu.c | 17 +-
+ fs/sync.c | 15 +-
+ fs/xfs/xfs_super.c | 2 +-
+ include/asm-generic/bitops/find.h | 12 +-
+ include/linux/binfmts.h | 3 -
+ include/linux/compat.h | 4 +-
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/genalloc.h | 2 +
+ include/linux/init.h | 6 +-
+ include/linux/input.h | 21 +
+ include/linux/irqreturn.h | 2 +-
+ include/linux/jump_label.h | 4 +-
+ include/linux/kernel-page-flags.h | 1 +
+ include/linux/kfifo.h | 47 +-
+ include/linux/lglock.h | 16 +
+ include/linux/memblock.h | 24 +
+ include/linux/memory_hotplug.h | 11 +-
+ include/linux/mempolicy.h | 5 +-
+ include/linux/mfd/samsung/core.h | 1 +
+ include/linux/mfd/samsung/rtc.h | 11 +
+ include/linux/mm.h | 4 +
+ include/linux/msg.h | 6 +-
+ include/linux/oom.h | 5 +
+ include/linux/page-flags.h | 4 +-
+ include/linux/platform_data/lm3630_bl.h | 57 --
+ include/linux/platform_data/lm3630a_bl.h | 65 +++
+ include/linux/platform_data/lp855x.h | 19 +
+ include/linux/posix_acl.h | 78 +--
+ include/linux/sched.h | 13 +-
+ include/linux/syscalls.h | 4 +-
+ include/linux/writeback.h | 2 +-
+ include/trace/events/kmem.h | 10 +-
+ include/trace/events/writeback.h | 6 +-
+ include/uapi/asm-generic/errno.h | 2 +-
+ init/Kconfig | 8 +-
+ init/do_mounts.c | 2 +
+ init/do_mounts_rd.c | 12 +
+ init/main.c | 40 +-
+ ipc/msgutil.c | 20 +-
+ ipc/util.c | 4 +-
+ ipc/util.h | 4 +-
+ kernel/Makefile | 4 +-
+ kernel/audit.c | 7 -
+ kernel/cpu.c | 29 +-
+ kernel/delayacct.c | 7 -
+ kernel/gcov/Kconfig | 30 +
+ kernel/gcov/Makefile | 32 +-
+ kernel/gcov/base.c | 32 +-
+ kernel/gcov/fs.c | 52 +-
+ kernel/gcov/gcc_3_4.c | 115 ++++
+ kernel/gcov/gcc_4_7.c | 560 ++++++++++++++++++
+ kernel/gcov/gcov.h | 65 +--
+ kernel/kexec.c | 2 +-
+ kernel/kthread.c | 73 ++-
+ kernel/module.c | 103 ++--
+ kernel/panic.c | 2 +-
+ kernel/printk/printk.c | 31 +-
+ kernel/ptrace.c | 3 +-
+ kernel/sys.c | 1 -
+ kernel/sysctl.c | 5 +-
+ kernel/sysctl_binary.c | 6 +-
+ kernel/taskstats.c | 16 +-
+ kernel/time/sched_clock.c | 4 +
+ kernel/time/tick-common.c | 15 +
+ kernel/timer.c | 5 +-
+ kernel/watchdog.c | 10 +-
+ lib/Kconfig | 7 +
+ lib/Kconfig.debug | 9 +
+ lib/Makefile | 3 +
+ lib/crc64_ecma.c | 341 +++++++++++
+ lib/debugobjects.c | 2 +-
+ lib/digsig.c | 2 +-
+ lib/genalloc.c | 28 +
+ lib/kfifo.c | 4 +-
+ lib/percpu_test.c | 138 +++++
+ lib/show_mem.c | 39 +-
+ lib/vsprintf.c | 35 +-
+ mm/Kconfig | 17 +-
+ mm/bootmem.c | 8 +-
+ mm/bounce.c | 2 -
+ mm/compaction.c | 7 +-
+ mm/huge_memory.c | 78 ++-
+ mm/kmemleak.c | 4 +-
+ mm/ksm.c | 4 +-
+ mm/memblock.c | 124 +++-
+ mm/memcontrol.c | 97 ++--
+ mm/memory-failure.c | 38 +-
+ mm/memory.c | 2 -
+ mm/memory_hotplug.c | 65 ++-
+ mm/mempolicy.c | 62 +-
+ mm/mmap.c | 12 +-
+ mm/nobootmem.c | 25 +-
+ mm/page_alloc.c | 34 +-
+ mm/readahead.c | 8 +-
+ mm/slab.c | 2 +-
+ mm/slab.h | 6 +-
+ mm/slab_common.c | 2 +-
+ mm/slub.c | 2 +-
+ mm/sparse.c | 53 +-
+ mm/swap_state.c | 63 +-
+ mm/swapfile.c | 36 +-
+ mm/vmalloc.c | 48 +-
+ mm/vmstat.c | 21 +-
+ mm/zswap.c | 195 +++----
+ samples/kfifo/bytestream-example.c | 4 +-
+ samples/kfifo/dma-example.c | 2 +-
+ samples/kfifo/inttype-example.c | 4 +-
+ scripts/bloat-o-meter | 3 +-
+ scripts/checkpatch.pl | 147 +++--
+ scripts/docproc.c | 14 +-
+ scripts/gen_initramfs_list.sh | 24 +-
+ scripts/get_maintainer.pl | 90 ++-
+ scripts/kernel-doc | 6 +
+ scripts/mod/modpost.c | 15 +-
+ scripts/sortextable.c | 24 +
+ scripts/sortextable.h | 26 +-
+ sound/soc/davinci/davinci-pcm.c | 3 +-
+ sound/soc/pxa/mmp-pcm.c | 3 +-
+ tools/vm/page-types.c | 32 +-
+ usr/Makefile | 23 +-
+ usr/gen_init_cpio.c | 27 +-
+ 344 files changed, 6417 insertions(+), 2753 deletions(-)
+ create mode 100644 drivers/input/leds.c
+ create mode 100644 drivers/rtc/rtc-s5m.c
+ delete mode 100644 drivers/video/backlight/lm3630_bl.c
+ create mode 100644 drivers/video/backlight/lm3630a_bl.c
+ create mode 100644 include/linux/crc64_ecma.h
+ delete mode 100644 include/linux/platform_data/lm3630_bl.h
+ create mode 100644 include/linux/platform_data/lm3630a_bl.h
+ create mode 100644 kernel/gcov/gcc_4_7.c
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 lib/percpu_test.c
+$ 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: net/netfilter/ipset/ip_set_hash_netnet.c: fix build with older gcc
+Applying: net/netfilter/ipset/ip_set_hash_netportnet.c: fix build with older gccs
+Applying: mm: drop actor argument of do_generic_file_read()
+Applying: mm-drop-actor-argument-of-do_generic_file_read-fix
+Applying: mm: avoid increase sizeof(struct page) due to split page table lock
+Applying: mm: rename USE_SPLIT_PTLOCKS to USE_SPLIT_PTE_PTLOCKS
+Applying: mm: convert mm->nr_ptes to atomic_long_t
+Applying: mm: introduce api for split page table lock for PMD level
+Applying: mm, thp: change pmd_trans_huge_lock() to return taken lock
+Applying: mm, thp: move ptl taking inside page_check_address_pmd()
+Applying: mm, thp: do not access mm->pmd_huge_pte directly
+Applying: mm, hugetlb: convert hugetlbfs to use split pmd lock
+Applying: mm-hugetlb-convert-hugetlbfs-to-use-split-pmd-lock-checkpatch-fixes
+Applying: mm: convert the rest to new page table lock api
+Applying: mm: implement split page table lock for PMD level
+Applying: x86, mm: enable split page table lock for PMD level
+Applying: x86-mm-enable-split-page-table-lock-for-pmd-level-checkpatch-fixes
+Applying: x86: add missed pgtable_pmd_page_ctor/dtor calls for preallocated pmds
+Applying: cris: fix potential NULL-pointer dereference
+Applying: m32r: fix potential NULL-pointer dereference
+Applying: xtensa: fix potential NULL-pointer dereference
+Applying: mm: allow pgtable_page_ctor() to fail
+Applying: microblaze: add missing pgtable_page_ctor/dtor calls
+Applying: mn10300: add missing pgtable_page_ctor/dtor calls
+Applying: openrisc: add missing pgtable_page_ctor/dtor calls
+Applying: alpha: handle pgtable_page_ctor() fail
+Applying: arc: handle pgtable_page_ctor() fail
+Applying: arm: handle pgtable_page_ctor() fail
+Applying: arm64: handle pgtable_page_ctor() fail
+Applying: avr32: handle pgtable_page_ctor() fail
+Applying: cris: handle pgtable_page_ctor() fail
+Applying: frv: handle pgtable_page_ctor() fail
+Applying: hexagon: handle pgtable_page_ctor() fail
+Applying: ia64: handle pgtable_page_ctor() fail
+Applying: m32r: handle pgtable_page_ctor() fail
+Applying: m68k: handle pgtable_page_ctor() fail
+Applying: m68k-handle-pgtable_page_ctor-fail-fix
+Applying: m68k-handle-pgtable_page_ctor-fail-fix-fix
+Applying: metag: handle pgtable_page_ctor() fail
+Applying: mips: handle pgtable_page_ctor() fail
+Applying: parisc: handle pgtable_page_ctor() fail
+Applying: powerpc: handle pgtable_page_ctor() fail
+Applying: s390: handle pgtable_page_ctor() fail
+Applying: score: handle pgtable_page_ctor() fail
+Applying: sh: handle pgtable_page_ctor() fail
+Applying: sparc: handle pgtable_page_ctor() fail
+Applying: tile: handle pgtable_page_ctor() fail
+Applying: um: handle pgtable_page_ctor() fail
+Applying: unicore32: handle pgtable_page_ctor() fail
+Applying: x86: handle pgtable_page_ctor() fail
+Applying: xtensa: handle pgtable_page_ctor() fail
+Applying: iommu/arm-smmu: handle pgtable_page_ctor() fail
+Applying: xtensa: use buddy allocator for PTE table
+Applying: mm: dynamically allocate page->ptl if it cannot be embedded to struct page
+Applying: mm: try to detect that page->ptl is in use
+Applying: mm-dynamically-allocate-page-ptl-if-it-cannot-be-embedded-to-struct-page-fix-fix
+Applying: seq_file: introduce seq_setwidth() and seq_pad()
+Applying: seq_file: remove "%n" usage from seq_file users
+Applying: vsprintf: ignore %n again
+Applying: drivers/rtc/rtc-hid-sensor-time.c: use dev_get_platdata()
+Applying: drivers/rtc/rtc-hid-sensor-time.c: enable HID input processing early
+Applying: sched: replace INIT_COMPLETION with reinit_completion
+Applying: tree-wide: use reinit_completion instead of INIT_COMPLETION
+Applying: tree-wide-use-reinit_completion-instead-of-init_completion-fix
+Applying: sched: remove INIT_COMPLETION
+Applying: drivers/w1/masters/w1-gpio.c: use dev_get_platdata()
+Applying: scripts/tags.sh: remove obsolete __devinit[const|data]
+Applying: revert "softirq: Add support for triggering softirq work on softirqs"
+Applying: kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS
+Applying: kernel: provide a __smp_call_function_single stub for !CONFIG_SMP
+Applying: kernel-provide-a-__smp_call_function_single-stub-for-config_smp-fix
+Applying: kernel: fix generic_exec_single indentation
+Applying: llists: move llist_reverse_order from raid5 to llist.c
+Applying: llists-move-llist_reverse_order-from-raid5-to-llistc-fix
+Applying: kernel: use lockless list for smp_call_function_single
+Applying: blk-mq: use __smp_call_function_single directly
+Applying: sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 0c3e7dd7f7bc...140eefdb357f akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (140eefdb357f sound/core/memalloc.c: use gen_pool_dma_alloc() to allocate iram buffer)
+$ git merge --no-ff akpm/master
+Merge made by the 'recursive' strategy.
+ Documentation/vm/split_page_table_lock | 94 ++++++++++
+ arch/Kconfig | 3 -
+ arch/alpha/Kconfig | 1 -
+ arch/alpha/include/asm/pgalloc.h | 5 +-
+ arch/arc/Kconfig | 1 -
+ arch/arc/include/asm/pgalloc.h | 11 +-
+ arch/arm/Kconfig | 1 -
+ arch/arm/include/asm/pgalloc.h | 12 +-
+ arch/arm/mach-tegra/apbio.c | 2 +-
+ arch/arm/mm/fault-armv.c | 6 +-
+ arch/arm64/Kconfig | 1 -
+ arch/arm64/include/asm/pgalloc.h | 9 +-
+ arch/avr32/include/asm/pgalloc.h | 5 +-
+ arch/blackfin/Kconfig | 1 -
+ arch/cris/include/asm/pgalloc.h | 7 +-
+ arch/frv/mm/pgalloc.c | 12 +-
+ arch/hexagon/Kconfig | 1 -
+ arch/hexagon/include/asm/pgalloc.h | 10 +-
+ arch/ia64/Kconfig | 1 -
+ arch/ia64/include/asm/pgalloc.h | 5 +-
+ arch/m32r/Kconfig | 1 -
+ arch/m32r/include/asm/pgalloc.h | 7 +-
+ arch/m68k/include/asm/mcf_pgalloc.h | 4 +
+ arch/m68k/include/asm/motorola_pgalloc.h | 8 +-
+ arch/m68k/include/asm/sun3_pgalloc.h | 5 +-
+ arch/metag/Kconfig | 1 -
+ arch/metag/include/asm/pgalloc.h | 8 +-
+ arch/microblaze/include/asm/pgalloc.h | 12 +-
+ arch/mips/Kconfig | 1 -
+ arch/mips/include/asm/pgalloc.h | 9 +-
+ arch/mn10300/Kconfig | 1 -
+ arch/mn10300/include/asm/pgalloc.h | 1 +
+ arch/mn10300/mm/pgtable.c | 9 +-
+ arch/openrisc/include/asm/pgalloc.h | 10 +-
+ arch/parisc/Kconfig | 1 -
+ arch/parisc/include/asm/pgalloc.h | 8 +-
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/include/asm/pgalloc-64.h | 5 +-
+ arch/powerpc/mm/pgtable_32.c | 5 +-
+ arch/powerpc/mm/pgtable_64.c | 7 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 6 +-
+ arch/powerpc/platforms/pseries/suspend.c | 2 +-
+ arch/s390/Kconfig | 1 -
+ arch/s390/mm/pgtable.c | 23 ++-
+ arch/score/include/asm/pgalloc.h | 9 +-
+ arch/sh/Kconfig | 1 -
+ arch/sh/include/asm/pgalloc.h | 5 +-
+ arch/sparc/Kconfig | 1 -
+ arch/sparc/mm/init_64.c | 11 +-
+ arch/sparc/mm/srmmu.c | 5 +-
+ arch/sparc/mm/tlb.c | 12 +-
+ arch/tile/Kconfig | 1 -
+ arch/tile/mm/pgtable.c | 6 +-
+ arch/um/kernel/mem.c | 8 +-
+ arch/unicore32/include/asm/pgalloc.h | 14 +-
+ arch/x86/Kconfig | 5 +-
+ arch/x86/include/asm/pgalloc.h | 11 +-
+ arch/x86/mm/pgtable.c | 19 +-
+ arch/x86/xen/mmu.c | 8 +-
+ arch/xtensa/include/asm/pgalloc.h | 29 ++-
+ arch/xtensa/include/asm/pgtable.h | 3 +-
+ arch/xtensa/mm/mmu.c | 20 --
+ block/blk-mq-cpu.c | 31 ----
+ block/blk-mq.c | 68 ++-----
+ block/blk-mq.h | 1 -
+ block/blk-softirq.c | 4 +-
+ block/blk-sysfs.c | 2 +-
+ crypto/af_alg.c | 2 +-
+ crypto/tcrypt.c | 4 +-
+ crypto/testmgr.c | 12 +-
+ drivers/ata/libata-eh.c | 4 +-
+ drivers/base/power/main.c | 4 +-
+ drivers/block/amiflop.c | 2 +-
+ drivers/block/cciss.c | 4 +-
+ drivers/char/hw_random/timeriomem-rng.c | 2 +-
+ drivers/crypto/tegra-aes.c | 2 +-
+ drivers/firewire/core-transaction.c | 2 +-
+ drivers/gpu/drm/gma500/oaktrail_hdmi_i2c.c | 2 +-
+ drivers/hid/hid-wiimote.h | 2 +-
+ drivers/hwmon/jz4740-hwmon.c | 2 +-
+ drivers/i2c/busses/i2c-at91.c | 2 +-
+ drivers/i2c/busses/i2c-bcm2835.c | 2 +-
+ drivers/i2c/busses/i2c-davinci.c | 2 +-
+ drivers/i2c/busses/i2c-designware-core.c | 2 +-
+ drivers/i2c/busses/i2c-ismt.c | 2 +-
+ drivers/i2c/busses/i2c-mxs.c | 2 +-
+ drivers/i2c/busses/i2c-omap.c | 2 +-
+ drivers/i2c/busses/i2c-tegra.c | 2 +-
+ drivers/i2c/busses/i2c-wmt.c | 4 +-
+ drivers/iio/adc/ad_sigma_delta.c | 6 +-
+ drivers/iio/adc/nau7802.c | 2 +-
+ drivers/input/touchscreen/cyttsp_core.c | 2 +-
+ drivers/iommu/arm-smmu.c | 5 +-
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/md/raid5.c | 14 --
+ drivers/media/platform/blackfin/bfin_capture.c | 2 +-
+ drivers/media/radio/radio-wl1273.c | 10 +-
+ drivers/media/radio/si470x/radio-si470x-common.c | 4 +-
+ drivers/media/rc/iguanair.c | 2 +-
+ drivers/memstick/core/memstick.c | 2 +-
+ drivers/memstick/host/r592.c | 2 +-
+ drivers/misc/mic/card/mic_virtio.c | 2 +-
+ drivers/misc/mic/host/mic_boot.c | 2 +-
+ drivers/misc/ti-st/st_kim.c | 12 +-
+ drivers/mtd/nand/mxc_nand.c | 2 +-
+ drivers/mtd/nand/r852.c | 2 +-
+ drivers/mtd/onenand/omap2.c | 10 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 2 +-
+ drivers/net/ieee802154/at86rf230.c | 2 +-
+ drivers/net/ieee802154/mrf24j40.c | 2 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 4 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 18 +-
+ drivers/net/wireless/ath/carl9170/usb.c | 2 +-
+ drivers/net/wireless/ath/wil6210/main.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 4 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
+ drivers/parport/parport_ip32.c | 4 +-
+ drivers/platform/x86/apple-gmux.c | 2 +-
+ drivers/power/ab8500_fg.c | 4 +-
+ drivers/power/jz4740-battery.c | 2 +-
+ drivers/rtc/rtc-hid-sensor-time.c | 13 +-
+ drivers/spi/spi-bcm2835.c | 2 +-
+ drivers/spi/spi-clps711x.c | 2 +-
+ drivers/spi/spi-davinci.c | 2 +-
+ drivers/spi/spi-fsl-espi.c | 2 +-
+ drivers/spi/spi-fsl-spi.c | 2 +-
+ drivers/spi/spi-mpc512x-psc.c | 2 +-
+ drivers/spi/spi-mxs.c | 2 +-
+ drivers/spi/spi-s3c64xx.c | 2 +-
+ drivers/spi/spi-sh-msiof.c | 2 +-
+ drivers/spi/spi-sirf.c | 4 +-
+ drivers/spi/spi-tegra114.c | 6 +-
+ drivers/spi/spi-tegra20-sflash.c | 2 +-
+ drivers/spi/spi-tegra20-slink.c | 6 +-
+ drivers/spi/spi-xilinx.c | 2 +-
+ drivers/spi/spi.c | 2 +-
+ drivers/staging/iio/adc/mxs-lradc.c | 2 +-
+ drivers/staging/media/solo6x10/solo6x10-p2m.c | 2 +-
+ drivers/staging/tidspbridge/core/sync.c | 4 +-
+ .../staging/tidspbridge/include/dspbridge/sync.h | 2 +-
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 6 +-
+ drivers/tty/metag_da.c | 2 +-
+ drivers/usb/c67x00/c67x00-sched.c | 2 +-
+ drivers/usb/gadget/f_fs.c | 2 +-
+ drivers/usb/serial/mos7720.c | 2 +-
+ drivers/video/exynos/exynos_mipi_dsi_common.c | 4 +-
+ .../video/omap2/displays-new/encoder-tpd12s015.c | 2 +-
+ drivers/w1/masters/w1-gpio.c | 10 +-
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/nfs/nfs4state.c | 2 +-
+ fs/ocfs2/dlmglue.c | 4 +-
+ fs/proc/consoles.c | 10 +-
+ fs/proc/meminfo.c | 2 +-
+ fs/proc/nommu.c | 12 +-
+ fs/proc/task_mmu.c | 36 ++--
+ fs/proc/task_nommu.c | 19 +-
+ fs/seq_file.c | 15 ++
+ include/linux/blkdev.h | 5 +-
+ include/linux/completion.h | 28 +--
+ include/linux/huge_mm.h | 17 +-
+ include/linux/hugetlb.h | 26 +++
+ include/linux/interrupt.h | 22 ---
+ include/linux/llist.h | 2 +
+ include/linux/mm.h | 128 +++++++++++--
+ include/linux/mm_types.h | 22 ++-
+ include/linux/seq_file.h | 15 ++
+ include/linux/smp.h | 22 +--
+ include/linux/swapops.h | 7 +-
+ kernel/Kconfig.hz | 2 +-
+ kernel/fork.c | 6 +-
+ kernel/smp.c | 56 ++----
+ kernel/softirq.c | 131 --------------
+ kernel/up.c | 11 ++
+ lib/llist.c | 22 +++
+ lib/vsprintf.c | 20 +-
+ mm/Kconfig | 4 +-
+ mm/filemap.c | 10 +-
+ mm/huge_memory.c | 201 ++++++++++++---------
+ mm/hugetlb.c | 110 ++++++-----
+ mm/memcontrol.c | 10 +-
+ mm/memory.c | 36 +++-
+ mm/mempolicy.c | 5 +-
+ mm/migrate.c | 14 +-
+ mm/mmap.c | 3 +-
+ mm/oom_kill.c | 6 +-
+ mm/pgtable-generic.c | 16 +-
+ mm/rmap.c | 15 +-
+ net/ipv4/fib_trie.c | 13 +-
+ net/ipv4/ping.c | 15 +-
+ net/ipv4/tcp_ipv4.c | 33 ++--
+ net/ipv4/udp.c | 15 +-
+ net/netfilter/ipset/ip_set_hash_netnet.c | 28 +--
+ net/netfilter/ipset/ip_set_hash_netportnet.c | 28 +--
+ net/phonet/socket.c | 24 ++-
+ net/sctp/objcnt.c | 9 +-
+ scripts/tags.sh | 4 +-
+ sound/core/memalloc.c | 6 +-
+ sound/firewire/dice.c | 2 +-
+ sound/soc/samsung/ac97.c | 6 +-
+ 199 files changed, 1161 insertions(+), 984 deletions(-)
+ create mode 100644 Documentation/vm/split_page_table_lock
projects / karo-tx-linux.git / commitdiff