Google Git
Sign in
kernel / pub / scm / linux / kernel / git / joro / linux / e85db7e77c6801b854864ee65c264be164dd02c1 / . / Next / merge.log
blob: 305bd62bac226904a50e480ab19bb493efc43044 [file] [log] [blame]
$ date
Monday 1 December 10:12:48 AEDT 2014
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 3314bf6ba2ac Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Merging origin/master (2f19cad94cee btrfs: zero out left over bytes after processing compression streams)
$ git merge origin/master
Updating 3314bf6ba2ac..2f19cad94cee
Fast-forward
Documentation/networking/timestamping.txt | 2 +-
arch/arm/boot/dts/exynos5250-snow.dts | 4 +
arch/arm/boot/dts/exynos5250.dtsi | 2 +-
arch/arm/configs/exynos_defconfig | 2 +
arch/arm/include/asm/thread_info.h | 11 ---
arch/arm/kernel/traps.c | 31 +-----
arch/arm/mach-mvebu/coherency.c | 2 +
arch/arm/mach-tegra/irq.c | 22 ++---
arch/arm/mm/proc-v7.S | 2 -
arch/arm/mm/proc-xscale.S | 4 +-
arch/mips/Kconfig | 14 ++-
arch/mips/include/asm/mipsregs.h | 2 +
arch/mips/include/asm/r4kcache.h | 4 +
arch/mips/include/asm/uaccess.h | 6 +-
arch/mips/include/uapi/asm/unistd.h | 2 +-
arch/mips/kernel/bmips_vec.S | 3 -
arch/mips/kernel/cps-vec.S | 2 +
arch/mips/kernel/cpu-probe.c | 33 ++++++-
arch/mips/kernel/rtlx.c | 4 +-
arch/mips/kernel/setup.c | 4 +-
arch/mips/kernel/signal.c | 8 +-
arch/mips/loongson/common/Makefile | 3 +-
arch/mips/mm/tlbex.c | 10 +-
arch/mips/mti-sead3/sead3-leds.c | 8 +-
arch/mips/netlogic/xlp/Makefile | 12 ++-
arch/powerpc/kernel/eeh_sysfs.c | 2 +-
arch/powerpc/kernel/vdso32/getcpu.S | 4 +-
arch/powerpc/platforms/powernv/opal-hmi.c | 2 +-
arch/powerpc/platforms/powernv/pci-ioda.c | 2 +-
arch/powerpc/xmon/xmon.c | 6 +-
arch/sparc/include/asm/dma-mapping.h | 8 ++
drivers/atm/solos-pci.c | 2 +
drivers/iio/accel/bmc150-accel.c | 40 ++++++--
drivers/iio/accel/kxcjk-1013.c | 2 +
drivers/iio/adc/men_z188_adc.c | 1 +
drivers/iio/gyro/bmg160.c | 53 +++++++++-
drivers/input/joystick/xpad.c | 16 ++-
drivers/input/mouse/elantech.c | 10 +-
drivers/input/mouse/synaptics.c | 4 +
drivers/irqchip/irq-atmel-aic-common.c | 6 +-
drivers/irqchip/irq-bcm7120-l2.c | 4 +-
drivers/irqchip/irq-brcmstb-l2.c | 4 +-
drivers/net/dsa/bcm_sf2.c | 58 ++++++-----
drivers/net/ethernet/broadcom/tg3.c | 3 +-
drivers/net/ethernet/emulex/benet/be_main.c | 5 +
drivers/net/ethernet/intel/igb/igb_main.c | 23 +++--
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 17 +++-
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 2 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 13 +--
drivers/net/vxlan.c | 4 +-
drivers/net/wireless/iwlwifi/iwl-fw.h | 2 +
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 12 ++-
drivers/net/wireless/rtlwifi/pci.c | 20 ++--
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 5 +-
drivers/net/xen-netback/xenbus.c | 15 +--
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 7 ++
drivers/scsi/scsi_devinfo.c | 1 +
drivers/scsi/ufs/ufshcd-pltfrm.c | 15 +--
drivers/scsi/ufs/ufshcd.c | 104 ++++++++++++--------
drivers/scsi/ufs/ufshcd.h | 2 -
drivers/spi/spi-dw.c | 6 +-
drivers/spi/spi-sirf.c | 4 +-
drivers/spi/spi.c | 6 +-
drivers/staging/rtl8188eu/core/rtw_cmd.c | 22 ++---
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 12 +--
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 2 +-
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 +
drivers/thermal/cpu_cooling.c | 37 ++++---
drivers/thermal/samsung/exynos_thermal_common.c | 9 +-
drivers/thermal/st/st_thermal.c | 3 +
drivers/tty/serial/of_serial.c | 27 ------
drivers/usb/core/quirks.c | 3 +
drivers/usb/dwc3/ep0.c | 8 +-
drivers/usb/host/xhci-hub.c | 5 +-
drivers/usb/host/xhci-pci.c | 2 +-
drivers/usb/host/xhci-plat.c | 10 +-
drivers/usb/host/xhci-ring.c | 43 +++------
drivers/usb/host/xhci.c | 107 +++++++++++----------
drivers/usb/host/xhci.h | 2 +-
drivers/usb/serial/cp210x.c | 1 +
drivers/usb/serial/ftdi_sio.c | 33 +++++++
drivers/usb/serial/ftdi_sio_ids.h | 39 +++++++-
drivers/usb/serial/keyspan.c | 97 +++++++++++--------
drivers/usb/serial/ssu100.c | 11 +--
drivers/usb/storage/unusual_uas.h | 7 ++
fs/btrfs/compression.c | 33 ++++++-
fs/btrfs/compression.h | 4 +-
fs/btrfs/lzo.c | 15 +++
fs/btrfs/zlib.c | 20 +++-
include/linux/iio/events.h | 2 +-
include/net/inet_common.h | 2 +
include/sound/pcm.h | 2 +
include/uapi/sound/asound.h | 4 +-
net/bridge/br_netlink.c | 1 +
net/core/rtnetlink.c | 23 ++++-
net/ipv4/af_inet.c | 11 +++
net/ipv4/ip_vti.c | 1 +
net/ipv4/ping.c | 14 +--
net/ipv4/tcp.c | 2 +-
net/ipv4/tcp_ipv4.c | 5 +-
net/ipv6/ip6_gre.c | 4 +-
net/ipv6/ip6_offload.c | 3 +-
net/ipv6/ip6_udp_tunnel.c | 4 +-
net/ipv6/ip6_vti.c | 11 +++
net/ipv6/tcp_ipv6.c | 5 +-
net/netfilter/nf_conntrack_core.c | 14 ++-
net/packet/af_packet.c | 2 +-
sound/core/pcm.c | 2 +
sound/core/pcm_misc.c | 8 ++
sound/pci/hda/patch_realtek.c | 1 -
sound/usb/mixer_quirks.c | 4 +-
sound/usb/quirks.c | 4 +-
112 files changed, 858 insertions(+), 511 deletions(-)
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (f114040e3ea6 Linux 3.18-rc1)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (3f4aa45ceea5 ARM: 8226/1: cacheflush: get rid of restarting block)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (f7bbd12a4b7e m68k: Wire up bpf)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
Merging powerpc-merge/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging powerpc-merge-mpe/fixes (152d44a853e4 powerpc: 32 bit getcpu VDSO function uses 64 bit instructions)
$ git merge powerpc-merge-mpe/fixes
Already up-to-date.
Merging sparc/master (0d1d9092b536 sparc: Add NOP dma_cache_sync() implementation.)
$ git merge sparc/master
Already up-to-date.
Merging net/master (7fa2955ff70c sh_eth: Fix sleeping function called from invalid context)
$ git merge net/master
Merge made by the 'recursive' strategy.
drivers/net/bonding/bond_netlink.c | 7 +-
drivers/net/ethernet/renesas/sh_eth.c | 96 +++++++++++-----------
drivers/net/ethernet/renesas/sh_eth.h | 5 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 18 ++--
net/core/rtnetlink.c | 1 +
5 files changed, 67 insertions(+), 60 deletions(-)
Merging ipsec/master (d10845fc85b2 Merge branch 'gso_encap_fixes')
$ git merge ipsec/master
Already up-to-date.
Merging sound-current/for-linus (d42472ecffd7 ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (7fc986d8a972 PCI: Support 64-bit bridge windows if we have 64-bit dma_addr_t)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless/master (7d63a5f9b25b rtlwifi: Change order in device startup)
$ git merge wireless/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (206c5f60a3d9 Linux 3.18-rc4)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (a5e9ab291c60 Revert "serial: of-serial: add PM suspend/resume support")
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (263e80b43559 usb-quirks: Add reset-resume quirk for MS Wireless Laser Mouse 6000)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (520fe7633692 usb: dwc3: ep0: fix for dead code)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (75bcbf29c284 USB: ssu100: fix overrun-error reporting)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging staging.current/staging-linus (6d4556fc0309 staging: r8188eu: Add new device ID for DLink GO-USB-N150)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (0df1f2487d2f Linux 3.18-rc3)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (a1f9a4072655 Input: xpad - use proper endpoint type)
$ 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 crypto-current/master (24c65bc7037e hwrng: pseries - port to new read API and fix stack corruption)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (7546e52b5e3d Drivers: ide: Remove typedef atiixp_ide_timing)
$ 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 devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap)
$ git merge devicetree-current/devicetree/merge
Merge made by the 'recursive' strategy.
drivers/of/fdt.c | 2 --
1 file changed, 2 deletions(-)
Merging rr-fixes/fixes (3438cf549d2f param: fix crash on bad kernel arguments)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging vfio-fixes/for-linus (239a87020b26 Merge branch 'for-joerg/arm-smmu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into for-linus)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (884716497d4c selftests/timers: change test to use ksft framework)
$ git merge kselftest-fixes/fixes
Merge made by the 'recursive' strategy.
.../selftests/breakpoints/breakpoint_test.c | 10 ++--
tools/testing/selftests/ipc/msgque.c | 26 ++++-----
tools/testing/selftests/kcmp/kcmp_test.c | 27 +++++++---
tools/testing/selftests/kselftest.h | 62 ++++++++++++++++++++++
tools/testing/selftests/net/Makefile | 8 +--
tools/testing/selftests/net/test_bpf.sh | 10 ++++
tools/testing/selftests/timers/posix_timers.c | 14 ++---
tools/testing/selftests/user/Makefile | 8 +--
tools/testing/selftests/user/test_user_copy.sh | 10 ++++
9 files changed, 132 insertions(+), 43 deletions(-)
create mode 100644 tools/testing/selftests/kselftest.h
create mode 100755 tools/testing/selftests/net/test_bpf.sh
create mode 100755 tools/testing/selftests/user/test_user_copy.sh
Merging drm-intel-fixes/for-linux-next-fixes (afa4e53a7bcd drm/i915: Cancel vdd off work before suspend)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/intel_display.c | 4 ++++
drivers/gpu/drm/i915/intel_dp.c | 1 +
2 files changed, 5 insertions(+)
Merging asm-generic/master (cb61f6769b88 ARM64: use GENERIC_PCI_IOMAP)
$ git merge asm-generic/master
Auto-merging arch/arm64/include/asm/memory.h
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/mach-ixp4xx/include/mach/io.h
Merge made by the 'recursive' strategy.
Documentation/memory-barriers.txt | 13 +-
arch/arc/include/asm/io.h | 2 -
arch/arm/include/asm/io.h | 89 ++--
arch/arm/include/asm/memory.h | 4 +
arch/arm/mach-ebsa110/include/mach/io.h | 25 +-
arch/arm/mach-ebsa110/io.c | 14 +-
arch/arm/mach-ixp4xx/common.c | 2 +-
arch/arm/mach-ixp4xx/include/mach/io.h | 24 +-
arch/arm/mach-sa1100/pci-nanoengine.c | 8 +-
arch/arm64/Kconfig | 2 +-
arch/arm64/include/asm/io.h | 122 ++----
arch/arm64/include/asm/memory.h | 2 +
arch/cris/include/asm/io.h | 3 +
arch/frv/include/asm/io.h | 3 +
arch/ia64/include/asm/io.h | 4 +
arch/ia64/include/asm/uaccess.h | 16 +-
arch/m32r/include/asm/io.h | 3 +
arch/m68k/include/asm/io.h | 8 +
arch/m68k/include/asm/io_no.h | 4 -
arch/microblaze/include/asm/io.h | 8 -
arch/mn10300/include/asm/io.h | 4 +
arch/parisc/include/asm/io.h | 12 +-
arch/powerpc/include/asm/io.h | 12 +-
arch/s390/include/asm/io.h | 10 +-
arch/s390/mm/maccess.c | 4 +-
arch/sparc/include/asm/io_32.h | 4 -
arch/sparc/include/asm/io_64.h | 14 +-
arch/tile/include/asm/io.h | 4 +
arch/x86/include/asm/io.h | 8 +-
arch/x86/mm/ioremap.c | 4 +-
arch/xtensa/include/asm/io.h | 7 -
drivers/char/mem.c | 13 +-
include/asm-generic/io.h | 751 ++++++++++++++++++++++++++------
33 files changed, 835 insertions(+), 368 deletions(-)
Merging arc/for-next (996bad6cb351 ARC: add power management options)
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
arch/arc/Kconfig | 1 +
1 file changed, 1 insertion(+)
Merging arm/for-next (71a4d7620f94 Merge branch 'devel-stable' into for-next)
$ git merge arm/for-next
Auto-merging drivers/dma/pl330.c
Auto-merging arch/arm/mm/init.c
Merge made by the 'recursive' strategy.
Documentation/arm/memory.txt | 2 +-
Documentation/power/runtime_pm.txt | 4 +
arch/arm/common/sa1111.c | 13 +-
arch/arm/include/asm/cacheflush.h | 10 ++
arch/arm/include/asm/fixmap.h | 31 +++--
arch/arm/include/asm/hw_irq.h | 1 +
arch/arm/include/asm/percpu.h | 4 +-
arch/arm/include/asm/ptrace.h | 5 +-
arch/arm/include/asm/thread_info.h | 9 +-
arch/arm/include/asm/vfp.h | 5 +
arch/arm/kernel/Makefile | 3 +-
arch/arm/kernel/atags_compat.c | 6 +-
arch/arm/kernel/atags_parse.c | 5 +-
arch/arm/kernel/atags_proc.c | 4 +-
arch/arm/kernel/bios32.c | 2 +-
arch/arm/kernel/dma-isa.c | 4 +-
arch/arm/kernel/dma.c | 26 ++--
arch/arm/kernel/entry-common.S | 235 -----------------------------------
arch/arm/kernel/entry-ftrace.S | 243 +++++++++++++++++++++++++++++++++++++
arch/arm/kernel/etm.c | 12 +-
arch/arm/kernel/fiq.c | 2 +-
arch/arm/kernel/ftrace.c | 19 +++
arch/arm/kernel/io.c | 5 +-
arch/arm/kernel/irq.c | 8 +-
arch/arm/kernel/jump_label.c | 2 +-
arch/arm/kernel/kgdb.c | 29 +++++
arch/arm/kernel/machine_kexec.c | 15 +--
arch/arm/kernel/module.c | 2 +-
arch/arm/kernel/patch.c | 92 +++++++++++---
arch/arm/kernel/patch.h | 12 +-
arch/arm/kernel/return_address.c | 3 +-
arch/arm/kernel/setup.c | 1 +
arch/arm/kernel/signal.c | 1 -
arch/arm/kernel/smp.c | 15 +--
arch/arm/kernel/smp_twd.c | 4 +-
arch/arm/kernel/stacktrace.c | 4 +-
arch/arm/kernel/swp_emulate.c | 2 +-
arch/arm/kernel/thumbee.c | 2 +-
arch/arm/kernel/topology.c | 4 +-
arch/arm/kernel/traps.c | 42 +++----
arch/arm/kernel/unwind.c | 3 +-
arch/arm/kernel/vmlinux.lds.S | 19 +++
arch/arm/kernel/xscale-cp0.c | 7 +-
arch/arm/lib/copy_from_user.S | 5 +
arch/arm/lib/copy_template.S | 30 +++++
arch/arm/lib/copy_to_user.S | 5 +
arch/arm/lib/memcpy.S | 5 +
arch/arm/lib/memmove.S | 28 +++++
arch/arm/lib/memset.S | 12 ++
arch/arm/lib/memzero.S | 12 ++
arch/arm/mach-sa1100/collie.c | 55 ++-------
arch/arm/mm/Kconfig | 21 ++++
arch/arm/mm/alignment.c | 10 +-
arch/arm/mm/cache-feroceon-l2.c | 6 +-
arch/arm/mm/cache-tauros2.c | 12 +-
arch/arm/mm/context.c | 58 +++++----
arch/arm/mm/fault-armv.c | 6 +-
arch/arm/mm/fault.c | 31 +++--
arch/arm/mm/highmem.c | 15 +--
arch/arm/mm/init.c | 153 ++++++++++++++++++++++-
arch/arm/mm/mmu.c | 77 +++++++-----
arch/arm/mm/proc-v7.S | 5 +-
arch/arm/nwfpe/fpmodule.c | 8 +-
arch/arm/vfp/vfphw.S | 6 +
arch/arm/vfp/vfpmodule.c | 102 +++++++++-------
arch/arm/vfp/vfpsingle.c | 2 +-
drivers/amba/bus.c | 15 ++-
drivers/dma/pl330.c | 99 ++++++++++++++-
include/linux/amba/bus.h | 10 ++
include/linux/pm_runtime.h | 6 +
70 files changed, 1121 insertions(+), 590 deletions(-)
create mode 100644 arch/arm/kernel/entry-ftrace.S
Merging arm-perf/for-next/perf (cac7f2429872 Linux 3.18-rc2)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (ee5254b783f6 arm-soc: document merges)
$ git merge arm-soc/for-next
Auto-merging drivers/memory/omap-gpmc.c
Removing drivers/clk/versatile/clk-vexpress.c
Auto-merging arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
Auto-merging arch/arm64/boot/dts/arm/foundation-v8.dts
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/mm/Kconfig
Removing arch/arm/mach-vexpress/include/mach/motherboard.h
Removing arch/arm/mach-vexpress/include/mach/irqs.h
Removing arch/arm/mach-vexpress/include/mach/hardware.h
Removing arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
Removing arch/arm/mach-vexpress/ct-ca9x4.c
Removing arch/arm/mach-shmobile/clock-r8a7791.c
Removing arch/arm/mach-shmobile/board-koelsch.c
Removing arch/arm/mach-shmobile/board-koelsch-reference.c
Removing arch/arm/mach-omap2/gpmc-smc91x.h
Removing arch/arm/mach-omap2/gpmc-smc91x.c
Removing arch/arm/mach-omap2/gpmc-onenand.h
Removing arch/arm/mach-omap2/gpmc-nand.h
Removing arch/arm/mach-omap2/cminst44xx.h
Removing arch/arm/mach-omap2/cm_44xx_54xx.h
Removing arch/arm/mach-omap2/cm44xx.c
Removing arch/arm/mach-omap2/board-ti8168evm.c
Removing arch/arm/mach-omap2/board-3430sdp.c
Removing arch/arm/mach-integrator/leds.c
Removing arch/arm/mach-integrator/include/mach/uncompress.h
Removing arch/arm/mach-exynos/hotplug.c
Removing arch/arm/mach-at91/stamp9g20.h
Removing arch/arm/mach-at91/irq.c
Removing arch/arm/mach-at91/include/mach/at91x40.h
Removing arch/arm/mach-at91/clock.h
Removing arch/arm/mach-at91/clock.c
Removing arch/arm/mach-at91/board-yl-9200.c
Removing arch/arm/mach-at91/board-stamp9g20.c
Removing arch/arm/mach-at91/board-snapper9260.c
Removing arch/arm/mach-at91/board-sam9rlek.c
Removing arch/arm/mach-at91/board-sam9m10g45ek.c
Removing arch/arm/mach-at91/board-sam9g20ek.c
Removing arch/arm/mach-at91/board-sam9263ek.c
Removing arch/arm/mach-at91/board-sam9261ek.c
Removing arch/arm/mach-at91/board-sam9260ek.c
Removing arch/arm/mach-at91/board-sam9-l9260.c
Removing arch/arm/mach-at91/board-rm9200ek.c
Removing arch/arm/mach-at91/board-picotux200.c
Removing arch/arm/mach-at91/board-pcontrol-g20.c
Removing arch/arm/mach-at91/board-kb9202.c
Removing arch/arm/mach-at91/board-kafa.c
Removing arch/arm/mach-at91/board-gsia18s.c
Removing arch/arm/mach-at91/board-flexibity.c
Removing arch/arm/mach-at91/board-eco920.c
Removing arch/arm/mach-at91/board-ecbat91.c
Removing arch/arm/mach-at91/board-eb9200.c
Removing arch/arm/mach-at91/board-eb01.c
Removing arch/arm/mach-at91/board-csb637.c
Removing arch/arm/mach-at91/board-csb337.c
Removing arch/arm/mach-at91/board-cpuat91.c
Removing arch/arm/mach-at91/board-cpu9krea.c
Removing arch/arm/mach-at91/board-carmeva.c
Removing arch/arm/mach-at91/board-cam60.c
Removing arch/arm/mach-at91/board-afeb-9260v1.c
Removing arch/arm/mach-at91/board-1arm.c
Removing arch/arm/mach-at91/at91x40_time.c
Removing arch/arm/mach-at91/at91x40.c
Removing arch/arm/mach-at91/at91sam9rl_devices.c
Removing arch/arm/mach-at91/at91sam9g45_devices.c
Removing arch/arm/mach-at91/at91sam9263_devices.c
Removing arch/arm/mach-at91/at91sam9261_devices.c
Removing arch/arm/mach-at91/at91sam9260_devices.c
Removing arch/arm/mach-at91/at91rm9200_devices.c
Removing arch/arm/mach-at91/at91_aic.h
Removing arch/arm/mach-at91/Kconfig.non_dt
Auto-merging arch/arm/kernel/Makefile
Auto-merging arch/arm/include/debug/sa1100.S
Removing arch/arm/configs/koelsch_defconfig
Removing arch/arm/configs/at91x40_defconfig
Removing arch/arm/configs/at91sam9rl_defconfig
Removing arch/arm/configs/at91sam9g45_defconfig
Removing arch/arm/configs/at91sam9263_defconfig
Removing arch/arm/configs/at91sam9261_9g10_defconfig
Removing arch/arm/configs/at91sam9260_9g20_defconfig
Removing arch/arm/configs/at91rm9200_defconfig
Auto-merging arch/arm/boot/dts/stih407-family.dtsi
Merge made by the 'recursive' strategy.
Documentation/arm/firmware.txt | 28 +-
Documentation/arm/sunxi/README | 16 +-
Documentation/devicetree/bindings/arm/amlogic.txt | 8 +-
Documentation/devicetree/bindings/arm/arm-boards | 65 +
.../devicetree/bindings/arm/bcm/cygnus.txt | 31 +
Documentation/devicetree/bindings/arm/cpus.txt | 9 +
Documentation/devicetree/bindings/arm/fsl.txt | 38 +
Documentation/devicetree/bindings/arm/gic.txt | 1 +
.../devicetree/bindings/arm/marvell,berlin.txt | 10 +
Documentation/devicetree/bindings/arm/mediatek.txt | 19 +-
.../devicetree/bindings/arm/omap/omap.txt | 3 +
Documentation/devicetree/bindings/arm/rockchip.txt | 4 +
.../devicetree/bindings/arm/samsung-boards.txt | 19 +-
.../devicetree/bindings/arm/ste-nomadik.txt | 6 +
Documentation/devicetree/bindings/arm/sunxi.txt | 12 +
.../devicetree/bindings/arm/ux500/power_domain.txt | 35 +
.../devicetree/bindings/clock/bcm-cygnus-clock.txt | 34 +
.../devicetree/bindings/clock/vf610-clock.txt | 15 +
.../devicetree/bindings/dma/atmel-xdma.txt | 54 +
.../devicetree/bindings/i2c/i2c-s3c2410.txt | 1 +
.../devicetree/bindings/i2c/trivial-devices.txt | 2 +
.../bindings/power_supply/imx-snvs-poweroff.txt | 23 +
.../devicetree/bindings/rtc/atmel,at91sam9-rtc.txt | 23 +
.../devicetree/bindings/timer/renesas,mtu2.txt | 2 +-
.../devicetree/bindings/timer/renesas,tmu.txt | 4 +-
.../devicetree/bindings/vendor-prefixes.txt | 3 +
Documentation/devicetree/bindings/w1/omap-hdq.txt | 17 +
MAINTAINERS | 64 +-
arch/arm/Kconfig | 27 +-
arch/arm/Kconfig.debug | 167 +-
arch/arm/Makefile | 8 +-
arch/arm/arm-soc-for-next-contents.txt | 298 +++
arch/arm/boot/dts/Makefile | 70 +-
arch/arm/boot/dts/am335x-evm.dts | 17 +-
arch/arm/boot/dts/am335x-igep0033.dtsi | 4 +-
arch/arm/boot/dts/am335x-lxm.dts | 362 ++++
arch/arm/boot/dts/am33xx.dtsi | 32 +-
arch/arm/boot/dts/am4372.dtsi | 48 +
arch/arm/boot/dts/am437x-gp-evm.dts | 34 +
arch/arm/boot/dts/am43x-epos-evm.dts | 12 +-
arch/arm/boot/dts/am57xx-beagle-x15.dts | 405 +++++
arch/arm/boot/dts/arm-realview-pb1176.dts | 412 +++++
arch/arm/boot/dts/armada-370-db.dts | 106 +-
arch/arm/boot/dts/armada-370-mirabox.dts | 25 +-
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 101 +-
arch/arm/boot/dts/armada-370-netgear-rn104.dts | 64 +-
arch/arm/boot/dts/armada-370-rd.dts | 73 +-
arch/arm/boot/dts/armada-370-synology-ds213j.dts | 316 ++++
arch/arm/boot/dts/armada-370-xp.dtsi | 11 +-
arch/arm/boot/dts/armada-370.dtsi | 190 +-
arch/arm/boot/dts/armada-375.dtsi | 23 +-
arch/arm/boot/dts/armada-385-db.dts | 2 +-
arch/arm/boot/dts/armada-38x.dtsi | 6 +-
arch/arm/boot/dts/armada-xp-axpwifiap.dts | 57 +-
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 75 +-
arch/arm/boot/dts/armada-xp-mv78230.dtsi | 15 +-
arch/arm/boot/dts/armada-xp-mv78260.dtsi | 15 +-
arch/arm/boot/dts/armada-xp-mv78460.dtsi | 15 +-
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 166 +-
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 14 +-
arch/arm/boot/dts/armada-xp-synology-ds414.dts | 330 ++++
arch/arm/boot/dts/armada-xp.dtsi | 66 +-
arch/arm/boot/dts/at91-sama5d4ek.dts | 4 +-
arch/arm/boot/dts/at91sam9260.dtsi | 14 +
arch/arm/boot/dts/at91sam9261.dtsi | 14 +
arch/arm/boot/dts/at91sam9263.dtsi | 40 +
arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 14 +
arch/arm/boot/dts/at91sam9g45.dtsi | 46 +
arch/arm/boot/dts/at91sam9m10g45ek.dts | 9 +
arch/arm/boot/dts/at91sam9rl.dtsi | 21 +
arch/arm/boot/dts/at91sam9x25.dtsi | 1 +
arch/arm/boot/dts/at91sam9x35.dtsi | 1 +
arch/arm/boot/dts/at91sam9x5.dtsi | 12 +
arch/arm/boot/dts/at91sam9x5_can.dtsi | 50 +-
arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 3 +
arch/arm/boot/dts/atlas6.dtsi | 15 +
arch/arm/boot/dts/bcm-cygnus-clock.dtsi | 91 +
arch/arm/boot/dts/bcm-cygnus.dtsi | 140 ++
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 30 +
arch/arm/boot/dts/bcm2835-rpi-b.dts | 46 +-
arch/arm/boot/dts/bcm2835-rpi.dtsi | 51 +
arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 34 +
arch/arm/boot/dts/bcm5301x.dtsi | 16 +
arch/arm/boot/dts/bcm911360_entphn.dts | 53 +
arch/arm/boot/dts/bcm911360k.dts | 53 +
arch/arm/boot/dts/bcm958300k.dts | 53 +
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 16 +
arch/arm/boot/dts/berlin2.dtsi | 110 ++
arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 30 +
arch/arm/boot/dts/berlin2cd.dtsi | 82 +
arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 61 +
arch/arm/boot/dts/berlin2q.dtsi | 96 +-
arch/arm/boot/dts/dra7-evm.dts | 133 ++
arch/arm/boot/dts/dra7.dtsi | 202 ++-
arch/arm/boot/dts/dra72-evm.dts | 319 ++++
arch/arm/boot/dts/dra74x.dtsi | 22 +
arch/arm/boot/dts/emev2-kzm9d.dts | 63 +-
arch/arm/boot/dts/emev2.dtsi | 12 +-
arch/arm/boot/dts/exynos3250-monk.dts | 579 ++++++
arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 16 +
arch/arm/boot/dts/exynos3250-rinato.dts | 682 +++++++
arch/arm/boot/dts/exynos3250.dtsi | 10 +
arch/arm/boot/dts/exynos4.dtsi | 4 +-
arch/arm/boot/dts/exynos4210-trats.dts | 16 +
arch/arm/boot/dts/exynos4210-universal_c210.dts | 16 +
arch/arm/boot/dts/exynos4210.dtsi | 17 +
arch/arm/boot/dts/exynos4212.dtsi | 17 +
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 26 +
arch/arm/boot/dts/exynos4412-trats2.dts | 412 ++++-
arch/arm/boot/dts/exynos4412.dtsi | 29 +
arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 573 ++++++
arch/arm/boot/dts/exynos4415.dtsi | 604 ++++++
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 16 +
arch/arm/boot/dts/exynos4x12.dtsi | 10 +
arch/arm/boot/dts/exynos5250-arndale.dts | 907 +++++----
arch/arm/boot/dts/exynos5250-smdk5250.dts | 618 +++----
arch/arm/boot/dts/exynos5250-snow.dts | 266 +--
arch/arm/boot/dts/exynos5250-spring.dts | 566 ++++++
arch/arm/boot/dts/exynos5250.dtsi | 20 +-
arch/arm/boot/dts/exynos5420-peach-pit.dts | 7 +-
arch/arm/boot/dts/exynos5420.dtsi | 4 +
arch/arm/boot/dts/exynos5800-peach-pi.dts | 7 +-
arch/arm/boot/dts/hisi-x5hd2-dkb.dts | 33 +
arch/arm/boot/dts/hisi-x5hd2.dtsi | 390 +++-
arch/arm/boot/dts/imx51.dtsi | 12 +-
arch/arm/boot/dts/imx53.dtsi | 25 +-
arch/arm/boot/dts/imx6dl.dtsi | 8 +
arch/arm/boot/dts/imx6q-tbs2910.dts | 432 +++++
arch/arm/boot/dts/imx6q.dtsi | 4 +
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 -
arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 131 +-
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 97 +-
arch/arm/boot/dts/imx6qdl-rex.dtsi | 1 -
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 12 +-
arch/arm/boot/dts/imx6qdl.dtsi | 14 +
arch/arm/boot/dts/imx6sl-evk.dts | 4 +
arch/arm/boot/dts/imx6sl.dtsi | 6 +
arch/arm/boot/dts/imx6sx-sdb.dts | 66 +
arch/arm/boot/dts/imx6sx.dtsi | 8 +-
arch/arm/boot/dts/integrator.dtsi | 48 +-
arch/arm/boot/dts/k2e-evm.dts | 12 +
arch/arm/boot/dts/k2e.dtsi | 45 +
arch/arm/boot/dts/k2l-evm.dts | 12 +
arch/arm/boot/dts/keystone.dtsi | 45 +
arch/arm/boot/dts/kirkwood-dir665.dts | 278 +++
arch/arm/boot/dts/kirkwood-synology.dtsi | 2 +-
arch/arm/boot/dts/ls1021a-qds.dts | 240 +++
arch/arm/boot/dts/ls1021a-twr.dts | 127 ++
arch/arm/boot/dts/ls1021a.dtsi | 408 +++++
arch/arm/boot/dts/meson.dtsi | 37 +
arch/arm/boot/dts/meson6-atv1200.dts | 2 +-
arch/arm/boot/dts/meson6.dtsi | 2 +
arch/arm/boot/dts/meson8.dtsi | 92 +
arch/arm/boot/dts/mt6592-evb.dts | 26 +
arch/arm/boot/dts/mt6592.dtsi | 98 +
arch/arm/boot/dts/mt8127-moose.dts | 25 +
arch/arm/boot/dts/mt8127.dtsi | 94 +
arch/arm/boot/dts/mt8135-evbp1.dts | 25 +
arch/arm/boot/dts/mt8135.dtsi | 116 ++
arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi | 41 +-
arch/arm/boot/dts/omap-zoom-common.dtsi | 62 +-
arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 +-
arch/arm/boot/dts/omap2420.dtsi | 1 +
arch/arm/boot/dts/omap2430-sdp.dts | 28 +-
arch/arm/boot/dts/omap2430.dtsi | 1 +
arch/arm/boot/dts/omap3-cm-t3517.dts | 11 +
arch/arm/boot/dts/omap3-cm-t3530.dts | 11 +
arch/arm/boot/dts/omap3-cm-t3730.dts | 24 +
arch/arm/boot/dts/omap3-cm-t3x.dtsi | 151 ++
arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 35 +
arch/arm/boot/dts/omap3-devkit8000.dts | 4 +-
arch/arm/boot/dts/omap3-evm-37xx.dts | 5 +-
arch/arm/boot/dts/omap3-evm-common.dtsi | 21 +
arch/arm/boot/dts/omap3-gta04.dtsi | 86 +-
arch/arm/boot/dts/omap3-igep.dtsi | 103 +-
arch/arm/boot/dts/omap3-igep0020-common.dtsi | 246 +++
arch/arm/boot/dts/omap3-igep0020-rev-f.dts | 45 +
arch/arm/boot/dts/omap3-igep0020.dts | 285 +--
arch/arm/boot/dts/omap3-igep0030-common.dtsi | 60 +
arch/arm/boot/dts/omap3-igep0030-rev-g.dts | 67 +
arch/arm/boot/dts/omap3-igep0030.dts | 123 +-
arch/arm/boot/dts/omap3-ldp.dts | 26 +-
arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +-
arch/arm/boot/dts/omap3-n900.dts | 51 +-
arch/arm/boot/dts/omap3-n950-n9.dtsi | 4 +-
arch/arm/boot/dts/omap3-sb-t35.dtsi | 126 +-
arch/arm/boot/dts/omap3-sbc-t3517.dts | 15 +
arch/arm/boot/dts/omap3-sbc-t3530.dts | 15 +
arch/arm/boot/dts/omap3-sbc-t3730.dts | 15 +
arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +-
arch/arm/boot/dts/omap3.dtsi | 3 +-
arch/arm/boot/dts/omap3430-sdp.dts | 8 +-
arch/arm/boot/dts/omap4-duovero-parlor.dts | 1 +
arch/arm/boot/dts/omap4.dtsi | 3 +-
arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 -
arch/arm/boot/dts/omap5.dtsi | 1 +
arch/arm/boot/dts/prima2.dtsi | 33 +
arch/arm/boot/dts/r7s72100-genmai.dts | 3 +-
arch/arm/boot/dts/r7s72100.dtsi | 202 +--
arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 7 +-
arch/arm/boot/dts/r8a73a4.dtsi | 263 +--
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 7 +-
arch/arm/boot/dts/r8a7740.dtsi | 44 +-
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 7 +-
arch/arm/boot/dts/r8a7778.dtsi | 42 +-
arch/arm/boot/dts/r8a7779-marzen.dts | 84 +
arch/arm/boot/dts/r8a7779.dtsi | 34 +-
arch/arm/boot/dts/r8a7790-lager.dts | 185 +-
arch/arm/boot/dts/r8a7790.dtsi | 279 ++-
arch/arm/boot/dts/r8a7791-henninger.dts | 12 +
arch/arm/boot/dts/r8a7791-koelsch.dts | 118 +-
arch/arm/boot/dts/r8a7791.dtsi | 255 ++-
arch/arm/boot/dts/r8a7794-alt.dts | 3 +-
arch/arm/boot/dts/r8a7794.dtsi | 29 +-
arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 41 +
arch/arm/boot/dts/rk3066a-bqcurie2.dts | 4 +
arch/arm/boot/dts/rk3066a-marsboard.dts | 192 ++
arch/arm/boot/dts/rk3066a.dtsi | 115 +-
arch/arm/boot/dts/rk3188-radxarock.dts | 18 +-
arch/arm/boot/dts/rk3188.dtsi | 45 +-
arch/arm/boot/dts/rk3288-evb-rk808.dts | 6 +-
arch/arm/boot/dts/rk3288.dtsi | 70 +-
arch/arm/boot/dts/rk3xxx.dtsi | 8 +
arch/arm/boot/dts/s3c6410-mini6410.dts | 4 -
arch/arm/boot/dts/s3c64xx.dtsi | 1 -
arch/arm/boot/dts/sama5d4.dtsi | 75 +-
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 9 +-
arch/arm/boot/dts/sh73a0.dtsi | 10 +-
arch/arm/boot/dts/socfpga.dtsi | 27 +
arch/arm/boot/dts/socfpga_arria10.dtsi | 374 ++++
arch/arm/boot/dts/socfpga_arria10_socdk.dts | 48 +
arch/arm/boot/dts/socfpga_cyclone5.dtsi | 4 +
arch/arm/boot/dts/ste-dbx5x0.dtsi | 22 +
arch/arm/boot/dts/ste-nomadik-nhk15.dts | 151 ++
arch/arm/boot/dts/ste-nomadik-s8815.dts | 56 +-
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 45 +-
arch/arm/boot/dts/stih407-b2120.dts | 55 +-
arch/arm/boot/dts/stih407-clock.dtsi | 293 ++-
.../boot/dts/{stih407.dtsi => stih407-family.dtsi} | 35 +-
arch/arm/boot/dts/stih410-b2120.dts | 29 +
arch/arm/boot/dts/stih410-clock.dtsi | 338 ++++
arch/arm/boot/dts/stih410-pinctrl.dtsi | 34 +
arch/arm/boot/dts/stih410.dtsi | 14 +
arch/arm/boot/dts/stih415-pinctrl.dtsi | 361 ++--
arch/arm/boot/dts/stih415.dtsi | 12 +
arch/arm/boot/dts/stih416-b2020.dts | 22 +
arch/arm/boot/dts/stih416-b2020e.dts | 26 +-
arch/arm/boot/dts/stih416-pinctrl.dtsi | 415 +++--
arch/arm/boot/dts/stih416.dtsi | 209 +++
arch/arm/boot/dts/stih41x-b2000.dtsi | 6 +-
arch/arm/boot/dts/stih41x-b2020.dtsi | 10 +-
arch/arm/boot/dts/stih41x-b2020x.dtsi | 4 +
arch/arm/boot/dts/stihxxx-b2120.dtsi | 59 +
arch/arm/boot/dts/sun4i-a10-a1000.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 46 +-
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 46 +-
arch/arm/boot/dts/sun4i-a10.dtsi | 14 +
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 46 +-
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 46 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 14 +
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 6 +-
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 48 +-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 46 +-
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 46 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 46 +-
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 46 +-
arch/arm/boot/dts/sun6i-a31-m9.dts | 103 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 46 +-
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 214 +++
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 14 +
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 46 +-
arch/arm/boot/dts/sun7i-a20-m3.dts | 168 ++
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 46 +-
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 228 +++
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 46 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 45 +-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 46 +-
arch/arm/boot/dts/sun8i-a23.dtsi | 6 +-
arch/arm/boot/dts/sun9i-a80-optimus.dts | 119 ++
arch/arm/boot/dts/sun9i-a80.dtsi | 514 ++++++
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 66 +-
arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 96 +
arch/arm/boot/dts/vf-colibri.dtsi | 186 ++
arch/arm/boot/dts/vf500-colibri-eval-v3.dts | 17 +
arch/arm/boot/dts/vf500-colibri.dtsi | 20 +
arch/arm/boot/dts/vf500.dtsi | 171 ++
arch/arm/boot/dts/vf610-colibri-eval-v3.dts | 33 +-
arch/arm/boot/dts/vf610-colibri.dtsi | 100 +-
arch/arm/boot/dts/vf610-cosmic.dts | 14 +-
arch/arm/boot/dts/vf610-twr.dts | 46 +-
arch/arm/boot/dts/vf610.dtsi | 486 +----
arch/arm/boot/dts/vfxxx.dtsi | 437 +++++
arch/arm/common/edma.c | 54 +-
arch/arm/configs/ape6evm_defconfig | 1 +
arch/arm/configs/at91rm9200_defconfig | 161 --
arch/arm/configs/at91sam9260_9g20_defconfig | 145 --
arch/arm/configs/at91sam9261_9g10_defconfig | 147 --
arch/arm/configs/at91sam9263_defconfig | 151 --
arch/arm/configs/at91sam9g45_defconfig | 175 --
arch/arm/configs/at91sam9rl_defconfig | 92 -
arch/arm/configs/at91x40_defconfig | 48 -
arch/arm/configs/bcm_defconfig | 3 +-
arch/arm/configs/exynos_defconfig | 1 +
arch/arm/configs/hisi_defconfig | 19 +
arch/arm/configs/integrator_defconfig | 3 +
arch/arm/configs/keystone_defconfig | 7 +
arch/arm/configs/koelsch_defconfig | 113 --
arch/arm/configs/multi_v5_defconfig | 2 +
arch/arm/configs/multi_v7_defconfig | 32 +-
arch/arm/configs/mvebu_v5_defconfig | 2 +
arch/arm/configs/mvebu_v7_defconfig | 9 +-
arch/arm/configs/nhk8815_defconfig | 11 +-
arch/arm/configs/sama5_defconfig | 1 -
arch/arm/configs/shmobile_defconfig | 4 +-
arch/arm/configs/tegra_defconfig | 2 -
arch/arm/include/asm/firmware.h | 10 +-
arch/arm/include/asm/perf_event.h | 2 +-
arch/arm/include/asm/pmu.h | 36 +-
arch/arm/include/debug/asm9260.S | 29 +
arch/arm/include/debug/renesas-scif.S | 52 +
.../mach/debug-macro.S => include/debug/sa1100.S} | 10 +-
arch/arm/kernel/Makefile | 2 +-
arch/arm/kernel/perf_callchain.c | 136 ++
arch/arm/kernel/perf_event.c | 162 +-
arch/arm/kernel/perf_event_cpu.c | 181 +-
arch/arm/kernel/perf_event_v6.c | 12 +-
arch/arm/kernel/perf_event_v7.c | 72 +-
arch/arm/kernel/perf_event_xscale.c | 20 +-
arch/arm/mach-asm9260/Kconfig | 6 +
arch/arm/mach-at91/Kconfig | 58 +-
arch/arm/mach-at91/Kconfig.non_dt | 344 ----
arch/arm/mach-at91/Makefile | 62 +-
arch/arm/mach-at91/Makefile.boot | 6 -
arch/arm/mach-at91/at91_aic.h | 99 -
arch/arm/mach-at91/at91rm9200.c | 341 ----
arch/arm/mach-at91/at91rm9200_devices.c | 1212 -------------
arch/arm/mach-at91/at91sam9260.c | 397 ----
arch/arm/mach-at91/at91sam9260_devices.c | 1364 --------------
arch/arm/mach-at91/at91sam9261.c | 375 ----
arch/arm/mach-at91/at91sam9261_devices.c | 1098 -----------
arch/arm/mach-at91/at91sam9263.c | 399 ----
arch/arm/mach-at91/at91sam9263_devices.c | 1538 ----------------
arch/arm/mach-at91/at91sam9g45.c | 456 +----
arch/arm/mach-at91/at91sam9g45_devices.c | 1915 --------------------
arch/arm/mach-at91/at91sam9n12.c | 213 +--
arch/arm/mach-at91/at91sam9rl.c | 378 +---
arch/arm/mach-at91/at91sam9rl_devices.c | 1260 -------------
arch/arm/mach-at91/at91sam9x5.c | 311 +---
arch/arm/mach-at91/at91x40.c | 93 -
arch/arm/mach-at91/at91x40_time.c | 85 -
arch/arm/mach-at91/board-1arm.c | 99 -
arch/arm/mach-at91/board-afeb-9260v1.c | 223 ---
arch/arm/mach-at91/board-cam60.c | 199 --
arch/arm/mach-at91/board-carmeva.c | 167 --
arch/arm/mach-at91/board-cpu9krea.c | 386 ----
arch/arm/mach-at91/board-cpuat91.c | 189 --
arch/arm/mach-at91/board-csb337.c | 260 ---
arch/arm/mach-at91/board-csb637.c | 142 --
arch/arm/mach-at91/board-dt-rm9200.c | 1 -
arch/arm/mach-at91/board-dt-sam9.c | 1 -
arch/arm/mach-at91/board-dt-sama5.c | 1 -
arch/arm/mach-at91/board-eb01.c | 52 -
arch/arm/mach-at91/board-eb9200.c | 126 --
arch/arm/mach-at91/board-ecbat91.c | 191 --
arch/arm/mach-at91/board-eco920.c | 160 --
arch/arm/mach-at91/board-flexibity.c | 171 --
arch/arm/mach-at91/board-gsia18s.c | 585 ------
arch/arm/mach-at91/board-kafa.c | 113 --
arch/arm/mach-at91/board-kb9202.c | 159 --
arch/arm/mach-at91/board-pcontrol-g20.c | 228 ---
arch/arm/mach-at91/board-picotux200.c | 129 --
arch/arm/mach-at91/board-rm9200ek.c | 196 --
arch/arm/mach-at91/board-sam9-l9260.c | 230 ---
arch/arm/mach-at91/board-sam9260ek.c | 354 ----
arch/arm/mach-at91/board-sam9261ek.c | 623 -------
arch/arm/mach-at91/board-sam9263ek.c | 493 -----
arch/arm/mach-at91/board-sam9g20ek.c | 429 -----
arch/arm/mach-at91/board-sam9m10g45ek.c | 527 ------
arch/arm/mach-at91/board-sam9rlek.c | 333 ----
arch/arm/mach-at91/board-snapper9260.c | 191 --
arch/arm/mach-at91/board-stamp9g20.c | 294 ---
arch/arm/mach-at91/board-yl-9200.c | 597 ------
arch/arm/mach-at91/board.h | 4 -
arch/arm/mach-at91/clock.c | 977 ----------
arch/arm/mach-at91/clock.h | 49 -
arch/arm/mach-at91/generic.h | 20 -
arch/arm/mach-at91/include/mach/at91_dbgu.h | 3 -
arch/arm/mach-at91/include/mach/at91_ramc.h | 6 +-
arch/arm/mach-at91/include/mach/at91x40.h | 60 -
arch/arm/mach-at91/include/mach/cpu.h | 1 -
arch/arm/mach-at91/include/mach/hardware.h | 5 -
arch/arm/mach-at91/include/mach/uncompress.h | 7 -
arch/arm/mach-at91/irq.c | 296 ---
arch/arm/mach-at91/pm.c | 22 -
arch/arm/mach-at91/pm.h | 1 -
arch/arm/mach-at91/setup.c | 15 +-
arch/arm/mach-at91/stamp9g20.h | 7 -
arch/arm/mach-bcm/Kconfig | 96 +-
arch/arm/mach-bcm/Makefile | 5 +
arch/arm/mach-bcm/bcm_cygnus.c | 25 +
arch/arm/mach-bcm/brcmstb.h | 19 +
arch/arm/mach-bcm/headsmp-brcmstb.S | 33 +
arch/arm/mach-bcm/platsmp-brcmstb.c | 329 ++++
arch/arm/mach-berlin/Kconfig | 3 +-
arch/arm/mach-davinci/board-da830-evm.c | 89 +-
arch/arm/mach-davinci/board-da850-evm.c | 9 +-
arch/arm/mach-davinci/board-dm644x-evm.c | 10 +-
arch/arm/mach-davinci/board-mityomapl138.c | 45 +-
arch/arm/mach-davinci/board-neuros-osd2.c | 5 +-
arch/arm/mach-davinci/clock.c | 2 +-
arch/arm/mach-davinci/mux.c | 15 +-
arch/arm/mach-davinci/time.c | 13 +-
arch/arm/mach-ep93xx/dma.c | 12 +-
arch/arm/mach-exynos/Kconfig | 11 +
arch/arm/mach-exynos/Makefile | 7 +-
arch/arm/mach-exynos/common.h | 33 +-
arch/arm/mach-exynos/exynos-pmu.h | 24 +
arch/arm/mach-exynos/exynos.c | 80 +-
arch/arm/mach-exynos/firmware.c | 67 +-
arch/arm/mach-exynos/hotplug.c | 91 -
arch/arm/mach-exynos/include/mach/map.h | 23 -
arch/arm/mach-exynos/mcpm-exynos.c | 32 +-
arch/arm/mach-exynos/platsmp.c | 148 ++
arch/arm/mach-exynos/pm.c | 311 +---
arch/arm/mach-exynos/pmu.c | 675 ++++++-
arch/arm/mach-exynos/regs-pmu.h | 361 ++++
arch/arm/mach-exynos/sleep.S | 28 +
arch/arm/mach-exynos/smc.h | 4 +
arch/arm/mach-exynos/suspend.c | 566 ++++++
arch/arm/mach-imx/Kconfig | 31 +-
arch/arm/mach-imx/Makefile | 6 +-
arch/arm/mach-imx/anatop.c | 34 +-
arch/arm/mach-imx/clk-cpu.c | 107 ++
arch/arm/mach-imx/clk-imx51-imx53.c | 14 +-
arch/arm/mach-imx/clk-imx6q.c | 2 +-
arch/arm/mach-imx/clk-pllv3.c | 7 +-
arch/arm/mach-imx/clk-vf610.c | 21 +-
arch/arm/mach-imx/clk.h | 4 +
arch/arm/mach-imx/common.h | 3 +-
arch/arm/mach-imx/imx25-dt.c | 9 -
arch/arm/mach-imx/imx27-dt.c | 3 -
arch/arm/mach-imx/imx31-dt.c | 9 -
arch/arm/mach-imx/imx35-dt.c | 10 -
arch/arm/mach-imx/iomux-imx31.c | 8 +-
arch/arm/mach-imx/iomux-mx3.h | 2 +-
arch/arm/mach-imx/mach-imx50.c | 9 -
arch/arm/mach-imx/mach-imx51.c | 2 -
arch/arm/mach-imx/mach-imx53.c | 4 +-
arch/arm/mach-imx/mach-imx6q.c | 3 -
arch/arm/mach-imx/mach-imx6sl.c | 4 -
arch/arm/mach-imx/mach-imx6sx.c | 55 +-
arch/arm/mach-imx/mach-ls1021a.c | 22 +
arch/arm/mach-imx/mach-vf610.c | 10 -
arch/arm/mach-imx/mmdc.c | 17 +
arch/arm/mach-imx/mxc.h | 2 +
arch/arm/mach-imx/platsmp.c | 33 +
arch/arm/mach-imx/pm-imx6.c | 10 +-
arch/arm/mach-imx/suspend-imx6.S | 14 +-
arch/arm/mach-imx/system.c | 15 -
arch/arm/mach-integrator/Kconfig | 23 +
arch/arm/mach-integrator/Makefile | 2 +-
arch/arm/mach-integrator/cm.h | 1 -
arch/arm/mach-integrator/common.h | 2 -
arch/arm/mach-integrator/core.c | 103 --
arch/arm/mach-integrator/include/mach/uncompress.h | 48 -
arch/arm/mach-integrator/integrator_ap.c | 218 ---
arch/arm/mach-integrator/integrator_cp.c | 28 -
arch/arm/mach-integrator/leds.c | 124 --
arch/arm/mach-keystone/Kconfig | 2 +
arch/arm/mach-mediatek/Kconfig | 4 +-
arch/arm/mach-mediatek/mediatek.c | 3 +
arch/arm/mach-meson/Kconfig | 6 +
arch/arm/mach-meson/meson.c | 10 +-
arch/arm/mach-mvebu/armada-370-xp.h | 6 -
arch/arm/mach-mvebu/board-v7.c | 71 +-
arch/arm/mach-mvebu/coherency.c | 221 +--
arch/arm/mach-mvebu/coherency_ll.S | 21 +-
arch/arm/mach-mvebu/cpu-reset.c | 1 -
arch/arm/mach-mvebu/headsmp-a9.S | 1 +
arch/arm/mach-mvebu/platsmp-a9.c | 53 +-
arch/arm/mach-mvebu/platsmp.c | 2 +
arch/arm/mach-mvebu/pmsu.c | 3 +-
arch/arm/mach-mvebu/pmsu.h | 2 +
arch/arm/mach-mvebu/pmsu_ll.S | 20 +-
arch/arm/mach-nomadik/cpu-8815.c | 1 +
arch/arm/mach-omap2/Kconfig | 18 +-
arch/arm/mach-omap2/Makefile | 10 +-
arch/arm/mach-omap2/am33xx-restart.c | 12 +-
arch/arm/mach-omap2/board-3430sdp.c | 632 -------
arch/arm/mach-omap2/board-am3517crane.c | 1 +
arch/arm/mach-omap2/board-cm-t35.c | 3 +-
arch/arm/mach-omap2/board-cm-t3517.c | 3 +-
arch/arm/mach-omap2/board-flash.c | 3 +-
arch/arm/mach-omap2/board-flash.h | 1 -
arch/arm/mach-omap2/board-n8x0.c | 2 -
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 32 +-
arch/arm/mach-omap2/board-ti8168evm.c | 62 -
arch/arm/mach-omap2/cclock3xxx_data.c | 6 +
arch/arm/mach-omap2/clock.c | 7 +-
arch/arm/mach-omap2/clock.h | 1 +
arch/arm/mach-omap2/clock3xxx.c | 38 +-
arch/arm/mach-omap2/cm.h | 18 +-
arch/arm/mach-omap2/cm1_44xx.h | 2 -
arch/arm/mach-omap2/cm1_54xx.h | 2 -
arch/arm/mach-omap2/cm1_7xx.h | 2 -
arch/arm/mach-omap2/cm2_44xx.h | 2 -
arch/arm/mach-omap2/cm2_54xx.h | 2 -
arch/arm/mach-omap2/cm2_7xx.h | 2 -
arch/arm/mach-omap2/cm2xxx.c | 17 +-
arch/arm/mach-omap2/cm2xxx.h | 10 +-
arch/arm/mach-omap2/cm33xx.c | 61 +-
arch/arm/mach-omap2/cm33xx.h | 37 +-
arch/arm/mach-omap2/cm3xxx.c | 19 +-
arch/arm/mach-omap2/cm3xxx.h | 12 -
arch/arm/mach-omap2/cm44xx.c | 49 -
arch/arm/mach-omap2/cm44xx.h | 3 +
arch/arm/mach-omap2/cm_44xx_54xx.h | 36 -
arch/arm/mach-omap2/cm_common.c | 82 +-
arch/arm/mach-omap2/cminst44xx.c | 80 +-
arch/arm/mach-omap2/cminst44xx.h | 43 -
arch/arm/mach-omap2/devices.c | 62 +-
arch/arm/mach-omap2/dpll3xxx.c | 179 +-
arch/arm/mach-omap2/dpll44xx.c | 41 +
arch/arm/mach-omap2/gpmc-nand.c | 3 +-
arch/arm/mach-omap2/gpmc-nand.h | 27 -
arch/arm/mach-omap2/gpmc-onenand.c | 3 +-
arch/arm/mach-omap2/gpmc-onenand.h | 24 -
arch/arm/mach-omap2/gpmc-smc91x.c | 186 --
arch/arm/mach-omap2/gpmc-smc91x.h | 42 -
arch/arm/mach-omap2/gpmc.h | 227 +--
arch/arm/mach-omap2/io.c | 11 +-
arch/arm/mach-omap2/omap-mpuss-lowpower.c | 4 +-
arch/arm/mach-omap2/omap2-restart.c | 5 +-
arch/arm/mach-omap2/omap3-restart.c | 7 +-
arch/arm/mach-omap2/omap4-restart.c | 6 +-
arch/arm/mach-omap2/omap_hwmod.c | 272 +--
arch/arm/mach-omap2/omap_hwmod.h | 8 +
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 39 +
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 25 +-
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 5 +
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 100 +
arch/arm/mach-omap2/omap_phy_internal.c | 8 +-
arch/arm/mach-omap2/pdata-quirks.c | 39 +-
arch/arm/mach-omap2/pm34xx.c | 2 +-
arch/arm/mach-omap2/pm44xx.c | 146 +-
arch/arm/mach-omap2/prm.h | 16 +
arch/arm/mach-omap2/prm2xxx.c | 6 +-
arch/arm/mach-omap2/prm2xxx.h | 1 -
arch/arm/mach-omap2/prm2xxx_3xxx.c | 19 +-
arch/arm/mach-omap2/prm2xxx_3xxx.h | 9 +-
arch/arm/mach-omap2/prm33xx.c | 64 +-
arch/arm/mach-omap2/prm33xx.h | 11 +-
arch/arm/mach-omap2/prm3xxx.c | 32 +-
arch/arm/mach-omap2/prm3xxx.h | 16 -
arch/arm/mach-omap2/prm44xx.c | 36 +-
arch/arm/mach-omap2/prm44xx_54xx.h | 19 -
arch/arm/mach-omap2/prm_common.c | 99 +
arch/arm/mach-omap2/prminst44xx.c | 10 +-
arch/arm/mach-omap2/prminst44xx.h | 5 +-
arch/arm/mach-omap2/serial.c | 3 -
arch/arm/mach-pxa/Kconfig | 11 +
arch/arm/mach-pxa/Makefile | 1 +
arch/arm/mach-pxa/em-x270.c | 4 +-
arch/arm/mach-pxa/generic.h | 65 +-
arch/arm/mach-pxa/gumstix.c | 3 +-
arch/arm/mach-pxa/include/mach/pxa25x.h | 8 -
arch/arm/mach-pxa/include/mach/pxa27x.h | 4 -
arch/arm/mach-pxa/include/mach/pxa3xx.h | 5 -
arch/arm/mach-pxa/mfp-pxa2xx.c | 12 +-
arch/arm/mach-pxa/poodle.c | 2 +-
arch/arm/mach-pxa/pxa-dt.c | 18 +-
arch/arm/mach-pxa/pxa27x.c | 6 +
arch/arm/mach-pxa/pxa3xx-ulpi.c | 6 +-
arch/arm/mach-pxa/raumfeld.c | 26 +-
arch/arm/mach-pxa/tosa.c | 41 +-
arch/arm/mach-realview/Kconfig | 13 +
arch/arm/mach-realview/Makefile | 1 +
arch/arm/mach-realview/realview-dt.c | 32 +
arch/arm/mach-rockchip/headsmp.S | 5 +-
arch/arm/mach-rockchip/platsmp.c | 223 ++-
arch/arm/mach-rockchip/rockchip.c | 7 +
arch/arm/mach-shmobile/Kconfig | 22 +-
arch/arm/mach-shmobile/Makefile | 6 +-
arch/arm/mach-shmobile/Makefile.boot | 1 -
arch/arm/mach-shmobile/board-ape6evm-reference.c | 5 -
arch/arm/mach-shmobile/board-ape6evm.c | 4 -
arch/arm/mach-shmobile/board-armadillo800eva.c | 57 +-
arch/arm/mach-shmobile/board-bockw-reference.c | 4 -
arch/arm/mach-shmobile/board-bockw.c | 4 -
arch/arm/mach-shmobile/board-koelsch-reference.c | 117 --
arch/arm/mach-shmobile/board-koelsch.c | 527 ------
arch/arm/mach-shmobile/board-kzm9g-reference.c | 12 +-
arch/arm/mach-shmobile/board-kzm9g.c | 4 -
arch/arm/mach-shmobile/board-lager-reference.c | 84 -
arch/arm/mach-shmobile/board-lager.c | 4 -
arch/arm/mach-shmobile/board-mackerel.c | 4 -
arch/arm/mach-shmobile/board-marzen-reference.c | 5 -
arch/arm/mach-shmobile/board-marzen.c | 4 -
arch/arm/mach-shmobile/clock-r8a73a4.c | 4 -
arch/arm/mach-shmobile/clock-r8a7740.c | 4 -
arch/arm/mach-shmobile/clock-r8a7778.c | 4 -
arch/arm/mach-shmobile/clock-r8a7779.c | 4 -
arch/arm/mach-shmobile/clock-r8a7790.c | 4 -
arch/arm/mach-shmobile/clock-r8a7791.c | 342 ----
arch/arm/mach-shmobile/clock-sh7372.c | 4 -
arch/arm/mach-shmobile/clock-sh73a0.c | 4 -
arch/arm/mach-shmobile/clock.c | 36 +-
arch/arm/mach-shmobile/clock.h | 14 -
arch/arm/mach-shmobile/common.h | 5 -
arch/arm/mach-shmobile/console.c | 4 -
arch/arm/mach-shmobile/headsmp-scu.S | 5 -
arch/arm/mach-shmobile/intc-sh7372.c | 4 -
arch/arm/mach-shmobile/intc-sh73a0.c | 4 -
arch/arm/mach-shmobile/platsmp-apmu.c | 27 +-
arch/arm/mach-shmobile/platsmp-apmu.h | 32 +
arch/arm/mach-shmobile/pm-r8a7740.c | 44 +-
arch/arm/mach-shmobile/r8a73a4.h | 1 -
arch/arm/mach-shmobile/r8a7740.h | 4 -
arch/arm/mach-shmobile/r8a7778.h | 5 -
arch/arm/mach-shmobile/r8a7791.h | 3 -
arch/arm/mach-shmobile/setup-emev2.c | 4 -
arch/arm/mach-shmobile/setup-r7s72100.c | 4 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 13 +-
arch/arm/mach-shmobile/setup-r8a7740.c | 16 +-
arch/arm/mach-shmobile/setup-r8a7778.c | 14 +-
arch/arm/mach-shmobile/setup-r8a7779.c | 11 +-
arch/arm/mach-shmobile/setup-r8a7790.c | 4 -
arch/arm/mach-shmobile/setup-r8a7791.c | 185 +-
arch/arm/mach-shmobile/setup-rcar-gen2.c | 76 +-
arch/arm/mach-shmobile/setup-sh7372.c | 8 +-
arch/arm/mach-shmobile/setup-sh73a0.c | 24 +-
arch/arm/mach-shmobile/sh73a0.h | 1 -
arch/arm/mach-shmobile/sleep-sh7372.S | 5 -
arch/arm/mach-shmobile/smp-emev2.c | 4 -
arch/arm/mach-shmobile/smp-r8a7779.c | 4 -
arch/arm/mach-shmobile/smp-r8a7790.c | 16 +-
arch/arm/mach-shmobile/smp-r8a7791.c | 12 +-
arch/arm/mach-shmobile/smp-sh73a0.c | 4 -
arch/arm/mach-shmobile/timer.c | 28 +-
arch/arm/mach-socfpga/core.h | 3 +
arch/arm/mach-socfpga/platsmp.c | 19 +-
arch/arm/mach-sti/Kconfig | 10 +
arch/arm/mach-sunxi/Kconfig | 7 +
arch/arm/mach-sunxi/platsmp.c | 2 +-
arch/arm/mach-sunxi/sunxi.c | 9 +
arch/arm/mach-tegra/cpuidle-tegra114.c | 2 +-
arch/arm/mach-tegra/reset-handler.S | 1 +
arch/arm/mach-u300/dummyspichip.c | 65 +-
arch/arm/mach-ux500/Kconfig | 1 +
arch/arm/mach-ux500/Makefile | 1 +
arch/arm/mach-ux500/pm.c | 4 +
arch/arm/mach-ux500/pm_domains.c | 79 +
arch/arm/mach-ux500/pm_domains.h | 17 +
arch/arm/mach-vexpress/Kconfig | 4 +-
arch/arm/mach-vexpress/Makefile | 3 +-
arch/arm/mach-vexpress/core.h | 7 -
arch/arm/mach-vexpress/ct-ca9x4.c | 212 ---
arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 47 -
arch/arm/mach-vexpress/include/mach/hardware.h | 1 -
arch/arm/mach-vexpress/include/mach/irqs.h | 6 -
arch/arm/mach-vexpress/include/mach/motherboard.h | 88 -
arch/arm/mach-vexpress/platsmp.c | 42 -
arch/arm/mach-vexpress/v2m.c | 374 ----
arch/arm/mm/Kconfig | 28 +-
arch/arm/plat-samsung/Makefile | 1 +
arch/arm/plat-samsung/include/plat/map-s5p.h | 21 -
arch/arm/plat-versatile/Kconfig | 2 +-
arch/arm64/Kconfig | 5 +
arch/arm64/Makefile | 10 +-
arch/arm64/boot/dts/Makefile | 16 +-
arch/arm64/boot/dts/amd/Makefile | 5 +
arch/arm64/boot/dts/amd/amd-overdrive.dts | 66 +
arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi | 54 +
arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi | 172 ++
arch/arm64/boot/dts/apm/Makefile | 5 +
arch/arm64/boot/dts/{ => apm}/apm-mustang.dts | 0
arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi | 0
arch/arm64/boot/dts/arm/Makefile | 7 +
arch/arm64/boot/dts/{ => arm}/foundation-v8.dts | 8 +-
arch/arm64/boot/dts/arm/juno-clocks.dtsi | 44 +
arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 129 ++
arch/arm64/boot/dts/arm/juno.dts | 218 +++
arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts | 8 +-
.../boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi | 0
arch/arm64/boot/dts/cavium/Makefile | 5 +
arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts | 0
arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi | 0
arch/arm64/boot/dts/include/dt-bindings | 1 +
drivers/bus/arm-cci.c | 552 ++++--
drivers/bus/brcmstb_gisb.c | 51 +-
drivers/bus/omap_l3_noc.c | 63 +-
drivers/bus/omap_l3_smx.c | 26 +-
drivers/clk/samsung/clk-exynos5440.c | 29 +-
drivers/clk/ti/dpll.c | 15 +
drivers/clk/versatile/Makefile | 1 -
drivers/clk/versatile/clk-vexpress-osc.c | 7 -
drivers/clk/versatile/clk-vexpress.c | 86 -
drivers/clocksource/Kconfig | 1 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/timer-integrator-ap.c | 210 +++
drivers/dma/Kconfig | 7 +
drivers/dma/Makefile | 1 +
drivers/dma/at_xdmac.c | 1524 ++++++++++++++++
drivers/irqchip/irq-gic.c | 2 +
drivers/memory/Kconfig | 8 +
drivers/memory/Makefile | 1 +
.../gpmc.c => drivers/memory/omap-gpmc.c | 387 +++-
drivers/misc/Kconfig | 2 +-
drivers/misc/vexpress-syscfg.c | 60 +-
drivers/net/ethernet/cadence/Kconfig | 2 +-
drivers/power/reset/Kconfig | 9 +
drivers/power/reset/Makefile | 1 +
drivers/power/reset/at91-reset.c | 4 +-
drivers/power/reset/imx-snvs-poweroff.c | 66 +
drivers/reset/Makefile | 1 +
drivers/reset/reset-berlin.c | 131 ++
drivers/rtc/Kconfig | 30 +-
drivers/rtc/rtc-at91sam9.c | 138 +-
drivers/soc/ti/knav_qmss.h | 8 +-
drivers/soc/ti/knav_qmss_queue.c | 13 +-
drivers/soc/versatile/Kconfig | 9 +
drivers/soc/versatile/Makefile | 1 +
drivers/soc/versatile/soc-integrator.c | 154 ++
drivers/staging/iio/light/isl29028.c | 3 +-
drivers/tty/serial/Kconfig | 4 +-
drivers/video/backlight/Kconfig | 1 -
drivers/video/fbdev/Kconfig | 17 -
drivers/w1/masters/omap_hdq.c | 7 +
drivers/watchdog/Kconfig | 4 +-
include/dt-bindings/arm/ux500_pm_domains.h | 15 +
include/dt-bindings/clock/imx5-clock.h | 5 +-
include/dt-bindings/clock/r8a7740-clock.h | 1 +
include/dt-bindings/clock/r8a7790-clock.h | 14 +-
include/dt-bindings/clock/r8a7791-clock.h | 11 +-
include/dt-bindings/clock/r8a7794-clock.h | 9 +
include/dt-bindings/clock/stih407-clks.h | 86 +
include/dt-bindings/clock/stih410-clks.h | 25 +
include/dt-bindings/dma/at91.h | 25 +
include/dt-bindings/phy/phy.h | 18 +
.../dt-bindings/reset-controller/stih407-resets.h | 61 +
include/linux/clk/ti.h | 15 +
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 39 +
include/linux/omap-gpmc.h | 199 ++
include/linux/platform_data/serial-omap.h | 3 -
include/linux/vexpress.h | 19 -
.../mach => include/soc/at91}/at91rm9200_sdramc.h | 0
.../mach => include/soc/at91}/at91sam9_ddrsdr.h | 0
.../mach => include/soc/at91}/at91sam9_sdramc.h | 0
scripts/Kbuild.include | 6 +
scripts/Makefile.dtbinst | 51 +
scripts/Makefile.lib | 12 -
760 files changed, 31367 insertions(+), 33087 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/bcm/cygnus.txt
create mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt
create mode 100644 Documentation/devicetree/bindings/arm/ux500/power_domain.txt
create mode 100644 Documentation/devicetree/bindings/clock/bcm-cygnus-clock.txt
create mode 100644 Documentation/devicetree/bindings/dma/atmel-xdma.txt
create mode 100644 Documentation/devicetree/bindings/power_supply/imx-snvs-poweroff.txt
create mode 100644 Documentation/devicetree/bindings/rtc/atmel,at91sam9-rtc.txt
create mode 100644 Documentation/devicetree/bindings/w1/omap-hdq.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/am335x-lxm.dts
create mode 100644 arch/arm/boot/dts/am57xx-beagle-x15.dts
create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts
create mode 100644 arch/arm/boot/dts/armada-370-synology-ds213j.dts
create mode 100644 arch/arm/boot/dts/armada-xp-synology-ds414.dts
create mode 100644 arch/arm/boot/dts/bcm-cygnus-clock.dtsi
create mode 100644 arch/arm/boot/dts/bcm-cygnus.dtsi
create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-plus.dts
create mode 100644 arch/arm/boot/dts/bcm2835-rpi.dtsi
create mode 100644 arch/arm/boot/dts/bcm911360_entphn.dts
create mode 100644 arch/arm/boot/dts/bcm911360k.dts
create mode 100644 arch/arm/boot/dts/bcm958300k.dts
create mode 100644 arch/arm/boot/dts/exynos3250-monk.dts
create mode 100644 arch/arm/boot/dts/exynos3250-rinato.dts
create mode 100644 arch/arm/boot/dts/exynos4415-pinctrl.dtsi
create mode 100644 arch/arm/boot/dts/exynos4415.dtsi
create mode 100644 arch/arm/boot/dts/exynos5250-spring.dts
create mode 100644 arch/arm/boot/dts/imx6q-tbs2910.dts
create mode 100644 arch/arm/boot/dts/kirkwood-dir665.dts
create mode 100644 arch/arm/boot/dts/ls1021a-qds.dts
create mode 100644 arch/arm/boot/dts/ls1021a-twr.dts
create mode 100644 arch/arm/boot/dts/ls1021a.dtsi
create mode 100644 arch/arm/boot/dts/meson8.dtsi
create mode 100644 arch/arm/boot/dts/mt6592-evb.dts
create mode 100644 arch/arm/boot/dts/mt6592.dtsi
create mode 100644 arch/arm/boot/dts/mt8127-moose.dts
create mode 100644 arch/arm/boot/dts/mt8127.dtsi
create mode 100644 arch/arm/boot/dts/mt8135-evbp1.dts
create mode 100644 arch/arm/boot/dts/mt8135.dtsi
create mode 100644 arch/arm/boot/dts/omap3-igep0020-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-igep0020-rev-f.dts
create mode 100644 arch/arm/boot/dts/omap3-igep0030-common.dtsi
create mode 100644 arch/arm/boot/dts/omap3-igep0030-rev-g.dts
create mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
create mode 100644 arch/arm/boot/dts/rk3066a-marsboard.dts
create mode 100644 arch/arm/boot/dts/socfpga_arria10.dtsi
create mode 100755 arch/arm/boot/dts/socfpga_arria10_socdk.dts
create mode 100644 arch/arm/boot/dts/ste-nomadik-nhk15.dts
rename arch/arm/boot/dts/{stih407.dtsi => stih407-family.dtsi} (87%)
create mode 100644 arch/arm/boot/dts/stih410-b2120.dts
create mode 100644 arch/arm/boot/dts/stih410-clock.dtsi
create mode 100644 arch/arm/boot/dts/stih410-pinctrl.dtsi
create mode 100644 arch/arm/boot/dts/stih410.dtsi
create mode 100644 arch/arm/boot/dts/stihxxx-b2120.dtsi
create mode 100644 arch/arm/boot/dts/sun7i-a20-bananapi.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-m3.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
create mode 100644 arch/arm/boot/dts/sun9i-a80-optimus.dts
create mode 100644 arch/arm/boot/dts/sun9i-a80.dtsi
create mode 100644 arch/arm/boot/dts/vf-colibri-eval-v3.dtsi
create mode 100644 arch/arm/boot/dts/vf-colibri.dtsi
create mode 100644 arch/arm/boot/dts/vf500-colibri-eval-v3.dts
create mode 100644 arch/arm/boot/dts/vf500-colibri.dtsi
create mode 100644 arch/arm/boot/dts/vf500.dtsi
create mode 100644 arch/arm/boot/dts/vfxxx.dtsi
delete mode 100644 arch/arm/configs/at91rm9200_defconfig
delete mode 100644 arch/arm/configs/at91sam9260_9g20_defconfig
delete mode 100644 arch/arm/configs/at91sam9261_9g10_defconfig
delete mode 100644 arch/arm/configs/at91sam9263_defconfig
delete mode 100644 arch/arm/configs/at91sam9g45_defconfig
delete mode 100644 arch/arm/configs/at91sam9rl_defconfig
delete mode 100644 arch/arm/configs/at91x40_defconfig
delete mode 100644 arch/arm/configs/koelsch_defconfig
create mode 100644 arch/arm/include/debug/asm9260.S
create mode 100644 arch/arm/include/debug/renesas-scif.S
rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (83%)
create mode 100644 arch/arm/kernel/perf_callchain.c
create mode 100644 arch/arm/mach-asm9260/Kconfig
delete mode 100644 arch/arm/mach-at91/Kconfig.non_dt
delete mode 100644 arch/arm/mach-at91/at91_aic.h
delete mode 100644 arch/arm/mach-at91/at91rm9200_devices.c
delete mode 100644 arch/arm/mach-at91/at91sam9260_devices.c
delete mode 100644 arch/arm/mach-at91/at91sam9261_devices.c
delete mode 100644 arch/arm/mach-at91/at91sam9263_devices.c
delete mode 100644 arch/arm/mach-at91/at91sam9g45_devices.c
delete mode 100644 arch/arm/mach-at91/at91sam9rl_devices.c
delete mode 100644 arch/arm/mach-at91/at91x40.c
delete mode 100644 arch/arm/mach-at91/at91x40_time.c
delete mode 100644 arch/arm/mach-at91/board-1arm.c
delete mode 100644 arch/arm/mach-at91/board-afeb-9260v1.c
delete mode 100644 arch/arm/mach-at91/board-cam60.c
delete mode 100644 arch/arm/mach-at91/board-carmeva.c
delete mode 100644 arch/arm/mach-at91/board-cpu9krea.c
delete mode 100644 arch/arm/mach-at91/board-cpuat91.c
delete mode 100644 arch/arm/mach-at91/board-csb337.c
delete mode 100644 arch/arm/mach-at91/board-csb637.c
delete mode 100644 arch/arm/mach-at91/board-eb01.c
delete mode 100644 arch/arm/mach-at91/board-eb9200.c
delete mode 100644 arch/arm/mach-at91/board-ecbat91.c
delete mode 100644 arch/arm/mach-at91/board-eco920.c
delete mode 100644 arch/arm/mach-at91/board-flexibity.c
delete mode 100644 arch/arm/mach-at91/board-gsia18s.c
delete mode 100644 arch/arm/mach-at91/board-kafa.c
delete mode 100644 arch/arm/mach-at91/board-kb9202.c
delete mode 100644 arch/arm/mach-at91/board-pcontrol-g20.c
delete mode 100644 arch/arm/mach-at91/board-picotux200.c
delete mode 100644 arch/arm/mach-at91/board-rm9200ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9-l9260.c
delete mode 100644 arch/arm/mach-at91/board-sam9260ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9261ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9263ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9g20ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9m10g45ek.c
delete mode 100644 arch/arm/mach-at91/board-sam9rlek.c
delete mode 100644 arch/arm/mach-at91/board-snapper9260.c
delete mode 100644 arch/arm/mach-at91/board-stamp9g20.c
delete mode 100644 arch/arm/mach-at91/board-yl-9200.c
delete mode 100644 arch/arm/mach-at91/clock.c
delete mode 100644 arch/arm/mach-at91/clock.h
delete mode 100644 arch/arm/mach-at91/include/mach/at91x40.h
delete mode 100644 arch/arm/mach-at91/irq.c
delete mode 100644 arch/arm/mach-at91/stamp9g20.h
create mode 100644 arch/arm/mach-bcm/bcm_cygnus.c
create mode 100644 arch/arm/mach-bcm/brcmstb.h
create mode 100644 arch/arm/mach-bcm/headsmp-brcmstb.S
create mode 100644 arch/arm/mach-bcm/platsmp-brcmstb.c
create mode 100644 arch/arm/mach-exynos/exynos-pmu.h
delete mode 100644 arch/arm/mach-exynos/hotplug.c
create mode 100644 arch/arm/mach-exynos/suspend.c
create mode 100644 arch/arm/mach-imx/clk-cpu.c
create mode 100644 arch/arm/mach-imx/mach-ls1021a.c
delete mode 100644 arch/arm/mach-integrator/include/mach/uncompress.h
delete mode 100644 arch/arm/mach-integrator/leds.c
delete mode 100644 arch/arm/mach-omap2/board-3430sdp.c
delete mode 100644 arch/arm/mach-omap2/board-ti8168evm.c
delete mode 100644 arch/arm/mach-omap2/cm44xx.c
delete mode 100644 arch/arm/mach-omap2/cm_44xx_54xx.h
delete mode 100644 arch/arm/mach-omap2/cminst44xx.h
delete mode 100644 arch/arm/mach-omap2/gpmc-nand.h
delete mode 100644 arch/arm/mach-omap2/gpmc-onenand.h
delete mode 100644 arch/arm/mach-omap2/gpmc-smc91x.c
delete mode 100644 arch/arm/mach-omap2/gpmc-smc91x.h
create mode 100644 arch/arm/mach-realview/realview-dt.c
delete mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-koelsch.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c
create mode 100644 arch/arm/mach-shmobile/platsmp-apmu.h
create mode 100644 arch/arm/mach-ux500/pm_domains.c
create mode 100644 arch/arm/mach-ux500/pm_domains.h
delete mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c
delete mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
delete mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h
delete mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h
delete mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h
create mode 100644 arch/arm64/boot/dts/amd/Makefile
create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive.dts
create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-clks.dtsi
create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi
create mode 100644 arch/arm64/boot/dts/apm/Makefile
rename arch/arm64/boot/dts/{ => apm}/apm-mustang.dts (100%)
rename arch/arm64/boot/dts/{ => apm}/apm-storm.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/arm/Makefile
rename arch/arm64/boot/dts/{ => arm}/foundation-v8.dts (98%)
create mode 100644 arch/arm64/boot/dts/arm/juno-clocks.dtsi
create mode 100644 arch/arm64/boot/dts/arm/juno-motherboard.dtsi
create mode 100644 arch/arm64/boot/dts/arm/juno.dts
rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-aemv8a.dts (97%)
rename arch/arm64/boot/dts/{ => arm}/rtsm_ve-motherboard.dtsi (100%)
create mode 100644 arch/arm64/boot/dts/cavium/Makefile
rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dts (100%)
rename arch/arm64/boot/dts/{ => cavium}/thunder-88xx.dtsi (100%)
create mode 120000 arch/arm64/boot/dts/include/dt-bindings
delete mode 100644 drivers/clk/versatile/clk-vexpress.c
create mode 100644 drivers/clocksource/timer-integrator-ap.c
create mode 100644 drivers/dma/at_xdmac.c
rename arch/arm/mach-omap2/gpmc.c => drivers/memory/omap-gpmc.c (83%)
create mode 100644 drivers/power/reset/imx-snvs-poweroff.c
create mode 100644 drivers/reset/reset-berlin.c
create mode 100644 drivers/soc/versatile/soc-integrator.c
create mode 100644 include/dt-bindings/arm/ux500_pm_domains.h
create mode 100644 include/dt-bindings/clock/stih407-clks.h
create mode 100644 include/dt-bindings/clock/stih410-clks.h
create mode 100644 include/dt-bindings/phy/phy.h
create mode 100644 include/dt-bindings/reset-controller/stih407-resets.h
create mode 100644 include/linux/omap-gpmc.h
rename {arch/arm/mach-at91/include/mach => include/soc/at91}/at91rm9200_sdramc.h (100%)
rename {arch/arm/mach-at91/include/mach => include/soc/at91}/at91sam9_ddrsdr.h (100%)
rename {arch/arm/mach-at91/include/mach => include/soc/at91}/at91sam9_sdramc.h (100%)
create mode 100644 scripts/Makefile.dtbinst
Merging bcm2835/for-next (6298ed17a404 ARM: bcm2835: Add device tree for Raspberry Pi model B+)
$ git merge bcm2835/for-next
Merge made by the 'recursive' strategy.
Merging berlin/berlin/for-next (91bcb334bf0b Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f0d7515372ff ARM: v7m: add trivial suspend support)
$ git merge cortex-m/for-next
Already up-to-date.
Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next)
$ git merge ep93xx/ep93xx-for-next
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (8a73e870fc56 Merge tag 'imx-dt-3.19' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging ixp4xx/next (19f949f52599 Linux 3.8)
$ git merge ixp4xx/next
Already up-to-date.
Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next)
$ git merge keystone/next
Already up-to-date!
Merge made by the 'recursive' strategy.
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 (9993917cbc99 Merge branch 'mvebu/dt-usb_phy' into mvebu/for-next)
$ git merge mvebu/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/bus/mvebu-mbus.txt | 17 +-
.../memory-controllers/mvebu-sdram-controller.txt | 21 ++
arch/arm/boot/dts/armada-370-xp.dtsi | 3 +-
arch/arm/boot/dts/armada-xp-gp.dts | 19 +-
arch/arm/boot/dts/armada-xp.dtsi | 5 +
arch/arm/mach-mvebu/Makefile | 2 +-
arch/arm/mach-mvebu/board-v7.c | 51 +++++
arch/arm/mach-mvebu/common.h | 2 +
arch/arm/mach-mvebu/platsmp.c | 31 ++-
arch/arm/mach-mvebu/pm-board.c | 141 +++++++++++++
arch/arm/mach-mvebu/pm.c | 218 +++++++++++++++++++++
arch/arm/mach-mvebu/pmsu.h | 1 +
arch/arm/mach-mvebu/pmsu_ll.S | 8 +
drivers/bus/mvebu-mbus.c | 180 ++++++++++++++++-
drivers/clk/mvebu/common.c | 32 ++-
drivers/clocksource/time-armada-370-xp.c | 25 +++
drivers/irqchip/irq-armada-370-xp.c | 52 +++++
include/linux/mbus.h | 1 +
18 files changed, 777 insertions(+), 32 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/mvebu-sdram-controller.txt
create mode 100644 arch/arm/mach-mvebu/pm-board.c
create mode 100644 arch/arm/mach-mvebu/pm.c
Merging renesas/next (2ed235fdf545 Merge branches 'heads/dt-cleanups-for-v3.19', 'heads/dt-clocksource-for-v3.19', 'heads/dt-fixes-for-v3.18', 'heads/kconfig-cleanups-for-v3.19', 'heads/clock-fixes-for-v3.18' and 'heads/runtime-pm-for-v3.19' into next)
$ git merge renesas/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging samsung/for-next (9db7d78aca2c Merge branch 'v3.19-next/dt-samsung-3' into for-next)
$ git merge samsung/for-next
Recorded preimage for 'arch/arm64/Kconfig'
Auto-merging arch/arm64/boot/dts/Makefile
Auto-merging arch/arm64/Kconfig
CONFLICT (content): Merge conflict in arch/arm64/Kconfig
Auto-merging arch/arm/configs/exynos_defconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/arm64/Kconfig'.
[master 74f15af5b366] Merge remote-tracking branch 'samsung/for-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/arm/samsung/pmu.txt | 1 +
.../devicetree/bindings/clock/exynos4415-clock.txt | 38 +
.../devicetree/bindings/clock/exynos7-clock.txt | 93 ++
arch/arm/configs/exynos_defconfig | 3 +-
arch/arm/plat-samsung/cpu.c | 4 +
arch/arm64/Kconfig | 17 +
arch/arm64/boot/dts/Makefile | 1 +
arch/arm64/boot/dts/exynos/Makefile | 5 +
arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 ++
arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 ++++++++++
arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++++
drivers/clk/samsung/Makefile | 2 +
drivers/clk/samsung/clk-exynos4415.c | 1142 ++++++++++++++++++++
drivers/clk/samsung/clk-exynos5260.c | 185 +---
drivers/clk/samsung/clk-exynos7.c | 743 +++++++++++++
drivers/clk/samsung/clk-pll.c | 25 +-
drivers/clk/samsung/clk-pll.h | 4 +
drivers/clk/samsung/clk.c | 98 ++
drivers/clk/samsung/clk.h | 37 +
include/dt-bindings/clock/exynos4415.h | 360 ++++++
include/dt-bindings/clock/exynos7-clk.h | 92 ++
21 files changed, 3887 insertions(+), 165 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/exynos4415-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/exynos7-clock.txt
create mode 100644 arch/arm64/boot/dts/exynos/Makefile
create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts
create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi
create mode 100644 drivers/clk/samsung/clk-exynos4415.c
create mode 100644 drivers/clk/samsung/clk-exynos7.c
create mode 100644 include/dt-bindings/clock/exynos4415.h
create mode 100644 include/dt-bindings/clock/exynos7-clk.h
Merging sunxi/sunxi/for-next (ad01dbad5626 Merge branch 'sunxi/clocks-for-3.19' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/clock/sunxi.txt | 31 ++-
arch/arm/boot/dts/sun4i-a10.dtsi | 12 +-
arch/arm/boot/dts/sun5i-a10s.dtsi | 12 +-
arch/arm/boot/dts/sun5i-a13.dtsi | 12 +-
arch/arm/boot/dts/sun6i-a31.dtsi | 12 +-
arch/arm/boot/dts/sun7i-a20.dtsi | 12 +-
arch/arm/boot/dts/sun8i-a23.dtsi | 12 +-
drivers/clk/sunxi/Makefile | 1 +
drivers/clk/sunxi/clk-a20-gmac.c | 7 +-
drivers/clk/sunxi/clk-factors.c | 2 +-
drivers/clk/sunxi/clk-factors.h | 3 +-
drivers/clk/sunxi/clk-mod0.c | 1 +
drivers/clk/sunxi/clk-sun8i-mbus.c | 1 +
drivers/clk/sunxi/clk-sun9i-core.c | 271 ++++++++++++++++++++++
drivers/clk/sunxi/clk-sunxi.c | 85 ++++---
15 files changed, 380 insertions(+), 94 deletions(-)
create mode 100644 drivers/clk/sunxi/clk-sun9i-core.c
Merging tegra/for-next (620e0b217672 Merge branch for-3.19/soc into for-next)
$ git merge tegra/for-next
Removing drivers/memory/tegra30-mc.c
Auto-merging drivers/memory/Makefile
Auto-merging drivers/memory/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/boot/dts/tegra30.dtsi
Auto-merging arch/arm/boot/dts/tegra124.dtsi
Auto-merging arch/arm/boot/dts/tegra114.dtsi
Auto-merging arch/arm/Kconfig
Merge made by the 'recursive' strategy.
.../memory-controllers/nvidia,tegra-mc.txt | 36 +
arch/arm/Kconfig | 3 -
arch/arm/boot/dts/tegra114.dtsi | 23 +-
arch/arm/boot/dts/tegra124.dtsi | 19 +-
arch/arm/boot/dts/tegra30.dtsi | 25 +-
arch/arm/mach-tegra/Kconfig | 9 +-
arch/arm64/Kconfig | 3 -
arch/powerpc/include/asm/iommu.h | 17 +-
arch/powerpc/kernel/dma-iommu.c | 8 +-
arch/powerpc/kernel/iommu.c | 16 +-
arch/powerpc/platforms/cell/iommu.c | 9 +-
drivers/Kconfig | 2 +
drivers/amba/Kconfig | 14 +
drivers/clk/tegra/clk-divider.c | 13 +
drivers/clk/tegra/clk-tegra114.c | 7 +-
drivers/clk/tegra/clk-tegra124.c | 7 +-
drivers/clk/tegra/clk-tegra20.c | 8 +-
drivers/clk/tegra/clk-tegra30.c | 7 +-
drivers/clk/tegra/clk.h | 2 +
drivers/iommu/Kconfig | 12 +-
drivers/iommu/amd_iommu.c | 1 +
drivers/iommu/arm-smmu.c | 1 +
drivers/iommu/exynos-iommu.c | 1 +
drivers/iommu/intel-iommu.c | 1 +
drivers/iommu/iommu.c | 50 +-
drivers/iommu/ipmmu-vmsa.c | 1 +
drivers/iommu/msm_iommu.c | 1 +
drivers/iommu/omap-iommu.c | 1 +
drivers/iommu/shmobile-iommu.c | 1 +
drivers/iommu/tegra-smmu.c | 1603 +++++++-------------
drivers/memory/Kconfig | 12 +-
drivers/memory/Makefile | 3 +-
drivers/memory/tegra/Kconfig | 7 +
drivers/memory/tegra/Makefile | 7 +
drivers/memory/tegra/mc.c | 301 ++++
drivers/memory/tegra/mc.h | 53 +
drivers/memory/tegra/tegra114.c | 948 ++++++++++++
drivers/memory/tegra/tegra124.c | 995 ++++++++++++
drivers/memory/tegra/tegra30.c | 970 ++++++++++++
drivers/memory/tegra30-mc.c | 378 -----
include/dt-bindings/clock/tegra114-car.h | 2 +-
include/dt-bindings/clock/tegra124-car.h | 2 +-
include/dt-bindings/clock/tegra20-car.h | 2 +-
include/dt-bindings/memory/tegra114-mc.h | 25 +
include/dt-bindings/memory/tegra124-mc.h | 31 +
include/dt-bindings/memory/tegra30-mc.h | 24 +
include/linux/iommu.h | 22 +
include/soc/tegra/mc.h | 107 ++
48 files changed, 4237 insertions(+), 1553 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/nvidia,tegra-mc.txt
create mode 100644 drivers/amba/Kconfig
create mode 100644 drivers/memory/tegra/Kconfig
create mode 100644 drivers/memory/tegra/Makefile
create mode 100644 drivers/memory/tegra/mc.c
create mode 100644 drivers/memory/tegra/mc.h
create mode 100644 drivers/memory/tegra/tegra114.c
create mode 100644 drivers/memory/tegra/tegra124.c
create mode 100644 drivers/memory/tegra/tegra30.c
delete mode 100644 drivers/memory/tegra30-mc.c
create mode 100644 include/dt-bindings/memory/tegra114-mc.h
create mode 100644 include/dt-bindings/memory/tegra124-mc.h
create mode 100644 include/dt-bindings/memory/tegra30-mc.h
create mode 100644 include/soc/tegra/mc.h
Merging arm64/for-next/core (a1ae65b21941 arm64: add seccomp support)
$ git merge arm64/for-next/core
Auto-merging mm/memory.c
Auto-merging arch/arm64/mm/mmu.c
Auto-merging arch/arm64/kernel/insn.c
Auto-merging arch/arm64/kernel/efi-entry.S
Auto-merging arch/arm64/include/asm/unistd32.h
Auto-merging arch/arm64/include/asm/io.h
Auto-merging arch/arm64/Kconfig
Merge made by the 'recursive' strategy.
Documentation/arm64/legacy_instructions.txt | 45 +++
arch/arm64/Kconfig | 187 ++++++++++
arch/arm64/Kconfig.debug | 12 +
arch/arm64/crypto/Kconfig | 5 +-
arch/arm64/crypto/aes-ce-ccm-glue.c | 4 +-
arch/arm64/crypto/aes-ce-cipher.c | 112 +++++-
arch/arm64/crypto/aes-ce-setkey.h | 5 +
arch/arm64/crypto/aes-glue.c | 18 +-
arch/arm64/include/asm/alternative-asm.h | 29 ++
arch/arm64/include/asm/alternative.h | 43 +++
arch/arm64/include/asm/cmpxchg.h | 73 ++++
arch/arm64/include/asm/compat.h | 7 +
arch/arm64/include/asm/cpu.h | 2 +
arch/arm64/include/asm/cpufeature.h | 29 ++
arch/arm64/include/asm/cputype.h | 5 +
arch/arm64/include/asm/dmi.h | 31 ++
arch/arm64/include/asm/fixmap.h | 8 +-
arch/arm64/include/asm/hwcap.h | 1 +
arch/arm64/include/asm/insn.h | 10 +
arch/arm64/include/asm/io.h | 23 +-
arch/arm64/include/asm/irq.h | 1 -
arch/arm64/include/asm/kvm_arm.h | 21 +-
arch/arm64/include/asm/opcodes.h | 1 +
arch/arm64/include/asm/percpu.h | 215 +++++++++++
arch/arm64/include/asm/pgalloc.h | 8 +-
arch/arm64/include/asm/seccomp.h | 25 ++
arch/arm64/include/asm/tlb.h | 67 +---
arch/arm64/include/asm/traps.h | 16 +
arch/arm64/include/asm/unistd.h | 3 +
arch/arm64/include/asm/unistd32.h | 3 +-
arch/arm64/kernel/Makefile | 7 +-
arch/arm64/kernel/alternative.c | 64 ++++
arch/arm64/kernel/armv8_deprecated.c | 553 ++++++++++++++++++++++++++++
arch/arm64/kernel/cpu_errata.c | 111 ++++++
arch/arm64/kernel/cpuinfo.c | 23 +-
arch/arm64/kernel/efi-entry.S | 3 +-
arch/arm64/kernel/efi.c | 37 +-
arch/arm64/kernel/entry-ftrace.S | 21 +-
arch/arm64/kernel/entry.S | 138 +++----
arch/arm64/kernel/head.S | 434 +++++++++++-----------
arch/arm64/kernel/insn.c | 26 ++
arch/arm64/kernel/io.c | 66 +++-
arch/arm64/kernel/irq.c | 2 +
arch/arm64/kernel/jump_label.c | 23 +-
arch/arm64/kernel/ptrace.c | 40 ++
arch/arm64/kernel/setup.c | 108 ++++--
arch/arm64/kernel/signal32.c | 6 +
arch/arm64/kernel/sleep.S | 36 +-
arch/arm64/kernel/smp.c | 2 +
arch/arm64/kernel/suspend.c | 4 +-
arch/arm64/kernel/topology.c | 7 +-
arch/arm64/kernel/trace-events-emulation.h | 35 ++
arch/arm64/kernel/traps.c | 66 ++++
arch/arm64/kernel/vmlinux.lds.S | 33 +-
arch/arm64/kvm/hyp.S | 4 +-
arch/arm64/mm/Makefile | 1 +
arch/arm64/mm/cache.S | 4 +-
arch/arm64/mm/dump.c | 332 +++++++++++++++++
arch/arm64/mm/fault.c | 2 +-
arch/arm64/mm/init.c | 2 +
arch/arm64/mm/ioremap.c | 93 +----
arch/arm64/mm/mmap.c | 12 +-
arch/arm64/mm/mmu.c | 94 +++++
arch/arm64/mm/pgd.c | 4 +-
arch/microblaze/include/asm/tlb.h | 3 +-
arch/powerpc/include/asm/pgalloc.h | 3 +-
arch/powerpc/include/asm/tlb.h | 1 +
arch/powerpc/mm/hugetlbpage.c | 2 -
drivers/firmware/dmi_scan.c | 79 +++-
drivers/firmware/efi/efi.c | 4 +
drivers/firmware/efi/libstub/arm-stub.c | 11 +-
drivers/xen/efi.c | 1 +
include/asm-generic/seccomp.h | 30 ++
include/asm-generic/tlb.h | 57 ++-
include/linux/efi.h | 6 +-
include/uapi/linux/elf.h | 1 +
mm/memory.c | 30 +-
77 files changed, 2999 insertions(+), 631 deletions(-)
create mode 100644 Documentation/arm64/legacy_instructions.txt
create mode 100644 arch/arm64/crypto/aes-ce-setkey.h
create mode 100644 arch/arm64/include/asm/alternative-asm.h
create mode 100644 arch/arm64/include/asm/alternative.h
create mode 100644 arch/arm64/include/asm/dmi.h
create mode 100644 arch/arm64/include/asm/opcodes.h
create mode 100644 arch/arm64/include/asm/seccomp.h
create mode 100644 arch/arm64/kernel/alternative.c
create mode 100644 arch/arm64/kernel/armv8_deprecated.c
create mode 100644 arch/arm64/kernel/cpu_errata.c
create mode 100644 arch/arm64/kernel/trace-events-emulation.h
create mode 100644 arch/arm64/mm/dump.c
create mode 100644 include/asm-generic/seccomp.h
Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP)
$ git merge blackfin/for-linus
Merge made by the 'recursive' strategy.
arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 -
arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 -
arch/blackfin/configs/BF533-EZKIT_defconfig | 1 -
arch/blackfin/configs/BF533-STAMP_defconfig | 1 -
arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++-
arch/blackfin/configs/BF538-EZKIT_defconfig | 1 -
arch/blackfin/configs/BF561-ACVILON_defconfig | 1 -
arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 -
arch/blackfin/configs/BF561-EZKIT_defconfig | 1 -
arch/blackfin/configs/CM-BF527_defconfig | 1 -
arch/blackfin/configs/CM-BF533_defconfig | 1 -
arch/blackfin/configs/CM-BF537E_defconfig | 1 -
arch/blackfin/configs/CM-BF537U_defconfig | 1 -
arch/blackfin/configs/CM-BF548_defconfig | 1 -
arch/blackfin/configs/CM-BF561_defconfig | 1 -
arch/blackfin/configs/DNP5370_defconfig | 1 -
arch/blackfin/configs/IP0X_defconfig | 1 -
arch/blackfin/configs/PNAV-10_defconfig | 1 -
arch/blackfin/configs/SRV1_defconfig | 1 -
arch/blackfin/configs/TCM-BF518_defconfig | 1 -
arch/blackfin/configs/TCM-BF537_defconfig | 1 -
arch/blackfin/kernel/kgdb.c | 12 ++++--------
arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++----
23 files changed, 10 insertions(+), 33 deletions(-)
Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (21bd887cd7c4 CRISv32: Remove last remnants of ETRAX_SPI_MMC_BOARD)
$ git merge cris/for-next
Auto-merging scripts/headers.sh
Auto-merging arch/cris/include/asm/Kbuild
Auto-merging arch/cris/arch-v32/drivers/sync_serial.c
Auto-merging arch/cris/arch-v32/drivers/Kconfig
Merge made by the 'recursive' strategy.
arch/cris/arch-v10/lib/usercopy.c | 14 +-
arch/cris/arch-v32/drivers/Kconfig | 8 +-
arch/cris/arch-v32/drivers/Makefile | 1 -
arch/cris/arch-v32/drivers/i2c.h | 1 -
arch/cris/arch-v32/drivers/sync_serial.c | 1430 ++++++++++++----------
arch/cris/arch-v32/kernel/debugport.c | 82 +-
arch/cris/arch-v32/kernel/time.c | 29 +-
arch/cris/arch-v32/lib/usercopy.c | 15 +-
arch/cris/arch-v32/mach-fs/pinmux.c | 152 +--
arch/cris/include/arch-v32/mach-fs/mach/pinmux.h | 2 -
arch/cris/include/asm/Kbuild | 4 -
arch/cris/include/uapi/asm/Kbuild | 4 +-
arch/cris/kernel/crisksyms.c | 9 +-
arch/cris/kernel/traps.c | 61 +-
arch/cris/mm/init.c | 38 +-
arch/cris/mm/ioremap.c | 3 +-
scripts/headers.sh | 2 -
17 files changed, 1039 insertions(+), 816 deletions(-)
Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (069fb0b63722 syslog: Provide stub check_syslog_permissions)
$ git merge ia64/next
Merge made by the 'recursive' strategy.
fs/pstore/inode.c | 22 ++++++++++++++++++++++
fs/pstore/ram.c | 22 +++++++++++++++-------
include/linux/syslog.h | 9 +++++++++
kernel/printk/printk.c | 2 +-
4 files changed, 47 insertions(+), 8 deletions(-)
Merging m68k/for-next (f0b99a643e96 m68k/mm: Eliminate memset after alloc_bootmem_pages)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
arch/m68k/mm/init.c | 1 -
drivers/nubus/nubus.c | 4 ----
2 files changed, 5 deletions(-)
Merging m68knommu/for-next (0259650b4cf7 m68knommu: fix irq handler types in 68360/commproc.c)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
arch/m68k/68360/commproc.c | 8 ++++----
arch/m68k/include/asm/commproc.h | 24 +-----------------------
2 files changed, 5 insertions(+), 27 deletions(-)
Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (a4f174dee4ae microblaze: Wire up bpf syscall)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (17aabbd94a29 Merge branch '3.18-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Auto-merging include/linux/irqchip/mips-gic.h
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
Removing arch/mips/mti-sead3/sead3-serial.c
Removing arch/mips/loongson1/common/clock.c
Removing arch/mips/kernel/irq-gic.c
Removing arch/mips/kernel/csrc-gic.c
Removing arch/mips/kernel/cevt-gic.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../bindings/interrupt-controller/mips-gic.txt | 55 ++
.../devicetree/bindings/mips/brcm/bcm3384-intc.txt | 37 +
.../devicetree/bindings/mips/brcm/bmips.txt | 8 +
.../devicetree/bindings/mips/brcm/cm-dsl.txt | 11 +
.../devicetree/bindings/mips/brcm/usb.txt | 11 +
Documentation/devicetree/bindings/mips/cpu_irq.txt | 4 +-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
MAINTAINERS | 26 +
arch/mips/Kbuild.platforms | 2 +
arch/mips/Kconfig | 100 ++-
arch/mips/Kconfig.debug | 13 +
arch/mips/Makefile | 1 +
arch/mips/alchemy/common/clock.c | 7 +-
arch/mips/alchemy/common/setup.c | 6 +-
arch/mips/ar7/platform.c | 24 +-
arch/mips/ath25/Kconfig | 16 +
arch/mips/ath25/Makefile | 16 +
arch/mips/ath25/Platform | 6 +
arch/mips/ath25/ar2315.c | 364 ++++++++++
arch/mips/ath25/ar2315.h | 22 +
arch/mips/ath25/ar2315_regs.h | 410 +++++++++++
arch/mips/ath25/ar5312.c | 393 ++++++++++
arch/mips/ath25/ar5312.h | 22 +
arch/mips/ath25/ar5312_regs.h | 224 ++++++
arch/mips/ath25/board.c | 234 ++++++
arch/mips/ath25/devices.c | 125 ++++
arch/mips/ath25/devices.h | 43 ++
arch/mips/ath25/early_printk.c | 44 ++
arch/mips/ath25/prom.c | 26 +
arch/mips/ath79/irq.c | 1 -
arch/mips/ath79/prom.c | 38 +-
arch/mips/ath79/setup.c | 5 +
arch/mips/bcm3384/Makefile | 1 +
arch/mips/bcm3384/Platform | 7 +
arch/mips/bcm3384/dma.c | 81 +++
arch/mips/bcm3384/irq.c | 193 +++++
arch/mips/bcm3384/setup.c | 97 +++
arch/mips/bcm47xx/bcm47xx_private.h | 6 +
arch/mips/bcm47xx/irq.c | 8 +
arch/mips/bcm47xx/nvram.c | 155 ++--
arch/mips/bcm47xx/setup.c | 91 +--
arch/mips/bcm47xx/sprom.c | 82 +++
arch/mips/bcm63xx/cpu.c | 2 +-
arch/mips/boot/dts/Makefile | 1 +
arch/mips/boot/dts/bcm3384.dtsi | 109 +++
arch/mips/boot/dts/bcm93384wvg.dts | 32 +
arch/mips/cavium-octeon/dma-octeon.c | 4 +-
arch/mips/cavium-octeon/executive/octeon-model.c | 49 +-
arch/mips/configs/bcm3384_defconfig | 78 ++
arch/mips/fw/lib/cmdline.c | 8 +-
arch/mips/include/asm/atomic.h | 374 +++++-----
arch/mips/include/asm/bitops.h | 35 +-
arch/mips/include/asm/bmips.h | 1 +
arch/mips/include/asm/bootinfo.h | 13 +-
arch/mips/include/asm/clock.h | 3 -
arch/mips/include/asm/cmpxchg.h | 27 +-
arch/mips/include/asm/compiler.h | 8 +
arch/mips/include/asm/cpu-features.h | 4 +
arch/mips/include/asm/cpu.h | 2 +
arch/mips/include/asm/edac.h | 6 +-
arch/mips/include/asm/elf.h | 74 +-
arch/mips/include/asm/fpu.h | 49 +-
arch/mips/include/asm/futex.h | 27 +-
arch/mips/include/asm/hpet.h | 73 ++
arch/mips/include/asm/io.h | 8 +-
arch/mips/include/asm/irq.h | 3 +
arch/mips/include/asm/irq_cpu.h | 4 +-
arch/mips/include/asm/mach-ath25/ath25_platform.h | 73 ++
.../include/asm/mach-ath25/cpu-feature-overrides.h | 64 ++
arch/mips/include/asm/mach-ath25/dma-coherence.h | 82 +++
arch/mips/include/asm/mach-ath25/gpio.h | 16 +
arch/mips/include/asm/mach-ath25/war.h | 25 +
arch/mips/include/asm/mach-au1x00/ioremap.h | 10 +-
arch/mips/include/asm/mach-bcm3384/dma-coherence.h | 48 ++
arch/mips/include/asm/mach-bcm3384/war.h | 24 +
arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 36 +-
arch/mips/include/asm/mach-bcm63xx/ioremap.h | 6 +-
arch/mips/include/asm/mach-generic/ioremap.h | 4 +-
arch/mips/include/asm/mach-generic/irq.h | 6 +
arch/mips/include/asm/mach-lantiq/lantiq.h | 2 +
arch/mips/include/asm/mach-loongson/boot_param.h | 49 +-
.../mips/include/asm/mach-loongson/dma-coherence.h | 6 +-
arch/mips/include/asm/mach-loongson/irq.h | 3 +-
arch/mips/include/asm/mach-loongson/loongson.h | 2 +-
.../include/asm/mach-loongson/loongson_hwmon.h | 55 ++
arch/mips/include/asm/mach-loongson/machine.h | 2 +-
arch/mips/include/asm/mach-loongson/topology.h | 2 +-
arch/mips/include/asm/mach-loongson/workarounds.h | 7 +
arch/mips/include/asm/mach-loongson1/cpufreq.h | 23 +
arch/mips/include/asm/mach-loongson1/loongson1.h | 8 +-
arch/mips/include/asm/mach-loongson1/platform.h | 10 +-
arch/mips/include/asm/mach-loongson1/regs-clk.h | 23 +-
arch/mips/include/asm/mach-loongson1/regs-mux.h | 67 ++
arch/mips/include/asm/mach-loongson1/regs-pwm.h | 29 +
arch/mips/include/asm/mach-loongson1/regs-wdt.h | 11 +-
arch/mips/include/asm/mach-malta/irq.h | 1 -
.../include/asm/mach-pmcs-msp71xx/msp_regops.h | 25 +-
arch/mips/include/asm/mach-ralink/mt7620.h | 64 +-
arch/mips/include/asm/mach-ralink/pinmux.h | 55 ++
arch/mips/include/asm/mach-ralink/ralink_regs.h | 7 +
arch/mips/include/asm/mach-ralink/rt305x.h | 35 +-
arch/mips/include/asm/mach-ralink/rt3883.h | 16 +-
arch/mips/include/asm/mach-sead3/irq.h | 1 -
arch/mips/include/asm/mach-tx39xx/ioremap.h | 4 +-
arch/mips/include/asm/mach-tx49xx/ioremap.h | 4 +-
arch/mips/include/asm/mips-boards/maltaint.h | 24 +-
arch/mips/include/asm/mips-boards/sead3int.h | 15 +-
arch/mips/include/asm/mips-cm.h | 2 +-
arch/mips/include/asm/mips-cpc.h | 4 +-
arch/mips/include/asm/mipsregs.h | 43 ++
arch/mips/include/asm/octeon/cvmx-cmd-queue.h | 4 +-
arch/mips/include/asm/octeon/cvmx-pow.h | 69 +-
arch/mips/include/asm/octeon/cvmx.h | 63 --
arch/mips/include/asm/octeon/octeon-feature.h | 52 --
arch/mips/include/asm/octeon/octeon-model.h | 3 +-
arch/mips/include/asm/paccess.h | 2 +
arch/mips/include/asm/page.h | 2 +-
arch/mips/include/asm/pci.h | 2 +-
arch/mips/include/asm/pgtable-32.h | 104 +--
arch/mips/include/asm/pgtable-bits.h | 36 +-
arch/mips/include/asm/pgtable.h | 18 +-
arch/mips/include/asm/prom.h | 1 +
arch/mips/include/asm/r4kcache.h | 59 --
arch/mips/include/asm/spinlock.h | 50 +-
arch/mips/include/asm/thread_info.h | 2 +
arch/mips/include/asm/time.h | 6 +-
arch/mips/include/asm/types.h | 18 +-
arch/mips/include/asm/uaccess.h | 27 -
arch/mips/include/asm/uasm.h | 2 +
arch/mips/include/uapi/asm/inst.h | 7 +-
arch/mips/jz4740/setup.c | 2 +-
arch/mips/kernel/Makefile | 10 +-
arch/mips/kernel/cevt-gic.c | 105 ---
arch/mips/kernel/cevt-r4k.c | 6 +-
arch/mips/kernel/cpu-probe.c | 71 +-
arch/mips/kernel/crash_dump.c | 4 +-
arch/mips/kernel/csrc-gic.c | 40 --
arch/mips/kernel/elf.c | 191 +++++
arch/mips/kernel/i8259.c | 24 +-
arch/mips/kernel/irq-gic.c | 402 -----------
arch/mips/kernel/irq_cpu.c | 48 +-
arch/mips/kernel/mips-cm.c | 12 +-
arch/mips/kernel/mips-cpc.c | 4 +-
arch/mips/kernel/mips_ksyms.c | 4 -
arch/mips/kernel/perf_event_mipsxx.c | 30 +-
arch/mips/kernel/process.c | 54 +-
arch/mips/kernel/prom.c | 18 +
arch/mips/kernel/setup.c | 14 +-
arch/mips/kernel/signal.c | 2 +-
arch/mips/kernel/smp-bmips.c | 114 +--
arch/mips/kernel/smp-cmp.c | 2 +-
arch/mips/kernel/smp-cps.c | 6 +-
arch/mips/kernel/smp-gic.c | 2 +-
arch/mips/kernel/smp-mt.c | 6 +-
arch/mips/kernel/syscall.c | 2 +
arch/mips/kernel/traps.c | 66 +-
arch/mips/kernel/vdso.c | 15 +-
arch/mips/lantiq/falcon/sysctrl.c | 11 +-
arch/mips/lantiq/irq.c | 56 +-
arch/mips/lantiq/prom.c | 18 +-
arch/mips/lantiq/xway/Makefile | 2 +
arch/mips/lantiq/xway/reset.c | 70 +-
arch/mips/lantiq/xway/vmmc.c | 69 ++
arch/mips/lantiq/xway/xrx200_phy_fw.c | 23 +-
arch/mips/lib/iomap.c | 18 +-
arch/mips/lib/memset.S | 6 +-
arch/mips/lib/mips-atomic.c | 20 -
arch/mips/lib/r3k_dump_tlb.c | 11 +-
arch/mips/lib/strlen_user.S | 3 -
arch/mips/loongson/Kconfig | 17 +
arch/mips/loongson/common/cs5536/cs5536_pci.c | 25 +-
arch/mips/loongson/common/dma-swiotlb.c | 14 +
arch/mips/loongson/common/early_printk.c | 2 +-
arch/mips/loongson/common/env.c | 28 +-
arch/mips/loongson/common/gpio.c | 2 +-
arch/mips/loongson/common/init.c | 1 +
arch/mips/loongson/common/machtype.c | 23 +-
arch/mips/loongson/common/rtc.c | 2 +-
arch/mips/loongson/common/serial.c | 66 +-
arch/mips/loongson/common/setup.c | 1 +
arch/mips/loongson/common/time.c | 5 +
arch/mips/loongson/common/uart_base.c | 30 +-
arch/mips/loongson/lemote-2f/irq.c | 4 +-
arch/mips/loongson/lemote-2f/reset.c | 2 +-
arch/mips/loongson/loongson-3/Makefile | 4 +-
arch/mips/loongson/loongson-3/hpet.c | 257 +++++++
arch/mips/loongson/loongson-3/irq.c | 16 +-
arch/mips/loongson/loongson-3/numa.c | 12 +-
arch/mips/loongson/loongson-3/platform.c | 43 ++
arch/mips/loongson/loongson-3/smp.c | 70 +-
arch/mips/loongson1/Kconfig | 42 +-
arch/mips/loongson1/common/Makefile | 2 +-
arch/mips/loongson1/common/clock.c | 28 -
arch/mips/loongson1/common/platform.c | 141 +++-
arch/mips/loongson1/common/prom.c | 30 +-
arch/mips/loongson1/common/reset.c | 20 +-
arch/mips/loongson1/common/time.c | 226 ++++++
arch/mips/loongson1/ls1b/board.c | 12 +-
arch/mips/math-emu/cp1emu.c | 9 +-
arch/mips/math-emu/ieee754dp.c | 2 +-
arch/mips/math-emu/ieee754sp.c | 2 +-
arch/mips/mm/Makefile | 10 +-
arch/mips/mm/c-r4k.c | 43 ++
arch/mips/mm/dma-default.c | 5 +
arch/mips/mm/gup.c | 2 +-
arch/mips/mm/init.c | 2 +-
arch/mips/mm/ioremap.c | 18 +-
arch/mips/mm/sc-r5k.c | 2 +-
arch/mips/mm/tlb-r4k.c | 2 +-
arch/mips/mm/tlbex.c | 18 +-
arch/mips/mm/uasm-mips.c | 2 +
arch/mips/mm/uasm.c | 14 +-
arch/mips/mti-malta/malta-init.c | 2 +-
arch/mips/mti-malta/malta-int.c | 327 ++-------
arch/mips/mti-malta/malta-time.c | 51 +-
arch/mips/mti-sead3/sead3-ehci.c | 8 +-
arch/mips/mti-sead3/sead3-int.c | 131 +---
arch/mips/mti-sead3/sead3-net.c | 14 +-
arch/mips/mti-sead3/sead3-platform.c | 18 +-
arch/mips/mti-sead3/sead3-serial.c | 45 --
arch/mips/mti-sead3/sead3-time.c | 35 +-
arch/mips/oprofile/Makefile | 1 +
arch/mips/oprofile/backtrace.c | 5 +-
arch/mips/oprofile/common.c | 11 +-
arch/mips/oprofile/op_model_loongson3.c | 220 ++++++
arch/mips/oprofile/op_model_mipsxx.c | 18 +-
arch/mips/pci/Makefile | 2 +
arch/mips/pci/ops-bcm63xx.c | 2 +-
arch/mips/pci/ops-nile4.c | 12 +-
arch/mips/pci/ops-pmcmsp.c | 12 -
arch/mips/pci/pci-ar2315.c | 511 +++++++++++++
arch/mips/pci/pci-ar71xx.c | 13 -
arch/mips/pci/pci-ar724x.c | 23 -
arch/mips/pci/pci-rt2880.c | 285 ++++++++
arch/mips/pci/pci-rt3883.c | 9 -
arch/mips/pci/pci-tx4939.c | 2 +-
arch/mips/pmcs-msp71xx/msp_prom.c | 2 +-
arch/mips/ralink/Kconfig | 3 +-
arch/mips/ralink/Makefile | 4 +
arch/mips/ralink/bootrom.c | 48 ++
arch/mips/ralink/clk.c | 6 +
arch/mips/ralink/common.h | 19 -
arch/mips/ralink/early_printk.c | 45 +-
arch/mips/ralink/ill_acc.c | 87 +++
arch/mips/ralink/irq.c | 45 +-
arch/mips/ralink/mt7620.c | 465 ++++++++----
arch/mips/ralink/of.c | 32 +-
arch/mips/ralink/prom.c | 1 +
arch/mips/ralink/rt288x.c | 65 +-
arch/mips/ralink/rt305x.c | 153 ++--
arch/mips/ralink/rt3883.c | 174 ++---
arch/mips/rb532/gpio.c | 2 +-
arch/mips/rb532/prom.c | 8 +-
arch/mips/sgi-ip22/ip22-mc.c | 6 +-
arch/mips/sgi-ip22/ip28-berr.c | 6 +-
arch/mips/sgi-ip27/ip27-klnuma.c | 5 +-
arch/mips/sgi-ip27/ip27-memory.c | 5 +-
arch/mips/sibyte/common/cfe.c | 8 +-
arch/mips/sibyte/swarm/platform.c | 2 +-
arch/mips/sibyte/swarm/rtc_m41t81.c | 4 +-
arch/mips/sibyte/swarm/rtc_xicor1241.c | 4 +-
arch/mips/sibyte/swarm/setup.c | 2 +-
arch/mips/txx9/generic/setup_tx4927.c | 4 +-
arch/mips/txx9/generic/setup_tx4938.c | 4 +-
arch/mips/txx9/generic/setup_tx4939.c | 4 +-
drivers/bcma/driver_mips.c | 13 +-
drivers/clk/clk-ls1x.c | 109 ++-
drivers/clocksource/Kconfig | 5 +
drivers/clocksource/Makefile | 1 +
drivers/clocksource/mips-gic-timer.c | 166 +++++
drivers/dma/txx9dmac.c | 2 +-
drivers/dma/txx9dmac.h | 4 +-
drivers/irqchip/Kconfig | 4 +
drivers/irqchip/Makefile | 1 +
drivers/irqchip/irq-mips-gic.c | 789 +++++++++++++++++++++
drivers/net/wireless/ath/ath5k/Kconfig | 14 +-
drivers/net/wireless/ath/ath5k/Makefile | 1 +
drivers/net/wireless/ath/ath5k/ahb.c | 234 ++++++
drivers/net/wireless/ath/ath5k/ath5k.h | 28 +
drivers/net/wireless/ath/ath5k/base.c | 14 +
drivers/net/wireless/ath/ath5k/led.c | 6 +
drivers/pcmcia/Kconfig | 2 -
drivers/ssb/driver_mipscore.c | 14 +-
drivers/tc/tc.c | 36 +-
fs/Kconfig.binfmt | 3 +
fs/binfmt_elf.c | 238 +++++--
.../dt-bindings/interrupt-controller/mips-gic.h | 9 +
include/linux/elf.h | 5 +
.../asm/gic.h => include/linux/irqchip/mips-gic.h | 267 ++-----
289 files changed, 9837 insertions(+), 3445 deletions(-)
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mips-gic.txt
create mode 100644 Documentation/devicetree/bindings/mips/brcm/bcm3384-intc.txt
create mode 100644 Documentation/devicetree/bindings/mips/brcm/bmips.txt
create mode 100644 Documentation/devicetree/bindings/mips/brcm/cm-dsl.txt
create mode 100644 Documentation/devicetree/bindings/mips/brcm/usb.txt
create mode 100644 arch/mips/ath25/Kconfig
create mode 100644 arch/mips/ath25/Makefile
create mode 100644 arch/mips/ath25/Platform
create mode 100644 arch/mips/ath25/ar2315.c
create mode 100644 arch/mips/ath25/ar2315.h
create mode 100644 arch/mips/ath25/ar2315_regs.h
create mode 100644 arch/mips/ath25/ar5312.c
create mode 100644 arch/mips/ath25/ar5312.h
create mode 100644 arch/mips/ath25/ar5312_regs.h
create mode 100644 arch/mips/ath25/board.c
create mode 100644 arch/mips/ath25/devices.c
create mode 100644 arch/mips/ath25/devices.h
create mode 100644 arch/mips/ath25/early_printk.c
create mode 100644 arch/mips/ath25/prom.c
create mode 100644 arch/mips/bcm3384/Makefile
create mode 100644 arch/mips/bcm3384/Platform
create mode 100644 arch/mips/bcm3384/dma.c
create mode 100644 arch/mips/bcm3384/irq.c
create mode 100644 arch/mips/bcm3384/setup.c
create mode 100644 arch/mips/boot/dts/bcm3384.dtsi
create mode 100644 arch/mips/boot/dts/bcm93384wvg.dts
create mode 100644 arch/mips/configs/bcm3384_defconfig
create mode 100644 arch/mips/include/asm/hpet.h
create mode 100644 arch/mips/include/asm/mach-ath25/ath25_platform.h
create mode 100644 arch/mips/include/asm/mach-ath25/cpu-feature-overrides.h
create mode 100644 arch/mips/include/asm/mach-ath25/dma-coherence.h
create mode 100644 arch/mips/include/asm/mach-ath25/gpio.h
create mode 100644 arch/mips/include/asm/mach-ath25/war.h
create mode 100644 arch/mips/include/asm/mach-bcm3384/dma-coherence.h
create mode 100644 arch/mips/include/asm/mach-bcm3384/war.h
create mode 100644 arch/mips/include/asm/mach-loongson/loongson_hwmon.h
create mode 100644 arch/mips/include/asm/mach-loongson/workarounds.h
create mode 100644 arch/mips/include/asm/mach-loongson1/cpufreq.h
create mode 100644 arch/mips/include/asm/mach-loongson1/regs-mux.h
create mode 100644 arch/mips/include/asm/mach-loongson1/regs-pwm.h
create mode 100644 arch/mips/include/asm/mach-ralink/pinmux.h
delete mode 100644 arch/mips/kernel/cevt-gic.c
delete mode 100644 arch/mips/kernel/csrc-gic.c
create mode 100644 arch/mips/kernel/elf.c
delete mode 100644 arch/mips/kernel/irq-gic.c
create mode 100644 arch/mips/lantiq/xway/vmmc.c
create mode 100644 arch/mips/loongson/loongson-3/hpet.c
create mode 100644 arch/mips/loongson/loongson-3/platform.c
delete mode 100644 arch/mips/loongson1/common/clock.c
create mode 100644 arch/mips/loongson1/common/time.c
delete mode 100644 arch/mips/mti-sead3/sead3-serial.c
create mode 100644 arch/mips/oprofile/op_model_loongson3.c
create mode 100644 arch/mips/pci/pci-ar2315.c
create mode 100644 arch/mips/pci/pci-rt2880.c
create mode 100644 arch/mips/ralink/bootrom.c
create mode 100644 arch/mips/ralink/ill_acc.c
create mode 100644 drivers/clocksource/mips-gic-timer.c
create mode 100644 drivers/irqchip/irq-mips-gic.c
create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c
create mode 100644 include/dt-bindings/interrupt-controller/mips-gic.h
rename arch/mips/include/asm/gic.h => include/linux/irqchip/mips-gic.h (50%)
Merging nios2/nios2-next (26981a83bf16 nios2: Make NIOS2_CMDLINE_IGNORE_DTB depend on CMDLINE_BOOL)
$ git merge nios2/nios2-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/nios2/nios2.txt | 62 +++
Documentation/devicetree/bindings/nios2/timer.txt | 19 +
Documentation/nios2/README | 23 +
MAINTAINERS | 7 +
arch/nios2/Kconfig | 206 ++++++++
arch/nios2/Kconfig.debug | 17 +
arch/nios2/Makefile | 73 +++
arch/nios2/boot/Makefile | 52 ++
arch/nios2/boot/dts/3c120_devboard.dts | 164 ++++++
arch/nios2/boot/install.sh | 52 ++
arch/nios2/boot/linked_dtb.S | 19 +
arch/nios2/configs/3c120_defconfig | 77 +++
arch/nios2/include/asm/Kbuild | 66 +++
arch/nios2/include/asm/asm-macros.h | 309 +++++++++++
arch/nios2/include/asm/asm-offsets.h | 20 +
arch/nios2/include/asm/cache.h | 36 ++
arch/nios2/include/asm/cacheflush.h | 52 ++
arch/nios2/include/asm/checksum.h | 78 +++
arch/nios2/include/asm/cmpxchg.h | 61 +++
arch/nios2/include/asm/cpuinfo.h | 57 +++
arch/nios2/include/asm/delay.h | 21 +
arch/nios2/include/asm/dma-mapping.h | 140 +++++
arch/nios2/include/asm/elf.h | 101 ++++
arch/nios2/include/asm/entry.h | 120 +++++
arch/nios2/include/asm/io.h | 61 +++
arch/nios2/include/asm/irq.h | 28 +
arch/nios2/include/asm/irqflags.h | 72 +++
arch/nios2/include/asm/linkage.h | 25 +
arch/nios2/include/asm/mmu.h | 16 +
arch/nios2/include/asm/mmu_context.h | 66 +++
arch/nios2/include/asm/mutex.h | 1 +
arch/nios2/include/asm/page.h | 109 ++++
arch/nios2/include/asm/pgalloc.h | 86 ++++
arch/nios2/include/asm/pgtable-bits.h | 35 ++
arch/nios2/include/asm/pgtable.h | 310 +++++++++++
arch/nios2/include/asm/processor.h | 103 ++++
arch/nios2/include/asm/ptrace.h | 33 ++
arch/nios2/include/asm/registers.h | 71 +++
arch/nios2/include/asm/setup.h | 38 ++
arch/nios2/include/asm/signal.h | 22 +
arch/nios2/include/asm/string.h | 24 +
arch/nios2/include/asm/switch_to.h | 31 ++
arch/nios2/include/asm/syscall.h | 138 +++++
arch/nios2/include/asm/syscalls.h | 25 +
arch/nios2/include/asm/thread_info.h | 120 +++++
arch/nios2/include/asm/timex.h | 24 +
arch/nios2/include/asm/tlb.h | 34 ++
arch/nios2/include/asm/tlbflush.h | 46 ++
arch/nios2/include/asm/traps.h | 19 +
arch/nios2/include/asm/uaccess.h | 231 +++++++++
arch/nios2/include/asm/ucontext.h | 32 ++
arch/nios2/include/uapi/asm/Kbuild | 4 +
arch/nios2/include/uapi/asm/byteorder.h | 22 +
arch/nios2/include/uapi/asm/elf.h | 67 +++
arch/nios2/include/uapi/asm/ptrace.h | 120 +++++
arch/nios2/include/uapi/asm/sigcontext.h | 28 +
arch/nios2/include/uapi/asm/signal.h | 23 +
arch/nios2/include/uapi/asm/swab.h | 37 ++
arch/nios2/include/uapi/asm/unistd.h | 25 +
arch/nios2/kernel/Makefile | 24 +
arch/nios2/kernel/asm-offsets.c | 87 ++++
arch/nios2/kernel/cpuinfo.c | 197 +++++++
arch/nios2/kernel/entry.S | 555 ++++++++++++++++++++
arch/nios2/kernel/head.S | 175 +++++++
arch/nios2/kernel/insnemu.S | 592 ++++++++++++++++++++++
arch/nios2/kernel/irq.c | 93 ++++
arch/nios2/kernel/misaligned.c | 256 ++++++++++
arch/nios2/kernel/module.c | 138 +++++
arch/nios2/kernel/nios2_ksyms.c | 33 ++
arch/nios2/kernel/process.c | 258 ++++++++++
arch/nios2/kernel/prom.c | 65 +++
arch/nios2/kernel/ptrace.c | 166 ++++++
arch/nios2/kernel/setup.c | 218 ++++++++
arch/nios2/kernel/signal.c | 323 ++++++++++++
arch/nios2/kernel/sys_nios2.c | 53 ++
arch/nios2/kernel/syscall_table.c | 29 ++
arch/nios2/kernel/time.c | 308 +++++++++++
arch/nios2/kernel/traps.c | 185 +++++++
arch/nios2/kernel/vmlinux.lds.S | 75 +++
arch/nios2/lib/Makefile | 8 +
arch/nios2/lib/delay.c | 52 ++
arch/nios2/lib/memcpy.c | 202 ++++++++
arch/nios2/lib/memmove.c | 82 +++
arch/nios2/lib/memset.c | 81 +++
arch/nios2/mm/Makefile | 14 +
arch/nios2/mm/cacheflush.c | 271 ++++++++++
arch/nios2/mm/dma-mapping.c | 186 +++++++
arch/nios2/mm/extable.c | 25 +
arch/nios2/mm/fault.c | 251 +++++++++
arch/nios2/mm/init.c | 142 ++++++
arch/nios2/mm/ioremap.c | 187 +++++++
arch/nios2/mm/mmu_context.c | 116 +++++
arch/nios2/mm/pgtable.c | 74 +++
arch/nios2/mm/tlb.c | 275 ++++++++++
arch/nios2/mm/uaccess.c | 163 ++++++
arch/nios2/platform/Kconfig.platform | 129 +++++
arch/nios2/platform/Makefile | 1 +
arch/nios2/platform/platform.c | 46 ++
include/asm-generic/futex.h | 114 +++++
include/uapi/linux/elf-em.h | 1 +
100 files changed, 10208 insertions(+)
create mode 100644 Documentation/devicetree/bindings/nios2/nios2.txt
create mode 100644 Documentation/devicetree/bindings/nios2/timer.txt
create mode 100644 Documentation/nios2/README
create mode 100644 arch/nios2/Kconfig
create mode 100644 arch/nios2/Kconfig.debug
create mode 100644 arch/nios2/Makefile
create mode 100644 arch/nios2/boot/Makefile
create mode 100644 arch/nios2/boot/dts/3c120_devboard.dts
create mode 100644 arch/nios2/boot/install.sh
create mode 100644 arch/nios2/boot/linked_dtb.S
create mode 100644 arch/nios2/configs/3c120_defconfig
create mode 100644 arch/nios2/include/asm/Kbuild
create mode 100644 arch/nios2/include/asm/asm-macros.h
create mode 100644 arch/nios2/include/asm/asm-offsets.h
create mode 100644 arch/nios2/include/asm/cache.h
create mode 100644 arch/nios2/include/asm/cacheflush.h
create mode 100644 arch/nios2/include/asm/checksum.h
create mode 100644 arch/nios2/include/asm/cmpxchg.h
create mode 100644 arch/nios2/include/asm/cpuinfo.h
create mode 100644 arch/nios2/include/asm/delay.h
create mode 100644 arch/nios2/include/asm/dma-mapping.h
create mode 100644 arch/nios2/include/asm/elf.h
create mode 100644 arch/nios2/include/asm/entry.h
create mode 100644 arch/nios2/include/asm/io.h
create mode 100644 arch/nios2/include/asm/irq.h
create mode 100644 arch/nios2/include/asm/irqflags.h
create mode 100644 arch/nios2/include/asm/linkage.h
create mode 100644 arch/nios2/include/asm/mmu.h
create mode 100644 arch/nios2/include/asm/mmu_context.h
create mode 100644 arch/nios2/include/asm/mutex.h
create mode 100644 arch/nios2/include/asm/page.h
create mode 100644 arch/nios2/include/asm/pgalloc.h
create mode 100644 arch/nios2/include/asm/pgtable-bits.h
create mode 100644 arch/nios2/include/asm/pgtable.h
create mode 100644 arch/nios2/include/asm/processor.h
create mode 100644 arch/nios2/include/asm/ptrace.h
create mode 100644 arch/nios2/include/asm/registers.h
create mode 100644 arch/nios2/include/asm/setup.h
create mode 100644 arch/nios2/include/asm/signal.h
create mode 100644 arch/nios2/include/asm/string.h
create mode 100644 arch/nios2/include/asm/switch_to.h
create mode 100644 arch/nios2/include/asm/syscall.h
create mode 100644 arch/nios2/include/asm/syscalls.h
create mode 100644 arch/nios2/include/asm/thread_info.h
create mode 100644 arch/nios2/include/asm/timex.h
create mode 100644 arch/nios2/include/asm/tlb.h
create mode 100644 arch/nios2/include/asm/tlbflush.h
create mode 100644 arch/nios2/include/asm/traps.h
create mode 100644 arch/nios2/include/asm/uaccess.h
create mode 100644 arch/nios2/include/asm/ucontext.h
create mode 100644 arch/nios2/include/uapi/asm/Kbuild
create mode 100644 arch/nios2/include/uapi/asm/byteorder.h
create mode 100644 arch/nios2/include/uapi/asm/elf.h
create mode 100644 arch/nios2/include/uapi/asm/ptrace.h
create mode 100644 arch/nios2/include/uapi/asm/sigcontext.h
create mode 100644 arch/nios2/include/uapi/asm/signal.h
create mode 100644 arch/nios2/include/uapi/asm/swab.h
create mode 100644 arch/nios2/include/uapi/asm/unistd.h
create mode 100644 arch/nios2/kernel/Makefile
create mode 100644 arch/nios2/kernel/asm-offsets.c
create mode 100644 arch/nios2/kernel/cpuinfo.c
create mode 100644 arch/nios2/kernel/entry.S
create mode 100644 arch/nios2/kernel/head.S
create mode 100644 arch/nios2/kernel/insnemu.S
create mode 100644 arch/nios2/kernel/irq.c
create mode 100644 arch/nios2/kernel/misaligned.c
create mode 100644 arch/nios2/kernel/module.c
create mode 100644 arch/nios2/kernel/nios2_ksyms.c
create mode 100644 arch/nios2/kernel/process.c
create mode 100644 arch/nios2/kernel/prom.c
create mode 100644 arch/nios2/kernel/ptrace.c
create mode 100644 arch/nios2/kernel/setup.c
create mode 100644 arch/nios2/kernel/signal.c
create mode 100644 arch/nios2/kernel/sys_nios2.c
create mode 100644 arch/nios2/kernel/syscall_table.c
create mode 100644 arch/nios2/kernel/time.c
create mode 100644 arch/nios2/kernel/traps.c
create mode 100644 arch/nios2/kernel/vmlinux.lds.S
create mode 100644 arch/nios2/lib/Makefile
create mode 100644 arch/nios2/lib/delay.c
create mode 100644 arch/nios2/lib/memcpy.c
create mode 100644 arch/nios2/lib/memmove.c
create mode 100644 arch/nios2/lib/memset.c
create mode 100644 arch/nios2/mm/Makefile
create mode 100644 arch/nios2/mm/cacheflush.c
create mode 100644 arch/nios2/mm/dma-mapping.c
create mode 100644 arch/nios2/mm/extable.c
create mode 100644 arch/nios2/mm/fault.c
create mode 100644 arch/nios2/mm/init.c
create mode 100644 arch/nios2/mm/ioremap.c
create mode 100644 arch/nios2/mm/mmu_context.c
create mode 100644 arch/nios2/mm/pgtable.c
create mode 100644 arch/nios2/mm/tlb.c
create mode 100644 arch/nios2/mm/uaccess.c
create mode 100644 arch/nios2/platform/Kconfig.platform
create mode 100644 arch/nios2/platform/Makefile
create mode 100644 arch/nios2/platform/platform.c
Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done())
$ 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 (56c381f93d57 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (5d01410fe4d9 Linux 3.18-rc6)
$ git merge powerpc/next
Already up-to-date.
Merging powerpc-mpe/next (e39f223fc935 powerpc: Remove more traces of bootmem)
$ git merge powerpc-mpe/next
Auto-merging drivers/rtc/Kconfig
Auto-merging arch/powerpc/xmon/xmon.c
Auto-merging arch/powerpc/sysdev/fsl_msi.c
Auto-merging arch/powerpc/platforms/powernv/pci.c
Auto-merging arch/powerpc/platforms/powernv/pci-ioda.c
Auto-merging arch/powerpc/mm/hugetlbpage.c
Removing arch/powerpc/mm/gup.c
Removing arch/powerpc/lib/devres.c
Auto-merging arch/powerpc/kernel/pci_64.c
Auto-merging arch/powerpc/kernel/iommu.c
Auto-merging arch/powerpc/include/asm/io.h
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/qoriq-clock.txt | 14 +-
.../devicetree/bindings/powerpc/fsl/fman.txt | 534 +++++++++++++++++++++
Documentation/devicetree/bindings/rtc/rtc-opal.txt | 16 +
.../devicetree/bindings/soc/fsl/bman-portals.txt | 56 +++
Documentation/devicetree/bindings/soc/fsl/bman.txt | 125 +++++
.../devicetree/bindings/soc/fsl/qman-portals.txt | 154 ++++++
Documentation/devicetree/bindings/soc/fsl/qman.txt | 165 +++++++
arch/powerpc/Kconfig | 5 +-
arch/powerpc/boot/dts/b4860emu.dts | 4 +-
arch/powerpc/boot/dts/b4qds.dtsi | 23 +
arch/powerpc/boot/dts/bsc9131rdb.dtsi | 50 --
arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 28 +-
arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 28 +-
arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 48 +-
arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 48 +-
arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 48 +-
arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 48 +-
arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 48 +-
arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi | 85 ++++
arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi | 68 +++
arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 30 +-
arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 29 +-
arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 29 +-
arch/powerpc/boot/dts/p3041ds.dts | 20 +
arch/powerpc/boot/dts/p5020ds.dts | 20 +
arch/powerpc/boot/dts/p5040ds.dts | 20 +
arch/powerpc/boot/dts/t104xrdb.dtsi | 7 +
arch/powerpc/boot/dts/t208xqds.dtsi | 11 +
arch/powerpc/boot/dts/t4240emu.dts | 4 +-
arch/powerpc/boot/main.c | 15 +-
arch/powerpc/boot/ops.h | 2 +-
arch/powerpc/boot/serial.c | 6 +-
arch/powerpc/configs/corenet32_smp_defconfig | 1 +
arch/powerpc/configs/corenet64_smp_defconfig | 1 +
arch/powerpc/configs/mpc85xx_defconfig | 1 +
arch/powerpc/configs/mpc85xx_smp_defconfig | 1 +
arch/powerpc/include/asm/bitops.h | 6 +-
arch/powerpc/include/asm/cputable.h | 10 +-
arch/powerpc/include/asm/elf.h | 3 +-
arch/powerpc/include/asm/fsl_guts.h | 5 +-
arch/powerpc/include/asm/hardirq.h | 7 +-
arch/powerpc/include/asm/hugetlb.h | 8 +-
arch/powerpc/include/asm/io.h | 3 -
arch/powerpc/include/asm/machdep.h | 15 -
arch/powerpc/include/asm/mmu-8xx.h | 2 +
arch/powerpc/include/asm/opal.h | 24 +-
arch/powerpc/include/asm/page.h | 4 +-
arch/powerpc/include/asm/pgtable-ppc32.h | 20 +
arch/powerpc/include/asm/pgtable-ppc64-4k.h | 16 +-
arch/powerpc/include/asm/pgtable-ppc64-64k.h | 3 +
arch/powerpc/include/asm/pgtable-ppc64.h | 52 +-
arch/powerpc/include/asm/pgtable.h | 6 +-
arch/powerpc/include/asm/pte-8xx.h | 7 +-
arch/powerpc/include/asm/setup.h | 3 +-
arch/powerpc/include/asm/thread_info.h | 5 +-
arch/powerpc/include/asm/tlbflush.h | 4 +-
arch/powerpc/include/asm/vga.h | 4 +-
arch/powerpc/include/asm/xics.h | 8 +-
arch/powerpc/kernel/align.c | 2 +-
arch/powerpc/kernel/crash_dump.c | 1 -
arch/powerpc/kernel/dbell.c | 2 +-
arch/powerpc/kernel/entry_32.S | 12 +-
arch/powerpc/kernel/entry_64.S | 35 +-
arch/powerpc/kernel/exceptions-64s.S | 13 +-
arch/powerpc/kernel/ftrace.c | 73 +--
arch/powerpc/kernel/head_8xx.S | 230 ++++-----
arch/powerpc/kernel/hw_breakpoint.c | 6 +-
arch/powerpc/kernel/iommu.c | 2 +-
arch/powerpc/kernel/irq.c | 5 +-
arch/powerpc/kernel/kgdb.c | 2 +-
arch/powerpc/kernel/kprobes.c | 6 +-
arch/powerpc/kernel/mce.c | 24 +-
arch/powerpc/kernel/pci-common.c | 3 +-
arch/powerpc/kernel/pci_32.c | 4 +-
arch/powerpc/kernel/pci_64.c | 1 -
arch/powerpc/kernel/process.c | 36 +-
arch/powerpc/kernel/prom.c | 11 +-
arch/powerpc/kernel/rtas-proc.c | 20 +-
arch/powerpc/kernel/rtas.c | 4 +-
arch/powerpc/kernel/rtas_pci.c | 1 -
arch/powerpc/kernel/setup-common.c | 6 +-
arch/powerpc/kernel/setup_32.c | 11 +-
arch/powerpc/kernel/setup_64.c | 35 +-
arch/powerpc/kernel/smp.c | 6 +-
arch/powerpc/kernel/sysfs.c | 4 +-
arch/powerpc/kernel/time.c | 23 +-
arch/powerpc/kernel/traps.c | 8 +-
arch/powerpc/kernel/udbg_16550.c | 6 +-
arch/powerpc/kernel/vdso.c | 1 -
arch/powerpc/kvm/book3s_hv_builtin.c | 3 +-
arch/powerpc/kvm/e500.c | 14 +-
arch/powerpc/kvm/e500mc.c | 4 +-
arch/powerpc/lib/Makefile | 1 -
arch/powerpc/lib/alloc.c | 4 +-
arch/powerpc/lib/devres.c | 43 --
arch/powerpc/lib/sstep.c | 6 +-
arch/powerpc/mm/Makefile | 2 +-
arch/powerpc/mm/fault.c | 7 -
arch/powerpc/mm/gup.c | 235 ---------
arch/powerpc/mm/hash_low_64.S | 4 +-
arch/powerpc/mm/hash_native_64.c | 2 +-
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/hugetlbpage-book3e.c | 6 +-
arch/powerpc/mm/hugetlbpage.c | 44 +-
arch/powerpc/mm/init_32.c | 10 -
arch/powerpc/mm/init_64.c | 1 -
arch/powerpc/mm/mem.c | 77 +--
arch/powerpc/mm/mmu_context_nohash.c | 8 +-
arch/powerpc/mm/numa.c | 224 ++-------
arch/powerpc/mm/pgtable_32.c | 3 +-
arch/powerpc/mm/pgtable_64.c | 34 +-
arch/powerpc/perf/core-book3s.c | 22 +-
arch/powerpc/perf/core-fsl-emb.c | 6 +-
arch/powerpc/platforms/44x/ppc476.c | 2 +-
arch/powerpc/platforms/512x/mpc512x_shared.c | 9 +-
arch/powerpc/platforms/52xx/efika.c | 3 +-
arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 8 +-
arch/powerpc/platforms/85xx/corenet_generic.c | 2 +-
arch/powerpc/platforms/85xx/sgy_cts1000.c | 4 +-
arch/powerpc/platforms/8xx/Kconfig | 4 -
arch/powerpc/platforms/cell/celleb_pci.c | 6 +-
arch/powerpc/platforms/cell/celleb_scc_epci.c | 1 -
arch/powerpc/platforms/cell/celleb_scc_pciex.c | 1 -
arch/powerpc/platforms/cell/celleb_setup.c | 4 +-
arch/powerpc/platforms/cell/interrupt.c | 6 +-
arch/powerpc/platforms/cell/qpace_setup.c | 2 +-
arch/powerpc/platforms/cell/setup.c | 2 +-
arch/powerpc/platforms/chrp/setup.c | 3 +-
arch/powerpc/platforms/embedded6xx/gamecube.c | 3 +-
arch/powerpc/platforms/embedded6xx/linkstation.c | 4 +-
arch/powerpc/platforms/embedded6xx/usbgecko_udbg.c | 6 +-
arch/powerpc/platforms/embedded6xx/wii.c | 3 +-
arch/powerpc/platforms/maple/pci.c | 1 -
arch/powerpc/platforms/maple/setup.c | 4 +-
arch/powerpc/platforms/powermac/nvram.c | 6 +-
arch/powerpc/platforms/powermac/pci.c | 1 -
arch/powerpc/platforms/powermac/setup.c | 3 +-
arch/powerpc/platforms/powernv/eeh-ioda.c | 1 -
arch/powerpc/platforms/powernv/opal-async.c | 3 +
arch/powerpc/platforms/powernv/opal-rtc.c | 65 +--
arch/powerpc/platforms/powernv/opal-tracepoints.c | 4 +-
arch/powerpc/platforms/powernv/opal-wrappers.S | 6 +-
arch/powerpc/platforms/powernv/opal.c | 20 +
arch/powerpc/platforms/powernv/pci-ioda.c | 217 ++++++---
arch/powerpc/platforms/powernv/pci-p5ioc2.c | 44 +-
arch/powerpc/platforms/powernv/pci.c | 1 -
arch/powerpc/platforms/powernv/pci.h | 2 +-
arch/powerpc/platforms/powernv/setup.c | 6 +-
arch/powerpc/platforms/ps3/interrupt.c | 2 +-
arch/powerpc/platforms/ps3/setup.c | 9 +-
arch/powerpc/platforms/pseries/dtl.c | 2 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 21 -
arch/powerpc/platforms/pseries/hvCall.S | 4 +-
arch/powerpc/platforms/pseries/hvCall_inst.c | 4 +-
arch/powerpc/platforms/pseries/iommu.c | 11 +-
arch/powerpc/platforms/pseries/lpar.c | 6 +-
arch/powerpc/platforms/pseries/nvram.c | 2 +
arch/powerpc/platforms/pseries/pci.c | 2 +-
arch/powerpc/platforms/pseries/ras.c | 4 +-
arch/powerpc/platforms/pseries/setup.c | 65 +--
arch/powerpc/sysdev/fsl_msi.c | 1 -
arch/powerpc/sysdev/fsl_pci.c | 3 +-
arch/powerpc/sysdev/fsl_rio.c | 104 ++++
arch/powerpc/sysdev/fsl_rio.h | 13 +
arch/powerpc/sysdev/fsl_soc.c | 5 +-
arch/powerpc/sysdev/ipic.c | 1 -
arch/powerpc/sysdev/mpc5xxx_clocks.c | 3 +-
arch/powerpc/sysdev/mpic.c | 1 -
arch/powerpc/sysdev/mpic_pasemi_msi.c | 1 -
arch/powerpc/sysdev/mpic_u3msi.c | 1 -
arch/powerpc/sysdev/ppc4xx_cpm.c | 8 +-
arch/powerpc/sysdev/ppc4xx_msi.c | 1 -
arch/powerpc/sysdev/ppc4xx_pci.c | 1 -
arch/powerpc/sysdev/qe_lib/qe.c | 1 -
arch/powerpc/sysdev/qe_lib/qe_ic.c | 1 -
arch/powerpc/sysdev/uic.c | 1 -
arch/powerpc/sysdev/xics/xics-common.c | 2 +-
arch/powerpc/xmon/xmon.c | 5 +-
drivers/misc/cxl/cxl.h | 15 +-
drivers/misc/cxl/irq.c | 144 ++++--
drivers/misc/cxl/native.c | 14 +-
drivers/rtc/Kconfig | 11 +
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-opal.c | 261 ++++++++++
include/linux/hugetlb.h | 46 ++
mm/gup.c | 81 +++-
186 files changed, 2874 insertions(+), 1803 deletions(-)
create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/fman.txt
create mode 100644 Documentation/devicetree/bindings/rtc/rtc-opal.txt
create mode 100644 Documentation/devicetree/bindings/soc/fsl/bman-portals.txt
create mode 100644 Documentation/devicetree/bindings/soc/fsl/bman.txt
create mode 100644 Documentation/devicetree/bindings/soc/fsl/qman-portals.txt
create mode 100644 Documentation/devicetree/bindings/soc/fsl/qman.txt
create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi
create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi
delete mode 100644 arch/powerpc/lib/devres.c
delete mode 100644 arch/powerpc/mm/gup.c
create mode 100644 drivers/rtc/rtc-opal.c
Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (57f2ffe14fd1 s390: remove diag 44 calls from cpu_relax())
$ git merge s390/features
Auto-merging mm/memory.c
Auto-merging mm/huge_memory.c
Auto-merging include/linux/mm.h
Auto-merging arch/s390/kernel/perf_cpum_sf.c
Auto-merging arch/s390/kernel/ftrace.c
Auto-merging arch/s390/include/asm/io.h
Merge made by the 'recursive' strategy.
Documentation/s390/Debugging390.txt | 462 +++++-------------------------------
arch/s390/include/asm/cmpxchg.h | 240 ++-----------------
arch/s390/include/asm/ftrace.h | 54 ++++-
arch/s390/include/asm/io.h | 9 +
arch/s390/include/asm/irq.h | 11 +-
arch/s390/include/asm/kprobes.h | 1 +
arch/s390/include/asm/lowcore.h | 4 +-
arch/s390/include/asm/pci.h | 5 +-
arch/s390/include/asm/pci_io.h | 6 +-
arch/s390/include/asm/pgalloc.h | 2 -
arch/s390/include/asm/pgtable.h | 33 ++-
arch/s390/include/asm/processor.h | 2 -
arch/s390/include/asm/spinlock.h | 9 +-
arch/s390/include/uapi/asm/unistd.h | 4 +-
arch/s390/kernel/asm-offsets.c | 5 +-
arch/s390/kernel/compat_signal.c | 2 +-
arch/s390/kernel/compat_wrapper.c | 2 +
arch/s390/kernel/dumpstack.c | 3 +-
arch/s390/kernel/early.c | 4 -
arch/s390/kernel/entry.h | 2 +
arch/s390/kernel/ftrace.c | 136 +++++++----
arch/s390/kernel/idle.c | 3 +-
arch/s390/kernel/irq.c | 5 +-
arch/s390/kernel/kprobes.c | 178 +++++++++-----
arch/s390/kernel/mcount.S | 1 +
arch/s390/kernel/perf_cpum_sf.c | 1 -
arch/s390/kernel/process.c | 2 +-
arch/s390/kernel/ptrace.c | 97 ++++++--
arch/s390/kernel/setup.c | 2 -
arch/s390/kernel/signal.c | 2 +-
arch/s390/kernel/smp.c | 1 -
arch/s390/kernel/syscalls.S | 2 +
arch/s390/kernel/time.c | 3 +-
arch/s390/kernel/traps.c | 25 +-
arch/s390/kvm/kvm-s390.c | 2 +-
arch/s390/kvm/priv.c | 17 +-
arch/s390/mm/fault.c | 10 +-
arch/s390/mm/pgtable.c | 185 +++++++--------
arch/s390/pci/Makefile | 2 +-
arch/s390/pci/pci.c | 9 +-
arch/s390/pci/pci_clp.c | 1 +
arch/s390/pci/pci_debug.c | 7 +-
arch/s390/pci/pci_mmio.c | 115 +++++++++
drivers/s390/block/dasd.c | 31 +--
drivers/s390/block/dasd_genhd.c | 26 +-
drivers/s390/char/Kconfig | 10 +
drivers/s390/char/sclp_async.c | 3 +-
include/asm-generic/pgtable.h | 11 +
include/linux/kprobes.h | 1 +
include/linux/mm.h | 11 +
kernel/kprobes.c | 18 +-
kernel/sys_ni.c | 2 +
mm/huge_memory.c | 5 +-
mm/memory.c | 2 +-
scripts/recordmcount.c | 2 +-
scripts/recordmcount.pl | 2 +-
56 files changed, 817 insertions(+), 973 deletions(-)
create mode 100644 arch/s390/pci/pci_mmio.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (c47b15c4928c arch/tile: update MAINTAINERS email to EZchip)
$ git merge tile/master
Auto-merging arch/tile/include/asm/io.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 2 +-
arch/tile/gxio/mpipe.c | 4 ++
arch/tile/include/asm/io.h | 5 +-
arch/tile/include/asm/pgtable.h | 4 +-
arch/tile/include/asm/pgtable_64.h | 2 +-
arch/tile/include/uapi/asm/ptrace.h | 16 +++---
arch/tile/include/uapi/asm/sigcontext.h | 14 +++--
arch/tile/kernel/hardwall.c | 6 +--
arch/tile/kernel/irq.c | 5 +-
arch/tile/kernel/kgdb.c | 6 +--
arch/tile/kernel/kprobes.c | 3 +-
arch/tile/kernel/machine_kexec.c | 28 ++++------
arch/tile/kernel/messaging.c | 5 +-
arch/tile/kernel/module.c | 12 ++---
arch/tile/kernel/pci.c | 7 ++-
arch/tile/kernel/pci_gx.c | 95 ++++++++++++++-------------------
arch/tile/kernel/process.c | 16 +++---
arch/tile/kernel/setup.c | 36 ++++++-------
arch/tile/kernel/signal.c | 20 ++-----
arch/tile/kernel/single_step.c | 6 +--
arch/tile/kernel/smpboot.c | 5 +-
arch/tile/kernel/stack.c | 7 +--
arch/tile/kernel/time.c | 4 +-
arch/tile/kernel/traps.c | 10 ++--
arch/tile/kernel/unaligned.c | 22 ++++----
arch/tile/mm/fault.c | 34 ++++++------
arch/tile/mm/homecache.c | 6 +--
arch/tile/mm/hugetlbpage.c | 18 +++----
arch/tile/mm/init.c | 32 +++++------
arch/tile/mm/pgtable.c | 4 +-
30 files changed, 187 insertions(+), 247 deletions(-)
Merging uml/next (989e59fa41c5 um: Include generic barrier.h)
$ git merge uml/next
Resolved 'arch/um/include/asm/Kbuild' using previous resolution.
Removing arch/x86/um/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
Removing arch/um/sys-ia64/sysdep/skas_ptrace.h
Auto-merging arch/um/os-Linux/skas/process.c
Auto-merging arch/um/kernel/um_arch.c
Auto-merging arch/um/kernel/trap.c
Auto-merging arch/um/kernel/ptrace.c
Removing arch/um/include/shared/skas_ptrace.h
Removing arch/um/include/shared/skas/proc_mm.h
Auto-merging arch/um/include/shared/os.h
Auto-merging arch/um/include/asm/Kbuild
CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b4eaa89879c1] Merge remote-tracking branch 'uml/next'
$ git diff -M --stat --summary HEAD^..
arch/um/include/shared/os.h | 2 -
arch/um/include/shared/skas/proc_mm.h | 44 ------
arch/um/include/shared/skas/skas.h | 3 -
arch/um/include/shared/skas_ptrace.h | 14 --
arch/um/kernel/ptrace.c | 32 ----
arch/um/kernel/reboot.c | 35 ++---
arch/um/kernel/skas/mmu.c | 68 +++------
arch/um/kernel/skas/process.c | 27 ----
arch/um/kernel/trap.c | 2 +-
arch/um/kernel/um_arch.c | 10 --
arch/um/os-Linux/process.c | 16 --
arch/um/os-Linux/skas/mem.c | 100 ++----------
arch/um/os-Linux/skas/process.c | 200 ++++++------------------
arch/um/os-Linux/start_up.c | 154 -------------------
arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 ---
arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 ---
arch/x86/um/ldt.c | 227 ++++++----------------------
arch/x86/um/shared/sysdep/faultinfo_32.h | 3 -
arch/x86/um/shared/sysdep/faultinfo_64.h | 3 -
arch/x86/um/shared/sysdep/skas_ptrace.h | 22 ---
20 files changed, 148 insertions(+), 858 deletions(-)
delete mode 100644 arch/um/include/shared/skas/proc_mm.h
delete mode 100644 arch/um/include/shared/skas_ptrace.h
delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h
delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (c0d7aa07504a Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next)
$ git merge xtensa/for_next
Removing arch/xtensa/variants/s6000/irq.c
Removing arch/xtensa/variants/s6000/include/variant/tie.h
Removing arch/xtensa/variants/s6000/include/variant/tie-asm.h
Removing arch/xtensa/variants/s6000/include/variant/irq.h
Removing arch/xtensa/variants/s6000/include/variant/hardware.h
Removing arch/xtensa/variants/s6000/include/variant/gpio.h
Removing arch/xtensa/variants/s6000/include/variant/dmac.h
Removing arch/xtensa/variants/s6000/include/variant/core.h
Removing arch/xtensa/variants/s6000/gpio.c
Removing arch/xtensa/variants/s6000/dmac.c
Removing arch/xtensa/variants/s6000/delay.c
Removing arch/xtensa/variants/s6000/Makefile
Removing arch/xtensa/platforms/s6105/setup.c
Removing arch/xtensa/platforms/s6105/include/platform/serial.h
Removing arch/xtensa/platforms/s6105/include/platform/hardware.h
Removing arch/xtensa/platforms/s6105/include/platform/gpio.h
Removing arch/xtensa/platforms/s6105/device.c
Removing arch/xtensa/platforms/s6105/Makefile
Removing arch/xtensa/configs/s6105_defconfig
Merge made by the 'recursive' strategy.
arch/xtensa/Kconfig | 50 +-
arch/xtensa/Kconfig.debug | 2 +-
arch/xtensa/Makefile | 1 -
arch/xtensa/boot/boot-elf/boot.lds.S | 2 +
arch/xtensa/boot/boot-elf/bootstrap.S | 10 +-
arch/xtensa/boot/boot-uboot/Makefile | 4 +
arch/xtensa/configs/iss_defconfig | 2 -
arch/xtensa/configs/s6105_defconfig | 615 ---------------------
arch/xtensa/include/asm/cacheflush.h | 7 +-
arch/xtensa/include/asm/initialize_mmu.h | 40 +-
arch/xtensa/include/asm/mmu_context.h | 4 -
arch/xtensa/include/asm/nommu_context.h | 4 +
arch/xtensa/include/asm/page.h | 12 +-
arch/xtensa/include/asm/pgtable.h | 1 +
arch/xtensa/include/asm/vectors.h | 7 +-
arch/xtensa/include/uapi/asm/mman.h | 6 +
arch/xtensa/kernel/head.S | 5 +
arch/xtensa/kernel/syscall.c | 2 +
arch/xtensa/mm/Makefile | 4 +-
arch/xtensa/mm/init.c | 19 +-
arch/xtensa/platforms/s6105/Makefile | 3 -
arch/xtensa/platforms/s6105/device.c | 161 ------
.../xtensa/platforms/s6105/include/platform/gpio.h | 27 -
.../platforms/s6105/include/platform/hardware.h | 11 -
.../platforms/s6105/include/platform/serial.h | 8 -
arch/xtensa/platforms/s6105/setup.c | 73 ---
.../platforms/xtfpga/include/platform/hardware.h | 4 +-
arch/xtensa/variants/s6000/Makefile | 4 -
arch/xtensa/variants/s6000/delay.c | 25 -
arch/xtensa/variants/s6000/dmac.c | 173 ------
arch/xtensa/variants/s6000/gpio.c | 230 --------
arch/xtensa/variants/s6000/include/variant/core.h | 431 ---------------
arch/xtensa/variants/s6000/include/variant/dmac.h | 387 -------------
arch/xtensa/variants/s6000/include/variant/gpio.h | 6 -
.../variants/s6000/include/variant/hardware.h | 259 ---------
arch/xtensa/variants/s6000/include/variant/irq.h | 8 -
.../variants/s6000/include/variant/tie-asm.h | 304 ----------
arch/xtensa/variants/s6000/include/variant/tie.h | 191 -------
arch/xtensa/variants/s6000/irq.c | 74 ---
39 files changed, 138 insertions(+), 3038 deletions(-)
delete mode 100644 arch/xtensa/configs/s6105_defconfig
delete mode 100644 arch/xtensa/platforms/s6105/Makefile
delete mode 100644 arch/xtensa/platforms/s6105/device.c
delete mode 100644 arch/xtensa/platforms/s6105/include/platform/gpio.h
delete mode 100644 arch/xtensa/platforms/s6105/include/platform/hardware.h
delete mode 100644 arch/xtensa/platforms/s6105/include/platform/serial.h
delete mode 100644 arch/xtensa/platforms/s6105/setup.c
delete mode 100644 arch/xtensa/variants/s6000/Makefile
delete mode 100644 arch/xtensa/variants/s6000/delay.c
delete mode 100644 arch/xtensa/variants/s6000/dmac.c
delete mode 100644 arch/xtensa/variants/s6000/gpio.c
delete mode 100644 arch/xtensa/variants/s6000/include/variant/core.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/dmac.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/gpio.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/hardware.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/irq.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/tie-asm.h
delete mode 100644 arch/xtensa/variants/s6000/include/variant/tie.h
delete mode 100644 arch/xtensa/variants/s6000/irq.c
Merging btrfs/next (a43bb39b5c71 btrfs: Fix compile error when CONFIG_SECURITY is not set.)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
fs/ceph/caps.c | 3 +-
fs/ceph/dir.c | 23 ++++++++----
fs/ceph/inode.c | 13 ++++---
fs/ceph/locks.c | 64 +++++++++++++++++++++++++++-----
fs/ceph/mds_client.c | 31 +++++++++++++---
fs/ceph/mds_client.h | 6 +++
fs/ceph/snap.c | 35 ++++++++++++++----
fs/ceph/super.c | 6 +++
fs/ceph/super.h | 40 +++++++++++++++++---
include/linux/ceph/auth.h | 26 +++++++++++++
include/linux/ceph/buffer.h | 3 +-
include/linux/ceph/ceph_features.h | 1 +
include/linux/ceph/ceph_fs.h | 7 +++-
include/linux/ceph/libceph.h | 2 +-
include/linux/ceph/messenger.h | 9 ++++-
include/linux/ceph/msgr.h | 11 +++++-
net/ceph/auth_x.c | 76 ++++++++++++++++++++++++++++++++++----
net/ceph/auth_x.h | 1 +
net/ceph/buffer.c | 4 +-
net/ceph/ceph_common.c | 21 +++++++----
net/ceph/messenger.c | 34 +++++++++++++++--
net/ceph/osd_client.c | 16 ++++++++
22 files changed, 360 insertions(+), 72 deletions(-)
Merging cifs/for-next (a8a7a807cd94 Update MAINTAINERS entry)
$ git merge cifs/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 3 +--
fs/cifs/cifsfs.h | 2 +-
fs/cifs/smb2ops.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
fs/cifs/smb2pdu.c | 3 +--
fs/cifs/smb2pdu.h | 19 +++++++++++++++++
5 files changed, 84 insertions(+), 6 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 (942080643bce eCryptfs: Remove buggy and unnecessary write in file name decode routine)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Merge made by the 'recursive' strategy.
fs/ecryptfs/crypto.c | 1 -
fs/ecryptfs/file.c | 12 ------------
fs/ecryptfs/keystore.c | 6 +++---
fs/ecryptfs/main.c | 16 +++++++++++++---
4 files changed, 16 insertions(+), 19 deletions(-)
Merging ext3/for_next (fdf2657bc81b udf: One function call less in udf_fill_super() after error detection)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
fs/ext2/ext2.h | 3 +++
fs/ext2/super.c | 10 ++++++++
fs/ext3/ext3.h | 4 ++++
fs/ext3/super.c | 10 ++++++++
fs/ext4/ext4.h | 4 ++++
fs/ext4/super.c | 8 +++++++
fs/gfs2/ops_fstype.c | 1 +
fs/inode.c | 3 ---
fs/jbd/journal.c | 3 +--
fs/jfs/jfs_incore.h | 3 +++
fs/jfs/super.c | 9 ++++++++
fs/ocfs2/inode.h | 2 ++
fs/ocfs2/super.c | 8 +++++++
fs/quota/dquot.c | 59 ++++++++++++++++++++++++++----------------------
fs/quota/quota.c | 13 +++++++++--
fs/reiserfs/reiserfs.h | 4 ++++
fs/reiserfs/super.c | 11 +++++++++
fs/udf/super.c | 11 ++++-----
fs/xfs/xfs_super.c | 1 +
include/linux/fs.h | 5 ++--
include/linux/quota.h | 5 ++++
include/linux/quotaops.h | 8 +++----
22 files changed, 138 insertions(+), 47 deletions(-)
Merging ext4/dev (ca83cc75a16f ext4: forbid journal_async_commit in data=ordered mode)
$ git merge ext4/dev
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/ext4.h
Merge made by the 'recursive' strategy.
fs/ext4/balloc.c | 14 +-
fs/ext4/ext4.h | 48 +++----
fs/ext4/extents.c | 216 +++++++++++++++--------------
fs/ext4/extents_status.c | 321 +++++++++++++++++++++++---------------------
fs/ext4/extents_status.h | 82 ++++++-----
fs/ext4/inode.c | 37 +----
fs/ext4/ioctl.c | 2 -
fs/ext4/mballoc.c | 15 +--
fs/ext4/migrate.c | 2 +-
fs/ext4/move_extent.c | 8 +-
fs/ext4/namei.c | 1 -
fs/ext4/resize.c | 10 +-
fs/ext4/super.c | 52 ++++---
fs/jbd2/journal.c | 3 +-
include/linux/jbd2.h | 8 +-
include/trace/events/ext4.h | 17 +--
16 files changed, 427 insertions(+), 409 deletions(-)
Merging f2fs/dev (31a3268839c1 f2fs: cleanup if-statement of phase in gc_data_segment)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
Documentation/filesystems/f2fs.txt | 7 +
fs/f2fs/acl.c | 148 +++++++++++-
fs/f2fs/acl.h | 5 +-
fs/f2fs/checkpoint.c | 109 +++++----
fs/f2fs/data.c | 164 ++++++-------
fs/f2fs/debug.c | 7 +-
fs/f2fs/dir.c | 308 +++++++++++++++---------
fs/f2fs/f2fs.h | 158 ++++++++++--
fs/f2fs/file.c | 99 +++++---
fs/f2fs/gc.c | 48 ++--
fs/f2fs/inline.c | 482 +++++++++++++++++++++++++++++--------
fs/f2fs/inode.c | 42 +++-
fs/f2fs/namei.c | 58 +++--
fs/f2fs/node.c | 65 +++--
fs/f2fs/node.h | 8 +-
fs/f2fs/recovery.c | 4 +-
fs/f2fs/segment.c | 118 ++++++---
fs/f2fs/segment.h | 8 +-
fs/f2fs/super.c | 29 ++-
fs/f2fs/xattr.c | 6 +-
fs/f2fs/xattr.h | 6 +-
include/linux/f2fs_fs.h | 27 ++-
22 files changed, 1353 insertions(+), 553 deletions(-)
Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.)
$ git merge fscache/fscache
Resolved 'fs/fscache/object.c' using previous resolution.
Auto-merging fs/fscache/object.c
CONFLICT (content): Merge conflict in fs/fscache/object.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 59d936fdea2c] Merge remote-tracking branch 'fscache/fscache'
$ git diff -M --stat --summary HEAD^..
Merging fuse/for-next (d7afaec0b564 fuse: add FUSE_NO_OPEN_SUPPORT flag to INIT)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/master (ec7d879c4576 GFS2: gfs2_atomic_open(): simplify the use of finish_no_open())
$ git merge gfs2/master
Auto-merging include/linux/fs.h
Auto-merging fs/gfs2/ops_fstype.c
Merge made by the 'recursive' strategy.
fs/block_dev.c | 10 ++++-
fs/gfs2/dir.c | 39 ++++--------------
fs/gfs2/file.c | 83 ++++++++++++++++++++++++--------------
fs/gfs2/glock.c | 3 +-
fs/gfs2/glops.c | 26 ++++++------
fs/gfs2/glops.h | 2 +
fs/gfs2/incore.h | 19 ++++++---
fs/gfs2/inode.c | 72 +++++++++------------------------
fs/gfs2/log.c | 42 +++++++++----------
fs/gfs2/main.c | 11 ++++-
fs/gfs2/ops_fstype.c | 18 +++------
fs/gfs2/quota.c | 9 +----
fs/gfs2/rgrp.c | 69 ++++++++++++++++++++++++++++---
fs/gfs2/rgrp.h | 1 +
fs/gfs2/super.c | 112 ++++++++++++++++++++++++++++++++++-----------------
fs/gfs2/super.h | 1 +
fs/gfs2/trans.c | 17 ++++++--
fs/ioctl.c | 6 ++-
include/linux/fs.h | 2 +
19 files changed, 315 insertions(+), 227 deletions(-)
Merging jfs/jfs-next (bb5e50aaa805 fs/jfs/super.c: convert simple_str to kstr)
$ 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 (388f0c776781 sunrpc: add a debugfs rpc_xprt directory with an info file in it)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
fs/lockd/svclock.c | 2 +-
fs/nfs/blocklayout/blocklayout.c | 2 +-
fs/nfs/callback_proc.c | 2 +-
fs/nfs/filelayout/filelayoutdev.c | 3 +-
fs/nfs/fscache.c | 24 +--
fs/nfs/inode.c | 9 +-
fs/nfs/iostat.h | 5 +
fs/nfs/nfs42.h | 2 +
fs/nfs/nfs42proc.c | 77 ++++++++-
fs/nfs/nfs42xdr.c | 139 +++++++++++++++
fs/nfs/nfs4_fs.h | 1 +
fs/nfs/nfs4client.c | 46 +++--
fs/nfs/nfs4file.c | 31 ++++
fs/nfs/nfs4proc.c | 12 +-
fs/nfs/nfs4xdr.c | 12 +-
fs/nfs/pagelist.c | 11 +-
fs/nfs/read.c | 2 +-
fs/nfs/write.c | 19 ++-
include/linux/lockd/debug.h | 6 +-
include/linux/nfs4.h | 2 +
include/linux/nfs_fs.h | 4 +-
include/linux/nfs_fs_sb.h | 2 +
include/linux/nfs_xdr.h | 14 ++
include/linux/sunrpc/auth.h | 2 +-
include/linux/sunrpc/clnt.h | 4 +
include/linux/sunrpc/debug.h | 64 +++++--
include/linux/sunrpc/metrics.h | 3 +
include/linux/sunrpc/sched.h | 8 +-
include/linux/sunrpc/xprt.h | 3 +
include/linux/sunrpc/xprtsock.h | 59 +++++++
include/trace/events/sunrpc.h | 160 +++++++++++++++++
include/uapi/linux/nfsd/debug.h | 2 +-
net/sunrpc/Kconfig | 1 +
net/sunrpc/Makefile | 1 +
net/sunrpc/auth.c | 4 +-
net/sunrpc/auth_generic.c | 2 +-
net/sunrpc/auth_gss/auth_gss.c | 2 +-
net/sunrpc/auth_gss/gss_generic_token.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_keys.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_seal.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 +-
net/sunrpc/auth_gss/gss_krb5_wrap.c | 2 +-
net/sunrpc/auth_gss/gss_mech_switch.c | 2 +-
net/sunrpc/auth_gss/gss_rpc_xdr.h | 2 +-
net/sunrpc/auth_gss/svcauth_gss.c | 2 +-
net/sunrpc/auth_null.c | 4 +-
net/sunrpc/auth_unix.c | 2 +-
net/sunrpc/backchannel_rqst.c | 2 +-
net/sunrpc/clnt.c | 16 +-
net/sunrpc/debugfs.c | 292 ++++++++++++++++++++++++++++++++
net/sunrpc/rpcb_clnt.c | 2 +-
net/sunrpc/sched.c | 4 +-
net/sunrpc/stats.c | 21 ++-
net/sunrpc/sunrpc_syms.c | 12 +-
net/sunrpc/svc.c | 23 +--
net/sunrpc/svc_xprt.c | 31 ++--
net/sunrpc/sysctl.c | 2 +-
net/sunrpc/xprt.c | 19 ++-
net/sunrpc/xprtrdma/rpc_rdma.c | 4 +-
net/sunrpc/xprtrdma/transport.c | 12 +-
net/sunrpc/xprtrdma/verbs.c | 122 ++++++++++---
net/sunrpc/xprtrdma/xprt_rdma.h | 6 +
net/sunrpc/xprtsock.c | 77 ++-------
66 files changed, 1171 insertions(+), 244 deletions(-)
create mode 100644 net/sunrpc/debugfs.c
Merging nfsd/nfsd-next (d395ac8becda sunrpc: release svc_pool_map reference when serv allocation fails)
$ git merge nfsd/nfsd-next
Auto-merging net/sunrpc/svc_xprt.c
Auto-merging net/sunrpc/svc.c
Auto-merging include/linux/nfs4.h
Auto-merging include/linux/fs.h
Auto-merging fs/ioctl.c
Merge made by the 'recursive' strategy.
drivers/staging/android/ashmem.c | 2 +-
fs/ioctl.c | 2 +-
fs/lockd/mon.c | 2 +-
fs/nfsd/nfs4proc.c | 51 ++++++++++++++++++++++++++++++++++++++
fs/nfsd/nfs4state.c | 53 +++++++++++++++++++++++-----------------
fs/nfsd/nfs4xdr.c | 37 ++++++++++++++++++++++++++--
fs/nfsd/nfsd.h | 2 +-
fs/nfsd/state.h | 19 +++++++++-----
fs/nfsd/vfs.c | 31 ++++++++++++++++++++---
fs/nfsd/vfs.h | 2 ++
fs/nfsd/xdr4.h | 9 +++++++
fs/open.c | 5 ++--
include/linux/fs.h | 2 +-
include/linux/nfs4.h | 9 +++++++
include/linux/sunrpc/svc_xprt.h | 7 +++---
mm/madvise.c | 2 +-
net/sunrpc/svc.c | 14 ++++++-----
net/sunrpc/svc_xprt.c | 4 +--
net/sunrpc/xdr.c | 9 ++++---
19 files changed, 203 insertions(+), 59 deletions(-)
Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
$ git merge omfs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (8cb983cec9d1 ovl: support multiple lower layers)
$ git merge overlayfs/overlayfs-next
Merge made by the 'recursive' strategy.
Documentation/filesystems/overlayfs.txt | 12 +
fs/overlayfs/copy_up.c | 4 +-
fs/overlayfs/dir.c | 24 +-
fs/overlayfs/inode.c | 9 +-
fs/overlayfs/overlayfs.h | 14 +-
fs/overlayfs/readdir.c | 120 +++-----
fs/overlayfs/super.c | 521 ++++++++++++++++++++------------
7 files changed, 427 insertions(+), 277 deletions(-)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Merge made by the 'recursive' strategy.
Documentation/filesystems/squashfs.txt | 8 +-
fs/squashfs/Kconfig | 15 ++++
fs/squashfs/Makefile | 1 +
fs/squashfs/decompressor.c | 7 ++
fs/squashfs/decompressor.h | 4 +
fs/squashfs/lz4_wrapper.c | 142 +++++++++++++++++++++++++++++++++
fs/squashfs/squashfs_fs.h | 1 +
7 files changed, 174 insertions(+), 4 deletions(-)
create mode 100644 fs/squashfs/lz4_wrapper.c
Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree())
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/attach.c | 126 +++++++++++++++++++-------------------
drivers/mtd/ubi/block.c | 41 +++++++------
drivers/mtd/ubi/build.c | 126 ++++++++++++++++++++------------------
drivers/mtd/ubi/cdev.c | 36 +++++------
drivers/mtd/ubi/debug.c | 10 ++--
drivers/mtd/ubi/eba.c | 53 ++++++++--------
drivers/mtd/ubi/fastmap.c | 96 ++++++++++++++---------------
drivers/mtd/ubi/io.c | 150 ++++++++++++++++++++++++----------------------
drivers/mtd/ubi/kapi.c | 6 +-
drivers/mtd/ubi/misc.c | 4 +-
drivers/mtd/ubi/ubi.h | 13 ++--
drivers/mtd/ubi/upd.c | 10 ++--
drivers/mtd/ubi/vmt.c | 69 +++++++++++----------
drivers/mtd/ubi/vtbl.c | 71 +++++++++++-----------
drivers/mtd/ubi/wl.c | 80 +++++++++++++------------
fs/ubifs/file.c | 1 +
fs/ubifs/journal.c | 7 ++-
17 files changed, 466 insertions(+), 433 deletions(-)
Merging xfs/for-next (216875a594e0 Merge branch 'xfs-consolidate-format-defs' into for-next)
$ git merge xfs/for-next
Auto-merging fs/xfs/xfs_super.c
Removing fs/xfs/libxfs/xfs_inum.h
Removing fs/xfs/libxfs/xfs_dinode.h
Removing fs/xfs/libxfs/xfs_ag.h
Merge made by the 'recursive' strategy.
fs/xfs/libxfs/xfs_ag.h | 281 ---------
fs/xfs/libxfs/xfs_alloc.c | 1 -
fs/xfs/libxfs/xfs_alloc.h | 3 +
fs/xfs/libxfs/xfs_alloc_btree.c | 1 -
fs/xfs/libxfs/xfs_attr.c | 3 -
fs/xfs/libxfs/xfs_attr_leaf.c | 2 -
fs/xfs/libxfs/xfs_attr_remote.c | 2 -
fs/xfs/libxfs/xfs_bmap.c | 3 -
fs/xfs/libxfs/xfs_bmap_btree.c | 3 -
fs/xfs/libxfs/xfs_btree.c | 2 -
fs/xfs/libxfs/xfs_da_btree.c | 2 -
fs/xfs/libxfs/xfs_da_format.c | 2 -
fs/xfs/libxfs/xfs_dinode.h | 243 --------
fs/xfs/libxfs/xfs_dir2.c | 4 -
fs/xfs/libxfs/xfs_dir2_block.c | 3 -
fs/xfs/libxfs/xfs_dir2_data.c | 2 -
fs/xfs/libxfs/xfs_dir2_leaf.c | 2 -
fs/xfs/libxfs/xfs_dir2_node.c | 2 -
fs/xfs/libxfs/xfs_dir2_sf.c | 3 -
fs/xfs/libxfs/xfs_dquot_buf.c | 2 -
fs/xfs/libxfs/xfs_format.h | 1107 ++++++++++++++++++++++++++++++++++++
fs/xfs/libxfs/xfs_ialloc.c | 3 -
fs/xfs/libxfs/xfs_ialloc.h | 4 +
fs/xfs/libxfs/xfs_ialloc_btree.c | 2 -
fs/xfs/libxfs/xfs_inode_buf.c | 3 -
fs/xfs/libxfs/xfs_inode_fork.c | 4 -
fs/xfs/libxfs/xfs_inum.h | 60 --
fs/xfs/libxfs/xfs_log_format.h | 2 +-
fs/xfs/libxfs/xfs_log_rlimit.c | 2 -
fs/xfs/libxfs/xfs_rtbitmap.c | 3 -
fs/xfs/libxfs/xfs_sb.c | 2 -
fs/xfs/libxfs/xfs_sb.h | 584 -------------------
fs/xfs/libxfs/xfs_symlink_remote.c | 2 -
fs/xfs/libxfs/xfs_trans_resv.c | 2 -
fs/xfs/xfs_acl.c | 2 -
fs/xfs/xfs_acl.h | 36 --
fs/xfs/xfs_aops.c | 3 -
fs/xfs/xfs_attr_inactive.c | 3 -
fs/xfs/xfs_attr_list.c | 3 -
fs/xfs/xfs_bmap_util.c | 3 -
fs/xfs/xfs_buf.c | 16 +-
fs/xfs/xfs_buf_item.c | 2 +-
fs/xfs/xfs_dir2_readdir.c | 3 -
fs/xfs/xfs_discard.c | 1 -
fs/xfs/xfs_dquot.c | 2 -
fs/xfs/xfs_dquot_item.c | 2 -
fs/xfs/xfs_error.c | 2 -
fs/xfs/xfs_export.c | 2 -
fs/xfs/xfs_extent_busy.c | 1 -
fs/xfs/xfs_extfree_item.c | 3 +-
fs/xfs/xfs_file.c | 3 -
fs/xfs/xfs_filestream.c | 3 -
fs/xfs/xfs_fsops.c | 2 -
fs/xfs/xfs_icache.c | 2 -
fs/xfs/xfs_icache.h | 8 +
fs/xfs/xfs_icreate_item.c | 3 +-
fs/xfs/xfs_inode.c | 17 +-
fs/xfs/xfs_inode.h | 2 -
fs/xfs/xfs_inode_item.c | 3 -
fs/xfs/xfs_ioctl.c | 3 -
fs/xfs/xfs_ioctl32.c | 2 -
fs/xfs/xfs_iomap.c | 3 -
fs/xfs/xfs_iops.c | 3 -
fs/xfs/xfs_itable.c | 4 -
fs/xfs/xfs_linux.h | 6 +
fs/xfs/xfs_log.c | 4 +-
fs/xfs/xfs_log_cil.c | 3 +-
fs/xfs/xfs_log_recover.c | 3 -
fs/xfs/xfs_message.c | 3 +-
fs/xfs/xfs_mount.c | 32 +-
fs/xfs/xfs_mount.h | 8 +-
fs/xfs/xfs_qm.c | 2 -
fs/xfs/xfs_qm_bhv.c | 2 -
fs/xfs/xfs_qm_syscalls.c | 27 +-
fs/xfs/xfs_quotaops.c | 2 -
fs/xfs/xfs_rtalloc.c | 3 -
fs/xfs/xfs_super.c | 14 +-
fs/xfs/xfs_symlink.c | 3 -
fs/xfs/xfs_trace.c | 2 -
fs/xfs/xfs_trans.c | 2 -
fs/xfs/xfs_trans_ail.c | 3 +-
fs/xfs/xfs_trans_buf.c | 2 -
fs/xfs/xfs_trans_dquot.c | 2 -
fs/xfs/xfs_trans_extfree.c | 3 +-
fs/xfs/xfs_trans_inode.c | 2 -
fs/xfs/xfs_xattr.c | 2 -
86 files changed, 1190 insertions(+), 1428 deletions(-)
delete mode 100644 fs/xfs/libxfs/xfs_ag.h
delete mode 100644 fs/xfs/libxfs/xfs_dinode.h
delete mode 100644 fs/xfs/libxfs/xfs_inum.h
Merging file-locks/linux-next (1b2b32dcdb3d locks: fix fcntl_setlease/getlease return when !CONFIG_FILE_LOCKING)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (8ce74dd60578 Merge tag 'trace-seq-file-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into for-next)
$ git merge vfs/for-next
Auto-merging security/integrity/ima/ima_appraise.c
Auto-merging net/netfilter/nfnetlink_queue_core.c
Auto-merging net/netfilter/nf_conntrack_proto_tcp.c
Auto-merging mm/memcontrol.c
Auto-merging kernel/trace/trace.c
Auto-merging kernel/events/core.c
Auto-merging include/linux/fs.h
Auto-merging fs/overlayfs/readdir.c
Auto-merging fs/open.c
Auto-merging fs/notify/fsnotify.c
Auto-merging fs/nfsd/vfs.h
Auto-merging fs/nfsd/vfs.c
Auto-merging fs/nfsd/nfs4xdr.c
Auto-merging fs/nfs/dir.c
Auto-merging fs/nfs/blocklayout/rpc_pipefs.c
Auto-merging fs/ecryptfs/file.c
Auto-merging fs/ecryptfs/crypto.c
Auto-merging fs/dcache.c
Auto-merging fs/ceph/inode.c
Auto-merging fs/ceph/dir.c
Auto-merging drivers/net/tun.c
Merge made by the 'recursive' strategy.
Documentation/filesystems/debugfs.txt | 2 +-
Documentation/filesystems/nfs/Exporting | 23 +-
Documentation/filesystems/porting | 8 +
Documentation/filesystems/seq_file.txt | 22 +-
Documentation/filesystems/vfs.txt | 2 +-
arch/alpha/kernel/osf_sys.c | 7 +-
arch/parisc/hpux/fs.c | 7 +-
arch/powerpc/oprofile/cell/spu_task_sync.c | 10 +-
arch/powerpc/platforms/cell/spufs/inode.c | 2 +-
arch/s390/hypfs/hypfs_dbfs.c | 3 +-
arch/x86/ia32/ia32_aout.c | 8 +-
drivers/block/drbd/drbd_debugfs.c | 6 +-
drivers/gpu/drm/armada/armada_gem.c | 2 +-
drivers/media/pci/zoran/zoran_procfs.c | 4 +-
drivers/misc/genwqe/card_dev.c | 2 +-
drivers/net/tun.c | 4 +-
drivers/s390/char/hmcdrv_dev.c | 16 +-
drivers/scsi/lpfc/lpfc_debugfs.c | 8 +-
drivers/staging/lustre/lustre/libcfs/tracefile.c | 4 +-
drivers/staging/lustre/lustre/llite/dcache.c | 21 +-
drivers/staging/lustre/lustre/llite/dir.c | 9 +-
drivers/staging/lustre/lustre/llite/file.c | 158 ++++-----
.../staging/lustre/lustre/llite/llite_internal.h | 10 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 8 +-
drivers/staging/lustre/lustre/llite/llite_mmap.c | 12 +-
drivers/staging/lustre/lustre/llite/llite_nfs.c | 8 +-
drivers/staging/lustre/lustre/llite/lloop.c | 7 +-
drivers/staging/lustre/lustre/llite/namei.c | 388 ++++++++-------------
drivers/staging/lustre/lustre/llite/statahead.c | 33 +-
drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +-
drivers/staging/lustre/lustre/llite/xattr.c | 9 +-
fs/9p/vfs_inode.c | 2 +-
fs/9p/vfs_inode_dotl.c | 4 +-
fs/affs/amigaffs.c | 2 +-
fs/affs/inode.c | 4 +-
fs/affs/namei.c | 40 +--
fs/afs/dir.c | 80 ++---
fs/afs/inode.c | 4 +-
fs/afs/mntpt.c | 22 +-
fs/afs/write.c | 9 +-
fs/autofs4/expire.c | 42 +--
fs/autofs4/root.c | 25 +-
fs/befs/linuxvfs.c | 16 +-
fs/binfmt_aout.c | 8 +-
fs/btrfs/inode.c | 2 +-
fs/btrfs/ioctl.c | 2 +-
fs/cachefiles/namei.c | 21 +-
fs/cachefiles/xattr.c | 15 +-
fs/ceph/debugfs.c | 14 +-
fs/ceph/dir.c | 56 ++-
fs/ceph/file.c | 6 +-
fs/ceph/inode.c | 18 +-
fs/cifs/cifsfs.c | 3 +-
fs/cifs/cifsglob.h | 6 +
fs/cifs/file.c | 12 +-
fs/cifs/inode.c | 2 +-
fs/cifs/readdir.c | 10 +-
fs/coda/cache.c | 2 +-
fs/coda/coda_linux.c | 6 -
fs/coda/coda_linux.h | 1 -
fs/coda/dir.c | 12 +-
fs/compat.c | 21 +-
fs/configfs/dir.c | 2 +-
fs/dcache.c | 271 +++++---------
fs/debugfs/file.c | 15 +-
fs/debugfs/inode.c | 2 +-
fs/dlm/debug_fs.c | 263 +++++++-------
fs/ecryptfs/crypto.c | 2 +-
fs/ecryptfs/file.c | 6 +-
fs/ecryptfs/mmap.c | 2 +-
fs/efivarfs/file.c | 4 +-
fs/eventfd.c | 9 +-
fs/eventpoll.c | 13 +-
fs/exportfs/expfs.c | 7 +-
fs/fat/dir.c | 5 +-
fs/fuse/dir.c | 4 +-
fs/fuse/file.c | 2 +-
fs/gfs2/export.c | 8 +-
fs/hppfs/hppfs.c | 5 +-
fs/jfs/namei.c | 18 +-
fs/kernfs/dir.c | 2 +-
fs/libfs.c | 12 +-
fs/lockd/svcsubs.c | 2 +-
fs/ncpfs/dir.c | 12 +-
fs/ncpfs/file.c | 14 +-
fs/ncpfs/mmap.c | 4 +-
fs/ncpfs/ncplib_kernel.h | 4 +-
fs/nfs/blocklayout/rpc_pipefs.c | 2 +-
fs/nfs/dir.c | 6 +-
fs/nfs/getroot.c | 4 +-
fs/nfsd/nfs4recover.c | 7 +-
fs/nfsd/nfs4xdr.c | 2 +-
fs/nfsd/nfsctl.c | 37 +-
fs/nfsd/vfs.c | 16 +-
fs/nfsd/vfs.h | 4 +-
fs/notify/fdinfo.c | 78 ++---
fs/notify/fdinfo.h | 4 +-
fs/notify/fsnotify.c | 4 +-
fs/ntfs/namei.c | 4 +-
fs/ocfs2/dcache.c | 20 +-
fs/ocfs2/dir.c | 8 +-
fs/ocfs2/dlmfs/dlmfs.c | 4 +-
fs/ocfs2/dlmglue.c | 3 +-
fs/ocfs2/journal.c | 8 +-
fs/open.c | 4 +-
fs/overlayfs/readdir.c | 8 +-
fs/proc/base.c | 4 +-
fs/proc/fd.c | 3 +-
fs/readdir.c | 21 +-
fs/reiserfs/xattr.c | 21 +-
fs/seq_file.c | 15 +-
fs/signalfd.c | 4 +-
fs/sync.c | 2 +-
fs/timerfd.c | 27 +-
fs/xattr.c | 16 +-
include/linux/audit.h | 9 +
include/linux/cgroup.h | 4 +-
include/linux/dcache.h | 9 +-
include/linux/debugfs.h | 7 +-
include/linux/fs.h | 13 +-
include/linux/seq_file.h | 15 +
include/net/netfilter/nf_conntrack_core.h | 2 +-
include/net/netfilter/nf_conntrack_l3proto.h | 4 +-
include/net/netfilter/nf_conntrack_l4proto.h | 6 +-
ipc/mqueue.c | 4 +-
kernel/auditsc.c | 7 +-
kernel/events/core.c | 2 +-
kernel/taskstats.c | 2 +-
kernel/trace/trace.c | 4 +-
kernel/trace/trace_events.c | 2 +-
mm/memcontrol.c | 4 +-
net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +-
.../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 53 +--
net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 10 +-
net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 +-
net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 10 +-
net/netfilter/nf_conntrack_l3proto_generic.c | 5 +-
net/netfilter/nf_conntrack_proto_dccp.c | 14 +-
net/netfilter/nf_conntrack_proto_generic.c | 5 +-
net/netfilter/nf_conntrack_proto_gre.c | 18 +-
net/netfilter/nf_conntrack_proto_sctp.c | 14 +-
net/netfilter/nf_conntrack_proto_tcp.c | 14 +-
net/netfilter/nf_conntrack_proto_udp.c | 10 +-
net/netfilter/nf_conntrack_proto_udplite.c | 10 +-
net/netfilter/nf_conntrack_standalone.c | 77 ++--
net/netfilter/nf_log.c | 30 +-
net/netfilter/nfnetlink_queue_core.c | 13 +-
net/netfilter/x_tables.c | 19 +-
net/netfilter/xt_hashlimit.c | 36 +-
security/commoncap.c | 2 +-
security/integrity/ima/ima_api.c | 4 +-
security/integrity/ima/ima_appraise.c | 4 +-
security/integrity/ima/ima_template_lib.c | 2 +-
security/selinux/selinuxfs.c | 6 +-
security/smack/smack_lsm.c | 8 +-
155 files changed, 1240 insertions(+), 1528 deletions(-)
Merging pci/next (149792795d2b Merge branch 'pci/msi' into next)
$ git merge pci/next
Auto-merging drivers/pci/probe.c
Auto-merging drivers/pci/pci.h
Auto-merging drivers/pci/pci-sysfs.c
Auto-merging drivers/pci/msi.c
Auto-merging drivers/pci/host/pci-imx6.c
Auto-merging arch/s390/pci/pci.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-bus-pci | 13 ++
.../devicetree/bindings/pci/layerscape-pci.txt | 42 +++++
MAINTAINERS | 10 ++
arch/s390/pci/pci.c | 4 +-
arch/x86/include/asm/x86_init.h | 3 -
arch/x86/kernel/x86_init.c | 10 --
arch/x86/pci/xen.c | 15 +-
drivers/pci/host/Kconfig | 13 +-
drivers/pci/host/Makefile | 1 +
drivers/pci/host/pci-dra7xx.c | 6 +-
drivers/pci/host/pci-exynos.c | 18 +--
drivers/pci/host/pci-host-generic.c | 126 ++++-----------
drivers/pci/host/pci-imx6.c | 4 +-
drivers/pci/host/pci-keystone-dw.c | 2 +-
drivers/pci/host/pci-keystone.c | 5 +-
drivers/pci/host/pci-layerscape.c | 179 +++++++++++++++++++++
drivers/pci/host/pci-mvebu.c | 2 +
drivers/pci/host/pcie-designware.c | 1 +
drivers/pci/host/pcie-rcar.c | 2 +-
drivers/pci/host/pcie-spear13xx.c | 13 +-
drivers/pci/hotplug/ibmphp_res.c | 5 +-
drivers/pci/iov.c | 11 +-
drivers/pci/msi.c | 29 ++--
drivers/pci/pci-acpi.c | 3 +-
drivers/pci/pci-sysfs.c | 27 +++-
drivers/pci/pci.c | 21 +--
drivers/pci/pci.h | 6 +-
drivers/pci/probe.c | 80 ++++-----
drivers/pci/search.c | 3 +-
drivers/pci/xen-pcifront.c | 13 +-
include/linux/msi.h | 5 +-
include/linux/pci_hotplug.h | 1 -
32 files changed, 416 insertions(+), 257 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pci/layerscape-pci.txt
create mode 100644 drivers/pci/host/pci-layerscape.c
Merging hid/for-next (f26441f561c8 Merge branch 'for-3.19/wacom' into for-next)
$ git merge hid/for-next
Auto-merging drivers/usb/core/quirks.c
Removing drivers/hid/hid-logitech-dj.h
Merge made by the 'recursive' strategy.
drivers/hid/Kconfig | 22 +-
drivers/hid/Makefile | 2 +
drivers/hid/hid-core.c | 30 +-
drivers/hid/hid-ids.h | 12 +
drivers/hid/hid-input.c | 2 +-
drivers/hid/hid-lenovo.c | 13 +-
drivers/hid/hid-logitech-dj.c | 397 +++++++++---
drivers/hid/hid-logitech-dj.h | 125 ----
drivers/hid/hid-logitech-hidpp.c | 1237 ++++++++++++++++++++++++++++++++++++++
drivers/hid/hid-microsoft.c | 2 +
drivers/hid/hid-multitouch.c | 27 +
drivers/hid/hid-plantronics.c | 55 ++
drivers/hid/hid-roccat-kone.c | 9 +-
drivers/hid/hid-saitek.c | 4 +-
drivers/hid/hid-sony.c | 150 +++--
drivers/hid/i2c-hid/i2c-hid.c | 14 +-
drivers/hid/usbhid/hid-core.c | 36 +-
drivers/hid/usbhid/hid-quirks.c | 2 +
drivers/hid/usbhid/usbhid.h | 1 +
drivers/hid/wacom.h | 2 +-
drivers/hid/wacom_sys.c | 33 +-
drivers/hid/wacom_wac.c | 64 +-
drivers/hid/wacom_wac.h | 1 +
drivers/usb/core/quirks.c | 3 +
include/linux/hid.h | 32 +-
25 files changed, 1937 insertions(+), 338 deletions(-)
delete mode 100644 drivers/hid/hid-logitech-dj.h
create mode 100644 drivers/hid/hid-logitech-hidpp.c
create mode 100644 drivers/hid/hid-plantronics.c
Merging i2c/i2c/for-next (6e79807443cb Merge branch 'i2c/for-3.19' into i2c/for-next)
$ git merge i2c/i2c/for-next
Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/i2c/i2c-img-scb.txt | 26 +
Documentation/devicetree/bindings/i2c/i2c-imx.txt | 11 +
.../devicetree/bindings/i2c/i2c-meson.txt | 24 +
.../devicetree/bindings/i2c/i2c-sh_mobile.txt | 14 +
.../devicetree/bindings/i2c/trivial-devices.txt | 8 +
Documentation/i2c/busses/i2c-i801 | 1 +
drivers/i2c/busses/Kconfig | 20 +-
drivers/i2c/busses/Makefile | 2 +
drivers/i2c/busses/i2c-at91.c | 127 +-
drivers/i2c/busses/i2c-davinci.c | 4 +-
drivers/i2c/busses/i2c-designware-core.c | 2 +-
drivers/i2c/busses/i2c-exynos5.c | 4 +-
drivers/i2c/busses/i2c-i801.c | 57 +-
drivers/i2c/busses/i2c-img-scb.c | 1412 ++++++++++++++++++++
drivers/i2c/busses/i2c-imx.c | 354 ++++-
drivers/i2c/busses/i2c-meson.c | 492 +++++++
drivers/i2c/busses/i2c-mpc.c | 18 +-
drivers/i2c/busses/i2c-mxs.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 143 +-
drivers/i2c/busses/i2c-pxa.c | 19 +-
drivers/i2c/busses/i2c-rk3x.c | 251 +++-
drivers/i2c/busses/i2c-s3c2410.c | 29 +
drivers/i2c/busses/i2c-sh_mobile.c | 238 +++-
drivers/i2c/busses/i2c-xiic.c | 58 +-
drivers/i2c/i2c-core.c | 15 +-
drivers/i2c/i2c-mux.c | 12 +
drivers/misc/eeprom/at24.c | 35 +-
drivers/of/irq.c | 1 +
28 files changed, 3218 insertions(+), 161 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-img-scb.txt
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-meson.txt
create mode 100644 drivers/i2c/busses/i2c-img-scb.c
create mode 100644 drivers/i2c/busses/i2c-meson.c
Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro)
$ git merge jdelvare-hwmon/master
Auto-merging drivers/hwmon/Makefile
Auto-merging drivers/hwmon/Kconfig
Merge made by the 'recursive' strategy.
drivers/hwmon/Kconfig | 10 +++
drivers/hwmon/Makefile | 1 +
drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 160 insertions(+)
create mode 100644 drivers/hwmon/i5500_temp.c
Merging hwmon-staging/hwmon-next (e46066eae1df hwmon: Driver for Nuvoton NCT7802Y)
$ git merge hwmon-staging/hwmon-next
Auto-merging drivers/hwmon/Makefile
Auto-merging drivers/hwmon/Kconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/hwmon/ltc2978.txt | 39 +
Documentation/hwmon/nct7802 | 32 +
arch/powerpc/platforms/powernv/opal-sensor.c | 20 +
drivers/hwmon/Kconfig | 11 +
drivers/hwmon/Makefile | 1 +
drivers/hwmon/ibmpowernv.c | 78 +-
drivers/hwmon/iio_hwmon.c | 7 +-
drivers/hwmon/nct7802.c | 860 +++++++++++++++++++++
drivers/hwmon/pmbus/Kconfig | 11 +-
drivers/hwmon/pmbus/ltc2978.c | 39 +-
drivers/hwmon/pmbus/pmbus.h | 30 +
drivers/hwmon/pmbus/pmbus_core.c | 118 +++
include/linux/i2c/pmbus.h | 4 +
13 files changed, 1187 insertions(+), 63 deletions(-)
create mode 100644 Documentation/devicetree/bindings/hwmon/ltc2978.txt
create mode 100644 Documentation/hwmon/nct7802
create mode 100644 drivers/hwmon/nct7802.c
Merging v4l-dvb/master (7996d58f03c1 [media] omap: disable COMPILE_TEST)
$ git merge v4l-dvb/master
Recorded preimage for 'arch/arm/mach-omap2/board-rx51-peripherals.c'
Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
Auto-merging include/uapi/linux/Kbuild
Removing include/media/radio-si4713.h
Removing drivers/staging/media/omap24xx/v4l2-int-device.h
Removing drivers/staging/media/omap24xx/v4l2-int-device.c
Removing drivers/staging/media/omap24xx/tcm825x.h
Removing drivers/staging/media/omap24xx/tcm825x.c
Removing drivers/staging/media/omap24xx/omap24xxcam.h
Removing drivers/staging/media/omap24xx/omap24xxcam.c
Removing drivers/staging/media/omap24xx/omap24xxcam-dma.c
Removing drivers/staging/media/omap24xx/Makefile
Removing drivers/staging/media/omap24xx/Kconfig
Removing drivers/staging/media/lirc/lirc_igorplugusb.c
Auto-merging drivers/media/platform/vim2m.c
Auto-merging arch/arm/mach-shmobile/board-mackerel.c
Auto-merging arch/arm/mach-omap2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
Recorded resolution for 'arch/arm/mach-omap2/board-rx51-peripherals.c'.
[master 93094ad16f40] Merge remote-tracking branch 'v4l-dvb/master'
$ git diff -M --stat --summary HEAD^..
Documentation/DocBook/media/dvb/dvbproperty.xml | 4 +-
Documentation/DocBook/media/v4l/io.xml | 5 +-
Documentation/DocBook/media/v4l/subdev-formats.xml | 308 ++--
Documentation/devicetree/bindings/media/si4713.txt | 30 +
Documentation/video4linux/CARDLIST.cx23885 | 2 +
Documentation/video4linux/CARDLIST.em28xx | 1 +
Documentation/video4linux/CARDLIST.saa7134 | 1 +
Documentation/video4linux/soc-camera.txt | 2 +-
MAINTAINERS | 73 +-
arch/arm/mach-davinci/board-dm355-evm.c | 2 +-
arch/arm/mach-davinci/board-dm365-evm.c | 4 +-
arch/arm/mach-davinci/dm355.c | 7 +-
arch/arm/mach-davinci/dm365.c | 7 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 69 +-
arch/arm/mach-omap2/devices.c | 31 -
arch/arm/mach-shmobile/board-mackerel.c | 2 +-
arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
drivers/gpu/ipu-v3/ipu-csi.c | 66 +-
drivers/media/common/cx2341x.c | 29 +
drivers/media/common/saa7146/saa7146_core.c | 2 +-
drivers/media/common/siano/smsir.c | 3 +-
drivers/media/common/tveeprom.c | 36 +-
drivers/media/dvb-core/dvb-usb-ids.h | 1 +
drivers/media/dvb-core/dvb_net.c | 4 +-
drivers/media/dvb-frontends/Kconfig | 5 +-
drivers/media/dvb-frontends/af9033.c | 140 +-
drivers/media/dvb-frontends/af9033_priv.h | 11 +-
drivers/media/dvb-frontends/au8522_dig.c | 117 +-
drivers/media/dvb-frontends/cx22700.c | 3 +
drivers/media/dvb-frontends/cx24110.c | 50 +-
drivers/media/dvb-frontends/dib7000p.c | 9 +-
drivers/media/dvb-frontends/drx39xyj/drxj.c | 3 +-
drivers/media/dvb-frontends/drxk_hard.c | 9 +-
drivers/media/dvb-frontends/m88ds3103.c | 267 ++-
drivers/media/dvb-frontends/m88ds3103_priv.h | 181 ++
drivers/media/dvb-frontends/mn88472.h | 38 +
drivers/media/dvb-frontends/mn88473.h | 38 +
drivers/media/dvb-frontends/rtl2832.c | 60 +-
drivers/media/dvb-frontends/rtl2832.h | 11 +
drivers/media/dvb-frontends/si2168.c | 20 +-
drivers/media/dvb-frontends/si2168.h | 4 +
drivers/media/dvb-frontends/si2168_priv.h | 1 +
drivers/media/dvb-frontends/sp2.c | 21 +-
drivers/media/dvb-frontends/stb0899_drv.c | 2 +-
drivers/media/dvb-frontends/stv090x.c | 177 +-
drivers/media/firewire/firedtv-ci.c | 3 +-
drivers/media/firewire/firedtv.h | 2 +-
drivers/media/i2c/adv7170.c | 16 +-
drivers/media/i2c/adv7175.c | 16 +-
drivers/media/i2c/adv7180.c | 6 +-
drivers/media/i2c/adv7183.c | 6 +-
drivers/media/i2c/adv7511.c | 21 +-
drivers/media/i2c/adv7604.c | 109 +-
drivers/media/i2c/adv7842.c | 40 +-
drivers/media/i2c/ak881x.c | 8 +-
drivers/media/i2c/cx25840/cx25840-core.c | 14 +-
drivers/media/i2c/cx25840/cx25840-firmware.c | 11 +-
drivers/media/i2c/ir-kbd-i2c.c | 3 +-
drivers/media/i2c/m5mols/m5mols_core.c | 6 +-
drivers/media/i2c/ml86v7667.c | 6 +-
drivers/media/i2c/mt9m032.c | 6 +-
drivers/media/i2c/mt9p031.c | 8 +-
drivers/media/i2c/mt9t001.c | 8 +-
drivers/media/i2c/mt9v011.c | 6 +-
drivers/media/i2c/mt9v032.c | 12 +-
drivers/media/i2c/noon010pc30.c | 12 +-
drivers/media/i2c/ov7670.c | 16 +-
drivers/media/i2c/ov9650.c | 10 +-
drivers/media/i2c/s5c73m3/s5c73m3.h | 6 +-
drivers/media/i2c/s5k4ecgx.c | 4 +-
drivers/media/i2c/s5k5baf.c | 14 +-
drivers/media/i2c/s5k6a3.c | 2 +-
drivers/media/i2c/s5k6aa.c | 8 +-
drivers/media/i2c/saa6752hs.c | 6 +-
drivers/media/i2c/saa7115.c | 2 +-
drivers/media/i2c/saa717x.c | 2 +-
drivers/media/i2c/smiapp-pll.c | 280 +--
drivers/media/i2c/smiapp-pll.h | 21 +-
drivers/media/i2c/smiapp/smiapp-core.c | 254 ++-
drivers/media/i2c/smiapp/smiapp.h | 8 +
drivers/media/i2c/soc_camera/imx074.c | 8 +-
drivers/media/i2c/soc_camera/mt9m001.c | 14 +-
drivers/media/i2c/soc_camera/mt9m111.c | 70 +-
drivers/media/i2c/soc_camera/mt9t031.c | 10 +-
drivers/media/i2c/soc_camera/mt9t112.c | 22 +-
drivers/media/i2c/soc_camera/mt9v022.c | 26 +-
drivers/media/i2c/soc_camera/ov2640.c | 54 +-
drivers/media/i2c/soc_camera/ov5642.c | 8 +-
drivers/media/i2c/soc_camera/ov6650.c | 58 +-
drivers/media/i2c/soc_camera/ov772x.c | 20 +-
drivers/media/i2c/soc_camera/ov9640.c | 40 +-
drivers/media/i2c/soc_camera/ov9740.c | 12 +-
drivers/media/i2c/soc_camera/rj54n1cb0c.c | 54 +-
drivers/media/i2c/soc_camera/tw9910.c | 10 +-
drivers/media/i2c/sr030pc30.c | 14 +-
drivers/media/i2c/tvp514x.c | 12 +-
drivers/media/i2c/tvp5150.c | 6 +-
drivers/media/i2c/tvp7002.c | 10 +-
drivers/media/i2c/vs6624.c | 18 +-
drivers/media/media-entity.c | 13 +-
drivers/media/pci/Kconfig | 1 +
drivers/media/pci/Makefile | 3 +-
drivers/media/pci/bt8xx/bttv-cards.c | 6 +-
drivers/media/pci/bt8xx/bttv-risc.c | 12 +-
drivers/media/pci/cx18/cx18-av-core.c | 18 +-
drivers/media/pci/cx18/cx18-controls.c | 2 +-
drivers/media/pci/cx18/cx18-ioctl.c | 2 +-
drivers/media/pci/cx23885/cx23885-417.c | 4 +-
drivers/media/pci/cx23885/cx23885-cards.c | 131 ++
drivers/media/pci/cx23885/cx23885-core.c | 21 +-
drivers/media/pci/cx23885/cx23885-dvb.c | 691 +++++--
drivers/media/pci/cx23885/cx23885-input.c | 31 +
drivers/media/pci/cx23885/cx23885-vbi.c | 10 +-
drivers/media/pci/cx23885/cx23885-video.c | 12 +-
drivers/media/pci/cx23885/cx23885.h | 8 +
drivers/media/pci/cx25821/cx25821-core.c | 12 +-
drivers/media/pci/cx88/Kconfig | 5 +-
drivers/media/pci/cx88/Makefile | 1 -
drivers/media/pci/cx88/cx88-alsa.c | 112 +-
drivers/media/pci/cx88/cx88-blackbird.c | 565 +++---
drivers/media/pci/cx88/cx88-cards.c | 71 +-
drivers/media/pci/cx88/cx88-core.c | 119 +-
drivers/media/pci/cx88/cx88-dvb.c | 158 +-
drivers/media/pci/cx88/cx88-mpeg.c | 159 +-
drivers/media/pci/cx88/cx88-vbi.c | 216 ++-
drivers/media/pci/cx88/cx88-video.c | 871 +++------
drivers/media/pci/cx88/cx88.h | 104 +-
drivers/media/pci/ivtv/ivtv-controls.c | 2 +-
drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +-
drivers/media/pci/ivtv/ivtv-udma.c | 2 +-
drivers/media/pci/pt1/pt1.c | 13 +-
drivers/media/pci/pt3/pt3.c | 75 +-
drivers/media/pci/saa7134/saa7134-core.c | 18 +-
drivers/media/pci/saa7134/saa7134-empress.c | 5 +-
drivers/media/pci/saa7134/saa7134-ts.c | 17 +-
drivers/media/pci/saa7134/saa7134-vbi.c | 16 +-
drivers/media/pci/saa7134/saa7134-video.c | 16 +-
drivers/media/pci/saa7134/saa7134.h | 2 +-
drivers/media/pci/saa7164/saa7164-buffer.c | 4 +-
drivers/media/pci/saa7164/saa7164-bus.c | 101 +-
drivers/media/pci/saa7164/saa7164-core.c | 13 +-
drivers/media/pci/saa7164/saa7164-fw.c | 6 +-
drivers/media/pci/saa7164/saa7164-types.h | 4 +-
drivers/media/pci/saa7164/saa7164.h | 4 +-
drivers/media/pci/smipcie/Kconfig | 17 +
drivers/media/pci/smipcie/Makefile | 6 +
drivers/media/pci/smipcie/smipcie.c | 1099 ++++++++++++
drivers/media/pci/smipcie/smipcie.h | 299 ++++
drivers/media/pci/solo6x10/solo6x10-core.c | 10 +-
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 88 +-
drivers/media/pci/solo6x10/solo6x10.h | 1 +
drivers/media/pci/tw68/tw68-core.c | 15 +-
drivers/media/pci/tw68/tw68-video.c | 9 +-
drivers/media/pci/tw68/tw68.h | 1 +
drivers/media/platform/Kconfig | 4 +-
drivers/media/platform/Makefile | 2 +-
drivers/media/platform/blackfin/bfin_capture.c | 14 +-
drivers/media/platform/coda/Makefile | 2 +-
drivers/media/platform/coda/coda-bit.c | 322 ++--
drivers/media/platform/coda/coda-common.c | 607 ++++---
drivers/media/platform/coda/coda-jpeg.c | 238 +++
drivers/media/platform/coda/coda.h | 24 +-
drivers/media/platform/coda/coda_regs.h | 7 +
drivers/media/platform/davinci/vpbe.c | 21 +-
drivers/media/platform/davinci/vpbe_display.c | 616 ++-----
drivers/media/platform/davinci/vpfe_capture.c | 4 +-
drivers/media/platform/exynos-gsc/gsc-core.c | 8 +-
drivers/media/platform/exynos-gsc/gsc-core.h | 2 +-
drivers/media/platform/exynos4-is/fimc-capture.c | 2 +-
drivers/media/platform/exynos4-is/fimc-core.c | 14 +-
drivers/media/platform/exynos4-is/fimc-core.h | 4 +-
drivers/media/platform/exynos4-is/fimc-is.c | 10 +-
drivers/media/platform/exynos4-is/fimc-isp.c | 16 +-
drivers/media/platform/exynos4-is/fimc-lite-reg.c | 26 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 14 +-
drivers/media/platform/exynos4-is/fimc-reg.c | 14 +-
drivers/media/platform/exynos4-is/mipi-csis.c | 14 +-
drivers/media/platform/marvell-ccic/mcam-core.c | 52 +-
drivers/media/platform/marvell-ccic/mcam-core.h | 3 +-
drivers/media/platform/omap/Kconfig | 3 +-
drivers/media/platform/omap3isp/ispccdc.c | 112 +-
drivers/media/platform/omap3isp/ispccp2.c | 18 +-
drivers/media/platform/omap3isp/ispcsi2.c | 42 +-
drivers/media/platform/omap3isp/isppreview.c | 60 +-
drivers/media/platform/omap3isp/ispresizer.c | 19 +-
drivers/media/platform/omap3isp/ispvideo.c | 95 +-
drivers/media/platform/omap3isp/ispvideo.h | 10 +-
drivers/media/platform/s3c-camif/camif-capture.c | 10 +-
drivers/media/platform/s3c-camif/camif-core.c | 3 +-
drivers/media/platform/s3c-camif/camif-regs.c | 8 +-
drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc.c | 49 +-
drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 4 +-
drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 122 +-
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 6 +-
drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 59 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 13 +-
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 32 +-
drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +-
drivers/media/platform/s5p-tv/sdo_drv.c | 2 +-
drivers/media/platform/sh_vou.c | 8 +-
drivers/media/platform/soc_camera/atmel-isi.c | 22 +-
drivers/media/platform/soc_camera/mx2_camera.c | 26 +-
drivers/media/platform/soc_camera/mx3_camera.c | 6 +-
drivers/media/platform/soc_camera/omap1_camera.c | 36 +-
drivers/media/platform/soc_camera/pxa_camera.c | 16 +-
drivers/media/platform/soc_camera/rcar_vin.c | 14 +-
.../platform/soc_camera/sh_mobile_ceu_camera.c | 20 +-
drivers/media/platform/soc_camera/sh_mobile_csi2.c | 38 +-
drivers/media/platform/soc_camera/soc_camera.c | 2 +-
.../platform/soc_camera/soc_camera_platform.c | 2 +-
drivers/media/platform/soc_camera/soc_mediabus.c | 78 +-
drivers/media/platform/ti-vpe/csc.c | 10 +-
drivers/media/platform/ti-vpe/sc.c | 10 +-
drivers/media/platform/via-camera.c | 8 +-
.../media/platform/{mem2mem_testdev.c => vim2m.c} | 222 +--
drivers/media/platform/vivid/vivid-core.c | 21 +-
drivers/media/platform/vivid/vivid-core.h | 3 -
drivers/media/platform/vivid/vivid-ctrls.c | 52 +-
drivers/media/platform/vivid/vivid-sdr-cap.c | 4 +-
drivers/media/platform/vivid/vivid-vbi-cap.c | 4 +-
drivers/media/platform/vivid/vivid-vbi-out.c | 4 +-
drivers/media/platform/vivid/vivid-vid-cap.c | 4 +-
drivers/media/platform/vivid/vivid-vid-out.c | 4 +-
drivers/media/platform/vsp1/vsp1_bru.c | 14 +-
drivers/media/platform/vsp1/vsp1_hsit.c | 12 +-
drivers/media/platform/vsp1/vsp1_lif.c | 10 +-
drivers/media/platform/vsp1/vsp1_lut.c | 14 +-
drivers/media/platform/vsp1/vsp1_rwpf.c | 10 +-
drivers/media/platform/vsp1/vsp1_sru.c | 12 +-
drivers/media/platform/vsp1/vsp1_uds.c | 10 +-
drivers/media/platform/vsp1/vsp1_video.c | 42 +-
drivers/media/radio/si4713/radio-platform-si4713.c | 28 +-
drivers/media/radio/si4713/si4713.c | 164 +-
drivers/media/radio/si4713/si4713.h | 15 +-
drivers/media/rc/Kconfig | 15 +
drivers/media/rc/Makefile | 1 +
drivers/media/rc/igorplugusb.c | 261 +++
drivers/media/rc/ir-lirc-codec.c | 12 +-
drivers/media/rc/ir-rc6-decoder.c | 2 +-
drivers/media/rc/lirc_dev.c | 3 +-
drivers/media/rc/rc-main.c | 8 +-
drivers/media/tuners/Kconfig | 8 +
drivers/media/tuners/Makefile | 1 +
drivers/media/tuners/m88rs6000t.c | 744 ++++++++
drivers/media/tuners/m88rs6000t.h | 29 +
drivers/media/tuners/m88ts2022.c | 2 +
drivers/media/tuners/mxl5007t.c | 30 +-
drivers/media/tuners/r820t.c | 12 +
drivers/media/tuners/si2157.c | 35 +-
drivers/media/tuners/si2157.h | 2 +-
drivers/media/tuners/si2157_priv.h | 8 +-
drivers/media/tuners/xc5000.c | 14 +-
drivers/media/tuners/xc5000.h | 1 +
drivers/media/usb/au0828/au0828-cards.c | 5 +
drivers/media/usb/au0828/au0828-core.c | 8 +
drivers/media/usb/au0828/au0828-dvb.c | 2 +
drivers/media/usb/au0828/au0828-input.c | 14 +-
drivers/media/usb/cx231xx/Kconfig | 1 +
drivers/media/usb/cx231xx/cx231xx-417.c | 59 +-
drivers/media/usb/cx231xx/cx231xx-audio.c | 97 +-
drivers/media/usb/cx231xx/cx231xx-avcore.c | 331 ++--
drivers/media/usb/cx231xx/cx231xx-cards.c | 257 +--
drivers/media/usb/cx231xx/cx231xx-core.c | 165 +-
drivers/media/usb/cx231xx/cx231xx-dvb.c | 159 +-
drivers/media/usb/cx231xx/cx231xx-i2c.c | 132 +-
drivers/media/usb/cx231xx/cx231xx-input.c | 8 +-
drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 47 +-
drivers/media/usb/cx231xx/cx231xx-vbi.c | 48 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 89 +-
drivers/media/usb/cx231xx/cx231xx.h | 41 +-
drivers/media/usb/dvb-usb-v2/Kconfig | 3 +
drivers/media/usb/dvb-usb-v2/af9035.c | 1 +
drivers/media/usb/dvb-usb-v2/dvbsky.c | 342 +++-
drivers/media/usb/dvb-usb-v2/lmedm04.c | 22 +-
drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 231 ++-
drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 7 +-
drivers/media/usb/dvb-usb/af9005.c | 3 +
drivers/media/usb/dvb-usb/cxusb.c | 136 +-
drivers/media/usb/em28xx/em28xx-camera.c | 2 +-
drivers/media/usb/em28xx/em28xx-cards.c | 43 +
drivers/media/usb/em28xx/em28xx-dvb.c | 65 +-
drivers/media/usb/em28xx/em28xx-i2c.c | 1 +
drivers/media/usb/em28xx/em28xx-input.c | 3 +-
drivers/media/usb/em28xx/em28xx.h | 2 +
drivers/media/usb/go7007/go7007-v4l2.c | 2 +-
drivers/media/usb/pvrusb2/pvrusb2-context.c | 2 +-
drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
drivers/media/usb/s2255/s2255drv.c | 27 +-
drivers/media/usb/stk1160/stk1160-v4l.c | 2 +-
drivers/media/usb/uvc/uvc_driver.c | 51 +-
drivers/media/usb/uvc/uvc_queue.c | 161 +-
drivers/media/usb/uvc/uvc_v4l2.c | 1009 ++++++-----
drivers/media/usb/uvc/uvc_video.c | 23 +-
drivers/media/usb/uvc/uvcvideo.h | 12 +-
drivers/media/v4l2-core/v4l2-common.c | 125 --
drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 10 +-
drivers/media/v4l2-core/v4l2-ctrls.c | 87 +-
drivers/media/v4l2-core/v4l2-dev.c | 34 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 4 +-
drivers/media/v4l2-core/videobuf-core.c | 6 +-
drivers/media/v4l2-core/videobuf2-core.c | 14 +-
drivers/media/v4l2-core/videobuf2-dma-contig.c | 71 +-
drivers/media/v4l2-core/videobuf2-dma-sg.c | 425 ++++-
drivers/media/v4l2-core/videobuf2-vmalloc.c | 191 +-
drivers/staging/media/Kconfig | 4 +-
drivers/staging/media/Makefile | 4 +-
drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +-
drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 18 +-
.../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 26 +-
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 100 +-
drivers/staging/media/davinci_vpfe/dm365_isif.c | 90 +-
drivers/staging/media/davinci_vpfe/dm365_resizer.c | 98 +-
.../staging/media/davinci_vpfe/vpfe_mc_capture.c | 18 +-
drivers/staging/media/lirc/Kconfig | 6 -
drivers/staging/media/lirc/Makefile | 1 -
drivers/staging/media/lirc/lirc_igorplugusb.c | 508 ------
drivers/staging/media/lirc/lirc_imon.c | 10 +-
drivers/staging/media/lirc/lirc_sasem.c | 10 +-
drivers/staging/media/lirc/lirc_zilog.c | 2 +-
drivers/staging/media/mn88472/Kconfig | 7 +
drivers/staging/media/mn88472/Makefile | 5 +
drivers/staging/media/mn88472/TODO | 21 +
drivers/staging/media/mn88472/mn88472.c | 523 ++++++
drivers/staging/media/mn88472/mn88472_priv.h | 36 +
drivers/staging/media/mn88473/Kconfig | 7 +
drivers/staging/media/mn88473/Makefile | 5 +
drivers/staging/media/mn88473/TODO | 21 +
drivers/staging/media/mn88473/mn88473.c | 464 +++++
drivers/staging/media/mn88473/mn88473_priv.h | 36 +
drivers/staging/media/omap24xx/Kconfig | 35 -
drivers/staging/media/omap24xx/Makefile | 5 -
drivers/staging/media/omap24xx/omap24xxcam-dma.c | 598 -------
drivers/staging/media/omap24xx/omap24xxcam.c | 1882 --------------------
drivers/staging/media/omap24xx/omap24xxcam.h | 596 -------
drivers/staging/media/omap24xx/tcm825x.c | 938 ----------
drivers/staging/media/omap24xx/tcm825x.h | 200 ---
drivers/staging/media/omap24xx/v4l2-int-device.c | 164 --
drivers/staging/media/omap24xx/v4l2-int-device.h | 305 ----
drivers/staging/media/omap4iss/iss_csi2.c | 62 +-
drivers/staging/media/omap4iss/iss_ipipe.c | 16 +-
drivers/staging/media/omap4iss/iss_ipipeif.c | 28 +-
drivers/staging/media/omap4iss/iss_resizer.c | 26 +-
drivers/staging/media/omap4iss/iss_video.c | 78 +-
drivers/staging/media/omap4iss/iss_video.h | 10 +-
include/media/davinci/vpbe.h | 2 +-
include/media/davinci/vpbe_display.h | 21 -
include/media/davinci/vpbe_venc.h | 5 +-
include/media/exynos-fimc.h | 2 +-
include/media/lirc_dev.h | 8 +-
include/media/radio-si4713.h | 30 -
include/media/si4713.h | 4 +-
include/media/soc_camera.h | 2 +-
include/media/soc_mediabus.h | 6 +-
include/media/v4l2-common.h | 17 +-
include/media/v4l2-ctrls.h | 25 +
include/media/v4l2-image-sizes.h | 9 +
include/media/v4l2-mediabus.h | 2 +-
include/media/v4l2-subdev.h | 2 +-
include/media/videobuf2-core.h | 42 +-
include/media/videobuf2-dma-sg.h | 3 +
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/media-bus-format.h | 125 ++
include/uapi/linux/v4l2-mediabus.h | 213 ++-
include/uapi/linux/v4l2-subdev.h | 6 +-
sound/usb/quirks-table.h | 166 +-
366 files changed, 13392 insertions(+), 12168 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/si4713.txt
create mode 100644 drivers/media/dvb-frontends/mn88472.h
create mode 100644 drivers/media/dvb-frontends/mn88473.h
create mode 100644 drivers/media/pci/smipcie/Kconfig
create mode 100644 drivers/media/pci/smipcie/Makefile
create mode 100644 drivers/media/pci/smipcie/smipcie.c
create mode 100644 drivers/media/pci/smipcie/smipcie.h
create mode 100644 drivers/media/platform/coda/coda-jpeg.c
rename drivers/media/platform/{mem2mem_testdev.c => vim2m.c} (81%)
create mode 100644 drivers/media/rc/igorplugusb.c
create mode 100644 drivers/media/tuners/m88rs6000t.c
create mode 100644 drivers/media/tuners/m88rs6000t.h
delete mode 100644 drivers/staging/media/lirc/lirc_igorplugusb.c
create mode 100644 drivers/staging/media/mn88472/Kconfig
create mode 100644 drivers/staging/media/mn88472/Makefile
create mode 100644 drivers/staging/media/mn88472/TODO
create mode 100644 drivers/staging/media/mn88472/mn88472.c
create mode 100644 drivers/staging/media/mn88472/mn88472_priv.h
create mode 100644 drivers/staging/media/mn88473/Kconfig
create mode 100644 drivers/staging/media/mn88473/Makefile
create mode 100644 drivers/staging/media/mn88473/TODO
create mode 100644 drivers/staging/media/mn88473/mn88473.c
create mode 100644 drivers/staging/media/mn88473/mn88473_priv.h
delete mode 100644 drivers/staging/media/omap24xx/Kconfig
delete mode 100644 drivers/staging/media/omap24xx/Makefile
delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam-dma.c
delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam.c
delete mode 100644 drivers/staging/media/omap24xx/omap24xxcam.h
delete mode 100644 drivers/staging/media/omap24xx/tcm825x.c
delete mode 100644 drivers/staging/media/omap24xx/tcm825x.h
delete mode 100644 drivers/staging/media/omap24xx/v4l2-int-device.c
delete mode 100644 drivers/staging/media/omap24xx/v4l2-int-device.h
delete mode 100644 include/media/radio-si4713.h
create mode 100644 include/uapi/linux/media-bus-format.h
Merging kbuild/for-next (7c87cfee71f2 Merge branch 'kbuild/kbuild' into kbuild/for-next)
$ git merge kbuild/for-next
Resolved 'scripts/Kbuild.include' using previous resolution.
Auto-merging scripts/Kbuild.include
CONFLICT (content): Merge conflict in scripts/Kbuild.include
Auto-merging kernel/gcov/Kconfig
Auto-merging init/Kconfig
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master edf66677f6dc] Merge remote-tracking branch 'kbuild/for-next'
$ git diff -M --stat --summary HEAD^..
.gitignore | 3 +
Documentation/lto-build | 173 ++++++++++++++++++++++++++++++++++++
Makefile | 36 +++++---
arch/x86/Kconfig | 2 +-
init/Kconfig | 73 +++++++++++++++
kernel/gcov/Kconfig | 2 +-
lib/Kconfig.debug | 2 +-
scripts/Kbuild.include | 12 +++
scripts/Makefile.clean | 10 +--
scripts/Makefile.headersinst | 1 -
scripts/Makefile.lto | 84 +++++++++++++++++
scripts/Makefile.modpost | 7 +-
scripts/coccinelle/misc/bugon.cocci | 2 +-
scripts/kconfig/menu.c | 4 +-
scripts/link-vmlinux.sh | 2 +-
15 files changed, 381 insertions(+), 32 deletions(-)
create mode 100644 Documentation/lto-build
create mode 100644 scripts/Makefile.lto
Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (598e9a9005ef sata_rcar: Document deprecated "renesas,rcar-sata")
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/ata/sata_rcar.txt | 11 ++--
drivers/ata/ahci_sunxi.c | 16 +++++-
drivers/ata/libata-core.c | 20 +++++--
drivers/ata/libata-eh.c | 7 ++-
drivers/ata/libata-scsi.c | 30 +++++++++-
drivers/ata/libata-transport.c | 1 +
drivers/scsi/aic94xx/aic94xx_task.c | 10 ++--
drivers/scsi/isci/request.c | 4 +-
drivers/scsi/libsas/sas_ata.c | 66 ++++------------------
drivers/scsi/mvsas/mv_sas.c | 4 +-
drivers/scsi/pm8001/pm8001_hwi.c | 2 +-
drivers/scsi/pm8001/pm80xx_hwi.c | 2 +-
include/linux/libata.h | 6 +-
include/scsi/libsas.h | 11 +---
14 files changed, 98 insertions(+), 92 deletions(-)
Merging pm/linux-next (0349e91d602f Merge branch 'acpi-pm' into linux-next)
$ git merge pm/linux-next
Auto-merging drivers/i2c/i2c-core.c
Auto-merging arch/arm/mach-tegra/cpuidle-tegra114.c
Merge made by the 'recursive' strategy.
Documentation/acpi/gpio-properties.txt | 96 ++++
Documentation/cpu-freq/intel-pstate.txt | 37 +-
.../devicetree/bindings/arm/idle-states.txt | 20 +
Documentation/gpio/consumer.txt | 18 +
Documentation/kernel-parameters.txt | 3 +
arch/arm/include/asm/cpuidle.h | 1 -
arch/arm/mach-davinci/cpuidle.c | 1 -
arch/arm/mach-imx/cpuidle-imx5.c | 1 -
arch/arm/mach-imx/cpuidle-imx6q.c | 3 +-
arch/arm/mach-imx/cpuidle-imx6sl.c | 3 +-
arch/arm/mach-omap2/cpuidle34xx.c | 7 -
arch/arm/mach-omap2/cpuidle44xx.c | 5 +-
arch/arm/mach-s3c24xx/h1940-bluetooth.c | 4 +-
arch/arm/mach-s3c24xx/h1940.h | 4 +-
arch/arm/mach-s3c24xx/mach-h1940.c | 3 +-
arch/arm/mach-s3c24xx/mach-rx1950.c | 3 +-
arch/arm/mach-s3c64xx/cpuidle.c | 1 -
arch/arm/mach-shmobile/pm-sh7372.c | 4 -
arch/arm/mach-tegra/cpuidle-tegra114.c | 1 -
arch/arm/mach-tegra/cpuidle-tegra20.c | 3 +-
arch/arm/mach-tegra/cpuidle-tegra30.c | 1 -
arch/arm/plat-orion/gpio.c | 3 +-
arch/arm/plat-orion/include/plat/orion-gpio.h | 5 +-
arch/ia64/Kconfig | 1 +
arch/mips/include/asm/idle.h | 1 -
arch/sh/kernel/cpu/shmobile/cpuidle.c | 3 -
arch/x86/include/asm/cpufeature.h | 5 +
arch/x86/include/uapi/asm/msr-index.h | 41 ++
arch/x86/kernel/apm_32.c | 1 -
arch/x86/kernel/cpu/scattered.c | 5 +
drivers/acpi/Kconfig | 13 +-
drivers/acpi/Makefile | 1 +
drivers/acpi/acpi_lpss.c | 94 ++--
drivers/acpi/battery.c | 4 +
drivers/acpi/device_pm.c | 2 +-
drivers/acpi/internal.h | 6 +
drivers/acpi/osl.c | 8 +-
drivers/acpi/processor_idle.c | 6 +-
drivers/acpi/property.c | 551 +++++++++++++++++++++
drivers/acpi/scan.c | 214 +++++++-
drivers/acpi/utils.c | 5 +-
drivers/acpi/video.c | 15 +
drivers/base/Makefile | 2 +-
drivers/base/power/clock_ops.c | 85 ++--
drivers/base/power/domain.c | 106 ++--
drivers/base/power/runtime.c | 69 ++-
drivers/base/property.c | 431 ++++++++++++++++
drivers/cpufreq/Kconfig | 57 +--
drivers/cpufreq/Makefile | 1 +
drivers/cpufreq/cpufreq-dt.c | 9 +-
drivers/cpufreq/cpufreq.c | 48 +-
drivers/cpufreq/intel_pstate.c | 101 +++-
drivers/cpufreq/ls1x-cpufreq.c | 223 +++++++++
drivers/cpufreq/pcc-cpufreq.c | 7 +
drivers/cpuidle/cpuidle-arm64.c | 14 +-
drivers/cpuidle/cpuidle-at91.c | 1 -
drivers/cpuidle/cpuidle-big_little.c | 6 +-
drivers/cpuidle/cpuidle-calxeda.c | 1 -
drivers/cpuidle/cpuidle-cps.c | 7 +-
drivers/cpuidle/cpuidle-exynos.c | 1 -
drivers/cpuidle/cpuidle-kirkwood.c | 1 -
drivers/cpuidle/cpuidle-mvebu-v7.c | 8 +-
drivers/cpuidle/cpuidle-powernv.c | 6 +-
drivers/cpuidle/cpuidle-pseries.c | 3 -
drivers/cpuidle/cpuidle-ux500.c | 3 +-
drivers/cpuidle/cpuidle-zynq.c | 1 -
drivers/cpuidle/driver.c | 1 -
drivers/cpuidle/dt_idle_states.c | 12 +-
drivers/cpuidle/governors/ladder.c | 2 +-
drivers/cpuidle/governors/menu.c | 2 +-
drivers/dma/dw/core.c | 11 +
drivers/gpio/devres.c | 32 ++
drivers/gpio/gpio-sch.c | 293 +++++------
drivers/gpio/gpiolib-acpi.c | 117 ++++-
drivers/gpio/gpiolib.c | 85 +++-
drivers/gpio/gpiolib.h | 7 +-
drivers/i2c/i2c-core.c | 1 +
drivers/idle/intel_idle.c | 108 ++--
drivers/input/keyboard/gpio_keys_polled.c | 112 ++---
drivers/leds/leds-gpio.c | 140 +++---
drivers/misc/eeprom/at25.c | 34 +-
drivers/of/base.c | 33 ++
drivers/powercap/Kconfig | 2 +-
drivers/powercap/intel_rapl.c | 264 ++++++----
include/acpi/acpi_bus.h | 29 ++
include/linux/acpi.h | 137 ++++-
include/linux/cpuidle.h | 4 +-
include/linux/gpio/consumer.h | 7 +
include/linux/gpio_keys.h | 3 +
include/linux/leds.h | 3 +-
include/linux/of.h | 34 ++
include/linux/pm.h | 6 +-
include/linux/pm_clock.h | 8 +
include/linux/pm_domain.h | 5 +
include/linux/property.h | 143 ++++++
kernel/power/Kconfig | 3 +-
kernel/power/hibernate.c | 14 +-
kernel/power/power.h | 3 +-
kernel/power/snapshot.c | 9 +-
kernel/power/swap.c | 43 +-
net/rfkill/rfkill-gpio.c | 18 +-
101 files changed, 3245 insertions(+), 874 deletions(-)
create mode 100644 Documentation/acpi/gpio-properties.txt
create mode 100644 drivers/acpi/property.c
create mode 100644 drivers/base/property.c
create mode 100644 drivers/cpufreq/ls1x-cpufreq.c
create mode 100644 include/linux/property.h
Merging idle/next (a8b65b07d753 tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS)
$ git merge idle/next
Resolved 'arch/x86/include/uapi/asm/msr-index.h' using previous resolution.
Auto-merging tools/power/x86/turbostat/turbostat.c
Auto-merging arch/x86/include/uapi/asm/msr-index.h
CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 22eaa5debcda] Merge remote-tracking branch 'idle/next'
$ git diff -M --stat --summary HEAD^..
arch/x86/include/uapi/asm/msr-index.h | 4 +
tools/power/x86/turbostat/turbostat.c | 179 +++++++++++++++++++++++++++++++---
2 files changed, 171 insertions(+), 12 deletions(-)
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ 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 (6ceaf58abe25 Merge branch 'int340x-thermal' of .git into next)
$ git merge thermal/next
Already up-to-date.
Merging thermal-soc/next (b1d52b27ea8d Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Removing drivers/thermal/samsung/exynos_tmu_data.h
Auto-merging arch/arm/boot/dts/tegra124.dtsi
Auto-merging arch/arm/boot/dts/tegra124-jetson-tk1.dts
Merge made by the 'recursive' strategy.
.../devicetree/bindings/thermal/armada-thermal.txt | 8 -
.../bindings/thermal/rockchip-thermal.txt | 68 ++
.../devicetree/bindings/thermal/tegra-soctherm.txt | 53 ++
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 44 ++
arch/arm/boot/dts/tegra124.dtsi | 47 ++
drivers/hwmon/lm75.c | 9 +-
drivers/hwmon/ntc_thermistor.c | 6 +-
drivers/hwmon/tmp102.c | 6 +-
drivers/thermal/Kconfig | 32 +
drivers/thermal/Makefile | 5 +
drivers/thermal/armada_thermal.c | 20 -
drivers/thermal/clock_cooling.c | 485 ++++++++++++++
drivers/thermal/of-thermal.c | 39 +-
drivers/thermal/rockchip_thermal.c | 693 +++++++++++++++++++++
drivers/thermal/samsung/exynos_thermal_common.h | 1 -
drivers/thermal/samsung/exynos_tmu.c | 692 +++++++++++++-------
drivers/thermal/samsung/exynos_tmu.h | 123 +---
drivers/thermal/samsung/exynos_tmu_data.c | 239 +------
drivers/thermal/samsung/exynos_tmu_data.h | 159 -----
drivers/thermal/tegra_soctherm.c | 476 ++++++++++++++
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +-
include/dt-bindings/thermal/tegra124-soctherm.h | 13 +
include/linux/clock_cooling.h | 65 ++
include/linux/thermal.h | 24 +-
24 files changed, 2523 insertions(+), 792 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/rockchip-thermal.txt
create mode 100644 Documentation/devicetree/bindings/thermal/tegra-soctherm.txt
create mode 100644 drivers/thermal/clock_cooling.c
create mode 100644 drivers/thermal/rockchip_thermal.c
delete mode 100644 drivers/thermal/samsung/exynos_tmu_data.h
create mode 100644 drivers/thermal/tegra_soctherm.c
create mode 100644 include/dt-bindings/thermal/tegra124-soctherm.h
create mode 100644 include/linux/clock_cooling.h
Merging ieee1394/for-next (51b04d59c274 firewire: ohci: replace vm_map_ram() with vmap())
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
drivers/firewire/ohci.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
$ git merge dlm/next
Merge made by the 'recursive' strategy.
fs/dlm/lock.c | 76 +++++++++++++++++++++++++++++++++++++--
fs/dlm/lock.h | 3 ++
fs/dlm/user.c | 13 +++++--
include/uapi/linux/dlmconstants.h | 2 +-
4 files changed, 89 insertions(+), 5 deletions(-)
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (14d0f54d42c8 Merge branch 'topic/at_xdmac' into next)
$ git merge slave-dma/next
Auto-merging drivers/dma/pl330.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 +
.../devicetree/bindings/dma/qcom_bam_dma.txt | 4 +-
.../devicetree/bindings/dma/sun6i-dma.txt | 2 +-
.../{dmaengine.txt => dmaengine/client.txt} | 0
Documentation/{ => dmaengine}/dmatest.txt | 0
Documentation/dmaengine/provider.txt | 366 +++++++++++++++++++++
MAINTAINERS | 3 +-
drivers/dma/Kconfig | 4 +-
drivers/dma/amba-pl08x.c | 2 -
drivers/dma/bcm2835-dma.c | 3 -
drivers/dma/cppi41.c | 1 -
drivers/dma/dma-jz4740.c | 4 +-
drivers/dma/fsldma.c | 1 -
drivers/dma/imx-sdma.c | 3 +-
drivers/dma/iop-adma.c | 1 -
drivers/dma/k3dma.c | 4 +-
drivers/dma/mmp_pdma.c | 1 -
drivers/dma/mmp_tdma.c | 1 -
drivers/dma/mpc512x_dma.c | 13 +-
drivers/dma/nbpfaxi.c | 1 -
drivers/dma/omap-dma.c | 2 -
drivers/dma/pl330.c | 5 +-
drivers/dma/qcom_bam_dma.c | 231 +++++++++----
drivers/dma/s3c24xx-dma.c | 1 -
drivers/dma/sa11x0-dma.c | 3 +-
drivers/dma/sh/rcar-audmapp.c | 3 -
drivers/dma/sh/rcar-hpbdma.c | 3 -
drivers/dma/sh/shdma-base.c | 4 +-
drivers/dma/sh/shdma-of.c | 1 -
drivers/dma/sh/shdmac.c | 2 -
drivers/dma/sh/sudmac.c | 3 -
drivers/dma/sirf-dma.c | 5 +-
drivers/dma/sun6i-dma.c | 122 +++++--
drivers/dma/tegra20-apb-dma.c | 1 -
drivers/dma/timb_dma.c | 1 -
drivers/dma/xilinx/xilinx_vdma.c | 13 +-
include/linux/platform_data/dma-imx.h | 1 +
37 files changed, 655 insertions(+), 161 deletions(-)
rename Documentation/{dmaengine.txt => dmaengine/client.txt} (100%)
rename Documentation/{ => dmaengine}/dmatest.txt (100%)
create mode 100644 Documentation/dmaengine/provider.txt
Merging net-next/master (cd4c910e0075 netpoll: delete defconfig references to obsolete NETPOLL_TRAP)
$ git merge net-next/master
Resolved 'net/netfilter/nf_log.c' using previous resolution.
Removing net/tipc/node_subscr.c
Auto-merging net/tipc/netlink.h
Auto-merging net/netfilter/nf_log.c
CONFLICT (content): Merge conflict in net/netfilter/nf_log.c
Removing net/mac802154/wpan.c
Removing net/mac802154/monitor.c
Auto-merging net/mac802154/ieee802154_i.h
Removing net/mac802154/ieee802154_dev.c
Removing net/ieee802154/wpan-class.c
Auto-merging include/uapi/linux/Kbuild
Removing include/net/wpan-phy.h
Auto-merging include/net/bonding.h
Auto-merging include/net/bond_options.h
Auto-merging include/net/bond_alb.h
Auto-merging include/net/bond_3ad.h
Auto-merging include/linux/ieee802154.h
Removing drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/sdio.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/sdio.c
Removing drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/debug.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/debug.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/core.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/core.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/bus.h
Auto-merging drivers/net/wireless/ath/ath9k/common-spectral.h
Auto-merging drivers/net/wireless/ath/ath9k/common-spectral.c
Auto-merging drivers/net/tun.c
Removing drivers/net/ieee802154/fakehard.c
Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
Auto-merging drivers/net/ethernet/renesas/sh_eth.c
Auto-merging drivers/net/bonding/bond_netlink.c
Auto-merging drivers/bcma/driver_mips.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 632c091c35c2] Merge remote-tracking branch 'net-next/master'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/bus/bcma.txt | 21 +
Documentation/devicetree/bindings/net/amd-xgbe.txt | 12 +-
.../devicetree/bindings/net/can/c_can.txt | 5 +
Documentation/devicetree/bindings/net/dsa/dsa.txt | 9 +-
Documentation/devicetree/bindings/net/micrel.txt | 35 +-
Documentation/devicetree/bindings/net/phy.txt | 3 +-
Documentation/devicetree/bindings/net/sh_eth.txt | 1 +
Documentation/networking/bonding.txt | 7 +-
Documentation/networking/ip-sysctl.txt | 23 +-
Documentation/networking/ipvlan.txt | 107 +
Documentation/networking/stmmac.txt | 132 +-
Documentation/sysctl/net.txt | 34 +-
MAINTAINERS | 20 +
arch/alpha/include/uapi/asm/socket.h | 2 +
arch/arm/configs/davinci_all_defconfig | 1 -
arch/arm/kernel/sys_oabi-compat.c | 4 +-
arch/arm/mach-mmp/gplugd.c | 1 +
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/configs/85xx/ge_imp3a_defconfig | 1 -
arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 1 -
arch/powerpc/configs/86xx/gef_sbc310_defconfig | 1 -
arch/powerpc/configs/86xx/gef_sbc610_defconfig | 1 -
arch/powerpc/configs/86xx/sbc8641d_defconfig | 1 -
arch/powerpc/configs/c2k_defconfig | 1 -
arch/powerpc/configs/ppc64_defconfig | 1 -
arch/powerpc/configs/ppc64e_defconfig | 1 -
arch/powerpc/configs/ppc6xx_defconfig | 1 -
arch/powerpc/configs/pseries_defconfig | 1 -
arch/powerpc/configs/pseries_le_defconfig | 1 -
arch/powerpc/include/asm/ppc-opcode.h | 1 +
arch/powerpc/include/uapi/asm/socket.h | 2 +
arch/powerpc/net/bpf_jit.h | 7 +
arch/powerpc/net/bpf_jit_comp.c | 49 +-
arch/s390/include/uapi/asm/socket.h | 2 +
arch/sparc/include/uapi/asm/socket.h | 2 +
arch/tile/configs/tilegx_defconfig | 1 -
arch/tile/configs/tilepro_defconfig | 1 -
arch/xtensa/include/uapi/asm/socket.h | 2 +
crypto/algif_hash.c | 2 +-
crypto/algif_skcipher.c | 10 +-
drivers/atm/eni.c | 3 +
drivers/bcma/bcma_private.h | 1 +
drivers/bcma/driver_chipcommon.c | 2 +-
drivers/bcma/driver_gpio.c | 4 +-
drivers/bcma/driver_mips.c | 11 +-
drivers/bcma/driver_pci_host.c | 4 +-
drivers/bcma/main.c | 79 +-
drivers/bcma/scan.c | 1 +
drivers/bluetooth/ath3k.c | 2 +
drivers/bluetooth/btusb.c | 10 +-
drivers/bluetooth/hci_ath.c | 2 +-
drivers/bluetooth/hci_h5.c | 25 +
drivers/infiniband/hw/cxgb4/cm.c | 176 +-
drivers/infiniband/hw/cxgb4/cq.c | 8 +-
drivers/infiniband/hw/cxgb4/mem.c | 34 +-
drivers/infiniband/hw/cxgb4/provider.c | 8 +-
drivers/infiniband/hw/cxgb4/qp.c | 26 +-
drivers/infiniband/hw/mlx4/main.c | 3 +-
drivers/infiniband/hw/mlx5/cq.c | 8 +-
drivers/infiniband/hw/mlx5/mr.c | 4 +-
drivers/infiniband/hw/mlx5/qp.c | 8 +-
drivers/infiniband/hw/mlx5/srq.c | 6 +-
drivers/isdn/mISDN/l1oip_codec.c | 6 +-
drivers/isdn/mISDN/socket.c | 4 +-
drivers/net/Kconfig | 20 +
drivers/net/Makefile | 1 +
drivers/net/bonding/bond_3ad.c | 106 +-
drivers/net/bonding/bond_alb.c | 23 +-
drivers/net/bonding/bond_debugfs.c | 4 +-
drivers/net/bonding/bond_main.c | 36 +-
drivers/net/bonding/bond_netlink.c | 2 +-
drivers/net/bonding/bond_options.c | 2 +-
drivers/net/bonding/bond_procfs.c | 2 +-
drivers/net/bonding/bond_sysfs.c | 2 +-
drivers/net/bonding/bond_sysfs_slave.c | 2 +-
drivers/net/can/c_can/c_can.c | 13 +
drivers/net/can/c_can/c_can.h | 25 +-
drivers/net/can/c_can/c_can_platform.c | 201 +-
drivers/net/dsa/Kconfig | 15 +-
drivers/net/dsa/Makefile | 3 +
drivers/net/dsa/mv88e6060.c | 5 +-
drivers/net/dsa/mv88e6123_61_65.c | 25 +-
drivers/net/dsa/mv88e6131.c | 12 +-
drivers/net/dsa/mv88e6171.c | 26 +-
drivers/net/dsa/mv88e6352.c | 788 +++++++
drivers/net/dsa/mv88e6xxx.c | 101 +-
drivers/net/dsa/mv88e6xxx.h | 16 +
drivers/net/ethernet/3com/typhoon.c | 4 +-
drivers/net/ethernet/amd/Kconfig | 2 +-
drivers/net/ethernet/amd/xgbe/xgbe-common.h | 63 +-
drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 201 +-
drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 446 +++-
drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 533 ++++-
drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 82 +-
drivers/net/ethernet/amd/xgbe/xgbe-main.c | 86 +-
drivers/net/ethernet/amd/xgbe/xgbe.h | 111 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 12 -
drivers/net/ethernet/broadcom/bcmsysport.c | 14 +-
drivers/net/ethernet/broadcom/bcmsysport.h | 3 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 114 +-
drivers/net/ethernet/broadcom/genet/bcmgenet.h | 29 +
drivers/net/ethernet/broadcom/tg3.c | 17 +-
drivers/net/ethernet/brocade/bna/bnad.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/Makefile | 1 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 11 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 14 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.h | 10 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 158 ++
drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 52 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 508 ++---
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 15 +-
drivers/net/ethernet/chelsio/cxgb4/l2t.c | 6 +-
drivers/net/ethernet/chelsio/cxgb4/sge.c | 155 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 387 ++--
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 120 +-
drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 160 ++
drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 72 +-
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 2269 +++++++++++++-------
.../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 99 +-
drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 104 +-
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 2 +-
drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 382 ++--
drivers/net/ethernet/cirrus/mac89x0.c | 8 +-
drivers/net/ethernet/cisco/enic/enic_main.c | 54 +-
drivers/net/ethernet/cisco/enic/vnic_rss.h | 9 +-
drivers/net/ethernet/cisco/enic/vnic_wq.h | 20 +-
drivers/net/ethernet/emulex/benet/be_main.c | 16 +-
drivers/net/ethernet/freescale/fec.h | 237 +-
drivers/net/ethernet/freescale/fec_main.c | 122 +-
drivers/net/ethernet/freescale/gianfar.c | 63 +-
drivers/net/ethernet/freescale/gianfar.h | 38 +-
drivers/net/ethernet/freescale/gianfar_ethtool.c | 7 +-
drivers/net/ethernet/ibm/emac/core.c | 24 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 9 +-
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 +-
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +-
drivers/net/ethernet/intel/i40e/i40e.h | 4 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.c | 12 +-
drivers/net/ethernet/intel/i40e/i40e_adminq.h | 5 +-
drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2184 ++++++++++---------
drivers/net/ethernet/intel/i40e/i40e_common.c | 76 +
drivers/net/ethernet/intel/i40e/i40e_dcb.c | 252 ++-
drivers/net/ethernet/intel/i40e/i40e_dcb.h | 5 +
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 8 +-
drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 95 +-
drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 65 +-
drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 +-
drivers/net/ethernet/intel/i40e/i40e_main.c | 449 ++--
drivers/net/ethernet/intel/i40e/i40e_prototype.h | 9 +
drivers/net/ethernet/intel/i40e/i40e_ptp.c | 12 +-
drivers/net/ethernet/intel/i40e/i40e_txrx.h | 5 +-
drivers/net/ethernet/intel/i40e/i40e_type.h | 54 +-
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +-
drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 12 +-
drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 5 +-
.../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 2136 +++++++++---------
drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 +
drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 5 +-
drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 +
drivers/net/ethernet/intel/i40evf/i40evf.h | 3 +-
drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 30 +-
drivers/net/ethernet/intel/i40evf/i40evf_main.c | 132 +-
.../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 86 +-
drivers/net/ethernet/intel/igb/igb_main.c | 11 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 50 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 8 +
drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 1 +
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 37 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 2 +
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 124 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 4 +
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 61 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 131 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 45 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 39 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 720 +++++--
drivers/net/ethernet/marvell/mvneta.c | 3 +-
drivers/net/ethernet/marvell/pxa168_eth.c | 256 +--
drivers/net/ethernet/marvell/sky2.c | 17 +-
drivers/net/ethernet/mellanox/mlx4/cmd.c | 89 +-
drivers/net/ethernet/mellanox/mlx4/en_clock.c | 46 -
drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 522 ++++-
drivers/net/ethernet/mellanox/mlx4/en_main.c | 12 +-
drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 132 +-
drivers/net/ethernet/mellanox/mlx4/en_port.c | 26 +-
drivers/net/ethernet/mellanox/mlx4/en_port.h | 35 +-
drivers/net/ethernet/mellanox/mlx4/en_rx.c | 287 ++-
drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 12 +-
drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +-
drivers/net/ethernet/mellanox/mlx4/eq.c | 8 +-
drivers/net/ethernet/mellanox/mlx4/fw.c | 348 ++-
drivers/net/ethernet/mellanox/mlx4/fw.h | 15 +-
drivers/net/ethernet/mellanox/mlx4/main.c | 323 ++-
drivers/net/ethernet/mellanox/mlx4/mlx4.h | 21 +-
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 25 +-
drivers/net/ethernet/mellanox/mlx4/mr.c | 10 +-
drivers/net/ethernet/mellanox/mlx4/port.c | 156 ++
drivers/net/ethernet/mellanox/mlx4/profile.c | 19 +-
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 17 +
drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +-
.../net/ethernet/mellanox/mlx5/core/pagealloc.c | 4 +-
drivers/net/ethernet/mellanox/mlx5/core/port.c | 4 +-
drivers/net/ethernet/natsemi/macsonic.c | 4 -
drivers/net/ethernet/realtek/8139too.c | 20 +-
drivers/net/ethernet/realtek/atp.h | 246 ++-
drivers/net/ethernet/renesas/sh_eth.c | 14 +-
.../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 3 -
drivers/net/ethernet/sfc/ef10.c | 5 +
drivers/net/ethernet/sfc/efx.c | 24 +-
drivers/net/ethernet/sfc/falcon.c | 10 +
drivers/net/ethernet/sfc/farch.c | 27 +-
drivers/net/ethernet/sfc/mcdi.c | 2 +-
drivers/net/ethernet/sfc/net_driver.h | 19 +-
drivers/net/ethernet/sfc/nic.h | 112 +-
drivers/net/ethernet/sfc/siena.c | 8 +-
drivers/net/ethernet/sfc/siena_sriov.c | 269 +--
drivers/net/ethernet/smsc/smsc911x.c | 10 +
drivers/net/ethernet/stmicro/stmmac/Kconfig | 72 +-
drivers/net/ethernet/stmicro/stmmac/Makefile | 17 +-
drivers/net/ethernet/stmicro/stmmac/common.h | 13 +
drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 4 +-
.../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 2 +
drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 17 +-
drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 4 +-
.../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 4 -
drivers/net/ethernet/stmicro/stmmac/stmmac.h | 77 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 211 +-
drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 84 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 68 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.h | 28 +
drivers/net/ethernet/sun/sunvnet.c | 355 +--
drivers/net/ethernet/sun/sunvnet.h | 8 +-
drivers/net/ethernet/wiznet/w5100.c | 6 +-
drivers/net/ethernet/wiznet/w5300.c | 6 +-
drivers/net/ethernet/xilinx/ll_temac_main.c | 3 +-
drivers/net/ethernet/xilinx/xilinx_emaclite.c | 3 +-
drivers/net/fddi/defxx.c | 187 +-
drivers/net/fddi/defxx.h | 4 +-
drivers/net/hamradio/6pack.c | 3 +-
drivers/net/hyperv/netvsc.c | 7 +-
drivers/net/hyperv/netvsc_drv.c | 9 +-
drivers/net/hyperv/rndis_filter.c | 12 +-
drivers/net/ieee802154/Kconfig | 10 -
drivers/net/ieee802154/Makefile | 1 -
drivers/net/ieee802154/at86rf230.c | 445 ++--
drivers/net/ieee802154/cc2520.c | 71 +-
drivers/net/ieee802154/fakehard.c | 430 ----
drivers/net/ieee802154/fakelb.c | 91 +-
drivers/net/ieee802154/mrf24j40.c | 104 +-
drivers/net/ipvlan/Makefile | 7 +
drivers/net/ipvlan/ipvlan.h | 131 ++
drivers/net/ipvlan/ipvlan_core.c | 607 ++++++
drivers/net/ipvlan/ipvlan_main.c | 790 +++++++
drivers/net/irda/act200l-sir.c | 11 +-
drivers/net/irda/actisys-sir.c | 3 +-
drivers/net/irda/ali-ircc.c | 263 +--
drivers/net/irda/donauboe.c | 96 +-
drivers/net/irda/girbil-sir.c | 14 +-
drivers/net/irda/irda-usb.c | 142 +-
drivers/net/irda/irtty-sir.c | 18 +-
drivers/net/irda/litelink-sir.c | 8 -
drivers/net/irda/ma600-sir.c | 20 +-
drivers/net/irda/mcp2120-sir.c | 14 +-
drivers/net/irda/mcs7780.c | 53 +-
drivers/net/irda/nsc-ircc.c | 229 +-
drivers/net/irda/old_belkin-sir.c | 8 -
drivers/net/irda/sir_dev.c | 79 +-
drivers/net/irda/sir_dongle.c | 4 +-
drivers/net/irda/smsc-ircc2.c | 255 +--
drivers/net/irda/tekram-sir.c | 15 +-
drivers/net/irda/toim3232-sir.c | 12 +-
drivers/net/irda/via-ircc.c | 175 +-
drivers/net/irda/vlsi_ir.c | 145 +-
drivers/net/irda/vlsi_ir.h | 3 +-
drivers/net/irda/w83977af_ir.c | 77 +-
drivers/net/macvlan.c | 5 +-
drivers/net/macvtap.c | 139 +-
drivers/net/phy/Kconfig | 2 +-
drivers/net/phy/amd-xgbe-phy.c | 18 +-
drivers/net/phy/amd.c | 17 +-
drivers/net/phy/at803x.c | 14 +-
drivers/net/phy/bcm63xx.c | 15 +-
drivers/net/phy/bcm7xxx.c | 149 +-
drivers/net/phy/bcm87xx.c | 14 +-
drivers/net/phy/broadcom.c | 15 +-
drivers/net/phy/cicada.c | 15 +-
drivers/net/phy/davicom.c | 15 +-
drivers/net/phy/et1011c.c | 17 +-
drivers/net/phy/icplus.c | 15 +-
drivers/net/phy/lxt.c | 15 +-
drivers/net/phy/marvell.c | 67 +-
drivers/net/phy/micrel.c | 344 +--
drivers/net/phy/national.c | 17 +-
drivers/net/phy/qsemi.c | 17 +-
drivers/net/phy/realtek.c | 13 +-
drivers/net/phy/smsc.c | 14 +-
drivers/net/phy/spi_ks8995.c | 4 +-
drivers/net/phy/ste10Xp.c | 15 +-
drivers/net/phy/vitesse.c | 14 +-
drivers/net/ppp/pppoe.c | 4 +-
drivers/net/team/team.c | 3 +
drivers/net/tun.c | 137 +-
drivers/net/usb/asix_devices.c | 3 +-
drivers/net/usb/cdc-phonet.c | 6 +-
drivers/net/usb/cdc_ether.c | 19 +-
drivers/net/usb/cdc_mbim.c | 2 +-
drivers/net/usb/hso.c | 3 +-
drivers/net/usb/r8152.c | 209 +-
drivers/net/usb/rtl8150.c | 3 +-
drivers/net/usb/smsc95xx.c | 6 +-
drivers/net/vmxnet3/vmxnet3_drv.c | 9 +-
drivers/net/vxlan.c | 25 +-
drivers/net/wireless/ath/ath.h | 13 +-
drivers/net/wireless/ath/ath10k/ce.c | 92 +-
drivers/net/wireless/ath/ath10k/ce.h | 21 +-
drivers/net/wireless/ath/ath10k/core.c | 141 +-
drivers/net/wireless/ath/ath10k/core.h | 87 +-
drivers/net/wireless/ath/ath10k/debug.c | 898 ++++++--
drivers/net/wireless/ath/ath10k/debug.h | 40 +-
drivers/net/wireless/ath/ath10k/hif.h | 10 +
drivers/net/wireless/ath/ath10k/htt.h | 2 +-
drivers/net/wireless/ath/ath10k/htt_rx.c | 109 +-
drivers/net/wireless/ath/ath10k/htt_tx.c | 4 +-
drivers/net/wireless/ath/ath10k/hw.h | 17 +-
drivers/net/wireless/ath/ath10k/mac.c | 544 +++--
drivers/net/wireless/ath/ath10k/mac.h | 2 +
drivers/net/wireless/ath/ath10k/pci.c | 553 ++---
drivers/net/wireless/ath/ath10k/spectral.c | 34 +-
drivers/net/wireless/ath/ath10k/spectral.h | 8 +-
drivers/net/wireless/ath/ath10k/trace.h | 196 ++
drivers/net/wireless/ath/ath10k/txrx.c | 4 +-
drivers/net/wireless/ath/ath10k/wmi.c | 1126 +++++-----
drivers/net/wireless/ath/ath10k/wmi.h | 273 +--
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 6 +-
drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +-
drivers/net/wireless/ath/ath6kl/common.h | 2 +-
drivers/net/wireless/ath/ath6kl/debug.c | 28 +-
drivers/net/wireless/ath/ath6kl/debug.h | 13 +-
drivers/net/wireless/ath/ath6kl/usb.c | 9 -
drivers/net/wireless/ath/ath9k/Kconfig | 7 +
drivers/net/wireless/ath/ath9k/Makefile | 9 +-
drivers/net/wireless/ath/ath9k/ar5008_phy.c | 7 +-
drivers/net/wireless/ath/ath9k/ar9002_calib.c | 42 +-
drivers/net/wireless/ath/ath9k/ar9002_phy.c | 9 +-
drivers/net/wireless/ath/ath9k/ar9003_calib.c | 11 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 9 +-
drivers/net/wireless/ath/ath9k/ar9003_hw.c | 54 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 7 +-
drivers/net/wireless/ath/ath9k/ar9003_rtt.h | 36 +
drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 498 ++++-
.../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 8 +-
.../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 144 +-
drivers/net/wireless/ath/ath9k/ath9k.h | 26 +-
drivers/net/wireless/ath/ath9k/calib.c | 6 +-
drivers/net/wireless/ath/ath9k/calib.h | 2 +-
drivers/net/wireless/ath/ath9k/channel.c | 338 ++-
.../ath/ath9k/{spectral.c => common-spectral.c} | 165 +-
.../ath/ath9k/{spectral.h => common-spectral.h} | 29 +-
drivers/net/wireless/ath/ath9k/common.c | 2 +-
drivers/net/wireless/ath/ath9k/common.h | 1 +
drivers/net/wireless/ath/ath9k/debug.c | 60 +-
drivers/net/wireless/ath/ath9k/debug.h | 1 +
drivers/net/wireless/ath/ath9k/eeprom_def.c | 31 +-
drivers/net/wireless/ath/ath9k/gpio.c | 9 +-
drivers/net/wireless/ath/ath9k/htc.h | 5 +
drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 6 +
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 25 +
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 13 +-
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 16 +-
drivers/net/wireless/ath/ath9k/hw-ops.h | 7 +-
drivers/net/wireless/ath/ath9k/hw.c | 98 +-
drivers/net/wireless/ath/ath9k/hw.h | 33 +-
drivers/net/wireless/ath/ath9k/init.c | 64 +-
drivers/net/wireless/ath/ath9k/link.c | 12 +-
drivers/net/wireless/ath/ath9k/main.c | 343 ++-
drivers/net/wireless/ath/ath9k/pci.c | 10 +-
drivers/net/wireless/ath/ath9k/recv.c | 2 +-
drivers/net/wireless/ath/ath9k/reg.h | 36 +-
drivers/net/wireless/ath/ath9k/tx99.c | 4 +-
drivers/net/wireless/ath/carl9170/phy.c | 4 +-
drivers/net/wireless/ath/wcn36xx/main.c | 7 +-
drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +-
drivers/net/wireless/ath/wil6210/main.c | 95 +-
drivers/net/wireless/ath/wil6210/netdev.c | 2 +-
drivers/net/wireless/ath/wil6210/txrx.c | 7 +-
drivers/net/wireless/ath/wil6210/txrx.h | 4 +-
drivers/net/wireless/ath/wil6210/wil6210.h | 13 +-
drivers/net/wireless/ath/wil6210/wmi.c | 4 +-
drivers/net/wireless/b43/main.c | 7 +-
drivers/net/wireless/brcm80211/brcmfmac/Makefile | 10 +-
drivers/net/wireless/brcm80211/brcmfmac/bcdc.c | 6 +-
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 51 +-
drivers/net/wireless/brcm80211/brcmfmac/btcoex.c | 6 +-
.../brcm80211/brcmfmac/{dhd_bus.h => bus.h} | 11 +-
.../brcmfmac/{wl_cfg80211.c => cfg80211.c} | 85 +-
.../brcmfmac/{wl_cfg80211.h => cfg80211.h} | 9 +-
drivers/net/wireless/brcm80211/brcmfmac/chip.c | 2 +-
drivers/net/wireless/brcm80211/brcmfmac/common.c | 168 ++
.../net/wireless/brcm80211/brcmfmac/commonring.c | 2 +-
.../brcm80211/brcmfmac/{dhd_linux.c => core.c} | 8 +-
.../wireless/brcm80211/brcmfmac/{dhd.h => core.h} | 7 +-
.../brcm80211/brcmfmac/{dhd_dbg.c => debug.c} | 6 +-
.../brcm80211/brcmfmac/{dhd_dbg.h => debug.h} | 6 +-
.../net/wireless/brcm80211/brcmfmac/dhd_common.c | 400 ----
drivers/net/wireless/brcm80211/brcmfmac/feature.c | 11 +-
drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 5 +-
drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 6 +-
drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 4 +-
drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 84 +-
.../net/wireless/brcm80211/brcmfmac/fwil_types.h | 89 +-
drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 8 +-
drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 9 +-
drivers/net/wireless/brcm80211/brcmfmac/of.c | 4 +-
drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 6 +-
drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 4 +-
drivers/net/wireless/brcm80211/brcmfmac/proto.c | 6 +-
.../brcm80211/brcmfmac/{dhd_sdio.c => sdio.c} | 55 +-
.../brcm80211/brcmfmac/{sdio_host.h => sdio.h} | 8 +-
.../net/wireless/brcm80211/brcmfmac/tracepoint.c | 15 +
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 142 +-
drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h | 75 -
drivers/net/wireless/brcm80211/brcmfmac/vendor.c | 6 +-
drivers/net/wireless/brcm80211/brcmsmac/debug.c | 166 +-
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 7 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 21 +-
drivers/net/wireless/cw1200/scan.c | 2 +-
drivers/net/wireless/ipw2x00/ipw2200.c | 2 +-
drivers/net/wireless/ipw2x00/libipw.h | 5 -
drivers/net/wireless/ipw2x00/libipw_module.c | 15 +-
drivers/net/wireless/ipw2x00/libipw_rx.c | 21 +-
drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
drivers/net/wireless/iwlegacy/4965.h | 5 +-
drivers/net/wireless/iwlwifi/Kconfig | 1 +
drivers/net/wireless/iwlwifi/dvm/lib.c | 4 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 1 +
drivers/net/wireless/iwlwifi/iwl-8000.c | 1 +
drivers/net/wireless/iwlwifi/iwl-config.h | 12 +
drivers/net/wireless/iwlwifi/iwl-drv.c | 3 -
drivers/net/wireless/iwlwifi/iwl-fw.h | 1 -
drivers/net/wireless/iwlwifi/iwl-trans.h | 4 -
drivers/net/wireless/iwlwifi/mvm/coex.c | 13 +-
drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 14 +-
drivers/net/wireless/iwlwifi/mvm/constants.h | 5 +
drivers/net/wireless/iwlwifi/mvm/d3.c | 318 +--
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 201 +-
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 +-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 120 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 18 +-
drivers/net/wireless/iwlwifi/mvm/ops.c | 15 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 80 +-
drivers/net/wireless/iwlwifi/mvm/rs.h | 2 +
drivers/net/wireless/iwlwifi/mvm/scan.c | 35 +-
drivers/net/wireless/iwlwifi/mvm/sta.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/tt.c | 4 -
drivers/net/wireless/iwlwifi/mvm/tx.c | 6 +-
drivers/net/wireless/iwlwifi/mvm/utils.c | 37 +
drivers/net/wireless/iwlwifi/pcie/trans.c | 45 +-
drivers/net/wireless/mac80211_hwsim.c | 657 +++++-
drivers/net/wireless/mac80211_hwsim.h | 28 +-
drivers/net/wireless/mwifiex/11n.h | 4 +
drivers/net/wireless/mwifiex/Kconfig | 2 +-
drivers/net/wireless/mwifiex/cfg80211.c | 81 +-
drivers/net/wireless/mwifiex/decl.h | 15 +
drivers/net/wireless/mwifiex/fw.h | 17 +
drivers/net/wireless/mwifiex/init.c | 19 +-
drivers/net/wireless/mwifiex/join.c | 4 +-
drivers/net/wireless/mwifiex/main.c | 55 +-
drivers/net/wireless/mwifiex/main.h | 50 +-
drivers/net/wireless/mwifiex/scan.c | 76 +-
drivers/net/wireless/mwifiex/sdio.c | 2 +
drivers/net/wireless/mwifiex/sdio.h | 7 +
drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 +-
drivers/net/wireless/mwifiex/sta_event.c | 9 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 4 +-
drivers/net/wireless/mwifiex/sta_rx.c | 3 +
drivers/net/wireless/mwifiex/tdls.c | 288 +++
drivers/net/wireless/mwifiex/txrx.c | 4 -
drivers/net/wireless/mwifiex/uap_cmd.c | 2 +-
drivers/net/wireless/mwifiex/usb.c | 51 +-
drivers/net/wireless/mwifiex/usb.h | 3 +
drivers/net/wireless/mwifiex/util.c | 38 +
drivers/net/wireless/mwl8k.c | 7 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 10 +-
drivers/net/wireless/rt2x00/rt2x00.h | 7 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 7 +-
drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +-
drivers/net/wireless/rt2x00/rt2x00usb.h | 39 +-
drivers/net/wireless/rtlwifi/core.c | 7 +-
drivers/net/wireless/rtlwifi/rtl8821ae/phy.c | 12 +-
drivers/net/wireless/ti/wl1251/main.c | 2 +-
drivers/net/wireless/ti/wlcore/cmd.c | 15 +-
drivers/net/wireless/ti/wlcore/cmd.h | 2 -
drivers/net/wireless/ti/wlcore/main.c | 23 +-
drivers/net/xen-netback/interface.c | 2 +-
drivers/net/xen-netback/netback.c | 28 +-
drivers/net/xen-netfront.c | 253 +--
drivers/s390/net/Kconfig | 2 +-
drivers/s390/net/ctcm_sysfs.c | 8 +-
drivers/s390/net/lcs.c | 11 +-
drivers/s390/net/qeth_core.h | 16 -
drivers/s390/net/qeth_core_main.c | 24 +-
drivers/s390/net/qeth_l2_main.c | 2 +-
drivers/s390/net/qeth_l3.h | 4 -
drivers/s390/net/qeth_l3_main.c | 10 +-
drivers/scsi/csiostor/csio_attr.c | 8 +-
drivers/scsi/csiostor/csio_hw.c | 52 +-
drivers/scsi/csiostor/csio_hw_chip.h | 49 +-
drivers/scsi/csiostor/csio_hw_t4.c | 15 +-
drivers/scsi/csiostor/csio_hw_t5.c | 21 +-
drivers/scsi/csiostor/csio_init.c | 78 +-
drivers/scsi/csiostor/csio_lnode.c | 20 +-
drivers/scsi/csiostor/csio_mb.c | 343 +--
drivers/scsi/csiostor/csio_mb.h | 12 +-
drivers/scsi/csiostor/csio_scsi.c | 26 +-
drivers/scsi/csiostor/csio_wr.h | 2 +-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 113 +-
drivers/scsi/fcoe/fcoe.c | 6 +-
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 4 +-
drivers/staging/vt6656/main_usb.c | 7 +-
drivers/usb/gadget/function/f_phonet.c | 6 +-
include/linux/ath9k_platform.h | 3 +
include/linux/bcma/bcma.h | 2 +
include/linux/bcma/bcma_driver_mips.h | 4 +-
include/linux/bpf.h | 7 +-
include/linux/ieee80211.h | 71 +-
include/{net => linux}/ieee802154.h | 61 +-
include/linux/if_vlan.h | 107 +-
include/linux/ipv6.h | 11 +-
include/linux/marvell_phy.h | 1 +
include/linux/micrel_phy.h | 1 -
include/linux/mlx4/cmd.h | 31 +
include/linux/mlx4/device.h | 78 +-
include/linux/mlx4/qp.h | 4 +-
include/linux/mlx5/driver.h | 8 -
include/linux/netdev_features.h | 9 +-
include/linux/netdevice.h | 80 +-
include/linux/nl802154.h | 4 -
include/linux/phy.h | 26 +
include/linux/pxa168_eth.h | 3 +
include/linux/rhashtable.h | 15 +-
include/linux/skbuff.h | 125 +-
include/linux/socket.h | 17 +-
include/linux/syscalls.h | 6 +-
include/linux/tcp.h | 4 +-
include/net/6lowpan.h | 12 +-
include/net/af_ieee802154.h | 4 -
include/net/af_vsock.h | 6 +-
include/net/bluetooth/hci.h | 27 +-
include/net/bluetooth/hci_core.h | 45 +-
include/net/bluetooth/l2cap.h | 15 +-
include/net/bluetooth/mgmt.h | 12 +-
{drivers/net/bonding => include/net}/bond_3ad.h | 6 +-
{drivers/net/bonding => include/net}/bond_alb.h | 6 +-
.../net/bonding => include/net}/bond_options.h | 6 +-
{drivers/net/bonding => include/net}/bonding.h | 18 +-
include/net/cfg80211.h | 178 +-
include/net/cfg802154.h | 161 ++
include/net/checksum.h | 16 +
include/net/compat.h | 5 +-
include/net/dsa.h | 33 +
include/net/fou.h | 19 +
include/net/gue.h | 103 +-
include/net/ieee802154_netdev.h | 18 +-
include/net/inet6_hashtables.h | 10 +
include/net/ip6_tunnel.h | 3 +-
include/net/ip_tunnels.h | 16 +
include/net/ipx.h | 5 +-
include/net/irda/irda.h | 15 -
include/net/irda/irlap.h | 2 +-
include/net/mac80211.h | 287 ++-
include/net/mac802154.h | 158 +-
include/net/mpls.h | 39 +
include/net/neighbour.h | 14 +-
include/net/netfilter/ipv4/nf_nat_redirect.h | 9 +
include/net/netfilter/ipv6/nf_nat_redirect.h | 8 +
include/net/netfilter/nft_redir.h | 21 +
include/net/netlink.h | 10 +
include/net/nl802154.h | 226 +-
include/net/ping.h | 2 +-
include/net/sctp/sm.h | 2 +-
include/net/sctp/structs.h | 7 +-
include/net/sock.h | 45 +-
include/net/tc_act/tc_vlan.h | 27 +
include/net/tcp.h | 25 +-
include/net/udplite.h | 6 +-
include/net/wpan-phy.h | 105 -
include/uapi/asm-generic/socket.h | 2 +
include/uapi/linux/Kbuild | 89 +-
include/uapi/linux/bpf.h | 13 +-
include/uapi/linux/ethtool.h | 18 +-
include/uapi/linux/if_link.h | 16 +
include/uapi/linux/if_tunnel.h | 1 +
include/uapi/linux/ipv6.h | 1 +
include/uapi/linux/netfilter/nf_tables.h | 18 +
include/uapi/linux/nl80211.h | 140 +-
include/uapi/linux/openvswitch.h | 53 +-
include/uapi/linux/rtnetlink.h | 1 +
include/uapi/linux/snmp.h | 1 +
include/uapi/linux/tc_act/tc_vlan.h | 35 +
include/uapi/linux/tipc_netlink.h | 244 +++
kernel/bpf/Makefile | 2 +-
kernel/bpf/arraymap.c | 156 ++
kernel/bpf/hashtab.c | 367 ++++
kernel/bpf/helpers.c | 89 +
kernel/bpf/syscall.c | 6 +-
kernel/bpf/test_stub.c | 56 +-
kernel/bpf/verifier.c | 101 +-
lib/rhashtable.c | 80 +-
lib/test_bpf.c | 43 +
net/6lowpan/iphc.c | 100 +-
net/8021q/vlan_dev.c | 21 +-
net/appletalk/ddp.c | 4 +-
net/atm/common.c | 19 +-
net/ax25/af_ax25.c | 4 +-
net/bluetooth/6lowpan.c | 300 +--
net/bluetooth/Kconfig | 20 +-
net/bluetooth/af_bluetooth.c | 4 +-
net/bluetooth/amp.c | 25 +-
net/bluetooth/bnep/Kconfig | 2 +-
net/bluetooth/cmtp/Kconfig | 2 +-
net/bluetooth/hci_conn.c | 14 +-
net/bluetooth/hci_core.c | 200 +-
net/bluetooth/hci_event.c | 141 +-
net/bluetooth/hci_sock.c | 6 +-
net/bluetooth/hidp/Kconfig | 2 +-
net/bluetooth/hidp/core.c | 10 +-
net/bluetooth/l2cap_core.c | 42 +-
net/bluetooth/l2cap_sock.c | 29 +-
net/bluetooth/mgmt.c | 193 +-
net/bluetooth/rfcomm/Kconfig | 2 +-
net/bluetooth/rfcomm/core.c | 12 +-
net/bluetooth/rfcomm/sock.c | 2 +-
net/bluetooth/sco.c | 2 +-
net/bluetooth/smp.c | 95 +-
net/bluetooth/smp.h | 9 +-
net/bridge/br_forward.c | 5 +
net/bridge/br_input.c | 60 +
net/bridge/br_netfilter.c | 1 +
net/bridge/br_netlink.c | 4 +-
net/bridge/br_private.h | 1 +
net/bridge/br_sysfs_if.c | 2 +
net/bridge/br_vlan.c | 4 +-
net/caif/caif_socket.c | 8 +-
net/can/bcm.c | 21 +-
net/can/raw.c | 4 +-
net/compat.c | 83 +-
net/core/datagram.c | 171 +-
net/core/dev.c | 154 +-
net/core/dev_addr_lists.c | 4 +-
net/core/dev_ioctl.c | 9 +-
net/core/ethtool.c | 12 +-
net/core/iovec.c | 47 -
net/core/link_watch.c | 2 +-
net/core/neighbour.c | 279 ++-
net/core/net-sysfs.c | 18 +
net/core/netpoll.c | 4 +-
net/core/pktgen.c | 3 +-
net/core/skbuff.c | 121 +-
net/core/sock.c | 7 +-
net/core/sysctl_net_core.c | 21 +
net/core/utils.c | 3 -
net/dccp/ackvec.c | 2 +-
net/dccp/dccp.h | 4 +-
net/dccp/feat.c | 4 +-
net/dccp/input.c | 2 +-
net/dccp/ipv4.c | 6 -
net/dccp/proto.c | 4 +-
net/decnet/af_decnet.c | 4 +-
net/decnet/dn_neigh.c | 4 +-
net/dsa/Kconfig | 11 +
net/dsa/dsa.c | 170 +-
net/dsa/slave.c | 74 +-
net/dsa/tag_dsa.c | 2 -
net/dsa/tag_edsa.c | 2 -
net/dsa/tag_trailer.c | 2 -
net/ieee802154/6lowpan_rtnl.c | 146 +-
net/ieee802154/Makefile | 4 +-
net/ieee802154/af802154.h | 4 -
net/ieee802154/af_ieee802154.c | 4 -
net/ieee802154/core.c | 321 +++
net/ieee802154/core.h | 46 +
net/ieee802154/dgram.c | 10 +-
net/ieee802154/header_ops.c | 3 +-
net/ieee802154/ieee802154.h | 6 +-
net/ieee802154/netlink.c | 6 +-
net/ieee802154/nl-mac.c | 253 +--
net/ieee802154/nl-phy.c | 29 +-
net/ieee802154/nl802154.c | 957 +++++++++
net/ieee802154/nl802154.h | 7 +
net/ieee802154/nl_policy.c | 4 -
net/ieee802154/raw.c | 8 +-
net/ieee802154/rdev-ops.h | 89 +
net/ieee802154/reassembly.c | 8 +-
net/ieee802154/reassembly.h | 4 +-
net/ieee802154/sysfs.c | 128 ++
net/ieee802154/sysfs.h | 9 +
net/ieee802154/wpan-class.c | 230 --
net/ipv4/Kconfig | 9 +
net/ipv4/af_inet.c | 2 +-
net/ipv4/arp.c | 2 +-
net/ipv4/cipso_ipv4.c | 8 +-
net/ipv4/esp4.c | 14 +-
net/ipv4/fou.c | 423 +++-
net/ipv4/geneve.c | 14 +-
net/ipv4/icmp.c | 51 +-
net/ipv4/igmp.c | 34 +-
net/ipv4/inet_fragment.c | 2 +-
net/ipv4/ip_fragment.c | 19 +-
net/ipv4/ip_gre.c | 2 +-
net/ipv4/ip_output.c | 8 +-
net/ipv4/ip_sockglue.c | 2 +-
net/ipv4/ip_tunnel.c | 115 +-
net/ipv4/ipconfig.c | 19 +-
net/ipv4/ipip.c | 2 +-
net/ipv4/netfilter/Kconfig | 15 +
net/ipv4/netfilter/Makefile | 2 +
net/ipv4/netfilter/nf_log_arp.c | 24 +-
net/ipv4/netfilter/nf_log_ipv4.c | 12 +-
net/ipv4/netfilter/nf_nat_redirect_ipv4.c | 82 +
net/ipv4/netfilter/nf_reject_ipv4.c | 1 +
net/ipv4/netfilter/nft_redir_ipv4.c | 77 +
net/ipv4/netfilter/nft_reject_ipv4.c | 7 +-
net/ipv4/ping.c | 10 +-
net/ipv4/proc.c | 7 +-
net/ipv4/raw.c | 106 +-
net/ipv4/syncookies.c | 86 +-
net/ipv4/sysctl_net_ipv4.c | 7 +
net/ipv4/tcp.c | 7 +-
net/ipv4/tcp_cong.c | 2 +-
net/ipv4/tcp_input.c | 42 +-
net/ipv4/tcp_ipv4.c | 4 +-
net/ipv4/tcp_offload.c | 2 +-
net/ipv4/tcp_output.c | 93 +-
net/ipv4/tcp_timer.c | 18 +-
net/ipv4/udp.c | 95 +-
net/ipv4/udp_offload.c | 69 +-
net/ipv6/addrconf.c | 74 +-
net/ipv6/ah6.c | 14 +-
net/ipv6/datagram.c | 8 +-
net/ipv6/esp6.c | 17 +-
net/ipv6/exthdrs.c | 20 +-
net/ipv6/icmp.c | 31 +-
net/ipv6/ip6_flowlabel.c | 13 +-
net/ipv6/ip6_gre.c | 2 +-
net/ipv6/ip6_input.c | 3 +-
net/ipv6/ip6_offload.c | 2 +-
net/ipv6/ip6_output.c | 22 +-
net/ipv6/ip6_tunnel.c | 109 +-
net/ipv6/ip6_vti.c | 14 +-
net/ipv6/ip6mr.c | 2 +-
net/ipv6/mcast.c | 6 +-
net/ipv6/mip6.c | 11 +-
net/ipv6/ndisc.c | 11 +-
net/ipv6/netfilter.c | 2 +-
net/ipv6/netfilter/Kconfig | 15 +
net/ipv6/netfilter/Makefile | 2 +
net/ipv6/netfilter/nf_log_ipv6.c | 12 +-
net/ipv6/netfilter/nf_nat_redirect_ipv6.c | 75 +
net/ipv6/netfilter/nf_reject_ipv6.c | 1 +
net/ipv6/netfilter/nft_redir_ipv6.c | 77 +
net/ipv6/netfilter/nft_reject_ipv6.c | 7 +-
net/ipv6/proc.c | 1 +
net/ipv6/raw.c | 9 +-
net/ipv6/reassembly.c | 15 +-
net/ipv6/route.c | 94 +-
net/ipv6/sit.c | 9 +-
net/ipv6/syncookies.c | 13 +-
net/ipv6/tcp_ipv6.c | 4 +-
net/ipv6/udp.c | 55 +-
net/ipv6/udp_offload.c | 4 +-
net/ipx/af_ipx.c | 8 +-
net/ipx/ipx_proc.c | 18 +-
net/ipx/ipx_route.c | 4 +-
net/ipx/sysctl_net_ipx.c | 4 +-
net/irda/af_irda.c | 253 +--
net/irda/discovery.c | 12 +-
net/irda/ircomm/ircomm_core.c | 55 +-
net/irda/ircomm/ircomm_event.c | 28 +-
net/irda/ircomm/ircomm_lmp.c | 30 +-
net/irda/ircomm/ircomm_param.c | 44 +-
net/irda/ircomm/ircomm_ttp.c | 30 +-
net/irda/ircomm/ircomm_tty.c | 116 +-
net/irda/ircomm/ircomm_tty_attach.c | 122 +-
net/irda/ircomm/ircomm_tty_ioctl.c | 21 +-
net/irda/irda_device.c | 34 +-
net/irda/iriap.c | 119 +-
net/irda/iriap_event.c | 42 +-
net/irda/irias_object.c | 78 +-
net/irda/irlan/irlan_client.c | 86 +-
net/irda/irlan/irlan_client_event.c | 66 +-
net/irda/irlan/irlan_common.c | 80 +-
net/irda/irlan/irlan_eth.c | 26 +-
net/irda/irlan/irlan_event.c | 4 +-
net/irda/irlan/irlan_filter.c | 23 +-
net/irda/irlan/irlan_provider.c | 42 +-
net/irda/irlan/irlan_provider_event.c | 16 +-
net/irda/irlap.c | 74 +-
net/irda/irlap_event.c | 234 +-
net/irda/irlap_frame.c | 117 +-
net/irda/irlmp.c | 186 +-
net/irda/irlmp_event.c | 133 +-
net/irda/irlmp_frame.c | 56 +-
net/irda/irmod.c | 12 -
net/irda/irnetlink.c | 4 +-
net/irda/irqueue.c | 14 +-
net/irda/irsysctl.c | 9 -
net/irda/irttp.c | 158 +-
net/irda/parameters.c | 77 +-
net/irda/qos.c | 83 +-
net/irda/wrapper.c | 28 +-
net/iucv/af_iucv.c | 4 +-
net/key/af_key.c | 4 +-
net/l2tp/l2tp_eth.c | 1 +
net/l2tp/l2tp_ip.c | 4 +-
net/l2tp/l2tp_ip6.c | 2 +-
net/l2tp/l2tp_ppp.c | 5 +-
net/lapb/lapb_iface.c | 17 +-
net/llc/af_llc.c | 5 +-
net/llc/llc_if.c | 2 +-
net/mac80211/Kconfig | 18 +
net/mac80211/Makefile | 3 +-
net/mac80211/agg-tx.c | 12 +-
net/mac80211/cfg.c | 193 +-
net/mac80211/chan.c | 5 +-
net/mac80211/debug.h | 10 +
net/mac80211/debugfs_key.c | 12 +-
net/mac80211/debugfs_sta.c | 11 +-
net/mac80211/driver-ops.h | 157 +-
net/mac80211/ieee80211_i.h | 122 +-
net/mac80211/iface.c | 32 +-
net/mac80211/key.c | 11 +-
net/mac80211/main.c | 44 +-
net/mac80211/mesh.h | 3 +
net/mac80211/mesh_pathtbl.c | 31 +
net/mac80211/mlme.c | 309 ++-
net/mac80211/ocb.c | 250 +++
net/mac80211/rate.c | 5 +-
net/mac80211/rc80211_minstrel.c | 2 +-
net/mac80211/rc80211_minstrel_ht.c | 319 ++-
net/mac80211/rc80211_minstrel_ht.h | 40 +-
net/mac80211/rc80211_minstrel_ht_debugfs.c | 43 +-
net/mac80211/rx.c | 181 +-
net/mac80211/scan.c | 129 +-
net/mac80211/sta_info.c | 19 +-
net/mac80211/sta_info.h | 11 +
net/mac80211/status.c | 58 +-
net/mac80211/tdls.c | 800 ++++++-
net/mac80211/trace.h | 242 ++-
net/mac80211/tx.c | 314 ++-
net/mac80211/util.c | 192 +-
net/mac80211/vht.c | 2 +
net/mac80211/wep.c | 2 -
net/mac80211/wme.c | 72 +-
net/mac80211/wme.h | 2 -
net/mac80211/wpa.c | 5 -
net/mac802154/Kconfig | 2 +-
net/mac802154/Makefile | 4 +-
net/mac802154/cfg.c | 210 ++
net/mac802154/cfg.h | 9 +
net/mac802154/driver-ops.h | 222 ++
net/mac802154/ieee802154_dev.c | 415 ----
net/mac802154/{mac802154.h => ieee802154_i.h} | 132 +-
net/mac802154/iface.c | 588 +++++
net/mac802154/llsec.c | 4 +-
net/mac802154/mac_cmd.c | 88 +-
net/mac802154/main.c | 217 ++
net/mac802154/mib.c | 265 +--
net/mac802154/monitor.c | 117 -
net/mac802154/rx.c | 311 ++-
net/mac802154/tx.c | 154 +-
net/mac802154/util.c | 84 +
net/mac802154/wpan.c | 599 ------
net/mpls/mpls_gso.c | 3 +-
net/netfilter/Kconfig | 11 +
net/netfilter/Makefile | 1 +
net/netfilter/core.c | 1 +
net/netfilter/ipvs/ip_vs_ctl.c | 3 +-
net/netfilter/ipvs/ip_vs_pe.c | 3 +-
net/netfilter/ipvs/ip_vs_sched.c | 3 +-
net/netfilter/ipvs/ip_vs_sync.c | 3 +-
net/netfilter/ipvs/ip_vs_xmit.c | 1 -
net/netfilter/nf_conntrack_h323_main.c | 14 +-
net/netfilter/nf_conntrack_helper.c | 2 +-
net/netfilter/nf_log.c | 40 +-
net/netfilter/nf_tables_api.c | 5 +-
net/netfilter/nfnetlink_log.c | 18 +-
net/netfilter/nft_hash.c | 10 +-
net/netfilter/nft_meta.c | 7 +
net/netfilter/nft_redir.c | 99 +
net/netfilter/xt_DSCP.c | 6 +-
net/netfilter/xt_REDIRECT.c | 84 +-
net/netfilter/xt_connlimit.c | 25 +-
net/netlink/af_netlink.c | 19 +-
net/netrom/af_netrom.c | 4 +-
net/nfc/llcp_commands.c | 4 +-
net/nfc/llcp_sock.c | 2 +-
net/nfc/rawsock.c | 4 +-
net/openvswitch/Kconfig | 23 +-
net/openvswitch/Makefile | 14 +-
net/openvswitch/actions.c | 355 +--
net/openvswitch/datapath.c | 346 +--
net/openvswitch/datapath.h | 24 +-
net/openvswitch/flow.c | 38 +-
net/openvswitch/flow.h | 88 +-
net/openvswitch/flow_netlink.c | 629 ++++--
net/openvswitch/flow_netlink.h | 18 +-
net/openvswitch/flow_table.c | 23 +-
net/openvswitch/flow_table.h | 10 +-
net/openvswitch/vport-geneve.c | 46 +-
net/openvswitch/vport-gre.c | 47 +-
net/openvswitch/vport-internal_dev.c | 22 +-
net/openvswitch/vport-netdev.c | 16 +-
net/openvswitch/vport-netdev.h | 3 +
net/openvswitch/vport-vxlan.c | 47 +-
net/openvswitch/vport.c | 171 +-
net/openvswitch/vport.h | 34 +-
net/packet/af_packet.c | 48 +-
net/phonet/af_phonet.c | 9 +-
net/phonet/datagram.c | 4 +-
net/phonet/pep-gprs.c | 3 +-
net/phonet/pep.c | 16 +-
net/rds/ib.h | 3 +-
net/rds/ib_recv.c | 37 +-
net/rds/iw.h | 3 +-
net/rds/iw_recv.c | 37 +-
net/rds/message.c | 77 +-
net/rds/rds.h | 9 +-
net/rds/recv.c | 5 +-
net/rds/send.c | 4 +-
net/rds/tcp.h | 3 +-
net/rds/tcp_recv.c | 38 +-
net/rose/af_rose.c | 4 +-
net/rxrpc/ar-recvmsg.c | 2 +-
net/sched/Kconfig | 11 +
net/sched/Makefile | 1 +
net/sched/act_gact.c | 2 +-
net/sched/act_ipt.c | 2 +-
net/sched/act_mirred.c | 2 +-
net/sched/act_pedit.c | 2 +-
net/sched/act_police.c | 2 +-
net/sched/act_simple.c | 2 +-
net/sched/act_vlan.c | 207 ++
net/sched/sch_fq.c | 9 +-
net/sched/sch_netem.c | 27 +-
net/sctp/chunk.c | 9 +-
net/sctp/proc.c | 12 +-
net/sctp/sm_make_chunk.c | 20 +-
net/sctp/socket.c | 19 +-
net/sctp/ulpqueue.c | 5 +-
net/socket.c | 140 +-
net/tipc/Makefile | 4 +-
net/tipc/bcast.c | 221 +-
net/tipc/bcast.h | 6 +-
net/tipc/bearer.c | 447 +++-
net/tipc/bearer.h | 16 +-
net/tipc/core.h | 2 +
net/tipc/link.c | 977 ++++++---
net/tipc/link.h | 55 +-
net/tipc/msg.c | 133 +-
net/tipc/msg.h | 16 +-
net/tipc/name_distr.c | 98 +-
net/tipc/name_distr.h | 1 +
net/tipc/name_table.c | 193 +-
net/tipc/name_table.h | 10 +-
net/tipc/net.c | 106 +
net/tipc/net.h | 8 +-
net/tipc/netlink.c | 133 +-
net/tipc/{node_subscr.h => netlink.h} | 35 +-
net/tipc/node.c | 106 +-
net/tipc/node.h | 16 +-
net/tipc/node_subscr.c | 96 -
net/tipc/socket.c | 381 +++-
net/tipc/socket.h | 3 +
net/unix/af_unix.c | 17 +-
net/vmw_vsock/af_vsock.c | 6 +-
net/vmw_vsock/vmci_transport.c | 17 +-
net/wireless/Makefile | 2 +-
net/wireless/chan.c | 10 +-
net/wireless/core.c | 81 +-
net/wireless/core.h | 13 +
net/wireless/nl80211.c | 718 ++++++-
net/wireless/ocb.c | 88 +
net/wireless/rdev-ops.h | 79 +-
net/wireless/reg.c | 49 +-
net/wireless/sme.c | 13 +-
net/wireless/trace.h | 155 +-
net/wireless/util.c | 5 +-
net/x25/af_x25.c | 4 +-
samples/bpf/Makefile | 3 +-
samples/bpf/libbpf.c | 3 +-
samples/bpf/libbpf.h | 2 +-
samples/bpf/test_maps.c | 291 +++
samples/bpf/test_verifier.c | 60 +-
1002 files changed, 44186 insertions(+), 22338 deletions(-)
create mode 100644 Documentation/networking/ipvlan.txt
create mode 100644 drivers/net/dsa/mv88e6352.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h
create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h
create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.h
delete mode 100644 drivers/net/ieee802154/fakehard.c
create mode 100644 drivers/net/ipvlan/Makefile
create mode 100644 drivers/net/ipvlan/ipvlan.h
create mode 100644 drivers/net/ipvlan/ipvlan_core.c
create mode 100644 drivers/net/ipvlan/ipvlan_main.c
rename drivers/net/wireless/ath/ath9k/{spectral.c => common-spectral.c} (73%)
rename drivers/net/wireless/ath/ath9k/{spectral.h => common-spectral.h} (85%)
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_bus.h => bus.h} (98%)
rename drivers/net/wireless/brcm80211/brcmfmac/{wl_cfg80211.c => cfg80211.c} (98%)
rename drivers/net/wireless/brcm80211/brcmfmac/{wl_cfg80211.h => cfg80211.h} (98%)
create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/common.c
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_linux.c => core.c} (99%)
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd.h => core.h} (98%)
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_dbg.c => debug.c} (98%)
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_dbg.h => debug.h} (98%)
delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
rename drivers/net/wireless/brcm80211/brcmfmac/{dhd_sdio.c => sdio.c} (98%)
rename drivers/net/wireless/brcm80211/brcmfmac/{sdio_host.h => sdio.h} (98%)
delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/usb_rdl.h
rename include/{net => linux}/ieee802154.h (79%)
rename {drivers/net/bonding => include/net}/bond_3ad.h (99%)
rename {drivers/net/bonding => include/net}/bond_alb.h (98%)
rename {drivers/net/bonding => include/net}/bond_options.h (97%)
rename {drivers/net/bonding => include/net}/bonding.h (98%)
create mode 100644 include/net/cfg802154.h
create mode 100644 include/net/fou.h
create mode 100644 include/net/mpls.h
create mode 100644 include/net/netfilter/ipv4/nf_nat_redirect.h
create mode 100644 include/net/netfilter/ipv6/nf_nat_redirect.h
create mode 100644 include/net/netfilter/nft_redir.h
create mode 100644 include/net/tc_act/tc_vlan.h
delete mode 100644 include/net/wpan-phy.h
create mode 100644 include/uapi/linux/tc_act/tc_vlan.h
create mode 100644 include/uapi/linux/tipc_netlink.h
create mode 100644 kernel/bpf/arraymap.c
create mode 100644 kernel/bpf/hashtab.c
create mode 100644 kernel/bpf/helpers.c
create mode 100644 net/ieee802154/core.c
create mode 100644 net/ieee802154/core.h
create mode 100644 net/ieee802154/nl802154.c
create mode 100644 net/ieee802154/nl802154.h
create mode 100644 net/ieee802154/rdev-ops.h
create mode 100644 net/ieee802154/sysfs.c
create mode 100644 net/ieee802154/sysfs.h
delete mode 100644 net/ieee802154/wpan-class.c
create mode 100644 net/ipv4/netfilter/nf_nat_redirect_ipv4.c
create mode 100644 net/ipv4/netfilter/nft_redir_ipv4.c
create mode 100644 net/ipv6/netfilter/nf_nat_redirect_ipv6.c
create mode 100644 net/ipv6/netfilter/nft_redir_ipv6.c
create mode 100644 net/mac80211/ocb.c
create mode 100644 net/mac802154/cfg.c
create mode 100644 net/mac802154/cfg.h
create mode 100644 net/mac802154/driver-ops.h
delete mode 100644 net/mac802154/ieee802154_dev.c
rename net/mac802154/{mac802154.h => ieee802154_i.h} (63%)
create mode 100644 net/mac802154/iface.c
create mode 100644 net/mac802154/main.c
delete mode 100644 net/mac802154/monitor.c
create mode 100644 net/mac802154/util.c
delete mode 100644 net/mac802154/wpan.c
create mode 100644 net/netfilter/nft_redir.c
create mode 100644 net/sched/act_vlan.c
rename net/tipc/{node_subscr.h => netlink.h} (63%)
delete mode 100644 net/tipc/node_subscr.c
create mode 100644 net/wireless/ocb.c
create mode 100644 samples/bpf/test_maps.c
Merging ipsec-next/master (12bfa8bdba05 xfrm: Use __xfrm_policy_link in xfrm_policy_insert)
$ git merge ipsec-next/master
Auto-merging net/xfrm/xfrm_policy.c
Merge made by the 'recursive' strategy.
include/net/netns/xfrm.h | 4 ++--
net/xfrm/xfrm_policy.c | 52 +++++++++++++++++++++++++++---------------------
net/xfrm/xfrm_user.c | 12 +++++++----
3 files changed, 39 insertions(+), 29 deletions(-)
Merging wireless-next/master (18ca43823f3c mwifiex: add Tx status support for ACTION frames)
$ git merge wireless-next/master
Resolved 'drivers/net/wireless/iwlwifi/iwl-fw.h' using previous resolution.
Removing drivers/net/wireless/p54/net2280.h
Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
Auto-merging drivers/net/wireless/iwlwifi/iwl-fw.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-fw.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d3b7dc26b146] Merge remote-tracking branch 'wireless-next/master'
$ git diff -M --stat --summary HEAD^..
drivers/net/wireless/ath/ath9k/ar9002_mac.c | 8 +-
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 47 ++
drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 +-
drivers/net/wireless/ath/ath9k/ar9003_phy.c | 174 +++++
drivers/net/wireless/ath/ath9k/ath9k.h | 1 +
drivers/net/wireless/ath/ath9k/beacon.c | 5 +-
drivers/net/wireless/ath/ath9k/hw.h | 6 +
drivers/net/wireless/ath/ath9k/mac.h | 2 +-
drivers/net/wireless/ath/ath9k/reg.h | 2 +
drivers/net/wireless/ath/ath9k/xmit.c | 37 +-
drivers/net/wireless/ath/dfs_pattern_detector.c | 4 +-
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 8 +-
drivers/net/wireless/iwlwifi/Kconfig | 2 +-
drivers/net/wireless/iwlwifi/iwl-7000.c | 38 +-
drivers/net/wireless/iwlwifi/iwl-8000.c | 23 +
drivers/net/wireless/iwlwifi/iwl-config.h | 10 +
drivers/net/wireless/iwlwifi/iwl-csr.h | 39 +-
drivers/net/wireless/iwlwifi/iwl-debug.h | 3 +-
drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-fw.h | 10 +-
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 5 +-
drivers/net/wireless/iwlwifi/iwl-op-mode.h | 3 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 12 +-
drivers/net/wireless/iwlwifi/iwl-trans.h | 14 +
drivers/net/wireless/iwlwifi/mvm/coex.c | 16 +
drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 19 +-
drivers/net/wireless/iwlwifi/mvm/constants.h | 2 +
drivers/net/wireless/iwlwifi/mvm/d3.c | 190 ++++--
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 14 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 9 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 253 +++++++
drivers/net/wireless/iwlwifi/mvm/fw-api.h | 169 +++++
drivers/net/wireless/iwlwifi/mvm/fw.c | 28 +
drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 86 ++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 419 ++++++++++--
drivers/net/wireless/iwlwifi/mvm/mvm.h | 130 +++-
drivers/net/wireless/iwlwifi/mvm/ops.c | 45 +-
drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 +-
drivers/net/wireless/iwlwifi/mvm/power.c | 40 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 45 +-
drivers/net/wireless/iwlwifi/mvm/rx.c | 150 ++--
drivers/net/wireless/iwlwifi/mvm/scan.c | 753 +++++++++++++++++++--
drivers/net/wireless/iwlwifi/mvm/sta.c | 301 ++++++--
drivers/net/wireless/iwlwifi/mvm/sta.h | 5 +
drivers/net/wireless/iwlwifi/mvm/tdls.c | 569 +++++++++++++++-
drivers/net/wireless/iwlwifi/mvm/time-event.c | 146 +++-
drivers/net/wireless/iwlwifi/mvm/time-event.h | 4 +-
drivers/net/wireless/iwlwifi/mvm/tt.c | 71 +-
drivers/net/wireless/iwlwifi/mvm/tx.c | 39 +-
drivers/net/wireless/iwlwifi/pcie/drv.c | 20 +
drivers/net/wireless/iwlwifi/pcie/trans.c | 37 +-
drivers/net/wireless/iwlwifi/pcie/tx.c | 3 +
drivers/net/wireless/mwifiex/cfg80211.c | 16 +-
drivers/net/wireless/mwifiex/decl.h | 4 +
drivers/net/wireless/mwifiex/fw.h | 17 +-
drivers/net/wireless/mwifiex/init.c | 3 +
drivers/net/wireless/mwifiex/main.c | 68 +-
drivers/net/wireless/mwifiex/main.h | 11 +
drivers/net/wireless/mwifiex/scan.c | 2 +-
drivers/net/wireless/mwifiex/sta_event.c | 5 +
drivers/net/wireless/mwifiex/sta_tx.c | 6 +
drivers/net/wireless/mwifiex/txrx.c | 31 +
drivers/net/wireless/mwifiex/uap_event.c | 4 +
drivers/net/wireless/mwifiex/uap_txrx.c | 8 +-
drivers/net/wireless/mwifiex/util.c | 2 +-
drivers/net/wireless/mwifiex/wmm.c | 10 +
drivers/net/wireless/p54/net2280.h | 451 ------------
drivers/net/wireless/p54/p54usb.h | 13 +-
drivers/net/wireless/rtlwifi/core.c | 14 +
drivers/net/wireless/rtlwifi/rtl8192ee/Makefile | 5 +-
drivers/net/wireless/rtlwifi/rtl8723ae/Makefile | 3 -
drivers/net/wireless/rtlwifi/rtl8723be/Makefile | 3 -
drivers/net/wireless/rtlwifi/rtl8821ae/Makefile | 3 -
74 files changed, 3735 insertions(+), 976 deletions(-)
delete mode 100644 drivers/net/wireless/p54/net2280.h
Merging bluetooth/master (f6af675ef548 Bluetooth: Automatically flushable packets aren't allowed on LE links)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/btmrvl.txt | 29 ++++++++++++++++
drivers/bluetooth/ath3k.c | 2 ++
drivers/bluetooth/btmrvl_main.c | 51 ++++++++++++++++------------
drivers/bluetooth/btusb.c | 1 +
include/net/bluetooth/hci_core.h | 1 +
net/bluetooth/hci_core.c | 39 ++++++++++-----------
net/bluetooth/hci_event.c | 51 +++++++++++++++++++++++-----
net/bluetooth/l2cap_core.c | 14 ++++++--
net/ieee802154/6lowpan_rtnl.c | 2 +-
net/ieee802154/netlink.c | 2 +-
net/ieee802154/nl-mac.c | 2 +-
net/ieee802154/nl-phy.c | 2 +-
net/mac802154/iface.c | 8 ++---
13 files changed, 143 insertions(+), 61 deletions(-)
create mode 100644 Documentation/devicetree/bindings/btmrvl.txt
Merging infiniband/for-next (7b909bb49ac2 Merge branches 'core', 'cxgb4', 'iser', 'mlx5' and 'ocrdma' into for-next)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (89cf38dd536a mtd: cfi_cmdset_0001.c: fix resume for LH28F640BF chips)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (c30e1f790b0e mtd: nand: correct the comment of function nand_block_isreserved())
$ git merge l2-mtd/master
Merge made by the 'recursive' strategy.
.../devicetree/bindings/mtd/atmel-nand.txt | 6 +-
.../devicetree/bindings/mtd/diskonchip.txt | 15 +
.../devicetree/bindings/mtd/gpio-control-nand.txt | 14 +-
.../devicetree/bindings/mtd/sunxi-nand.txt | 45 +
drivers/memory/fsl_ifc.c | 13 +-
drivers/mtd/Kconfig | 2 +-
drivers/mtd/bcm47xxpart.c | 28 +-
drivers/mtd/chips/cfi_cmdset_0001.c | 3 +-
drivers/mtd/devices/docg3.c | 122 +-
drivers/mtd/devices/m25p80.c | 24 +-
drivers/mtd/devices/mtd_dataflash.c | 6 +-
drivers/mtd/devices/phram.c | 2 +-
drivers/mtd/devices/pmc551.c | 3 +-
drivers/mtd/inftlmount.c | 2 +-
drivers/mtd/maps/bfin-async-flash.c | 1 -
drivers/mtd/nand/Kconfig | 12 +-
drivers/mtd/nand/Makefile | 1 +
drivers/mtd/nand/atmel_nand.c | 120 +-
drivers/mtd/nand/atmel_nand_ecc.h | 4 +
drivers/mtd/nand/cafe_nand.c | 45 -
drivers/mtd/nand/fsl_ifc_nand.c | 10 +-
drivers/mtd/nand/gpio.c | 4 +-
drivers/mtd/nand/mxc_nand.c | 10 +-
drivers/mtd/nand/nand_base.c | 12 +-
drivers/mtd/nand/nand_ids.c | 1 +
drivers/mtd/nand/nandsim.c | 42 +-
drivers/mtd/nand/omap2.c | 24 +-
drivers/mtd/nand/orion_nand.c | 39 +-
drivers/mtd/nand/sunxi_nand.c | 1432 ++++++++++++++++++++
drivers/mtd/spi-nor/fsl-quadspi.c | 18 +-
drivers/mtd/spi-nor/spi-nor.c | 157 +--
drivers/mtd/tests/oobtest.c | 77 +-
fs/jffs2/readinode.c | 2 +-
fs/jffs2/summary.c | 1 +
include/linux/fsl_ifc.h | 21 +-
include/linux/mtd/nand.h | 18 +-
include/linux/mtd/spi-nor.h | 11 +-
37 files changed, 1954 insertions(+), 393 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mtd/diskonchip.txt
create mode 100644 Documentation/devicetree/bindings/mtd/sunxi-nand.txt
create mode 100644 drivers/mtd/nand/sunxi_nand.c
Merging crypto/master (1e104f9a251b crypto: algif_skcipher - Fixed blocking recvmsg)
$ git merge crypto/master
Auto-merging net/core/sock.c
Auto-merging include/net/sock.h
Auto-merging drivers/crypto/qat/qat_dh895xcc/adf_isr.c
Auto-merging drivers/crypto/qat/qat_common/qat_algs.c
Auto-merging drivers/crypto/qat/qat_common/adf_accel_devices.h
Auto-merging crypto/algif_skcipher.c
Auto-merging crypto/algif_hash.c
Auto-merging arch/arm64/crypto/aes-glue.c
Auto-merging arch/arm64/crypto/aes-ce-ccm-glue.c
Auto-merging arch/arm64/crypto/Kconfig
Auto-merging arch/arm/boot/dts/at91sam9g45.dtsi
Merge made by the 'recursive' strategy.
Documentation/DocBook/Makefile | 2 +-
Documentation/DocBook/crypto-API.tmpl | 1253 ++++++++++
Documentation/crypto/crypto-API-userspace.txt | 205 ++
.../devicetree/bindings/hwrng/atmel-trng.txt | 16 +
arch/arm/boot/dts/at91sam9g45.dtsi | 7 +
arch/arm/crypto/aes_glue.c | 4 +-
arch/arm/crypto/sha1_glue.c | 2 +-
arch/arm/crypto/sha1_neon_glue.c | 2 +-
arch/arm/crypto/sha512_neon_glue.c | 4 +-
arch/arm64/crypto/Kconfig | 4 +
arch/arm64/crypto/Makefile | 4 +
arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +-
arch/arm64/crypto/aes-glue.c | 8 +-
arch/arm64/crypto/crc32-arm64.c | 274 +++
arch/powerpc/crypto/sha1.c | 2 +-
arch/s390/crypto/aes_s390.c | 2 +-
arch/s390/crypto/des_s390.c | 4 +-
arch/s390/crypto/ghash_s390.c | 2 +-
arch/s390/crypto/sha1_s390.c | 2 +-
arch/s390/crypto/sha256_s390.c | 4 +-
arch/s390/crypto/sha512_s390.c | 4 +-
arch/sparc/crypto/aes_glue.c | 2 +-
arch/sparc/crypto/camellia_glue.c | 2 +-
arch/sparc/crypto/crc32c_glue.c | 2 +-
arch/sparc/crypto/des_glue.c | 2 +-
arch/sparc/crypto/md5_glue.c | 2 +-
arch/sparc/crypto/sha1_glue.c | 2 +-
arch/sparc/crypto/sha256_glue.c | 4 +-
arch/sparc/crypto/sha512_glue.c | 4 +-
arch/x86/crypto/aes_glue.c | 4 +-
arch/x86/crypto/aesni-intel_glue.c | 10 +-
arch/x86/crypto/blowfish_glue.c | 4 +-
arch/x86/crypto/camellia_aesni_avx2_glue.c | 4 +-
arch/x86/crypto/camellia_aesni_avx_glue.c | 4 +-
arch/x86/crypto/camellia_glue.c | 4 +-
arch/x86/crypto/cast5_avx_glue.c | 2 +-
arch/x86/crypto/cast6_avx_glue.c | 2 +-
arch/x86/crypto/crc32-pclmul_glue.c | 4 +-
arch/x86/crypto/crc32c-intel_glue.c | 4 +-
arch/x86/crypto/crct10dif-pclmul_glue.c | 4 +-
arch/x86/crypto/des3_ede_glue.c | 8 +-
arch/x86/crypto/fpu.c | 3 +
arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +-
arch/x86/crypto/salsa20_glue.c | 4 +-
arch/x86/crypto/serpent_avx2_glue.c | 4 +-
arch/x86/crypto/serpent_avx_glue.c | 2 +-
arch/x86/crypto/serpent_sse2_glue.c | 2 +-
arch/x86/crypto/sha-mb/sha1_mb.c | 3 +-
arch/x86/crypto/sha1_ssse3_glue.c | 2 +-
arch/x86/crypto/sha256_ssse3_glue.c | 4 +-
arch/x86/crypto/sha512_ssse3_glue.c | 4 +-
arch/x86/crypto/twofish_avx_glue.c | 2 +-
arch/x86/crypto/twofish_glue.c | 4 +-
arch/x86/crypto/twofish_glue_3way.c | 4 +-
crypto/842.c | 1 +
crypto/aes_generic.c | 2 +-
crypto/algapi.c | 4 +-
crypto/algif_hash.c | 4 +-
crypto/algif_skcipher.c | 7 +-
crypto/ansi_cprng.c | 2 +-
crypto/anubis.c | 1 +
crypto/api.c | 4 +-
crypto/arc4.c | 1 +
crypto/authenc.c | 1 +
crypto/authencesn.c | 1 +
crypto/blowfish_generic.c | 2 +-
crypto/camellia_generic.c | 2 +-
crypto/cast5_generic.c | 2 +-
crypto/cast6_generic.c | 2 +-
crypto/cbc.c | 1 +
crypto/ccm.c | 5 +-
crypto/chainiv.c | 1 +
crypto/cmac.c | 1 +
crypto/crc32.c | 1 +
crypto/crc32c_generic.c | 2 +-
crypto/crct10dif_generic.c | 2 +-
crypto/cryptd.c | 1 +
crypto/crypto_null.c | 6 +-
crypto/crypto_user.c | 6 +-
crypto/ctr.c | 3 +-
crypto/cts.c | 1 +
crypto/deflate.c | 2 +-
crypto/des_generic.c | 2 +-
crypto/drbg.c | 127 +-
crypto/ecb.c | 1 +
crypto/eseqiv.c | 1 +
crypto/fcrypt.c | 1 +
crypto/gcm.c | 7 +-
crypto/ghash-generic.c | 2 +-
crypto/hmac.c | 1 +
crypto/khazad.c | 1 +
crypto/krng.c | 2 +-
crypto/lrw.c | 1 +
crypto/lz4.c | 1 +
crypto/lz4hc.c | 1 +
crypto/lzo.c | 1 +
crypto/mcryptd.c | 1 +
crypto/md4.c | 2 +-
crypto/md5.c | 1 +
crypto/michael_mic.c | 1 +
crypto/pcbc.c | 1 +
crypto/pcrypt.c | 1 +
crypto/rmd128.c | 1 +
crypto/rmd160.c | 1 +
crypto/rmd256.c | 1 +
crypto/rmd320.c | 1 +
crypto/salsa20_generic.c | 2 +-
crypto/seed.c | 1 +
crypto/seqiv.c | 1 +
crypto/serpent_generic.c | 4 +-
crypto/sha1_generic.c | 2 +-
crypto/sha256_generic.c | 4 +-
crypto/sha512_generic.c | 4 +-
crypto/tea.c | 4 +-
crypto/testmgr.c | 3 +-
crypto/tgr192.c | 4 +-
crypto/twofish_generic.c | 2 +-
crypto/vmac.c | 1 +
crypto/wp512.c | 4 +-
crypto/xcbc.c | 1 +
crypto/xts.c | 1 +
crypto/zlib.c | 1 +
drivers/char/hw_random/Kconfig | 2 +-
drivers/char/hw_random/atmel-rng.c | 15 +-
drivers/char/hw_random/core.c | 12 +-
drivers/crypto/bfin_crc.c | 2 +-
drivers/crypto/caam/caamalg.c | 2412 +++++++++++++++++---
drivers/crypto/caam/compat.h | 1 +
drivers/crypto/caam/desc_constr.h | 2 +
drivers/crypto/caam/error.c | 25 +-
drivers/crypto/caam/jr.c | 3 -
drivers/crypto/nx/nx-aes-cbc.c | 12 +-
drivers/crypto/nx/nx-aes-ccm.c | 61 +-
drivers/crypto/nx/nx-aes-ctr.c | 13 +-
drivers/crypto/nx/nx-aes-ecb.c | 12 +-
drivers/crypto/nx/nx-aes-gcm.c | 66 +-
drivers/crypto/nx/nx-aes-xcbc.c | 81 +-
drivers/crypto/nx/nx-sha256.c | 208 +-
drivers/crypto/nx/nx-sha512.c | 222 +-
drivers/crypto/nx/nx.c | 127 +-
drivers/crypto/nx/nx.h | 8 +-
drivers/crypto/padlock-aes.c | 2 +-
drivers/crypto/padlock-sha.c | 8 +-
drivers/crypto/qat/qat_common/adf_accel_devices.h | 2 -
drivers/crypto/qat/qat_common/adf_aer.c | 2 +-
drivers/crypto/qat/qat_common/adf_ctl_drv.c | 3 +-
drivers/crypto/qat/qat_common/adf_dev_mgr.c | 6 +-
.../qat/qat_common/adf_transport_access_macros.h | 9 +-
drivers/crypto/qat/qat_common/qat_algs.c | 37 +-
drivers/crypto/qat/qat_common/qat_hal.c | 3 +-
.../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 2 +
drivers/crypto/qat/qat_dh895xcc/adf_isr.c | 12 +-
drivers/crypto/ux500/cryp/cryp_core.c | 6 +-
drivers/crypto/ux500/hash/hash_core.c | 10 +-
drivers/s390/crypto/ap_bus.c | 3 +-
include/crypto/hash.h | 492 ++++
include/crypto/rng.h | 80 +
include/linux/crypto.h | 1112 ++++++++-
include/net/sock.h | 1 +
net/core/sock.c | 24 +-
160 files changed, 6340 insertions(+), 946 deletions(-)
create mode 100644 Documentation/DocBook/crypto-API.tmpl
create mode 100644 Documentation/crypto/crypto-API-userspace.txt
create mode 100644 Documentation/devicetree/bindings/hwrng/atmel-trng.txt
create mode 100644 arch/arm64/crypto/crc32-arm64.c
Merging drm/drm-next (21769c675412 Merge branch 'drm/du/adv7511' of git://linuxtv.org/pinchartl/fbdev into drm-next)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/exynos/exynos_drm_drv.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/i915_drv.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/intel_pm.c' using previous resolution.
Resolved 'drivers/gpu/drm/tegra/dc.c' using previous resolution.
Auto-merging mm/memory.c
Auto-merging mm/huge_memory.c
Auto-merging kernel/events/uprobes.c
Removing include/linux/platform_data/rcar-du.h
Removing drivers/staging/imx-drm/TODO
Auto-merging drivers/gpu/drm/tegra/dc.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/dc.c
Auto-merging drivers/gpu/drm/radeon/si.c
Auto-merging drivers/gpu/drm/radeon/radeon_device.c
Auto-merging drivers/gpu/drm/radeon/r600_dpm.c
Auto-merging drivers/gpu/drm/radeon/r600_dma.c
Auto-merging drivers/gpu/drm/radeon/cik_sdma.c
Auto-merging drivers/gpu/drm/radeon/cik.c
Auto-merging drivers/gpu/drm/nouveau/nv50_display.c
Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_panel.c
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem_tiling.c
Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.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
Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/exynos/exynos_drm_drv.c
Removing drivers/gpu/drm/README.drm
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
[master 4bc6b3b727d7] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
CREDITS | 7 +
Documentation/DocBook/drm.tmpl | 372 +-
.../{staging/imx-drm => drm/imx}/fsl-imx-drm.txt | 0
.../bindings/{staging/imx-drm => drm/imx}/hdmi.txt | 0
.../bindings/{staging/imx-drm => drm/imx}/ldb.txt | 0
.../bindings/gpu/nvidia,tegra20-host1x.txt | 2 +
.../devicetree/bindings/panel/auo,b116xw03.txt | 7 +
.../bindings/panel/hannstar,hsd070pww1.txt | 7 +
.../bindings/panel/hit,tx23d38vm0caa.txt | 7 +
.../bindings/panel/innolux,g121i1-l01.txt | 7 +
.../bindings/panel/sharp,lq101r1sx01.txt | 49 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
.../devicetree/bindings/video/adi,adv7511.txt | 88 +
.../devicetree/bindings/video/exynos_dsim.txt | 1 +
.../devicetree/bindings/video/samsung-fimd.txt | 1 +
MAINTAINERS | 17 +
arch/x86/kernel/early-quirks.c | 23 +
drivers/char/agp/intel-gtt.c | 4 -
drivers/gpu/drm/Kconfig | 4 +
drivers/gpu/drm/Makefile | 6 +-
drivers/gpu/drm/README.drm | 43 -
drivers/gpu/drm/amd/amdkfd/Kconfig | 9 +
drivers/gpu/drm/amd/amdkfd/Makefile | 14 +
drivers/gpu/drm/amd/amdkfd/cik_regs.h | 221 +
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 584 ++
drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 294 +
drivers/gpu/drm/amd/amdkfd/kfd_device.c | 308 +
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1062 +++
.../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 146 +
drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 256 +
drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 356 +
drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 176 +
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 347 +
drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 69 +
drivers/gpu/drm/amd/amdkfd/kfd_module.c | 159 +
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 346 +
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 91 +
drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 565 ++
drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 97 +
drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 405 ++
drivers/gpu/drm/amd/amdkfd/kfd_pm4_opcodes.h | 107 +
drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 600 ++
drivers/gpu/drm/amd/amdkfd/kfd_process.c | 410 ++
.../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 343 +
drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 85 +
drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1235 ++++
drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 168 +
drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 185 +
drivers/gpu/drm/armada/armada_crtc.c | 1 +
drivers/gpu/drm/ast/ast_mode.c | 1 +
drivers/gpu/drm/bochs/bochs_fbdev.c | 18 +-
drivers/gpu/drm/bochs/bochs_hw.c | 23 +-
drivers/gpu/drm/bochs/bochs_kms.c | 22 +
drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +
drivers/gpu/drm/cirrus/cirrus_fbdev.c | 5 +-
drivers/gpu/drm/cirrus/cirrus_main.c | 40 +-
drivers/gpu/drm/cirrus/cirrus_mode.c | 1 +
drivers/gpu/drm/drm_atomic.c | 647 ++
drivers/gpu/drm/drm_atomic_helper.c | 1913 ++++++
drivers/gpu/drm/drm_crtc.c | 338 +-
drivers/gpu/drm/drm_crtc_helper.c | 132 +
drivers/gpu/drm/drm_dp_helper.c | 194 +-
drivers/gpu/drm/drm_dp_mst_topology.c | 43 +-
drivers/gpu/drm/drm_drv.c | 5 +-
drivers/gpu/drm/drm_edid.c | 43 +-
drivers/gpu/drm/drm_edid_load.c | 3 +-
drivers/gpu/drm/drm_fb_helper.c | 1 -
drivers/gpu/drm/drm_flip_work.c | 105 +-
drivers/gpu/drm/drm_fops.c | 12 +-
drivers/gpu/drm/drm_gem.c | 13 +-
drivers/gpu/drm/drm_gem_cma_helper.c | 259 +-
drivers/gpu/drm/drm_irq.c | 7 +-
drivers/gpu/drm/drm_mipi_dsi.c | 660 +-
drivers/gpu/drm/drm_modes.c | 2 +-
drivers/gpu/drm/drm_modeset_lock.c | 43 +-
drivers/gpu/drm/drm_plane_helper.c | 203 +-
drivers/gpu/drm/drm_prime.c | 6 +-
drivers/gpu/drm/drm_probe_helper.c | 3 +-
drivers/gpu/drm/exynos/exynos_dp_core.c | 132 +-
drivers/gpu/drm/exynos/exynos_dp_core.h | 5 +-
drivers/gpu/drm/exynos/exynos_drm_crtc.h | 5 +-
drivers/gpu/drm/exynos/exynos_drm_dpi.c | 42 +-
drivers/gpu/drm/exynos/exynos_drm_drv.c | 246 +-
drivers/gpu/drm/exynos/exynos_drm_drv.h | 83 +-
drivers/gpu/drm/exynos/exynos_drm_dsi.c | 129 +-
drivers/gpu/drm/exynos/exynos_drm_encoder.h | 2 -
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 266 +-
drivers/gpu/drm/exynos/exynos_drm_iommu.h | 1 -
drivers/gpu/drm/exynos/exynos_drm_ipp.c | 3 +
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 150 +-
drivers/gpu/drm/exynos/exynos_hdmi.c | 65 +-
drivers/gpu/drm/exynos/exynos_mixer.c | 126 +-
drivers/gpu/drm/gma500/cdv_intel_dp.c | 195 +
drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 75 +-
drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.h | 12 -
drivers/gpu/drm/gma500/psb_intel_display.c | 1 +
drivers/gpu/drm/gma500/psb_intel_sdvo.c | 49 -
drivers/gpu/drm/i2c/Kconfig | 6 +
drivers/gpu/drm/i2c/Makefile | 2 +
drivers/gpu/drm/i2c/adv7511.c | 1010 +++
drivers/gpu/drm/i2c/adv7511.h | 289 +
drivers/gpu/drm/i915/Makefile | 12 +-
drivers/gpu/drm/i915/i915_cmd_parser.c | 33 +-
drivers/gpu/drm/i915/i915_debugfs.c | 180 +-
drivers/gpu/drm/i915/i915_dma.c | 41 +-
drivers/gpu/drm/i915/i915_drv.c | 338 +-
drivers/gpu/drm/i915/i915_drv.h | 212 +-
drivers/gpu/drm/i915/i915_gem.c | 228 +-
drivers/gpu/drm/i915/i915_gem_context.c | 10 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 38 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 62 +-
drivers/gpu/drm/i915/i915_gem_gtt.h | 8 +-
drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +
drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 42 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 26 +-
drivers/gpu/drm/i915/i915_ioc32.c | 2 -
drivers/gpu/drm/i915/i915_irq.c | 790 +--
drivers/gpu/drm/i915/i915_reg.h | 512 +-
drivers/gpu/drm/i915/i915_sysfs.c | 22 +-
drivers/gpu/drm/i915/intel_audio.c | 462 ++
drivers/gpu/drm/i915/intel_bios.h | 10 +-
drivers/gpu/drm/i915/intel_crt.c | 4 +-
drivers/gpu/drm/i915/intel_ddi.c | 115 +-
drivers/gpu/drm/i915/intel_display.c | 2359 ++++---
drivers/gpu/drm/i915/intel_dp.c | 623 +-
drivers/gpu/drm/i915/intel_dp_mst.c | 12 +-
drivers/gpu/drm/i915/intel_drv.h | 169 +-
drivers/gpu/drm/i915/intel_dsi.c | 2 +-
drivers/gpu/drm/i915/intel_fbdev.c | 20 +-
drivers/gpu/drm/i915/intel_fifo_underrun.c | 381 ++
drivers/gpu/drm/i915/intel_frontbuffer.c | 279 +
drivers/gpu/drm/i915/intel_hdmi.c | 44 +-
drivers/gpu/drm/i915/intel_lrc.c | 56 +-
drivers/gpu/drm/i915/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/intel_panel.c | 37 +-
drivers/gpu/drm/i915/intel_pm.c | 6772 ++++++++++----------
drivers/gpu/drm/i915/intel_renderstate.h | 1 +
drivers/gpu/drm/i915/intel_renderstate_gen8.c | 802 ++-
drivers/gpu/drm/i915/intel_renderstate_gen9.c | 974 +++
drivers/gpu/drm/i915/intel_ringbuffer.c | 223 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 1383 ++++
drivers/gpu/drm/i915/intel_sdvo.c | 47 -
drivers/gpu/drm/i915/intel_sprite.c | 604 +-
drivers/gpu/drm/i915/intel_tv.c | 9 +-
drivers/gpu/drm/i915/intel_uncore.c | 268 +-
drivers/{staging/imx-drm => gpu/drm/imx}/Kconfig | 0
drivers/{staging/imx-drm => gpu/drm/imx}/Makefile | 0
.../imx-drm => gpu/drm/imx}/imx-drm-core.c | 1 +
drivers/{staging/imx-drm => gpu/drm/imx}/imx-drm.h | 0
.../{staging/imx-drm => gpu/drm/imx}/imx-hdmi.c | 0
.../{staging/imx-drm => gpu/drm/imx}/imx-hdmi.h | 0
drivers/{staging/imx-drm => gpu/drm/imx}/imx-ldb.c | 0
drivers/{staging/imx-drm => gpu/drm/imx}/imx-tve.c | 0
.../{staging/imx-drm => gpu/drm/imx}/ipuv3-crtc.c | 0
.../{staging/imx-drm => gpu/drm/imx}/ipuv3-plane.c | 0
.../{staging/imx-drm => gpu/drm/imx}/ipuv3-plane.h | 0
.../imx-drm => gpu/drm/imx}/parallel-display.c | 0
drivers/gpu/drm/mgag200/mgag200_mode.c | 1 +
drivers/gpu/drm/msm/Kconfig | 1 +
drivers/gpu/drm/msm/Makefile | 4 +
drivers/gpu/drm/msm/adreno/a2xx.xml.h | 26 +-
drivers/gpu/drm/msm/adreno/a3xx.xml.h | 247 +-
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 91 +
drivers/gpu/drm/msm/adreno/a4xx.xml.h | 2144 +++++++
drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 604 ++
drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 34 +
drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 17 +-
drivers/gpu/drm/msm/adreno/adreno_device.c | 13 +
drivers/gpu/drm/msm/adreno/adreno_gpu.c | 31 +-
drivers/gpu/drm/msm/adreno/adreno_gpu.h | 126 +
drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 75 +-
drivers/gpu/drm/msm/dsi/dsi.xml.h | 8 +-
drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 8 +-
drivers/gpu/drm/msm/dsi/sfpb.xml.h | 8 +-
drivers/gpu/drm/msm/hdmi/hdmi.c | 144 +-
drivers/gpu/drm/msm/hdmi/hdmi.h | 17 -
drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 8 +-
drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 3 +-
drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 7 +-
drivers/gpu/drm/msm/hdmi/hdmi_phy_8960.c | 2 +-
drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 8 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h | 8 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 348 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 17 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 17 -
drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 3 +
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 120 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h | 10 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 207 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 91 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 467 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 322 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 122 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 24 +
drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 93 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 273 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 131 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 327 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 241 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.h | 23 +-
drivers/gpu/drm/msm/msm_atomic.c | 163 +
drivers/gpu/drm/msm/msm_drv.c | 25 +
drivers/gpu/drm/msm/msm_drv.h | 35 +-
drivers/gpu/drm/msm/msm_fb.c | 45 +-
drivers/gpu/drm/msm/msm_fbdev.c | 3 -
drivers/gpu/drm/msm/msm_gem.c | 40 +-
drivers/gpu/drm/msm/msm_gem.h | 13 +
drivers/gpu/drm/msm/msm_gem_prime.c | 13 +
drivers/gpu/drm/msm/msm_kms.h | 23 +
drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 +
drivers/gpu/drm/nouveau/nouveau_display.c | 9 +
drivers/gpu/drm/nouveau/nouveau_gem.c | 3 +
drivers/gpu/drm/nouveau/nv50_display.c | 1 +
drivers/gpu/drm/omapdrm/omap_crtc.c | 1 +
drivers/gpu/drm/omapdrm/omap_gem.c | 3 +-
drivers/gpu/drm/omapdrm/omap_plane.c | 15 +-
drivers/gpu/drm/panel/Kconfig | 13 +
drivers/gpu/drm/panel/Makefile | 1 +
drivers/gpu/drm/panel/panel-ld9040.c | 13 +-
drivers/gpu/drm/panel/panel-s6e8aa0.c | 30 +-
drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 464 ++
drivers/gpu/drm/panel/panel-simple.c | 133 +-
drivers/gpu/drm/qxl/qxl_display.c | 36 +-
drivers/gpu/drm/r128/r128_state.c | 4 +-
drivers/gpu/drm/radeon/Makefile | 4 +-
drivers/gpu/drm/radeon/ci_dpm.c | 753 ++-
drivers/gpu/drm/radeon/ci_dpm.h | 8 +
drivers/gpu/drm/radeon/ci_smc.c | 2 +-
drivers/gpu/drm/radeon/cik.c | 214 +-
drivers/gpu/drm/radeon/cik_reg.h | 136 +
drivers/gpu/drm/radeon/cik_sdma.c | 42 +-
drivers/gpu/drm/radeon/cikd.h | 93 +-
drivers/gpu/drm/radeon/evergreen_dma.c | 18 +-
drivers/gpu/drm/radeon/ni.c | 20 +-
drivers/gpu/drm/radeon/ni_dma.c | 17 +-
drivers/gpu/drm/radeon/ppsmc.h | 18 +-
drivers/gpu/drm/radeon/pptable.h | 8 +
drivers/gpu/drm/radeon/r600.c | 18 +-
drivers/gpu/drm/radeon/r600_dma.c | 18 +-
drivers/gpu/drm/radeon/r600_dpm.c | 9 +
drivers/gpu/drm/radeon/r600_dpm.h | 3 +
drivers/gpu/drm/radeon/radeon.h | 119 +-
drivers/gpu/drm/radeon/radeon_asic.h | 18 +-
drivers/gpu/drm/radeon/radeon_atombios.c | 21 +-
drivers/gpu/drm/radeon/radeon_cs.c | 12 +-
drivers/gpu/drm/radeon/radeon_cursor.c | 229 +-
drivers/gpu/drm/radeon/radeon_device.c | 32 +
drivers/gpu/drm/radeon/radeon_display.c | 3 +-
drivers/gpu/drm/radeon/radeon_drv.c | 5 +
drivers/gpu/drm/radeon/radeon_fence.c | 1 +
drivers/gpu/drm/radeon/radeon_gem.c | 92 +-
drivers/gpu/drm/radeon/radeon_ib.c | 16 +-
drivers/gpu/drm/radeon/radeon_kfd.c | 563 ++
drivers/gpu/drm/radeon/radeon_kfd.h | 47 +
drivers/gpu/drm/radeon/radeon_kms.c | 9 +-
drivers/gpu/drm/radeon/radeon_mode.h | 19 +-
drivers/gpu/drm/radeon/radeon_object.c | 68 +-
drivers/gpu/drm/radeon/radeon_object.h | 2 +
drivers/gpu/drm/radeon/radeon_semaphore.c | 154 +-
drivers/gpu/drm/radeon/radeon_sync.c | 220 +
drivers/gpu/drm/radeon/radeon_ttm.c | 25 +-
drivers/gpu/drm/radeon/radeon_vm.c | 164 +-
drivers/gpu/drm/radeon/rv770_dma.c | 18 +-
drivers/gpu/drm/radeon/si.c | 24 +-
drivers/gpu/drm/radeon/si_dma.c | 37 +-
drivers/gpu/drm/radeon/si_dpm.c | 381 +-
drivers/gpu/drm/radeon/si_dpm.h | 5 +
drivers/gpu/drm/radeon/si_smc.c | 2 +-
drivers/gpu/drm/radeon/sid.h | 40 +-
drivers/gpu/drm/radeon/sislands_smc.h | 25 +
drivers/gpu/drm/radeon/smu7_discrete.h | 30 +-
drivers/gpu/drm/rcar-du/Kconfig | 11 +-
drivers/gpu/drm/rcar-du/Makefile | 2 +
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 3 +-
drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 10 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 4 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 -
drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 45 +-
drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 23 +-
drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 118 +
drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h | 31 +
drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 151 +
drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h | 35 +
drivers/gpu/drm/rcar-du/rcar_du_kms.c | 57 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 31 +-
drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 2 -
drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 1 -
drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 5 +-
drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 1 +
drivers/gpu/drm/sti/sti_drm_crtc.c | 1 +
drivers/gpu/drm/tegra/Kconfig | 1 +
drivers/gpu/drm/tegra/dc.c | 596 +-
drivers/gpu/drm/tegra/drm.c | 46 +-
drivers/gpu/drm/tegra/drm.h | 18 +-
drivers/gpu/drm/tegra/dsi.c | 811 ++-
drivers/gpu/drm/tegra/dsi.h | 14 +-
drivers/gpu/drm/tegra/fb.c | 52 +-
drivers/gpu/drm/tegra/gem.c | 366 +-
drivers/gpu/drm/tegra/gem.h | 14 +-
drivers/gpu/drm/tegra/output.c | 35 +-
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 7 +-
drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-
drivers/gpu/drm/ttm/ttm_bo_manager.c | 8 +-
drivers/gpu/drm/ttm/ttm_page_alloc.c | 26 +-
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 25 +-
drivers/gpu/drm/udl/Makefile | 2 +-
drivers/gpu/drm/udl/udl_dmabuf.c | 276 +
drivers/gpu/drm/udl/udl_drv.c | 2 +
drivers/gpu/drm/udl/udl_drv.h | 8 +
drivers/gpu/drm/udl/udl_gem.c | 97 +-
drivers/gpu/drm/udl/udl_modeset.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 3 +-
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 4 +-
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 1 +
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 1 +
drivers/gpu/host1x/cdma.c | 2 +-
drivers/gpu/host1x/cdma.h | 2 +-
drivers/gpu/host1x/hw/cdma_hw.c | 10 +-
drivers/gpu/host1x/hw/channel_hw.c | 12 +-
drivers/gpu/host1x/hw/debug_hw.c | 4 +-
drivers/gpu/host1x/job.h | 2 +-
drivers/gpu/host1x/mipi.c | 148 +-
drivers/iommu/amd_iommu_v2.c | 69 +-
drivers/staging/Kconfig | 2 -
drivers/staging/Makefile | 1 -
drivers/staging/imx-drm/TODO | 17 -
include/drm/drmP.h | 25 +-
include/drm/drm_atomic.h | 67 +
include/drm/drm_atomic_helper.h | 100 +
include/drm/drm_crtc.h | 268 +-
include/drm/drm_crtc_helper.h | 13 +
include/drm/drm_dp_helper.h | 26 +-
include/drm/drm_dp_mst_helper.h | 4 +-
include/drm/drm_edid.h | 107 +
include/drm/drm_flip_work.h | 33 +-
include/drm/drm_gem.h | 7 +
include/drm/drm_gem_cma_helper.h | 30 +-
include/drm/drm_mipi_dsi.h | 94 +-
include/drm/drm_modeset_lock.h | 5 +-
include/drm/drm_plane_helper.h | 39 +
include/drm/i915_pciids.h | 17 +
include/linux/hdmi.h | 21 +-
include/linux/mmu_notifier.h | 88 +-
include/linux/platform_data/rcar-du.h | 74 -
include/trace/events/host1x.h | 27 +-
include/uapi/drm/drm_mode.h | 2 +
include/uapi/drm/i915_drm.h | 6 +
include/uapi/linux/kfd_ioctl.h | 154 +
kernel/events/uprobes.c | 2 +-
mm/fremap.c | 2 +-
mm/huge_memory.c | 9 +-
mm/hugetlb.c | 7 +-
mm/ksm.c | 4 +-
mm/memory.c | 3 +-
mm/migrate.c | 3 +-
mm/mmu_notifier.c | 25 +
mm/rmap.c | 2 +-
358 files changed, 39730 insertions(+), 11217 deletions(-)
rename Documentation/devicetree/bindings/{staging/imx-drm => drm/imx}/fsl-imx-drm.txt (100%)
rename Documentation/devicetree/bindings/{staging/imx-drm => drm/imx}/hdmi.txt (100%)
rename Documentation/devicetree/bindings/{staging/imx-drm => drm/imx}/ldb.txt (100%)
create mode 100644 Documentation/devicetree/bindings/panel/auo,b116xw03.txt
create mode 100644 Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt
create mode 100644 Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt
create mode 100644 Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt
create mode 100644 Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt
create mode 100644 Documentation/devicetree/bindings/video/adi,adv7511.txt
delete mode 100644 drivers/gpu/drm/README.drm
create mode 100644 drivers/gpu/drm/amd/amdkfd/Kconfig
create mode 100644 drivers/gpu/drm/amd/amdkfd/Makefile
create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_regs.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_crat.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_module.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pasid.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_opcodes.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_priv.h
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_process.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_process_queue_manager.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_queue.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_topology.c
create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_topology.h
create mode 100644 drivers/gpu/drm/amd/include/kgd_kfd_interface.h
create mode 100644 drivers/gpu/drm/drm_atomic.c
create mode 100644 drivers/gpu/drm/drm_atomic_helper.c
create mode 100644 drivers/gpu/drm/i2c/adv7511.c
create mode 100644 drivers/gpu/drm/i2c/adv7511.h
create mode 100644 drivers/gpu/drm/i915/intel_audio.c
create mode 100644 drivers/gpu/drm/i915/intel_fifo_underrun.c
create mode 100644 drivers/gpu/drm/i915/intel_frontbuffer.c
create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen9.c
create mode 100644 drivers/gpu/drm/i915/intel_runtime_pm.c
rename drivers/{staging/imx-drm => gpu/drm/imx}/Kconfig (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/Makefile (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-drm-core.c (99%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-drm.h (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-hdmi.c (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-hdmi.h (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-ldb.c (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/imx-tve.c (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/ipuv3-crtc.c (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/ipuv3-plane.c (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/ipuv3-plane.h (100%)
rename drivers/{staging/imx-drm => gpu/drm/imx}/parallel-display.c (100%)
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx.xml.h
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_gpu.c
create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_gpu.h
create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c
create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h
create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c
create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h
create mode 100644 drivers/gpu/drm/msm/msm_atomic.c
create mode 100644 drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c
create mode 100644 drivers/gpu/drm/radeon/radeon_kfd.c
create mode 100644 drivers/gpu/drm/radeon/radeon_kfd.h
create mode 100644 drivers/gpu/drm/radeon/radeon_sync.c
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmicon.h
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h
create mode 100644 drivers/gpu/drm/udl/udl_dmabuf.c
delete mode 100644 drivers/staging/imx-drm/TODO
create mode 100644 include/drm/drm_atomic.h
create mode 100644 include/drm/drm_atomic_helper.h
delete mode 100644 include/linux/platform_data/rcar-du.h
create mode 100644 include/uapi/linux/kfd_ioctl.h
Merging drm-panel/drm/panel/for-next (1976dbca047e drm/panel: Add Sharp LQ101R1SX01 support)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (372ee59699d9 drm/i915: Only init engines once)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/drm_edid.c
Auto-merging Documentation/DocBook/drm.tmpl
Merge made by the 'recursive' strategy.
Documentation/DocBook/drm.tmpl | 26 +
drivers/gpu/drm/drm_edid.c | 7 +-
drivers/gpu/drm/i915/Makefile | 1 +
drivers/gpu/drm/i915/i915_cmd_parser.c | 6 +-
drivers/gpu/drm/i915/i915_debugfs.c | 99 ++-
drivers/gpu/drm/i915/i915_dma.c | 1040 +-------------------------
drivers/gpu/drm/i915/i915_drv.c | 28 +-
drivers/gpu/drm/i915/i915_drv.h | 217 +++---
drivers/gpu/drm/i915/i915_gem.c | 762 +++++++++----------
drivers/gpu/drm/i915/i915_gem_context.c | 11 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 59 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 36 +-
drivers/gpu/drm/i915/i915_gem_gtt.h | 15 +-
drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 20 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 26 +-
drivers/gpu/drm/i915/i915_irq.c | 267 ++++---
drivers/gpu/drm/i915/i915_reg.h | 454 +++++++----
drivers/gpu/drm/i915/i915_suspend.c | 49 +-
drivers/gpu/drm/i915/i915_trace.h | 151 +++-
drivers/gpu/drm/i915/i915_ums.c | 14 +
drivers/gpu/drm/i915/intel_audio.c | 17 +-
drivers/gpu/drm/i915/intel_bios.c | 45 ++
drivers/gpu/drm/i915/intel_bios.h | 22 +-
drivers/gpu/drm/i915/intel_ddi.c | 604 ++++++++++++++-
drivers/gpu/drm/i915/intel_display.c | 601 +++++++++++----
drivers/gpu/drm/i915/intel_dp.c | 463 ++----------
drivers/gpu/drm/i915/intel_drv.h | 49 +-
drivers/gpu/drm/i915/intel_dsi.c | 151 ++--
drivers/gpu/drm/i915/intel_dsi.h | 19 +
drivers/gpu/drm/i915/intel_dsi_cmd.c | 64 +-
drivers/gpu/drm/i915/intel_frontbuffer.c | 4 +-
drivers/gpu/drm/i915/intel_hdmi.c | 76 ++
drivers/gpu/drm/i915/intel_lrc.c | 420 +++++++----
drivers/gpu/drm/i915/intel_lrc.h | 6 +-
drivers/gpu/drm/i915/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/intel_overlay.c | 44 +-
drivers/gpu/drm/i915/intel_panel.c | 99 ++-
drivers/gpu/drm/i915/intel_pm.c | 317 +++-----
drivers/gpu/drm/i915/intel_psr.c | 651 ++++++++++++++++
drivers/gpu/drm/i915/intel_ringbuffer.c | 358 ++++-----
drivers/gpu/drm/i915/intel_ringbuffer.h | 35 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 25 +-
drivers/gpu/drm/i915/intel_sprite.c | 5 +-
drivers/gpu/drm/i915/intel_uncore.c | 227 ++++--
drivers/gpu/drm/nouveau/nv50_display.c | 3 +-
include/uapi/drm/i915_drm.h | 1 +
47 files changed, 4315 insertions(+), 3283 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_psr.c
Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/topic/core-stuff (e5b5341c28c6 drm/atomic: clear plane's CRTC and FB when shutting down)
$ git merge drm-misc/topic/core-stuff
Auto-merging Documentation/DocBook/drm.tmpl
Merge made by the 'recursive' strategy.
Documentation/DocBook/drm.tmpl | 1 +
drivers/gpu/drm/drm_atomic.c | 32 ++++++++-----
drivers/gpu/drm/drm_atomic_helper.c | 77 ++++++++++++++++++++++++++-----
drivers/gpu/drm/drm_crtc.c | 75 +++++++++++++++++++++++++-----
drivers/gpu/drm/drm_drv.c | 2 +
drivers/gpu/drm/drm_plane_helper.c | 2 +-
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +--
drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 3 +-
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 9 ++--
drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 3 +-
drivers/gpu/drm/msm/msm_kms.h | 23 ---------
include/drm/drmP.h | 2 +-
include/drm/drm_atomic.h | 6 ++-
include/drm/drm_atomic_helper.h | 26 +++++++++++
include/drm/drm_crtc.h | 27 +++++++++--
include/drm/drm_plane_helper.h | 7 ++-
16 files changed, 226 insertions(+), 75 deletions(-)
Merging sound/for-next (fc5d3c70f97b ALSA: virmidi: Fix wrong error check)
$ git merge sound/for-next
Auto-merging sound/usb/quirks-table.h
Auto-merging sound/pci/hda/hda_priv.h
Auto-merging sound/pci/hda/hda_intel.c
Removing sound/firewire/speakers.c
Removing sound/firewire/dice.c
Merge made by the 'recursive' strategy.
Documentation/DocBook/alsa-driver-api.tmpl | 31 +
Documentation/DocBook/writing-an-alsa-driver.tmpl | 23 +
Documentation/sound/alsa/ControlNames.txt | 32 +-
Documentation/sound/alsa/Procfile.txt | 17 +-
drivers/media/pci/saa7134/saa7134-alsa.c | 4 +-
include/sound/compress_driver.h | 5 +-
include/sound/jack.h | 19 +-
include/sound/pcm.h | 254 +++-
include/sound/seq_kernel.h | 4 +
include/uapi/sound/compress_offload.h | 17 +-
include/uapi/sound/hdspm.h | 12 +-
sound/aoa/codecs/onyx.c | 8 +-
sound/aoa/codecs/tas.c | 10 +-
sound/arm/pxa2xx-pcm-lib.c | 4 +-
sound/core/Makefile | 3 +
sound/core/control.c | 71 +-
sound/core/init.c | 33 +-
sound/core/pcm.c | 48 +-
sound/core/pcm_lib.c | 148 +-
sound/core/pcm_native.c | 214 +--
sound/core/pcm_trace.h | 110 ++
sound/core/seq/oss/seq_oss_init.c | 9 +-
sound/core/seq/seq.c | 5 +-
sound/core/seq/seq_device.c | 103 +-
sound/core/sgbuf.c | 3 +-
sound/core/sound.c | 9 +-
sound/drivers/mts64.c | 18 +-
sound/drivers/virmidi.c | 21 +-
sound/drivers/vx/vx_core.c | 10 +
sound/drivers/vx/vx_mixer.c | 35 +-
sound/firewire/Kconfig | 16 +-
sound/firewire/Makefile | 7 +-
sound/firewire/amdtp.c | 8 +-
sound/firewire/amdtp.h | 24 +-
sound/firewire/bebob/bebob.h | 4 +-
sound/firewire/bebob/bebob_focusrite.c | 10 +-
sound/firewire/bebob/bebob_maudio.c | 59 +-
sound/firewire/bebob/bebob_terratec.c | 4 +-
sound/firewire/bebob/bebob_yamaha.c | 2 +-
sound/firewire/cmp.c | 2 +
sound/firewire/dice.c | 1511 ---------------------
sound/firewire/dice/Makefile | 3 +
sound/firewire/dice/dice-hwdep.c | 190 +++
sound/firewire/{ => dice}/dice-interface.h | 0
sound/firewire/dice/dice-pcm.c | 317 +++++
sound/firewire/dice/dice-proc.c | 252 ++++
sound/firewire/dice/dice-stream.c | 207 +++
sound/firewire/dice/dice-transaction.c | 387 ++++++
sound/firewire/dice/dice.c | 362 +++++
sound/firewire/dice/dice.h | 180 +++
sound/firewire/isight.c | 10 +-
sound/firewire/oxfw/Makefile | 2 +
sound/firewire/oxfw/oxfw-control.c | 283 ++++
sound/firewire/oxfw/oxfw-pcm.c | 249 ++++
sound/firewire/oxfw/oxfw-stream.c | 80 ++
sound/firewire/oxfw/oxfw.c | 194 +++
sound/firewire/oxfw/oxfw.h | 62 +
sound/firewire/speakers.c | 792 -----------
sound/i2c/other/ak4xxx-adda.c | 26 +-
sound/isa/ad1816a/ad1816a_lib.c | 10 +-
sound/isa/es1688/es1688_lib.c | 13 +-
sound/isa/es18xx.c | 78 +-
sound/isa/msnd/msnd_pinnacle_mixer.c | 11 +-
sound/isa/sb/emu8000_synth.c | 3 +-
sound/isa/sb/sb16_main.c | 10 +-
sound/isa/sb/sb_common.c | 3 +-
sound/isa/sb/sb_mixer.c | 31 +-
sound/isa/wss/wss_lib.c | 16 +-
sound/mips/sgio2audio.c | 11 +-
sound/oss/uart401.c | 11 +-
sound/parisc/harmony.c | 12 +-
sound/pci/ac97/ac97_codec.c | 10 +-
sound/pci/ac97/ac97_patch.c | 198 +--
sound/pci/ac97/ac97_patch.h | 2 +-
sound/pci/asihpi/asihpi.c | 377 ++---
sound/pci/asihpi/hpi.h | 16 +-
sound/pci/asihpi/hpi6205.c | 43 +-
sound/pci/asihpi/hpi_internal.h | 20 +-
sound/pci/asihpi/hpicmn.c | 107 +-
sound/pci/asihpi/hpicmn.h | 19 +-
sound/pci/asihpi/hpimsginit.c | 30 +-
sound/pci/asihpi/hpimsgx.c | 15 +-
sound/pci/asihpi/hpioctl.c | 123 +-
sound/pci/asihpi/hpios.h | 8 +-
sound/pci/atiixp.c | 4 +-
sound/pci/atiixp_modem.c | 4 +-
sound/pci/au88x0/au88x0.c | 35 +-
sound/pci/au88x0/au88x0.h | 4 +-
sound/pci/au88x0/au88x0_a3d.c | 21 +-
sound/pci/au88x0/au88x0_core.c | 102 +-
sound/pci/au88x0/au88x0_eq.c | 3 +-
sound/pci/au88x0/au88x0_game.c | 3 +-
sound/pci/au88x0/au88x0_mpu401.c | 2 +-
sound/pci/au88x0/au88x0_pcm.c | 8 +-
sound/pci/au88x0/au88x0_synth.c | 17 +-
sound/pci/aw2/aw2-alsa.c | 13 +-
sound/pci/azt3328.c | 13 +-
sound/pci/ca0106/ca0106_mixer.c | 40 +-
sound/pci/ctxfi/ctatc.c | 10 +-
sound/pci/ctxfi/cttimer.c | 4 +-
sound/pci/echoaudio/darla20_dsp.c | 5 +-
sound/pci/echoaudio/darla24_dsp.c | 13 +-
sound/pci/echoaudio/echo3g_dsp.c | 5 +-
sound/pci/echoaudio/echoaudio.c | 142 +-
sound/pci/echoaudio/echoaudio.h | 31 +-
sound/pci/echoaudio/echoaudio_3g.c | 27 +-
sound/pci/echoaudio/echoaudio_dsp.c | 109 +-
sound/pci/echoaudio/echoaudio_gml.c | 11 +-
sound/pci/echoaudio/gina20_dsp.c | 9 +-
sound/pci/echoaudio/gina24_dsp.c | 30 +-
sound/pci/echoaudio/indigo_dsp.c | 11 +-
sound/pci/echoaudio/indigo_express_dsp.c | 6 +-
sound/pci/echoaudio/indigodj_dsp.c | 11 +-
sound/pci/echoaudio/indigodjx_dsp.c | 5 +-
sound/pci/echoaudio/indigoio_dsp.c | 8 +-
sound/pci/echoaudio/indigoiox_dsp.c | 5 +-
sound/pci/echoaudio/layla20_dsp.c | 28 +-
sound/pci/echoaudio/layla24_dsp.c | 26 +-
sound/pci/echoaudio/mia_dsp.c | 15 +-
sound/pci/echoaudio/midi.c | 23 +-
sound/pci/echoaudio/mona_dsp.c | 29 +-
sound/pci/emu10k1/emu10k1_main.c | 9 +-
sound/pci/emu10k1/emu10k1x.c | 2 +-
sound/pci/emu10k1/emufx.c | 3 +-
sound/pci/emu10k1/emumixer.c | 58 +-
sound/pci/emu10k1/p16v.c | 20 +-
sound/pci/es1938.c | 10 +-
sound/pci/es1968.c | 15 +-
sound/pci/fm801.c | 10 +-
sound/pci/hda/hda_auto_parser.c | 66 +-
sound/pci/hda/hda_beep.c | 38 +
sound/pci/hda/hda_codec.c | 298 +++-
sound/pci/hda/hda_eld.c | 2 +-
sound/pci/hda/hda_generic.c | 181 ++-
sound/pci/hda/hda_intel.c | 107 +-
sound/pci/hda/hda_jack.c | 60 +
sound/pci/hda/hda_jack.h | 5 +
sound/pci/hda/hda_priv.h | 12 +-
sound/pci/hda/hda_sysfs.c | 35 +-
sound/pci/hda/patch_ca0132.c | 11 +-
sound/pci/hda/patch_realtek.c | 108 +-
sound/pci/ice1712/aureon.c | 46 +-
sound/pci/ice1712/ews.c | 16 +-
sound/pci/ice1712/hoontech.c | 6 +-
sound/pci/ice1712/ice1712.c | 52 +-
sound/pci/ice1712/ice1724.c | 18 +-
sound/pci/ice1712/juli.c | 5 +-
sound/pci/ice1712/maya44.c | 20 +-
sound/pci/ice1712/phase.c | 12 +-
sound/pci/ice1712/pontis.c | 8 +-
sound/pci/ice1712/prodigy192.c | 22 +-
sound/pci/ice1712/prodigy_hifi.c | 11 +-
sound/pci/ice1712/quartet.c | 32 +-
sound/pci/ice1712/revo.c | 4 +-
sound/pci/ice1712/se.c | 9 +-
sound/pci/korg1212/korg1212.c | 26 +-
sound/pci/lola/lola_mixer.c | 3 +-
sound/pci/lx6464es/lx_defs.h | 2 +-
sound/pci/mixart/mixart_hwdep.c | 9 +-
sound/pci/pcxhr/pcxhr.c | 52 +-
sound/pci/pcxhr/pcxhr_core.c | 10 +-
sound/pci/pcxhr/pcxhr_mixer.c | 18 +-
sound/pci/rme32.c | 34 +-
sound/pci/rme96.c | 62 +-
sound/pci/rme9652/hdsp.c | 178 +--
sound/pci/rme9652/hdspm.c | 84 +-
sound/pci/rme9652/rme9652.c | 58 +-
sound/pci/sonicvibes.c | 10 +-
sound/pci/via82xx.c | 10 +-
sound/pci/vx222/vx222_ops.c | 5 +
sound/pcmcia/vx/vxpocket.c | 1 +
sound/ppc/pmac.c | 3 +-
sound/ppc/tumbler.c | 11 +-
sound/soc/atmel/atmel-pcm-dma.c | 4 +-
sound/soc/fsl/fsl_dma.c | 9 +-
sound/sparc/cs4231.c | 12 +-
sound/usb/6fire/control.c | 22 +-
sound/usb/6fire/firmware.c | 2 +-
sound/usb/6fire/pcm.c | 17 +-
sound/usb/Makefile | 1 +
sound/usb/card.c | 109 +-
sound/usb/endpoint.c | 16 +-
sound/usb/endpoint.h | 2 +-
sound/usb/misc/ua101.c | 18 +-
sound/usb/mixer.c | 241 ++--
sound/usb/mixer.h | 40 +-
sound/usb/mixer_maps.c | 9 +
sound/usb/mixer_quirks.c | 920 +++++++------
sound/usb/mixer_scarlett.c | 1004 ++++++++++++++
sound/usb/mixer_scarlett.h | 6 +
sound/usb/pcm.c | 5 +
sound/usb/quirks-table.h | 92 +-
sound/usb/quirks.c | 64 +-
sound/usb/quirks.h | 3 +
sound/usb/usx2y/usbusx2yaudio.c | 9 +-
195 files changed, 7596 insertions(+), 5428 deletions(-)
create mode 100644 sound/core/pcm_trace.h
delete mode 100644 sound/firewire/dice.c
create mode 100644 sound/firewire/dice/Makefile
create mode 100644 sound/firewire/dice/dice-hwdep.c
rename sound/firewire/{ => dice}/dice-interface.h (100%)
create mode 100644 sound/firewire/dice/dice-pcm.c
create mode 100644 sound/firewire/dice/dice-proc.c
create mode 100644 sound/firewire/dice/dice-stream.c
create mode 100644 sound/firewire/dice/dice-transaction.c
create mode 100644 sound/firewire/dice/dice.c
create mode 100644 sound/firewire/dice/dice.h
create mode 100644 sound/firewire/oxfw/Makefile
create mode 100644 sound/firewire/oxfw/oxfw-control.c
create mode 100644 sound/firewire/oxfw/oxfw-pcm.c
create mode 100644 sound/firewire/oxfw/oxfw-stream.c
create mode 100644 sound/firewire/oxfw/oxfw.c
create mode 100644 sound/firewire/oxfw/oxfw.h
delete mode 100644 sound/firewire/speakers.c
create mode 100644 sound/usb/mixer_scarlett.c
create mode 100644 sound/usb/mixer_scarlett.h
Merging sound-asoc/for-next (1e2f1a5f8c48 Merge remote-tracking branches 'asoc/topic/wm9081', 'asoc/topic/wm9090', 'asoc/topic/wm9712' and 'asoc/topic/wm9713' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/codecs/ad1980.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/sound/arndale.txt | 24 +
.../bindings/sound/davinci-mcasp-audio.txt | 2 +-
.../devicetree/bindings/sound/eukrea-tlv320.txt | 15 +-
.../devicetree/bindings/sound/fsl,esai.txt | 44 +-
.../devicetree/bindings/sound/fsl,spdif.txt | 37 +-
.../devicetree/bindings/sound/fsl-sai.txt | 66 +-
.../bindings/sound/imx-audio-sgtl5000.txt | 61 +-
.../devicetree/bindings/sound/imx-audio-spdif.txt | 22 +-
.../devicetree/bindings/sound/imx-audio-wm8962.txt | 45 +-
.../devicetree/bindings/sound/imx-audmux.txt | 22 +-
.../devicetree/bindings/sound/max98090.txt | 2 +
.../devicetree/bindings/sound/renesas,fsi.txt | 9 +-
.../devicetree/bindings/sound/renesas,rsnd.txt | 10 +-
Documentation/devicetree/bindings/sound/rt5631.txt | 48 +
Documentation/devicetree/bindings/sound/rt5677.txt | 17 +
.../devicetree/bindings/sound/samsung-i2s.txt | 15 +-
.../devicetree/bindings/sound/sgtl5000.txt | 13 +
.../devicetree/bindings/sound/ts3a227e.txt | 26 +
Documentation/devicetree/bindings/sound/wm8960.txt | 31 +
MAINTAINERS | 6 +
arch/arm/mach-pxa/spitz.c | 9 +
arch/x86/include/asm/platform_sst_audio.h | 62 +
drivers/base/regmap/Kconfig | 5 +-
drivers/base/regmap/Makefile | 1 +
drivers/base/regmap/regmap-ac97.c | 114 ++
include/linux/mfd/arizona/core.h | 1 +
include/linux/mfd/davinci_voicecodec.h | 7 -
include/linux/platform_data/asoc-s3c.h | 1 +
include/linux/regmap.h | 7 +
include/sound/rt5645.h | 4 +
include/sound/rt5677.h | 10 +
include/sound/soc-dai.h | 7 +-
include/sound/soc-dapm.h | 9 +-
include/sound/soc.h | 116 +-
include/sound/uda134x.h | 12 -
include/trace/events/asoc.h | 25 -
sound/soc/Makefile | 6 +-
sound/soc/atmel/atmel_ssc_dai.c | 5 +-
sound/soc/au1x/ac97c.c | 2 +-
sound/soc/au1x/psc-ac97.c | 2 +-
sound/soc/blackfin/bf5xx-ac97.c | 2 +-
sound/soc/blackfin/bf5xx-ad1980.c | 2 -
sound/soc/cirrus/Kconfig | 3 +-
sound/soc/cirrus/ep93xx-ac97.c | 2 +-
sound/soc/codecs/Kconfig | 47 +-
sound/soc/codecs/Makefile | 10 +
sound/soc/codecs/ab8500-codec.c | 32 +-
sound/soc/codecs/ac97.c | 18 +-
sound/soc/codecs/ad193x.c | 14 +-
sound/soc/codecs/ad1980.c | 212 +--
sound/soc/codecs/ad1980.h | 26 -
sound/soc/codecs/adau1373.c | 6 +-
sound/soc/codecs/adau1701.c | 86 +-
sound/soc/codecs/adau1761.c | 25 +-
sound/soc/codecs/adau1781.c | 33 +-
sound/soc/codecs/adau17x1.c | 71 +-
sound/soc/codecs/adau17x1.h | 10 +-
sound/soc/codecs/adav80x.c | 4 +-
sound/soc/codecs/ak4535.c | 31 +-
sound/soc/codecs/ak4641.c | 33 +-
sound/soc/codecs/ak4642.c | 16 -
sound/soc/codecs/ak4671.c | 13 -
sound/soc/codecs/alc5623.c | 22 +-
sound/soc/codecs/alc5632.c | 22 +-
sound/soc/codecs/arizona.c | 34 +-
sound/soc/codecs/cq93vc.c | 33 -
sound/soc/codecs/cs4265.c | 2 -
sound/soc/codecs/cs4271-i2c.c | 62 +
sound/soc/codecs/cs4271-spi.c | 55 +
sound/soc/codecs/cs4271.c | 155 +-
sound/soc/codecs/cs4271.h | 11 +
sound/soc/codecs/cs42l51.c | 6 +-
sound/soc/codecs/cs42l73.c | 6 +-
sound/soc/codecs/hdmi.c | 2 +
sound/soc/codecs/lm49453.c | 8 -
sound/soc/codecs/max98088.c | 31 +-
sound/soc/codecs/max98090.c | 201 ++-
sound/soc/codecs/max98090.h | 8 +
sound/soc/codecs/max98095.c | 23 +-
sound/soc/codecs/max9850.c | 22 +-
sound/soc/codecs/rt286.c | 231 ++-
sound/soc/codecs/rt5631.c | 38 +-
sound/soc/codecs/rt5645.c | 200 ++-
sound/soc/codecs/rt5645.h | 19 +-
sound/soc/codecs/rt5670.c | 136 +-
sound/soc/codecs/rt5670.h | 6 +
sound/soc/codecs/rt5677-spi.c | 130 ++
sound/soc/codecs/rt5677-spi.h | 21 +
sound/soc/codecs/rt5677.c | 1176 ++++++++++++-
sound/soc/codecs/rt5677.h | 138 +-
sound/soc/codecs/sgtl5000.c | 111 +-
sound/soc/codecs/sigmadsp-i2c.c | 81 +-
sound/soc/codecs/sigmadsp-regmap.c | 46 +-
sound/soc/codecs/sigmadsp.c | 711 +++++++-
sound/soc/codecs/sigmadsp.h | 59 +-
sound/soc/codecs/sirf-audio-codec.c | 6 +-
sound/soc/codecs/sn95031.c | 15 +-
sound/soc/codecs/ssm4567.c | 128 ++
sound/soc/codecs/sta32x.c | 21 +-
sound/soc/codecs/sta350.c | 21 +-
sound/soc/codecs/sta529.c | 35 +-
sound/soc/codecs/stac9766.c | 60 +-
sound/soc/codecs/tas2552.c | 10 +-
sound/soc/codecs/tfa9879.c | 328 ++++
sound/soc/codecs/tfa9879.h | 202 +++
sound/soc/codecs/tlv320aic23.c | 21 +-
sound/soc/codecs/tlv320aic31xx.c | 31 +-
sound/soc/codecs/tlv320aic32x4.c | 24 +-
sound/soc/codecs/tlv320aic3x.c | 228 ++-
sound/soc/codecs/tlv320aic3x.h | 1 +
sound/soc/codecs/tlv320dac33.c | 2 -
sound/soc/codecs/ts3a227e.c | 314 ++++
sound/soc/codecs/ts3a227e.h | 17 +
sound/soc/codecs/twl4030.c | 2 -
sound/soc/codecs/twl6040.c | 23 +-
sound/soc/codecs/uda134x.c | 32 +-
sound/soc/codecs/uda1380.c | 20 +-
sound/soc/codecs/wl1273.c | 10 +-
sound/soc/codecs/wm5102.c | 16 +-
sound/soc/codecs/wm8350.c | 21 +-
sound/soc/codecs/wm8400.c | 34 +-
sound/soc/codecs/wm8510.c | 26 +-
sound/soc/codecs/wm8523.c | 29 +-
sound/soc/codecs/wm8580.c | 4 -
sound/soc/codecs/wm8711.c | 27 +-
sound/soc/codecs/wm8728.c | 34 +-
sound/soc/codecs/wm8731.c | 37 +-
sound/soc/codecs/wm8737.c | 49 +-
sound/soc/codecs/wm8750.c | 25 +-
sound/soc/codecs/wm8776.c | 31 +-
sound/soc/codecs/wm8804.c | 3 -
sound/soc/codecs/wm8900.c | 8 -
sound/soc/codecs/wm8903.c | 43 +-
sound/soc/codecs/wm8940.c | 22 +-
sound/soc/codecs/wm8955.c | 33 +-
sound/soc/codecs/wm8958-dsp2.c | 12 +-
sound/soc/codecs/wm8960.c | 113 +-
sound/soc/codecs/wm8961.c | 34 +-
sound/soc/codecs/wm8962.c | 11 +-
sound/soc/codecs/wm8974.c | 25 +-
sound/soc/codecs/wm8978.c | 10 -
sound/soc/codecs/wm8983.c | 27 +-
sound/soc/codecs/wm8985.c | 28 +-
sound/soc/codecs/wm8988.c | 27 +-
sound/soc/codecs/wm8990.c | 24 +-
sound/soc/codecs/wm8991.c | 32 +-
sound/soc/codecs/wm8993.c | 12 -
sound/soc/codecs/wm8994.c | 4 +-
sound/soc/codecs/wm8994.h | 2 +
sound/soc/codecs/wm8995.c | 17 +-
sound/soc/codecs/wm9081.c | 7 -
sound/soc/codecs/wm9090.c | 32 +-
sound/soc/codecs/wm9705.c | 46 +-
sound/soc/codecs/wm9712.c | 219 ++-
sound/soc/codecs/wm9713.c | 230 +--
sound/soc/codecs/wm_adsp.c | 97 +-
sound/soc/davinci/davinci-mcasp.c | 339 +++-
sound/soc/davinci/davinci-mcasp.h | 17 +
sound/soc/fsl/eukrea-tlv320.c | 5 +-
sound/soc/fsl/fsl-asoc-card.c | 19 +-
sound/soc/fsl/fsl_esai.c | 12 +-
sound/soc/fsl/fsl_ssi.c | 4 +-
sound/soc/fsl/imx-sgtl5000.c | 6 +-
sound/soc/fsl/imx-spdif.c | 3 +-
sound/soc/fsl/imx-ssi.c | 2 +-
sound/soc/fsl/imx-wm8962.c | 6 +-
sound/soc/fsl/mpc5200_dma.c | 3 -
sound/soc/fsl/mpc5200_psc_ac97.c | 6 +-
sound/soc/generic/simple-card.c | 160 +-
sound/soc/intel/Kconfig | 44 +-
sound/soc/intel/Makefile | 7 +
sound/soc/intel/broadwell.c | 49 +-
sound/soc/intel/bytcr_dpcm_rt5640.c | 230 +++
sound/soc/intel/cht_bsw_rt5672.c | 285 ++++
sound/soc/intel/sst-atom-controls.c | 1208 +++++++++++++-
sound/soc/intel/sst-atom-controls.h | 428 +++++
sound/soc/intel/sst-baytrail-dsp.c | 24 +-
sound/soc/intel/sst-dsp-priv.h | 136 +-
sound/soc/intel/sst-dsp.c | 31 +
sound/soc/intel/sst-dsp.h | 28 +-
sound/soc/intel/sst-firmware.c | 937 +++++++++--
sound/soc/intel/sst-haswell-dsp.c | 295 +++-
sound/soc/intel/sst-haswell-ipc.c | 413 ++++-
sound/soc/intel/sst-haswell-ipc.h | 25 +-
sound/soc/intel/sst-haswell-pcm.c | 389 ++++-
sound/soc/intel/sst-mfld-platform-compress.c | 8 +-
sound/soc/intel/sst-mfld-platform-pcm.c | 154 +-
sound/soc/intel/sst-mfld-platform.h | 5 +
sound/soc/intel/sst/Makefile | 7 +
sound/soc/intel/sst/sst.c | 437 +++++
sound/soc/intel/sst/sst.h | 546 ++++++
sound/soc/intel/sst/sst_acpi.c | 383 +++++
sound/soc/intel/sst/sst_drv_interface.c | 686 ++++++++
sound/soc/intel/sst/sst_ipc.c | 373 +++++
sound/soc/intel/sst/sst_loader.c | 456 +++++
sound/soc/intel/sst/sst_pci.c | 209 +++
sound/soc/intel/sst/sst_pvt.c | 449 +++++
sound/soc/intel/sst/sst_stream.c | 437 +++++
sound/soc/jz4740/qi_lb60.c | 11 +-
sound/soc/mxs/mxs-saif.c | 2 +-
sound/soc/mxs/mxs-sgtl5000.c | 7 -
sound/soc/nuc900/nuc900-ac97.c | 2 +-
sound/soc/omap/Kconfig | 8 +-
sound/soc/omap/mcbsp.c | 3 +-
sound/soc/pxa/mioa701_wm9713.c | 7 +-
sound/soc/pxa/pxa-ssp.c | 16 +-
sound/soc/pxa/pxa2xx-ac97.c | 6 +-
sound/soc/pxa/spitz.c | 52 +-
sound/soc/rockchip/Kconfig | 9 +-
sound/soc/samsung/Kconfig | 8 +-
sound/soc/samsung/Makefile | 2 +
sound/soc/samsung/ac97.c | 4 +-
sound/soc/samsung/arndale_rt5631.c | 150 ++
sound/soc/samsung/i2s-regs.h | 10 +-
sound/soc/samsung/i2s.c | 229 ++-
sound/soc/samsung/odroidx2_max98090.c | 4 +-
sound/soc/sh/hac.c | 2 +-
sound/soc/sh/rcar/core.c | 76 +-
sound/soc/sh/rcar/dvc.c | 242 ++-
sound/soc/sh/rcar/gen.c | 30 +-
sound/soc/sh/rcar/rsnd.h | 6 +
sound/soc/sh/rcar/src.c | 11 +-
sound/soc/sh/rcar/ssi.c | 40 +-
sound/soc/soc-ac97.c | 256 +++
sound/soc/soc-cache.c | 149 --
sound/soc/soc-compress.c | 11 +-
sound/soc/soc-core.c | 1754 +++-----------------
sound/soc/soc-dapm.c | 755 +++++----
sound/soc/soc-jack.c | 11 +-
sound/soc/soc-ops.c | 952 +++++++++++
sound/soc/soc-pcm.c | 19 +-
sound/soc/tegra/tegra20_ac97.c | 2 +-
sound/soc/tegra/tegra_rt5640.c | 6 +-
sound/soc/txx9/txx9aclc-ac97.c | 2 +-
sound/soc/txx9/txx9aclc.c | 2 +-
sound/soc/ux500/mop500.c | 6 +-
236 files changed, 17147 insertions(+), 5400 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/arndale.txt
create mode 100644 Documentation/devicetree/bindings/sound/rt5631.txt
create mode 100644 Documentation/devicetree/bindings/sound/ts3a227e.txt
create mode 100644 Documentation/devicetree/bindings/sound/wm8960.txt
create mode 100644 drivers/base/regmap/regmap-ac97.c
delete mode 100644 sound/soc/codecs/ad1980.h
create mode 100644 sound/soc/codecs/cs4271-i2c.c
create mode 100644 sound/soc/codecs/cs4271-spi.c
create mode 100644 sound/soc/codecs/cs4271.h
create mode 100644 sound/soc/codecs/rt5677-spi.c
create mode 100644 sound/soc/codecs/rt5677-spi.h
create mode 100644 sound/soc/codecs/tfa9879.c
create mode 100644 sound/soc/codecs/tfa9879.h
create mode 100644 sound/soc/codecs/ts3a227e.c
create mode 100644 sound/soc/codecs/ts3a227e.h
create mode 100644 sound/soc/intel/bytcr_dpcm_rt5640.c
create mode 100644 sound/soc/intel/cht_bsw_rt5672.c
create mode 100644 sound/soc/intel/sst/Makefile
create mode 100644 sound/soc/intel/sst/sst.c
create mode 100644 sound/soc/intel/sst/sst.h
create mode 100644 sound/soc/intel/sst/sst_acpi.c
create mode 100644 sound/soc/intel/sst/sst_drv_interface.c
create mode 100644 sound/soc/intel/sst/sst_ipc.c
create mode 100644 sound/soc/intel/sst/sst_loader.c
create mode 100644 sound/soc/intel/sst/sst_pci.c
create mode 100644 sound/soc/intel/sst/sst_pvt.c
create mode 100644 sound/soc/intel/sst/sst_stream.c
create mode 100644 sound/soc/samsung/arndale_rt5631.c
create mode 100644 sound/soc/soc-ac97.c
create mode 100644 sound/soc/soc-ops.c
Merging modules/modules-next (18eb74fa9416 params: cleanup sysfs allocation)
$ git merge modules/modules-next
Merge made by the 'recursive' strategy.
include/linux/module.h | 16 +---
include/trace/events/module.h | 2 +-
kernel/module.c | 170 +++++++++++++++++++-----------------------
kernel/params.c | 95 +++++++++++------------
lib/bug.c | 20 +++--
5 files changed, 135 insertions(+), 168 deletions(-)
Merging virtio/virtio-next (5a10b7dbf904 virtio_balloon: free some memory from balloon on OOM)
$ git merge virtio/virtio-next
Merge made by the 'recursive' strategy.
drivers/block/virtio_blk.c | 2 +-
drivers/virtio/virtio_balloon.c | 57 ++++++++++++++++++++++++++++++++++++-
include/linux/virtio.h | 2 +-
include/uapi/linux/virtio_balloon.h | 1 +
4 files changed, 59 insertions(+), 3 deletions(-)
Merging input/next (5447326ff7e4 Input: atkbd - correct MSC_SCAN events for force_release keys)
$ git merge input/next
Auto-merging drivers/input/touchscreen/edt-ft5x06.c
Auto-merging drivers/input/touchscreen/ad7879.c
Auto-merging drivers/input/serio/altera_ps2.c
Auto-merging drivers/input/misc/max77693-haptic.c
Removing drivers/input/keyboard/cap1106.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Auto-merging Documentation/devicetree/bindings/input/cap11xx.txt
Merge made by the 'recursive' strategy.
.../bindings/input/{cap1106.txt => cap11xx.txt} | 26 +-
.../devicetree/bindings/input/elan_i2c.txt | 34 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
MAINTAINERS | 6 +
drivers/input/keyboard/Kconfig | 8 +-
drivers/input/keyboard/Makefile | 2 +-
drivers/input/keyboard/atkbd.c | 6 +-
drivers/input/keyboard/cap1106.c | 341 ------
drivers/input/keyboard/cap11xx.c | 376 +++++++
drivers/input/keyboard/lpc32xx-keys.c | 92 +-
drivers/input/keyboard/mpr121_touchkey.c | 42 +-
drivers/input/keyboard/pxa27x_keypad.c | 84 +-
drivers/input/misc/88pm860x_onkey.c | 6 +-
drivers/input/misc/ad714x-i2c.c | 6 +-
drivers/input/misc/ad714x-spi.c | 6 +-
drivers/input/misc/adxl34x-i2c.c | 6 +-
drivers/input/misc/adxl34x-spi.c | 6 +-
drivers/input/misc/drv260x.c | 6 +-
drivers/input/misc/drv2667.c | 6 +-
drivers/input/misc/gp2ap002a00f.c | 6 +-
drivers/input/misc/kxtj9.c | 6 +-
drivers/input/misc/max77693-haptic.c | 6 +-
drivers/input/misc/max8925_onkey.c | 6 +-
drivers/input/misc/max8997_haptic.c | 4 +-
drivers/input/misc/palmas-pwrbutton.c | 6 +-
drivers/input/misc/pm8xxx-vibrator.c | 4 +-
drivers/input/misc/pmic8xxx-pwrkey.c | 6 +-
drivers/input/misc/pwm-beeper.c | 6 +-
drivers/input/misc/sirfsoc-onkey.c | 4 +-
drivers/input/misc/twl4030-vibra.c | 6 +-
drivers/input/misc/twl6040-vibra.c | 4 +-
drivers/input/mouse/Kconfig | 30 +
drivers/input/mouse/Makefile | 5 +
drivers/input/mouse/cyapa.c | 190 ++--
drivers/input/mouse/elan_i2c.h | 86 ++
drivers/input/mouse/elan_i2c_core.c | 1137 ++++++++++++++++++++
drivers/input/mouse/elan_i2c_i2c.c | 611 +++++++++++
drivers/input/mouse/elan_i2c_smbus.c | 514 +++++++++
drivers/input/mouse/lifebook.h | 6 +-
drivers/input/mouse/navpoint.c | 6 +-
drivers/input/mouse/synaptics_i2c.c | 6 +-
drivers/input/serio/altera_ps2.c | 81 +-
drivers/input/touchscreen/Kconfig | 13 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/ad7877.c | 6 +-
drivers/input/touchscreen/ad7879.c | 6 +-
drivers/input/touchscreen/ads7846.c | 6 +-
drivers/input/touchscreen/atmel_mxt_ts.c | 6 +-
drivers/input/touchscreen/auo-pixcir-ts.c | 6 +-
drivers/input/touchscreen/cy8ctmg110_ts.c | 6 +-
drivers/input/touchscreen/cyttsp_core.c | 7 +-
drivers/input/touchscreen/edt-ft5x06.c | 6 +-
drivers/input/touchscreen/eeti_ts.c | 6 +-
drivers/input/touchscreen/egalax_ts.c | 6 +-
drivers/input/touchscreen/goodix.c | 395 +++++++
drivers/input/touchscreen/ili210x.c | 6 +-
drivers/input/touchscreen/ipaq-micro-ts.c | 6 +-
drivers/input/touchscreen/mms114.c | 6 +-
drivers/input/touchscreen/pixcir_i2c_ts.c | 6 +-
drivers/input/touchscreen/st1232.c | 7 +-
drivers/input/touchscreen/tsc2005.c | 6 +-
drivers/input/touchscreen/ucb1400_ts.c | 6 +-
drivers/input/touchscreen/wacom_i2c.c | 6 +-
drivers/input/touchscreen/zforce_ts.c | 6 +-
64 files changed, 3497 insertions(+), 824 deletions(-)
rename Documentation/devicetree/bindings/input/{cap1106.txt => cap11xx.txt} (64%)
create mode 100644 Documentation/devicetree/bindings/input/elan_i2c.txt
delete mode 100644 drivers/input/keyboard/cap1106.c
create mode 100644 drivers/input/keyboard/cap11xx.c
create mode 100644 drivers/input/mouse/elan_i2c.h
create mode 100644 drivers/input/mouse/elan_i2c_core.c
create mode 100644 drivers/input/mouse/elan_i2c_i2c.c
create mode 100644 drivers/input/mouse/elan_i2c_smbus.c
create mode 100644 drivers/input/touchscreen/goodix.c
Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
$ git merge input-mt/for-next
Already up-to-date.
Merging block/for-next (2ef5864b6dee Merge branch 'for-3.19/drivers' into for-next)
$ git merge block/for-next
Auto-merging drivers/block/virtio_blk.c
Merge made by the 'recursive' strategy.
Documentation/block/biodoc.txt | 6 +-
block/bio.c | 28 +
block/blk-mq-cpumap.c | 2 +-
block/blk-mq-tag.c | 24 +-
block/blk-mq.c | 100 ++-
block/blk-settings.c | 4 +-
block/genhd.c | 11 +-
drivers/block/aoe/aoeblk.c | 2 +-
drivers/block/drbd/drbd_actlog.c | 3 +-
drivers/block/drbd/drbd_int.h | 39 +-
drivers/block/drbd/drbd_main.c | 23 +-
drivers/block/drbd/drbd_nl.c | 64 +-
drivers/block/drbd/drbd_receiver.c | 2 +-
drivers/block/drbd/drbd_req.c | 25 +-
drivers/block/drbd/drbd_state.c | 42 +-
drivers/block/drbd/drbd_state.h | 5 +
drivers/block/drbd/drbd_worker.c | 5 +-
drivers/block/mtip32xx/mtip32xx.c | 5 +-
drivers/block/null_blk.c | 52 +-
drivers/block/nvme-core.c | 1581 +++++++++++++++++-------------------
drivers/block/nvme-scsi.c | 162 +---
drivers/block/rsxx/dev.c | 29 +-
drivers/block/virtio_blk.c | 7 +-
drivers/md/bcache/request.c | 23 +-
drivers/md/dm.c | 13 +-
drivers/md/md.c | 6 +-
drivers/scsi/scsi_lib.c | 5 +-
fs/fs-writeback.c | 29 +-
include/linux/bio.h | 5 +
include/linux/blk-mq.h | 10 +-
include/linux/blkdev.h | 1 -
include/linux/drbd.h | 2 +-
include/linux/nvme.h | 18 +-
include/uapi/linux/nvme.h | 46 +-
34 files changed, 1131 insertions(+), 1248 deletions(-)
Merging device-mapper/for-next (c864e2483f19 dm cache: when reloading a discard bitset allow for a different discard block size)
$ git merge device-mapper/for-next
Auto-merging drivers/md/dm.c
Auto-merging drivers/md/dm-stats.c
Auto-merging drivers/md/dm-bufio.c
Merge made by the 'recursive' strategy.
Documentation/device-mapper/cache-policies.txt | 24 +-
drivers/md/dm-bio-prison.c | 186 +++--
drivers/md/dm-bio-prison.h | 28 +-
drivers/md/dm-bufio.c | 226 +++---
drivers/md/dm-cache-block-types.h | 11 +
drivers/md/dm-cache-metadata.c | 34 +-
drivers/md/dm-cache-metadata.h | 6 +-
drivers/md/dm-cache-policy-mq.c | 82 ++-
drivers/md/dm-cache-target.c | 358 ++++++++--
drivers/md/dm-ioctl.c | 5 +-
drivers/md/dm-stats.c | 2 +-
drivers/md/dm-table.c | 36 +-
drivers/md/dm-thin-metadata.c | 35 +-
drivers/md/dm-thin-metadata.h | 9 +-
drivers/md/dm-thin.c | 760 ++++++++++++++++-----
drivers/md/dm.c | 273 ++++++--
drivers/md/dm.h | 10 +
drivers/md/persistent-data/dm-array.c | 4 +-
.../md/persistent-data/dm-transaction-manager.c | 77 ++-
.../md/persistent-data/dm-transaction-manager.h | 7 +
include/linux/device-mapper.h | 2 +
include/uapi/linux/dm-ioctl.h | 9 +-
22 files changed, 1615 insertions(+), 569 deletions(-)
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 (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (903101a83949 mmc: omap_hsmmc: Fix UHS card with DDR50 support)
$ git merge mmc-uh/next
Recorded preimage for 'arch/arm/mach-omap2/board-n8x0.c'
Auto-merging include/linux/platform_data/mmc-atmel-mci.h
Removing arch/avr32/mach-at32ap/include/mach/atmel-mci.h
Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_54xx_data.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
Auto-merging arch/arm/mach-omap2/board-n8x0.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-n8x0.c
CONFLICT (modify/delete): arch/arm/mach-at91/at91sam9g45_devices.c deleted in HEAD and modified in mmc-uh/next. Version mmc-uh/next of arch/arm/mach-at91/at91sam9g45_devices.c left in tree.
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c: needs merge
rm 'arch/arm/mach-at91/at91sam9g45_devices.c'
$ git commit -v -a
Recorded resolution for 'arch/arm/mach-omap2/board-n8x0.c'.
[master f8d38a0da3a0] Merge remote-tracking branch 'mmc-uh/next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/mmc/exynos-dw-mshc.txt | 4 +
.../devicetree/bindings/mmc/img-dw-mshc.txt | 29 +
.../devicetree/bindings/mmc/sdhci-pxa.txt | 7 +
arch/arm/mach-omap2/board-n8x0.c | 2 +
arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +-
arch/arm/mach-omap2/hsmmc.c | 158 ++---
arch/arm/mach-omap2/hsmmc.h | 9 +-
arch/arm/mach-omap2/mmc.h | 10 -
arch/arm/mach-omap2/omap4-common.c | 1 -
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 4 +-
.../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 8 +-
arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 1 -
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 8 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 +-
arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 4 +-
arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 4 +-
arch/avr32/mach-at32ap/at32ap700x.c | 2 +-
arch/avr32/mach-at32ap/include/mach/atmel-mci.h | 17 -
drivers/mmc/card/block.c | 83 ++-
drivers/mmc/card/mmc_test.c | 28 +-
drivers/mmc/core/bus.c | 55 +-
drivers/mmc/core/core.c | 111 ++--
drivers/mmc/core/core.h | 1 +
drivers/mmc/core/debugfs.c | 9 +-
drivers/mmc/core/mmc.c | 184 +++---
drivers/mmc/core/mmc_ops.c | 131 +++-
drivers/mmc/core/mmc_ops.h | 2 +-
drivers/mmc/core/sdio.c | 10 +-
drivers/mmc/core/sdio_bus.c | 16 +-
drivers/mmc/host/Kconfig | 7 +-
drivers/mmc/host/Makefile | 1 +
drivers/mmc/host/atmel-mci.c | 128 ++--
drivers/mmc/host/dw_mmc-exynos.c | 91 ++-
drivers/mmc/host/dw_mmc-pltfm.c | 6 +
drivers/mmc/host/dw_mmc-rockchip.c | 13 +
drivers/mmc/host/dw_mmc.c | 346 +++++-----
drivers/mmc/host/dw_mmc.h | 15 +-
drivers/mmc/host/mmci.c | 7 +
drivers/mmc/host/msm_sdcc.c | 6 +-
drivers/mmc/host/mvsdio.c | 7 +-
drivers/mmc/host/mxcmmc.c | 25 +-
drivers/mmc/host/mxs-mmc.c | 26 +-
drivers/mmc/host/omap_hsmmc.c | 286 ++++----
drivers/mmc/host/sdhci-acpi.c | 40 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 10 +-
drivers/mmc/host/sdhci-of-arasan.c | 5 +-
drivers/mmc/host/sdhci-pci-o2micro.c | 2 -
drivers/mmc/host/sdhci-pci.c | 43 +-
drivers/mmc/host/sdhci-pxav2.c | 15 +-
drivers/mmc/host/sdhci-pxav3.c | 60 +-
drivers/mmc/host/sdhci-s3c.c | 8 +-
drivers/mmc/host/sdhci.c | 273 +++++---
drivers/mmc/host/sdhci.h | 45 +-
drivers/mmc/host/sunxi-mmc.c | 1 -
drivers/mmc/host/toshsd.c | 717 +++++++++++++++++++++
drivers/mmc/host/toshsd.h | 176 +++++
include/linux/atmel-mci.h | 2 +
include/linux/mmc/card.h | 23 +-
include/linux/mmc/core.h | 3 +-
include/linux/mmc/dw_mmc.h | 7 +-
include/linux/mmc/host.h | 1 +
include/linux/mmc/mmc.h | 3 +
include/linux/mmc/sdhci.h | 18 +-
include/linux/mmc/sdio_func.h | 2 -
include/linux/platform_data/hsmmc-omap.h | 90 +++
.../linux/platform_data/mmc-atmel-mci.h | 13 +-
include/linux/platform_data/mmc-omap.h | 27 -
include/linux/platform_data/pxa_sdhci.h | 5 -
68 files changed, 2390 insertions(+), 1069 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mmc/img-dw-mshc.txt
delete mode 100644 arch/avr32/mach-at32ap/include/mach/atmel-mci.h
create mode 100644 drivers/mmc/host/toshsd.c
create mode 100644 drivers/mmc/host/toshsd.h
create mode 100644 include/linux/platform_data/hsmmc-omap.h
rename arch/arm/mach-at91/include/mach/atmel-mci.h => include/linux/platform_data/mmc-atmel-mci.h (52%)
Merging kgdb/kgdb-next (0f16996cf2ed kernel/debug/debug_core.c: Logging clean-up)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
include/linux/kdb.h | 62 ++++++++--
kernel/debug/debug_core.c | 52 ++++----
kernel/debug/kdb/kdb_bp.c | 37 +++---
kernel/debug/kdb/kdb_debugger.c | 4 +
kernel/debug/kdb/kdb_main.c | 267 +++++++++++++++++++++++++---------------
kernel/debug/kdb/kdb_private.h | 3 +-
kernel/trace/trace_kdb.c | 4 +-
lib/Kconfig.kgdb | 25 ++++
8 files changed, 306 insertions(+), 148 deletions(-)
Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
$ git merge uclinux/for-next
Already up-to-date.
Merging md/for-next (206c5f60a3d9 Linux 3.18-rc4)
$ git merge md/for-next
Already up-to-date.
Merging mfd/for-mfd-next (439b8bddaa1e mfd: da9063: Get irq base dynamically before registering device)
$ git merge mfd/for-mfd-next
Resolved 'drivers/mfd/viperboard.c' using previous resolution.
Auto-merging include/linux/of.h
Auto-merging include/linux/mfd/max77693-private.h
Auto-merging drivers/mfd/viperboard.c
CONFLICT (content): Merge conflict in drivers/mfd/viperboard.c
Auto-merging drivers/mfd/twl4030-power.c
Auto-merging drivers/mfd/max77693.c
Auto-merging drivers/i2c/busses/Makefile
Auto-merging drivers/i2c/busses/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 680b58530384] Merge remote-tracking branch 'mfd/for-mfd-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/mfd/atmel-hlcdc.txt | 51 ++
Documentation/devicetree/bindings/mfd/max77686.txt | 6 +
Documentation/devicetree/bindings/mfd/max77693.txt | 21 +
Documentation/devicetree/bindings/mfd/s2mps11.txt | 22 +-
drivers/clk/clk-s2mps11.c | 24 +
drivers/gpio/Kconfig | 12 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio-dln2.c | 553 +++++++++++++++
drivers/gpio/gpio-tc3589x.c | 2 +-
drivers/hid/hid-sensor-hub.c | 8 +-
drivers/i2c/busses/Kconfig | 10 +
drivers/i2c/busses/Makefile | 1 +
drivers/i2c/busses/i2c-dln2.c | 262 +++++++
drivers/iio/adc/Kconfig | 8 +
drivers/iio/adc/Makefile | 1 +
drivers/iio/adc/axp288_adc.c | 261 +++++++
drivers/mfd/Kconfig | 20 +-
drivers/mfd/Makefile | 4 +-
drivers/mfd/ab8500-sysctrl.c | 57 --
drivers/mfd/arizona-spi.c | 2 +
drivers/mfd/atmel-hlcdc.c | 122 ++++
drivers/mfd/axp20x.c | 361 ++++++++--
drivers/mfd/da9063-core.c | 4 +-
drivers/mfd/db8500-prcmu.c | 22 +-
drivers/mfd/dln2.c | 781 +++++++++++++++++++++
drivers/mfd/lpc_sch.c | 6 +-
drivers/mfd/max14577.c | 2 +-
drivers/mfd/max77693.c | 31 +-
drivers/mfd/mfd-core.c | 8 +-
drivers/mfd/rts5227.c | 6 +
drivers/mfd/rts5249.c | 4 +
drivers/mfd/rtsx_gops.c | 37 +
drivers/mfd/rtsx_pcr.h | 3 +
drivers/mfd/rtsx_usb.c | 4 +-
drivers/mfd/sec-core.c | 39 +-
drivers/mfd/sec-irq.c | 23 +-
drivers/mfd/syscon.c | 96 ++-
drivers/mfd/t7l66xb.c | 14 +-
drivers/mfd/tc3589x.c | 9 +-
drivers/mfd/tc6387xb.c | 10 +-
drivers/mfd/tc6393xb.c | 23 +-
drivers/mfd/tps65090.c | 62 +-
drivers/mfd/tps65217.c | 2 +
drivers/mfd/twl4030-power.c | 3 +
drivers/mfd/viperboard.c | 5 +-
drivers/mfd/wm5102-tables.c | 6 +-
drivers/mfd/wm5110-tables.c | 20 +
drivers/mfd/wm8350-core.c | 2 +-
drivers/mfd/wm8997-tables.c | 6 +
drivers/regulator/Kconfig | 10 +-
drivers/regulator/s2mps11.c | 102 ++-
include/linux/mfd/abx500/ab8500-sysctrl.h | 1 -
include/linux/mfd/arizona/registers.h | 50 ++
include/linux/mfd/atmel-hlcdc.h | 85 +++
include/linux/mfd/axp20x.h | 59 ++
include/linux/mfd/core.h | 7 +
include/linux/mfd/dln2.h | 103 +++
include/linux/mfd/max77693-private.h | 1 -
include/linux/mfd/rtsx_pci.h | 28 +
include/linux/mfd/samsung/core.h | 2 +
include/linux/mfd/samsung/s2mps13.h | 186 +++++
include/linux/mfd/tc3589x.h | 8 -
include/linux/of.h | 11 +
63 files changed, 3417 insertions(+), 273 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
create mode 100644 drivers/gpio/gpio-dln2.c
create mode 100644 drivers/i2c/busses/i2c-dln2.c
create mode 100644 drivers/iio/adc/axp288_adc.c
create mode 100644 drivers/mfd/atmel-hlcdc.c
create mode 100644 drivers/mfd/dln2.c
create mode 100644 drivers/mfd/rtsx_gops.c
create mode 100644 include/linux/mfd/atmel-hlcdc.h
create mode 100644 include/linux/mfd/dln2.h
create mode 100644 include/linux/mfd/samsung/s2mps13.h
Merging backlight/for-backlight-next (3e0e9ce4ae9b backlight: Extend of_find_backlight_by_node stub-check to modules)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
drivers/video/backlight/pwm_bl.c | 5 ++++-
include/linux/backlight.h | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
Merging battery/master (99a79565e6db power: ds2782_battery: Simplify the PM hooks)
$ git merge battery/master
Merge made by the 'recursive' strategy.
.../bindings/power_supply/gpio-charger.txt | 27 ++++++++
drivers/power/ds2782_battery.c | 8 +--
drivers/power/gpio-charger.c | 72 +++++++++++++++++++++-
drivers/power/reset/axxia-reset.c | 21 +++++--
drivers/power/reset/brcmstb-reboot.c | 28 ++++++---
drivers/power/reset/hisi-reboot.c | 20 ++++--
drivers/power/reset/keystone-reset.c | 20 ++++--
drivers/power/reset/vexpress-poweroff.c | 40 +++++++++---
drivers/power/reset/xgene-reboot.c | 56 +++++++++--------
9 files changed, 224 insertions(+), 68 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power_supply/gpio-charger.txt
Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path)
$ git merge fbdev/for-next
Already up-to-date.
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 (10254e83abe1 Merge branches '3.19/simplefb' and '3.19/omapdss' into for-next)
$ git merge omap_dss2/for-next
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 drivers/video/fbdev/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2550c015993d] Merge remote-tracking branch 'omap_dss2/for-next'
$ git diff -M --stat --summary HEAD^..
.../bindings/video/simple-framebuffer-sunxi.txt | 33 ++
.../bindings/video/simple-framebuffer.txt | 68 ++-
MAINTAINERS | 8 +
drivers/video/console/fbcon.c | 2 +-
drivers/video/fbdev/Kconfig | 2 +-
drivers/video/fbdev/amba-clcd.c | 1 -
drivers/video/fbdev/mmp/core.c | 6 +-
drivers/video/fbdev/mxsfb.c | 19 +
.../fbdev/omap2/displays-new/encoder-tfp410.c | 1 +
.../fbdev/omap2/displays-new/encoder-tpd12s015.c | 1 +
drivers/video/fbdev/omap2/dss/Makefile | 2 +-
drivers/video/fbdev/omap2/dss/dispc.c | 20 +-
drivers/video/fbdev/omap2/dss/dpi.c | 327 ++++++----
drivers/video/fbdev/omap2/dss/dsi.c | 659 ++++++++-------------
drivers/video/fbdev/omap2/dss/dss-of.c | 58 +-
drivers/video/fbdev/omap2/dss/dss.c | 123 ++--
drivers/video/fbdev/omap2/dss/dss.h | 225 +++----
drivers/video/fbdev/omap2/dss/dss_features.c | 42 --
drivers/video/fbdev/omap2/dss/dss_features.h | 12 -
drivers/video/fbdev/omap2/dss/hdmi.h | 66 ++-
drivers/video/fbdev/omap2/dss/hdmi4.c | 98 ++-
drivers/video/fbdev/omap2/dss/hdmi4_core.c | 14 -
drivers/video/fbdev/omap2/dss/hdmi4_core.h | 4 -
drivers/video/fbdev/omap2/dss/hdmi5.c | 91 +--
drivers/video/fbdev/omap2/dss/hdmi5_core.c | 9 +-
drivers/video/fbdev/omap2/dss/hdmi5_core.h | 2 -
drivers/video/fbdev/omap2/dss/hdmi_common.c | 2 -
drivers/video/fbdev/omap2/dss/hdmi_phy.c | 31 +-
drivers/video/fbdev/omap2/dss/hdmi_pll.c | 313 +++++-----
drivers/video/fbdev/omap2/dss/hdmi_wp.c | 16 +-
drivers/video/fbdev/omap2/dss/output.c | 19 +-
drivers/video/fbdev/omap2/dss/pll.c | 378 ++++++++++++
drivers/video/fbdev/omap2/dss/sdi.c | 2 +-
drivers/video/fbdev/simplefb.c | 162 ++++-
drivers/video/fbdev/sm501fb.c | 1 +
include/linux/of.h | 3 +-
include/video/omapdss.h | 5 +-
37 files changed, 1647 insertions(+), 1178 deletions(-)
create mode 100644 Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt
create mode 100644 drivers/video/fbdev/omap2/dss/pll.c
Merging regulator/for-next (3a0028b1f0f3 Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next)
$ git merge regulator/for-next
Auto-merging drivers/regulator/s2mps11.c
Auto-merging drivers/regulator/Kconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/power/poweroff.txt | 18 ++
.../bindings/regulator/act8865-regulator.txt | 4 +
.../devicetree/bindings/regulator/max77802.txt | 35 +++
.../devicetree/bindings/regulator/regulator.txt | 22 ++
drivers/regulator/88pm8607.c | 3 +-
drivers/regulator/Kconfig | 10 +-
drivers/regulator/Makefile | 1 +
drivers/regulator/act8865-regulator.c | 31 +++
drivers/regulator/anatop-regulator.c | 18 +-
drivers/regulator/arizona-ldo1.c | 10 +-
drivers/regulator/arizona-micsupp.c | 8 +-
drivers/regulator/core.c | 21 +-
drivers/regulator/da9052-regulator.c | 3 +-
drivers/regulator/da9063-regulator.c | 19 +-
drivers/regulator/da9210-regulator.c | 2 +-
drivers/regulator/dummy.c | 2 +-
drivers/regulator/fan53555.c | 17 +-
drivers/regulator/fixed.c | 24 +-
drivers/regulator/gpio-regulator.c | 115 +++++-----
drivers/regulator/max77686.c | 172 +++++++-------
drivers/regulator/max77693.c | 2 +-
drivers/regulator/max77802.c | 254 +++++++++++----------
drivers/regulator/max8952.c | 4 +-
drivers/regulator/max8973-regulator.c | 3 +-
drivers/regulator/max8997.c | 3 +-
drivers/regulator/max8998.c | 5 +-
drivers/regulator/mc13xxx-regulator-core.c | 3 +-
drivers/regulator/of_regulator.c | 87 ++++++-
drivers/regulator/pwm-regulator.c | 3 +-
drivers/regulator/qcom_rpm-regulator.c | 28 ++-
drivers/regulator/rk808-regulator.c | 57 ++++-
drivers/regulator/rn5t618-regulator.c | 51 +----
drivers/regulator/rt5033-regulator.c | 123 ++++++++++
drivers/regulator/s2mpa01.c | 2 +-
drivers/regulator/s2mps11.c | 3 +-
drivers/regulator/s5m8767.c | 4 +-
drivers/regulator/sky81452-regulator.c | 3 +-
drivers/regulator/stw481x-vmmc.c | 3 +-
drivers/regulator/ti-abb-regulator.c | 3 +-
drivers/regulator/tps51632-regulator.c | 43 ++--
drivers/regulator/tps62360-regulator.c | 31 +--
drivers/regulator/tps65090-regulator.c | 4 +
drivers/regulator/tps65218-regulator.c | 3 +-
drivers/regulator/twl-regulator.c | 3 +-
drivers/regulator/vexpress.c | 3 +-
drivers/regulator/wm8994-regulator.c | 6 +-
include/dt-bindings/regulator/maxim,max77802.h | 18 ++
include/linux/mfd/max77686.h | 7 -
include/linux/regulator/consumer.h | 6 +-
include/linux/regulator/driver.h | 8 +
include/linux/regulator/of_regulator.h | 9 +-
51 files changed, 892 insertions(+), 425 deletions(-)
create mode 100644 Documentation/devicetree/bindings/power/poweroff.txt
create mode 100644 drivers/regulator/rt5033-regulator.c
create mode 100644 include/dt-bindings/regulator/maxim,max77802.h
Merging security/next (ac14ae25b676 Merge branch 'smack-for-3.19' of git://git.gitorious.org/smack-next/kernel into next)
$ git merge security/next
Auto-merging security/smack/smack_lsm.c
Auto-merging security/integrity/integrity.h
Auto-merging security/integrity/ima/ima_crypto.c
Auto-merging security/integrity/ima/ima_api.c
Auto-merging security/integrity/evm/evm_main.c
Auto-merging init/main.c
Auto-merging include/linux/fs.h
Auto-merging fs/read_write.c
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/kernel-parameters.txt | 4 ++
Documentation/security/IMA-templates.txt | 29 +++++----
fs/read_write.c | 24 +++++--
include/linux/fs.h | 1 +
include/linux/integrity.h | 6 ++
init/main.c | 6 +-
security/integrity/digsig.c | 38 +++++++++++-
security/integrity/evm/evm_main.c | 11 +++-
security/integrity/iint.c | 88 +++++++++++++++++++++++++-
security/integrity/ima/Kconfig | 25 ++++++++
security/integrity/ima/ima_api.c | 7 +--
security/integrity/ima/ima_crypto.c | 35 +----------
security/integrity/ima/ima_fs.c | 37 ++++++++---
security/integrity/ima/ima_init.c | 17 +++++
security/integrity/ima/ima_main.c | 5 +-
security/integrity/ima/ima_policy.c | 42 +++++--------
security/integrity/ima/ima_template.c | 103 +++++++++++++++++++++----------
security/integrity/integrity.h | 19 ++++--
security/smack/smack_access.c | 17 +++--
security/smack/smack_lsm.c | 13 +++-
20 files changed, 374 insertions(+), 153 deletions(-)
Merging integrity/next (6fb5032ebb1c VFS: refactor vfs_read())
$ git merge integrity/next
Already up-to-date.
Merging selinux/next (4093a8443941 selinux: normalize audit log formatting)
$ git merge selinux/next
Already up-to-date.
Merging lblnet/next (d8ec26d7f828 Linux 3.13)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (8ae1a57f54af watchdog: s3c2410_wdt: Fix the mask bit offset for Exynos7)
$ git merge watchdog/master
Resolved 'drivers/watchdog/s3c2410_wdt.c' using previous resolution.
Auto-merging drivers/watchdog/s3c2410_wdt.c
CONFLICT (content): Merge conflict in drivers/watchdog/s3c2410_wdt.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b073c6a681c2] Merge remote-tracking branch 'watchdog/master'
$ git diff -M --stat --summary HEAD^..
drivers/watchdog/s3c2410_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging iommu/next (0747669a8f9f Merge branches 'arm/omap', 'arm/msm', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next)
$ git merge iommu/next
Removing drivers/iommu/omap-iommu2.c
Auto-merging drivers/iommu/Kconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/iommu/rockchip,iommu.txt | 26 +
drivers/acpi/pci_root.c | 16 +-
drivers/iommu/Kconfig | 25 +-
drivers/iommu/Makefile | 2 +-
drivers/iommu/amd_iommu.c | 2 +
drivers/iommu/arm-smmu.c | 135 ++-
drivers/iommu/dmar.c | 532 ++++++++--
drivers/iommu/intel-iommu.c | 299 ++++--
drivers/iommu/intel_irq_remapping.c | 249 +++--
drivers/iommu/ipmmu-vmsa.c | 2 +-
drivers/iommu/msm_iommu.c | 3 +-
drivers/iommu/msm_iommu_dev.c | 10 +-
drivers/iommu/omap-iommu-debug.c | 242 ++---
drivers/iommu/omap-iommu.c | 312 +++---
drivers/iommu/omap-iommu.h | 98 +-
drivers/iommu/omap-iommu2.c | 337 -------
drivers/iommu/rockchip-iommu.c | 1038 ++++++++++++++++++++
include/linux/dmar.h | 50 +-
include/linux/iommu.h | 3 +-
19 files changed, 2412 insertions(+), 969 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iommu/rockchip,iommu.txt
delete mode 100644 drivers/iommu/omap-iommu2.c
create mode 100644 drivers/iommu/rockchip-iommu.c
Merging dwmw2-iommu/master (1860e379875d Linux 3.15)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU)
$ git merge vfio/next
Merge made by the 'recursive' strategy.
drivers/vfio/Kconfig | 2 +-
drivers/vfio/pci/Kconfig | 8 ++++++++
drivers/vfio/pci/vfio_pci.c | 5 +++--
drivers/vfio/pci/vfio_pci_config.c | 7 +++++++
4 files changed, 19 insertions(+), 3 deletions(-)
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (86d3e023e05d Merge branch 'docs-3.19' into docs-next)
$ git merge jc_docs/docs-next
Auto-merging Documentation/power/runtime_pm.txt
Auto-merging Documentation/kselftest.txt
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/CodingStyle | 43 ++++++++++++++++++++++
Documentation/filesystems/proc.txt | 2 +-
Documentation/kernel-parameters.txt | 7 ++++
.../README.txt => Documentation/kselftest.txt | 30 +++++++++------
Documentation/mailbox.txt | 2 +-
Documentation/power/runtime_pm.txt | 6 +--
Documentation/power/suspend-and-interrupts.txt | 2 +-
Documentation/power/userland-swsusp.txt | 2 +-
Documentation/vm/hugetlbpage.txt | 4 +-
drivers/dma-buf/fence.c | 2 +-
include/linux/fence.h | 4 +-
include/linux/i2c.h | 2 +-
12 files changed, 82 insertions(+), 24 deletions(-)
rename tools/testing/selftests/README.txt => Documentation/kselftest.txt (73%)
Merging trivial/for-next (078014dd3698 intel_ips: fix a type in error message)
$ git merge trivial/for-next
Auto-merging kernel/trace/trace.c
Auto-merging drivers/tty/serial/Kconfig
Auto-merging drivers/cpufreq/cpufreq-dt.c
Auto-merging arch/arm/mach-exynos/Kconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/st/st,flexgen.txt | 2 +-
Documentation/scsi/scsi_eh.txt | 4 +--
Documentation/usb/gadget_configfs.txt | 2 +-
arch/arm/boot/dts/bcm63138.dtsi | 2 +-
arch/arm/mach-exynos/Kconfig | 2 +-
arch/mips/cavium-octeon/setup.c | 4 +--
arch/mips/pci/pci-octeon.c | 2 +-
arch/powerpc/kvm/e500_mmu_host.c | 6 ++--
arch/powerpc/lib/copyuser_power7.S | 2 +-
arch/powerpc/lib/memcpy_power7.S | 2 +-
arch/powerpc/mm/mmu_decl.h | 2 +-
arch/powerpc/platforms/44x/Kconfig | 1 -
drivers/clk/Kconfig | 2 +-
drivers/cpufreq/cpufreq-dt.c | 2 +-
drivers/gpio/gpio-msm-v1.c | 2 +-
drivers/gpio/gpio-spear-spics.c | 2 +-
drivers/gpu/drm/radeon/mkregtable.c | 24 +++++++--------
drivers/isdn/mISDN/l1oip_core.c | 2 +-
drivers/media/pci/cx18/cx18-driver.h | 2 +-
drivers/media/pci/ttpci/budget-patch.c | 2 +-
drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +-
drivers/pci/pci-driver.c | 4 +--
drivers/pinctrl/spear/pinctrl-plgpio.c | 2 +-
drivers/platform/x86/intel_ips.c | 2 +-
drivers/s390/char/tape_3590.c | 4 +--
drivers/scsi/aha152x.c | 2 +-
drivers/scsi/isci/task.c | 2 +-
drivers/scsi/mac_scsi.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
drivers/scsi/ps3rom.c | 1 +
drivers/target/target_core_xcopy.c | 2 +-
drivers/tty/serial/Kconfig | 2 +-
drivers/usb/gadget/function/f_hid.c | 2 +-
drivers/usb/gadget/legacy/zero.c | 2 +-
drivers/usb/host/ehci-sysfs.c | 2 +-
drivers/usb/host/fotg210-hcd.c | 2 +-
drivers/usb/host/fusbh200-hcd.c | 2 +-
drivers/usb/serial/usb-serial-simple.c | 2 +-
drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 2 +-
.../video/fbdev/exynos/exynos_mipi_dsi_common.c | 2 +-
fs/reiserfs/journal.c | 2 +-
include/linux/list.h | 34 +++++++++++-----------
include/linux/mod_devicetable.h | 2 +-
include/linux/plist.h | 10 +++----
include/linux/rculist.h | 8 ++---
include/scsi/scsi_host.h | 2 +-
kernel/time/clocksource.c | 2 +-
kernel/trace/trace.c | 2 +-
mm/zbud.c | 2 +-
mm/zswap.c | 2 +-
scripts/kconfig/list.h | 6 ++--
.../multibuff/device_app/aio_multibuff.c | 2 +-
tools/usb/usbip/libsrc/list.h | 2 +-
54 files changed, 95 insertions(+), 95 deletions(-)
Merging audit/next (0288d7183c41 audit: convert status version to a feature bitmap)
$ git merge audit/next
Auto-merging kernel/audit.c
Auto-merging include/uapi/linux/audit.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 5 +++--
include/uapi/linux/audit.h | 17 +++++++++++++----
kernel/audit.c | 2 +-
3 files changed, 17 insertions(+), 7 deletions(-)
Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
$ git merge fsnotify/for-next
Already up-to-date.
Merging devicetree/devicetree/next (a81a6c654bbe ARM: dt: fix up PL011 device tree bindings)
$ git merge devicetree/devicetree/next
Resolved 'drivers/i2c/i2c-core.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 drivers/spi/spi.c
Auto-merging drivers/of/unittest.c
Removing drivers/of/testcase-data/testcases.dts
Auto-merging drivers/of/fdt.c
Auto-merging drivers/of/base.c
Auto-merging drivers/i2c/i2c-core.c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Auto-merging arch/powerpc/platforms/pseries/setup.c
Auto-merging arch/powerpc/platforms/pseries/iommu.c
Auto-merging arch/powerpc/platforms/pseries/hotplug-memory.c
Auto-merging arch/powerpc/mm/numa.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 665fcba83f13] Merge remote-tracking branch 'devicetree/devicetree/next'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/serial/pl011.txt | 28 +-
Documentation/devicetree/bindings/unittest.txt | 14 +
Documentation/devicetree/of_selftest.txt | 20 +-
Documentation/devicetree/overlay-notes.txt | 133 +++++
Documentation/devicetree/todo.txt | 1 -
arch/powerpc/mm/numa.c | 3 +-
arch/powerpc/platforms/pseries/hotplug-cpu.c | 7 +-
arch/powerpc/platforms/pseries/hotplug-memory.c | 15 +-
arch/powerpc/platforms/pseries/iommu.c | 5 +-
arch/powerpc/platforms/pseries/setup.c | 5 +-
drivers/base/platform.c | 1 +
drivers/crypto/nx/nx-842.c | 4 +-
drivers/i2c/i2c-core.c | 145 +++--
drivers/mfd/vexpress-sysreg.c | 2 +-
drivers/of/Kconfig | 11 +-
drivers/of/Makefile | 5 +-
drivers/of/address.c | 4 +-
drivers/of/base.c | 109 ++--
drivers/of/dynamic.c | 218 ++++++--
drivers/of/fdt.c | 87 +--
drivers/of/of_private.h | 2 +-
drivers/of/overlay.c | 562 +++++++++++++++++++
drivers/of/pdt.c | 27 +-
drivers/of/platform.c | 65 ++-
drivers/of/resolver.c | 128 ++++-
drivers/of/testcase-data/testcases.dts | 50 --
drivers/of/unittest-data/testcases.dts | 79 +++
.../tests-interrupts.dtsi | 0
.../tests-match.dtsi | 0
drivers/of/unittest-data/tests-overlay.dtsi | 180 ++++++
.../tests-phandle.dtsi | 0
.../tests-platform.dtsi | 0
drivers/of/{selftest.c => unittest.c} | 605 +++++++++++++++++++--
drivers/spi/spi.c | 306 +++++++----
include/linux/of.h | 106 +++-
include/linux/of_address.h | 4 +-
include/linux/of_pdt.h | 3 +-
include/linux/of_platform.h | 6 +
38 files changed, 2433 insertions(+), 507 deletions(-)
create mode 100644 Documentation/devicetree/bindings/unittest.txt
create mode 100644 Documentation/devicetree/overlay-notes.txt
create mode 100644 drivers/of/overlay.c
delete mode 100644 drivers/of/testcase-data/testcases.dts
create mode 100644 drivers/of/unittest-data/testcases.dts
rename drivers/of/{testcase-data => unittest-data}/tests-interrupts.dtsi (100%)
rename drivers/of/{testcase-data => unittest-data}/tests-match.dtsi (100%)
create mode 100644 drivers/of/unittest-data/tests-overlay.dtsi
rename drivers/of/{testcase-data => unittest-data}/tests-phandle.dtsi (100%)
rename drivers/of/{testcase-data => unittest-data}/tests-platform.dtsi (100%)
rename drivers/of/{selftest.c => unittest.c} (67%)
Merging dt-rh/for-next (a0e27f51ba8a documentation: pinctrl bindings: Fix trivial typo 'abitrary')
$ git merge dt-rh/for-next
Already up-to-date.
Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (6c32695a7cfe Merge remote-tracking branches 'spi/topic/pxa', 'spi/topic/rockchip', 'spi/topic/samsung', 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/spi/spi-gpio.txt | 6 +-
.../devicetree/bindings/spi/spi-img-spfi.txt | 37 +
.../devicetree/bindings/spi/spi-meson.txt | 22 +
.../devicetree/bindings/spi/spi-samsung.txt | 2 +-
drivers/spi/Kconfig | 17 +-
drivers/spi/Makefile | 2 +
drivers/spi/spi-atmel.c | 115 ++--
drivers/spi/spi-cadence.c | 33 +-
drivers/spi/spi-dw-mid.c | 114 +++-
drivers/spi/spi-dw.h | 2 +-
drivers/spi/spi-fsl-cpm.c | 5 +-
drivers/spi/spi-fsl-dspi.c | 3 +-
drivers/spi/spi-gpio.c | 37 +-
drivers/spi/spi-img-spfi.c | 746 +++++++++++++++++++++
drivers/spi/spi-meson-spifc.c | 462 +++++++++++++
drivers/spi/spi-mxs.c | 12 +-
drivers/spi/spi-pxa2xx-pci.c | 8 +
drivers/spi/spi-pxa2xx.c | 304 +++++++--
drivers/spi/spi-pxa2xx.h | 16 +-
drivers/spi/spi-rockchip.c | 2 -
drivers/spi/spi-s3c64xx.c | 32 +-
drivers/spi/spi-sirf.c | 12 +-
drivers/spi/spidev.c | 16 +-
include/linux/pxa2xx_ssp.h | 20 +
include/linux/spi/spi.h | 6 +
25 files changed, 1859 insertions(+), 172 deletions(-)
create mode 100644 Documentation/devicetree/bindings/spi/spi-img-spfi.txt
create mode 100644 Documentation/devicetree/bindings/spi/spi-meson.txt
create mode 100644 drivers/spi/spi-img-spfi.c
create mode 100644 drivers/spi/spi-meson-spifc.c
Merging tip/auto-latest (1fdf2540a41b Merge branch 'x86/vdso')
$ git merge tip/auto-latest
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutortureResolved 'drivers/pci/host/pcie-rcar.c' using previous resolution.
/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP
Removing tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST
Auto-merging net/core/rtnetlink.c
Auto-merging net/core/dev.c
Auto-merging net/bluetooth/rfcomm/core.c
Auto-merging lib/Kconfig.debug
Auto-merging kernel/module.c
Auto-merging kernel/events/core.c
Auto-merging kernel/audit.c
Auto-merging init/Kconfig
Auto-merging include/net/sock.h
Auto-merging include/linux/pci.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/acpi.h
Auto-merging drivers/pci/msi.c
Removing drivers/pci/ioapic.c
Auto-merging drivers/pci/host/pcie-rcar.c
CONFLICT (content): Merge conflict in drivers/pci/host/pcie-rcar.c
Auto-merging drivers/pci/host/pcie-designware.c
Auto-merging drivers/pci/host/pci-mvebu.c
Auto-merging drivers/pci/host/pci-keystone-dw.c
Auto-merging drivers/irqchip/irq-armada-370-xp.c
Auto-merging drivers/irqchip/Kconfig
Auto-merging drivers/iommu/intel_irq_remapping.c
Auto-merging drivers/iommu/amd_iommu.c
Auto-merging drivers/acpi/pci_root.c
Auto-merging drivers/acpi/internal.h
Auto-merging drivers/acpi/Makefile
Auto-merging drivers/acpi/Kconfig
Auto-merging arch/x86/mm/ioremap.c
Auto-merging arch/x86/include/uapi/asm/msr-index.h
Auto-merging arch/x86/include/asm/io.h
Auto-merging arch/x86/Kconfig
Auto-merging arch/tile/kernel/pci_gx.c
Auto-merging arch/s390/pci/pci.c
Auto-merging arch/powerpc/sysdev/ppc4xx_msi.c
Auto-merging arch/powerpc/sysdev/mpic_u3msi.c
Auto-merging arch/powerpc/sysdev/mpic_pasemi_msi.c
Auto-merging arch/powerpc/sysdev/fsl_msi.c
Auto-merging arch/powerpc/platforms/pseries/msi.c
Auto-merging arch/powerpc/platforms/powernv/pci.c
Auto-merging arch/arm/kernel/bios32.c
Auto-merging Documentation/memory-barriers.txt
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 61a3d28fc5aa] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
Documentation/IRQ-domain.txt | 71 +
Documentation/RCU/rcu.txt | 4 +-
Documentation/RCU/stallwarn.txt | 14 +-
Documentation/RCU/trace.txt | 4 +-
Documentation/RCU/whatisRCU.txt | 2 +-
Documentation/atomic_ops.txt | 12 +-
Documentation/kernel-parameters.txt | 16 +
Documentation/memory-barriers.txt | 40 +-
Documentation/x86/intel_mpx.txt | 234 ++++
arch/arm/include/asm/mach/pci.h | 10 +-
arch/arm/kernel/bios32.c | 28 +-
arch/arm/mach-iop13xx/msi.c | 10 +-
arch/ia64/include/uapi/asm/siginfo.h | 8 +-
arch/ia64/kernel/msi_ia64.c | 8 +-
arch/ia64/sn/kernel/msi_sn.c | 8 +-
arch/mips/include/uapi/asm/siginfo.h | 4 +
arch/mips/pci/msi-octeon.c | 2 +-
arch/mips/pci/msi-xlp.c | 12 +-
arch/mips/pci/pci-xlr.c | 2 +-
arch/powerpc/platforms/cell/axon_msi.c | 8 +-
arch/powerpc/platforms/powernv/pci.c | 2 +-
arch/powerpc/platforms/pseries/msi.c | 2 +-
arch/powerpc/sysdev/fsl_msi.c | 6 +-
arch/powerpc/sysdev/mpic_pasemi_msi.c | 6 +-
arch/powerpc/sysdev/mpic_u3msi.c | 6 +-
arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 2 +-
arch/powerpc/sysdev/ppc4xx_msi.c | 2 +-
arch/powerpc/sysdev/xics/ics-opal.c | 2 +-
arch/powerpc/sysdev/xics/ics-rtas.c | 2 +-
arch/s390/include/asm/mmu_context.h | 11 +
arch/s390/pci/pci.c | 10 +-
arch/sparc/kernel/pci_msi.c | 10 +-
arch/tile/kernel/pci_gx.c | 8 +-
arch/um/include/asm/mmu_context.h | 24 +-
arch/unicore32/include/asm/mmu_context.h | 11 +
arch/x86/Kconfig | 28 +-
arch/x86/boot/compressed/Makefile | 17 +-
arch/x86/boot/compressed/eboot.c | 8 +-
arch/x86/boot/compressed/eboot.h | 16 -
arch/x86/boot/compressed/misc.c | 14 +-
arch/x86/include/asm/cacheflush.h | 59 -
arch/x86/include/asm/disabled-features.h | 8 +-
arch/x86/include/asm/efi.h | 24 +
arch/x86/include/asm/fb.h | 6 +-
arch/x86/include/asm/fixmap.h | 4 +-
arch/x86/include/asm/highmem.h | 25 +-
arch/x86/include/asm/hw_irq.h | 84 +-
arch/x86/include/asm/insn.h | 10 +-
arch/x86/include/asm/io.h | 2 +-
arch/x86/include/asm/io_apic.h | 35 +-
arch/x86/include/asm/irq_vectors.h | 6 +
arch/x86/include/asm/mce.h | 5 +-
arch/x86/include/asm/mmu_context.h | 37 +-
arch/x86/include/asm/mpx.h | 103 ++
arch/x86/include/asm/page_64.h | 4 +-
arch/x86/include/asm/paravirt.h | 16 +-
arch/x86/include/asm/pat.h | 7 +-
arch/x86/include/asm/pci.h | 3 +
arch/x86/include/asm/pci_x86.h | 2 +
arch/x86/include/asm/percpu.h | 61 +-
arch/x86/include/asm/perf_event.h | 3 +
arch/x86/include/asm/pgtable.h | 19 +-
arch/x86/include/asm/pgtable_32_types.h | 2 +-
arch/x86/include/asm/pgtable_64_types.h | 2 +
arch/x86/include/asm/pgtable_types.h | 96 +-
arch/x86/include/asm/preempt.h | 3 -
arch/x86/include/asm/processor.h | 45 +-
arch/x86/include/asm/switch_to.h | 12 +-
arch/x86/include/asm/uv/uv_bau.h | 4 +-
arch/x86/include/asm/vgtod.h | 19 +
arch/x86/include/asm/vsyscall.h | 33 +-
arch/x86/include/asm/vvar.h | 2 -
arch/x86/include/uapi/asm/msr-index.h | 1 +
arch/x86/kernel/Makefile | 3 +-
arch/x86/kernel/acpi/boot.c | 99 +-
arch/x86/kernel/apic/Makefile | 4 +-
arch/x86/kernel/apic/apic.c | 22 +-
arch/x86/kernel/apic/apic_numachip.c | 26 +-
arch/x86/kernel/apic/htirq.c | 107 ++
arch/x86/kernel/apic/io_apic.c | 1368 ++++----------------
arch/x86/kernel/apic/msi.c | 286 ++++
arch/x86/kernel/apic/vector.c | 719 ++++++++++
arch/x86/kernel/asm-offsets_64.c | 1 -
arch/x86/kernel/cpu/amd.c | 23 +-
arch/x86/kernel/cpu/common.c | 10 -
arch/x86/kernel/cpu/mcheck/mce-internal.h | 4 +-
arch/x86/kernel/cpu/mcheck/mce-severity.c | 23 +-
arch/x86/kernel/cpu/mcheck/mce.c | 60 +-
arch/x86/kernel/cpu/mcheck/mce_amd.c | 54 +-
arch/x86/kernel/cpu/perf_event.h | 4 +
arch/x86/kernel/cpu/perf_event_amd_ibs.c | 15 +
arch/x86/kernel/cpu/perf_event_intel_ds.c | 98 +-
arch/x86/kernel/cpu/perf_event_intel_lbr.c | 25 +-
.../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 8 +
arch/x86/kernel/cpuid.c | 2 +-
arch/x86/kernel/crash.c | 1 +
arch/x86/kernel/entry_32.S | 4 +-
arch/x86/kernel/entry_64.S | 4 +-
arch/x86/kernel/espfix_64.c | 3 -
arch/x86/kernel/irqinit.c | 35 +-
arch/x86/kernel/kprobes/core.c | 8 +-
arch/x86/kernel/kprobes/opt.c | 4 +-
arch/x86/kernel/machine_kexec_32.c | 1 +
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/kernel/msr.c | 11 +-
arch/x86/kernel/reboot.c | 1 +
arch/x86/kernel/setup.c | 4 +-
arch/x86/kernel/setup_percpu.c | 2 +-
arch/x86/kernel/smpboot.c | 2 +-
arch/x86/kernel/sysfb.c | 2 +-
arch/x86/kernel/sysfb_simplefb.c | 5 +-
arch/x86/kernel/time.c | 2 +-
arch/x86/kernel/traps.c | 85 +-
arch/x86/kernel/uprobes.c | 2 +-
arch/x86/kernel/vmlinux.lds.S | 2 +
arch/x86/kernel/vsyscall_64.c | 147 +--
arch/x86/lguest/boot.c | 2 +-
arch/x86/lib/insn.c | 5 +-
arch/x86/mm/Makefile | 2 +
arch/x86/mm/dump_pagetables.c | 27 +-
arch/x86/mm/init.c | 37 +
arch/x86/mm/init_64.c | 65 +-
arch/x86/mm/iomap_32.c | 12 +-
arch/x86/mm/ioremap.c | 63 +-
arch/x86/mm/mm_internal.h | 2 +
arch/x86/mm/mpx.c | 928 +++++++++++++
arch/x86/mm/pageattr.c | 84 +-
arch/x86/mm/pat.c | 245 +++-
arch/x86/mm/pat_internal.h | 22 +-
arch/x86/mm/pat_rbtree.c | 8 +-
arch/x86/pci/acpi.c | 145 +--
arch/x86/pci/i386.c | 4 +-
arch/x86/pci/intel_mid_pci.c | 10 +-
arch/x86/pci/irq.c | 25 +-
arch/x86/pci/numachip.c | 2 +-
arch/x86/pci/xen.c | 4 +-
arch/x86/platform/efi/efi_64.c | 3 +-
arch/x86/platform/uv/tlb_uv.c | 4 +
arch/x86/platform/uv/uv_irq.c | 6 +-
arch/x86/purgatory/Makefile | 1 +
arch/x86/tools/insn_sanity.c | 2 +-
arch/x86/tools/relocs.c | 36 +-
arch/x86/tools/test_get_len.c | 2 +-
arch/x86/vdso/vgetcpu.c | 2 -
arch/x86/vdso/vma.c | 83 +-
arch/x86/xen/enlighten.c | 25 +-
arch/x86/xen/mmu.c | 53 +-
arch/x86/xen/xen-ops.h | 1 -
drivers/acpi/Kconfig | 6 +
drivers/acpi/Makefile | 1 +
drivers/acpi/apei/ghes.c | 20 +-
drivers/acpi/internal.h | 7 +
drivers/acpi/ioapic.c | 235 ++++
drivers/acpi/pci_irq.c | 11 +-
drivers/acpi/pci_root.c | 3 +
drivers/acpi/processor_core.c | 132 +-
drivers/acpi/resource.c | 2 +-
drivers/edac/mce_amd.h | 3 -
drivers/firmware/efi/Makefile | 2 +-
drivers/iommu/amd_iommu.c | 14 +-
drivers/iommu/intel_irq_remapping.c | 10 +-
drivers/iommu/irq_remapping.c | 14 +-
drivers/irqchip/Kconfig | 1 +
drivers/irqchip/irq-armada-370-xp.c | 18 +-
drivers/irqchip/irq-hip04.c | 3 +-
drivers/of/of_pci.c | 8 +-
drivers/pci/Kconfig | 15 +-
drivers/pci/Makefile | 2 -
drivers/pci/host/pci-keystone-dw.c | 6 +-
drivers/pci/host/pci-keystone.h | 2 +-
drivers/pci/host/pci-mvebu.c | 13 +-
drivers/pci/host/pci-tegra.c | 35 +-
drivers/pci/host/pcie-designware.c | 32 +-
drivers/pci/host/pcie-designware.h | 2 +-
drivers/pci/host/pcie-rcar.c | 31 +-
drivers/pci/host/pcie-xilinx.c | 37 +-
drivers/pci/hotplug/ibmphp_core.c | 6 +-
drivers/pci/ioapic.c | 121 --
drivers/pci/msi.c | 377 ++++--
drivers/rtc/class.c | 30 +-
drivers/rtc/rtc-lib.c | 38 +-
drivers/tty/n_tty.c | 17 +-
drivers/vfio/pci/vfio_pci_intrs.c | 2 +-
drivers/video/fbdev/gbefb.c | 3 +-
drivers/video/fbdev/vermilion/vermilion.c | 6 +-
fs/efivarfs/super.c | 11 +-
fs/exec.c | 1 +
fs/notify/inotify/inotify_user.c | 9 +-
fs/proc/task_mmu.c | 3 +
include/asm-generic/mm_hooks.h | 17 +-
include/asm-generic/msi.h | 32 +
include/asm-generic/preempt.h | 3 -
include/linux/acpi.h | 5 +
include/linux/freezer.h | 50 -
include/linux/init_task.h | 12 +-
include/linux/irq.h | 39 +-
include/linux/irqdomain.h | 101 ++
include/linux/irqhandler.h | 14 +
include/linux/kernel.h | 5 +
include/linux/mm.h | 6 +
include/linux/mm_types.h | 4 +
include/linux/msi.h | 186 ++-
include/linux/of_pci.h | 12 +-
include/linux/pci.h | 3 +-
include/linux/perf_event.h | 37 +-
include/linux/rcupdate.h | 19 +-
include/linux/rcutiny.h | 2 +-
include/linux/rcutree.h | 6 +-
include/linux/rtc.h | 21 +-
include/linux/sched.h | 91 +-
include/linux/time.h | 17 +-
include/linux/timekeeper_internal.h | 2 +
include/linux/timekeeping.h | 51 +-
include/linux/wait.h | 80 +-
include/net/sock.h | 1 +
include/trace/events/rcu.h | 4 +-
include/trace/events/sched.h | 9 +-
include/uapi/asm-generic/siginfo.h | 9 +-
include/uapi/linux/perf_event.h | 15 +-
include/uapi/linux/prctl.h | 6 +
include/uapi/linux/sched.h | 4 +-
init/Kconfig | 49 +-
kernel/audit.c | 11 +-
kernel/cpu.c | 19 +-
kernel/cpuset.c | 23 +-
kernel/events/core.c | 60 +-
kernel/exit.c | 5 +
kernel/fork.c | 5 +-
kernel/irq/Kconfig | 15 +
kernel/irq/Makefile | 1 +
kernel/irq/chip.c | 130 +-
kernel/irq/irqdomain.c | 567 +++++++-
kernel/irq/manage.c | 2 +
kernel/irq/msi.c | 324 +++++
kernel/locking/mutex.c | 8 +-
kernel/module.c | 30 +-
kernel/rcu/Makefile | 2 +-
kernel/rcu/rcu.h | 2 +
kernel/rcu/rcutorture.c | 1 +
kernel/rcu/tiny.c | 6 +-
kernel/rcu/tree.c | 97 +-
kernel/rcu/tree.h | 22 +-
kernel/rcu/tree_plugin.h | 111 +-
kernel/rcu/update.c | 89 +-
kernel/sched/completion.c | 5 +-
kernel/sched/core.c | 234 +++-
kernel/sched/cpudeadline.h | 3 -
kernel/sched/cpupri.h | 3 -
kernel/sched/deadline.c | 99 +-
kernel/sched/debug.c | 11 +-
kernel/sched/fair.c | 354 +++--
kernel/sched/rt.c | 17 +-
kernel/sched/sched.h | 43 +
kernel/sched/wait.c | 66 +
kernel/signal.c | 46 +-
kernel/smpboot.c | 15 +-
kernel/softirq.c | 2 +-
kernel/sys.c | 12 +
kernel/time/Makefile | 2 +-
kernel/time/{udelay_test.c => test_udelay.c} | 0
kernel/time/tick-sched.c | 2 +-
kernel/time/time.c | 20 +-
kernel/time/timekeeping.c | 127 +-
kernel/time/timer.c | 3 +-
lib/Kconfig.debug | 14 +-
mm/memory-failure.c | 2 +-
mm/mmap.c | 2 +
net/bluetooth/rfcomm/core.c | 18 +-
net/core/dev.c | 10 +-
net/core/rtnetlink.c | 10 +-
tools/perf/.gitignore | 2 +
tools/perf/Documentation/perf-record.txt | 6 +
tools/perf/Makefile.perf | 51 +-
tools/perf/arch/powerpc/util/skip-callchain-idx.c | 38 +-
tools/perf/builtin-diff.c | 1 +
tools/perf/builtin-inject.c | 4 +-
tools/perf/builtin-kvm.c | 25 +
tools/perf/builtin-probe.c | 65 +-
tools/perf/builtin-record.c | 20 +-
tools/perf/builtin-script.c | 8 +-
tools/perf/builtin-timechart.c | 9 +-
tools/perf/builtin-trace.c | 6 +-
tools/perf/config/Makefile | 49 +-
tools/perf/config/Makefile.arch | 8 +
tools/perf/config/feature-checks/Makefile | 16 +-
tools/perf/config/feature-checks/test-all.c | 5 +
tools/perf/config/feature-checks/test-compile.c | 4 +
tools/perf/config/feature-checks/test-zlib.c | 9 +
tools/perf/perf-read-vdso.c | 34 +
tools/perf/perf.h | 4 +
.../scripts/python/bin/export-to-postgresql-record | 8 +
.../scripts/python/bin/export-to-postgresql-report | 29 +
tools/perf/scripts/python/export-to-postgresql.py | 444 +++++++
tools/perf/tests/builtin-test.c | 2 +-
tools/perf/tests/code-reading.c | 13 +-
tools/perf/tests/dwarf-unwind.c | 18 +-
tools/perf/tests/hists_filter.c | 2 +-
tools/perf/tests/mmap-thread-lookup.c | 2 +-
tools/perf/tests/sample-parsing.c | 55 +-
tools/perf/ui/browsers/annotate.c | 13 +-
tools/perf/ui/browsers/hists.c | 17 -
tools/perf/ui/gtk/hists.c | 11 +-
tools/perf/ui/stdio/hist.c | 23 +-
tools/perf/util/annotate.c | 32 +-
tools/perf/util/annotate.h | 1 +
tools/perf/util/build-id.c | 348 ++++-
tools/perf/util/build-id.h | 12 +
tools/perf/util/callchain.c | 23 +-
tools/perf/util/callchain.h | 9 +-
tools/perf/util/comm.h | 4 +
tools/perf/util/db-export.c | 428 ++++++
tools/perf/util/db-export.h | 107 ++
tools/perf/util/dso.c | 71 +
tools/perf/util/dso.h | 13 +
tools/perf/util/event.c | 20 +-
tools/perf/util/event.h | 43 +-
tools/perf/util/evlist.c | 38 +-
tools/perf/util/evsel.c | 56 +-
tools/perf/util/evsel.h | 5 +
tools/perf/util/find-vdso-map.c | 30 +
tools/perf/util/header.c | 361 +-----
tools/perf/util/header.h | 8 +-
tools/perf/util/include/linux/bitmap.h | 17 +
tools/perf/util/include/linux/bitops.h | 2 +
tools/perf/util/machine.c | 142 +-
tools/perf/util/machine.h | 17 +-
tools/perf/util/map.c | 8 +-
tools/perf/util/map.h | 4 +-
tools/perf/util/parse-options.c | 78 +-
tools/perf/util/parse-options.h | 4 +
tools/perf/util/pmu.c | 41 +-
tools/perf/util/pmu.h | 1 +
tools/perf/util/probe-event.c | 18 +-
.../perf/util/scripting-engines/trace-event-perl.c | 29 +-
.../util/scripting-engines/trace-event-python.c | 440 ++++++-
tools/perf/util/session.c | 185 ++-
tools/perf/util/session.h | 15 +
tools/perf/util/sort.c | 2 +-
tools/perf/util/srcline.c | 2 +-
tools/perf/util/symbol-elf.c | 35 +-
tools/perf/util/symbol-minimal.c | 1 -
tools/perf/util/symbol.c | 19 +-
tools/perf/util/symbol.h | 1 +
tools/perf/util/thread-stack.c | 747 +++++++++++
tools/perf/util/thread-stack.h | 111 ++
tools/perf/util/thread.c | 14 +-
tools/perf/util/thread.h | 9 +-
tools/perf/util/tool.h | 3 +-
tools/perf/util/unwind-libdw.c | 8 +-
tools/perf/util/unwind-libunwind.c | 17 +-
tools/perf/util/unwind.h | 2 -
tools/perf/util/util.h | 6 +-
tools/perf/util/vdso.c | 217 +++-
tools/perf/util/vdso.h | 4 +-
tools/perf/util/zlib.c | 78 ++
.../selftests/rcutorture/bin/kvm-test-1-run.sh | 6 +-
tools/testing/selftests/rcutorture/bin/kvm.sh | 19 +-
.../selftests/rcutorture/configs/rcu/TINY02 | 2 +
.../selftests/rcutorture/configs/rcu/TINY02.boot | 2 +
.../selftests/rcutorture/configs/rcu/TREE01 | 3 +-
.../selftests/rcutorture/configs/rcu/TREE02 | 3 +-
.../selftests/rcutorture/configs/rcu/TREE02-T | 3 +-
.../selftests/rcutorture/configs/rcu/TREE03 | 5 +-
.../selftests/rcutorture/configs/rcu/TREE04 | 1 -
.../selftests/rcutorture/configs/rcu/TREE05 | 1 -
.../selftests/rcutorture/configs/rcu/TREE05.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE06 | 1 -
.../selftests/rcutorture/configs/rcu/TREE06.boot | 3 +
.../selftests/rcutorture/configs/rcu/TREE07 | 1 -
.../selftests/rcutorture/configs/rcu/TREE08 | 5 +-
.../selftests/rcutorture/configs/rcu/TREE08-T | 3 +-
.../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +
.../selftests/rcutorture/configs/rcu/TREE09 | 3 +-
.../selftests/rcutorture/configs/rcu/v0.0/CFLIST | 14 -
.../configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP | 18 -
.../configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp | 22 -
.../configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP | 18 -
.../configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp | 22 -
.../selftests/rcutorture/configs/rcu/v0.0/NT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v0.0/NT3-NH | 20 -
.../configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP | 19 -
.../configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp | 20 -
.../configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP | 22 -
.../configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp | 27 -
.../selftests/rcutorture/configs/rcu/v0.0/PT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v0.0/PT2-NH | 22 -
.../rcutorture/configs/rcu/v0.0/ver_functions.sh | 33 -
.../selftests/rcutorture/configs/rcu/v3.12/CFLIST | 17 -
.../configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP | 19 -
.../configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp | 22 -
.../configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP | 18 -
.../configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp | 22 -
.../configs/rcu/v3.12/N6---t-nh-SD-smp-hp | 19 -
.../configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP | 26 -
.../configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP | 22 -
.../selftests/rcutorture/configs/rcu/v3.12/NT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.12/NT3-NH | 20 -
.../configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP | 20 -
.../configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp | 20 -
.../configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP | 22 -
.../configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp | 27 -
.../configs/rcu/v3.12/P6---t-nh-SD-smp-hp | 18 -
.../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP | 30 -
.../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all | 30 -
.../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none | 30 -
.../configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp | 30 -
.../selftests/rcutorture/configs/rcu/v3.12/PT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.12/PT2-NH | 22 -
.../selftests/rcutorture/configs/rcu/v3.3/CFLIST | 14 -
.../configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP | 19 -
.../configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp | 22 -
.../configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP | 18 -
.../configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp | 22 -
.../selftests/rcutorture/configs/rcu/v3.3/NT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.3/NT3-NH | 20 -
.../configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP | 20 -
.../configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp | 20 -
.../configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP | 22 -
.../configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp | 27 -
.../selftests/rcutorture/configs/rcu/v3.3/PT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.3/PT2-NH | 22 -
.../rcutorture/configs/rcu/v3.3/ver_functions.sh | 44 -
.../selftests/rcutorture/configs/rcu/v3.5/CFLIST | 14 -
.../configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP | 19 -
.../configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp | 22 -
.../configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP | 18 -
.../configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp | 22 -
.../selftests/rcutorture/configs/rcu/v3.5/NT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.5/NT3-NH | 20 -
.../configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP | 20 -
.../configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp | 20 -
.../configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp | 20 -
.../configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP | 22 -
.../configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp | 27 -
.../selftests/rcutorture/configs/rcu/v3.5/PT1-nh | 23 -
.../selftests/rcutorture/configs/rcu/v3.5/PT2-NH | 22 -
.../rcutorture/configs/rcu/v3.5/ver_functions.sh | 57 -
.../testing/selftests/rcutorture/doc/TINY_RCU.txt | 2 +-
.../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 15 +-
446 files changed, 12321 insertions(+), 5709 deletions(-)
create mode 100644 Documentation/x86/intel_mpx.txt
create mode 100644 arch/x86/include/asm/mpx.h
create mode 100644 arch/x86/kernel/apic/htirq.c
create mode 100644 arch/x86/kernel/apic/msi.c
create mode 100644 arch/x86/kernel/apic/vector.c
create mode 100644 arch/x86/mm/mpx.c
create mode 100644 drivers/acpi/ioapic.c
delete mode 100644 drivers/pci/ioapic.c
create mode 100644 include/asm-generic/msi.h
create mode 100644 include/linux/irqhandler.h
create mode 100644 kernel/irq/msi.c
rename kernel/time/{udelay_test.c => test_udelay.c} (100%)
create mode 100644 tools/perf/config/feature-checks/test-compile.c
create mode 100644 tools/perf/config/feature-checks/test-zlib.c
create mode 100644 tools/perf/perf-read-vdso.c
create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record
create mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report
create mode 100644 tools/perf/scripts/python/export-to-postgresql.py
create mode 100644 tools/perf/util/db-export.c
create mode 100644 tools/perf/util/db-export.h
create mode 100644 tools/perf/util/find-vdso-map.c
create mode 100644 tools/perf/util/thread-stack.c
create mode 100644 tools/perf/util/thread-stack.h
create mode 100644 tools/perf/util/zlib.c
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/CFLIST
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/N5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/NT3-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/P5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/PT2-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v0.0/ver_functions.sh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/CFLIST
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N6---t-nh-SD-smp-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N7-4-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/N8-2-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/NT3-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P6---t-nh-SD-smp-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-all
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-HP-none
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/P7-4-T-NH-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.12/PT2-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/CFLIST
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/N5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/NT3-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/P5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/PT2-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.3/ver_functions.sh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/CFLIST
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/N5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/NT3-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P1-S-T-NH-SD-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P2-2-t-nh-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P3-3-T-nh-SD-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P4-A-t-NH-sd-SMP-HP
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/P5-U-T-NH-sd-SMP-hp
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT1-nh
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/PT2-NH
delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/v3.5/ver_functions.sh
Merging clockevents/clockevents/next (b0ad5917960c ARM/ARM64: arch-timer: fix arch_timer_probed logic)
$ git merge clockevents/clockevents/next
Merge made by the 'recursive' strategy.
Merging edac/linux_next (d0585cd815fa sb_edac: Claim a different PCI device)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (50872ccd8786 EDAC, MCE, AMD: Correct formatting of decoded text)
$ git merge edac-amd/for-next
Auto-merging drivers/edac/i3200_edac.c
Merge made by the 'recursive' strategy.
arch/x86/kernel/amd_nb.c | 2 +
drivers/edac/Kconfig | 16 +--
drivers/edac/Makefile | 2 +-
drivers/edac/amd64_edac.c | 260 +++++++++++++++++++++++++-----------
drivers/edac/amd64_edac.h | 15 ++-
drivers/edac/edac_mc.c | 40 +++---
drivers/edac/edac_pci_sysfs.c | 5 -
drivers/edac/ghes_edac.c | 4 +-
drivers/edac/i3000_edac.c | 3 +-
drivers/edac/i3200_edac.c | 3 +-
drivers/edac/i82443bxgx_edac.c | 3 +-
drivers/edac/mce_amd.c | 47 ++-----
drivers/edac/mce_amd_inj.c | 293 +++++++++++++++++++++++++++--------------
drivers/edac/mv64x60_edac.c | 8 +-
drivers/edac/ppc4xx_edac.c | 4 +-
drivers/edac/x38_edac.c | 3 +-
include/linux/edac.h | 4 +-
include/linux/pci_ids.h | 2 +
18 files changed, 446 insertions(+), 268 deletions(-)
Merging irqchip/irqchip/for-next (5cc8f658723f Merge branch 'irqchip/irqdomain-arm' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Resolved 'drivers/irqchip/Makefile' using previous resolution.
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/irqchip/Makefile
CONFLICT (content): Merge conflict in drivers/irqchip/Makefile
Auto-merging drivers/irqchip/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/plat-orion/gpio.c
Auto-merging arch/arm/mach-bcm/Kconfig
Auto-merging Documentation/devicetree/bindings/arm/gic.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3b995883801b] Merge remote-tracking branch 'irqchip/irqchip/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/devicetree/bindings/arm/gic-v3.txt | 39 +
Documentation/devicetree/bindings/arm/gic.txt | 53 +
.../bindings/arm/mediatek/mediatek,sysirq.txt | 28 +
.../interrupt-controller/brcm,bcm7120-l2-intc.txt | 26 +-
arch/arm/mach-bcm/Kconfig | 1 +
arch/arm/plat-orion/gpio.c | 8 +-
arch/arm64/Kconfig | 2 +
arch/arm64/include/asm/Kbuild | 1 +
drivers/irqchip/Kconfig | 18 +-
drivers/irqchip/Makefile | 7 +-
drivers/irqchip/irq-atmel-aic-common.c | 26 +
drivers/irqchip/irq-atmel-aic-common.h | 2 +
drivers/irqchip/irq-atmel-aic.c | 66 +-
drivers/irqchip/irq-atmel-aic5.c | 65 +-
drivers/irqchip/irq-bcm7120-l2.c | 174 ++-
drivers/irqchip/irq-brcmstb-l2.c | 41 +-
drivers/irqchip/irq-dw-apb-ictl.c | 32 +-
drivers/irqchip/irq-gic-v2m.c | 333 +++++
drivers/irqchip/irq-gic-v3-its.c | 1402 ++++++++++++++++++++
drivers/irqchip/irq-gic-v3.c | 156 ++-
drivers/irqchip/irq-gic.c | 81 +-
drivers/irqchip/irq-mtk-sysirq.c | 163 +++
drivers/irqchip/irq-sunxi-nmi.c | 4 +-
drivers/irqchip/irq-tb10x.c | 4 +-
include/linux/irq.h | 32 +-
include/linux/irqchip/arm-gic-v3.h | 128 ++
include/linux/irqchip/arm-gic.h | 4 +
kernel/irq/generic-chip.c | 36 +-
28 files changed, 2683 insertions(+), 249 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
create mode 100644 drivers/irqchip/irq-gic-v2m.c
create mode 100644 drivers/irqchip/irq-gic-v3-its.c
create mode 100644 drivers/irqchip/irq-mtk-sysirq.c
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (1dc38aa215e8 Merge branch 'for-next/ftrace/seq-buf' into trace/for-next)
$ git merge ftrace/for-next
Auto-merging lib/Makefile
Auto-merging kernel/trace/trace_syscalls.c
Auto-merging kernel/trace/trace_kdb.c
Auto-merging kernel/trace/trace_events.c
Auto-merging kernel/trace/trace.c
Auto-merging kernel/trace/ring_buffer.c
Auto-merging kernel/printk/printk.c
Auto-merging kernel/kprobes.c
Auto-merging arch/powerpc/kernel/ftrace.c
Merge made by the 'recursive' strategy.
Documentation/trace/ftrace.txt | 5 +
arch/powerpc/kernel/ftrace.c | 2 +-
arch/x86/kernel/apic/hw_nmi.c | 91 ++++-
arch/x86/kernel/ftrace.c | 286 +++++++++++++-
arch/x86/kernel/kprobes/ftrace.c | 9 +-
arch/x86/kernel/mcount_64.S | 69 +++-
arch/x86/kvm/mmutrace.h | 4 +-
drivers/firmware/efi/cper.c | 2 +-
include/linux/ftrace.h | 36 +-
include/linux/ftrace_event.h | 11 +
include/linux/percpu.h | 4 +
include/linux/printk.h | 2 +
include/linux/seq_buf.h | 136 +++++++
include/linux/trace_seq.h | 77 ++--
include/trace/ftrace.h | 8 +-
kernel/extable.c | 7 +-
kernel/kprobes.c | 2 +-
kernel/printk/printk.c | 41 +-
kernel/trace/blktrace.c | 148 ++++---
kernel/trace/ftrace.c | 330 ++++++++++++++--
kernel/trace/ring_buffer.c | 75 ++--
kernel/trace/trace.c | 217 ++++++-----
kernel/trace/trace.h | 15 +-
kernel/trace/trace_branch.c | 47 ++-
kernel/trace/trace_events.c | 13 +-
kernel/trace/trace_events_trigger.c | 6 +-
kernel/trace/trace_functions.c | 119 ++++--
kernel/trace/trace_functions_graph.c | 428 +++++++--------------
kernel/trace/trace_kdb.c | 21 +-
kernel/trace/trace_kprobe.c | 46 +--
kernel/trace/trace_mmiotrace.c | 52 +--
kernel/trace/trace_output.c | 416 ++++++++------------
kernel/trace/trace_output.h | 16 +-
kernel/trace/trace_printk.c | 2 +-
kernel/trace/trace_probe.c | 10 +-
kernel/trace/trace_sched_switch.c | 144 -------
kernel/trace/trace_sched_wakeup.c | 56 +++
kernel/trace/trace_seq.c | 253 +++++-------
kernel/trace/trace_syscalls.c | 47 +--
kernel/trace/trace_uprobe.c | 28 +-
lib/Makefile | 2 +-
lib/seq_buf.c | 359 +++++++++++++++++
tools/testing/selftests/ftrace/ftracetest | 7 +-
.../selftests/ftrace/test.d/00basic/basic4.tc | 5 +
.../selftests/ftrace/test.d/event/event-enable.tc | 53 +++
.../ftrace/test.d/event/subsystem-enable.tc | 53 +++
.../ftrace/test.d/event/toplevel-enable.tc | 47 +++
.../ftrace/test.d/ftrace/fgraph-filter-stack.tc | 89 +++++
.../ftrace/test.d/ftrace/fgraph-filter.tc | 52 +++
.../ftrace/test.d/ftrace/func_profiler.tc | 80 ++++
tools/testing/selftests/ftrace/test.d/functions | 16 +
.../ftrace/test.d/kprobe/add_and_remove.tc | 1 +
.../selftests/ftrace/test.d/kprobe/busy_check.tc | 1 +
.../selftests/ftrace/test.d/kprobe/kprobe_args.tc | 1 +
.../ftrace/test.d/kprobe/kprobe_ftrace.tc | 55 +++
.../ftrace/test.d/kprobe/kretprobe_args.tc | 1 +
56 files changed, 2756 insertions(+), 1347 deletions(-)
create mode 100644 include/linux/seq_buf.h
create mode 100644 lib/seq_buf.c
create mode 100644 tools/testing/selftests/ftrace/test.d/00basic/basic4.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-enable.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/event/toplevel-enable.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter-stack.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/fgraph-filter.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/func_profiler.tc
create mode 100644 tools/testing/selftests/ftrace/test.d/functions
create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_ftrace.tc
Merging rcu/rcu/next (71f55432d812 rcu: Expand SRCU ->completed to 64 bits)
$ git merge rcu/rcu/next
Resolved 'kernel/sched/core.c' using previous resolution.
Auto-merging kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/sched/core.c
Auto-merging Documentation/memory-barriers.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6023c90e304b] Merge remote-tracking branch 'rcu/rcu/next'
$ git diff -M --stat --summary HEAD^..
Documentation/RCU/stallwarn.txt | 2 +-
Documentation/memory-barriers.txt | 31 +++
include/linux/compiler.h | 2 +-
include/linux/rcupdate.h | 10 +-
include/linux/rcutiny.h | 40 +++-
include/linux/rcutree.h | 9 +-
include/linux/srcu.h | 4 +-
kernel/rcu/rcutorture.c | 63 +++---
kernel/rcu/srcu.c | 2 +-
kernel/rcu/tiny.c | 12 +-
kernel/rcu/tree.c | 205 +++++++++++++------
kernel/rcu/tree.h | 25 +--
kernel/rcu/tree_plugin.h | 216 ++++-----------------
.../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 18 ++
.../selftests/rcutorture/bin/parse-build.sh | 20 +-
15 files changed, 333 insertions(+), 326 deletions(-)
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 (b65d6e17fe22 kvm: x86: mask out XSAVES)
$ git merge kvm/linux-next
Auto-merging virt/kvm/kvm_main.c
Auto-merging include/linux/kvm_host.h
Auto-merging arch/x86/kvm/mmu.c
Auto-merging arch/x86/kvm/irq_comm.c
Auto-merging arch/x86/kvm/ioapic.h
Auto-merging arch/x86/kvm/ioapic.c
Auto-merging arch/x86/kvm/emulate.c
Auto-merging arch/s390/mm/pgtable.c
Auto-merging arch/s390/kvm/priv.c
Auto-merging arch/s390/kvm/kvm-s390.c
Removing arch/ia64/kvm/vtlb.c
Removing arch/ia64/kvm/vti.h
Removing arch/ia64/kvm/vmm_ivt.S
Removing arch/ia64/kvm/vmm.c
Removing arch/ia64/kvm/vcpu.h
Removing arch/ia64/kvm/vcpu.c
Removing arch/ia64/kvm/trampoline.S
Removing arch/ia64/kvm/process.c
Removing arch/ia64/kvm/optvfault.S
Removing arch/ia64/kvm/mmio.c
Removing arch/ia64/kvm/misc.h
Removing arch/ia64/kvm/memset.S
Removing arch/ia64/kvm/memcpy.S
Removing arch/ia64/kvm/lapic.h
Removing arch/ia64/kvm/kvm_minstate.h
Removing arch/ia64/kvm/kvm_lib.c
Removing arch/ia64/kvm/kvm_fw.c
CONFLICT (modify/delete): arch/ia64/kvm/kvm-ia64.c deleted in kvm/linux-next and modified in HEAD. Version HEAD of arch/ia64/kvm/kvm-ia64.c left in tree.
Removing arch/ia64/kvm/irq.h
Removing arch/ia64/kvm/asm-offsets.c
Removing arch/ia64/kvm/Makefile
Removing arch/ia64/kvm/Kconfig
Removing arch/ia64/include/uapi/asm/kvm.h
Removing arch/ia64/include/asm/pvclock-abi.h
Removing arch/ia64/include/asm/kvm_host.h
Auto-merging arch/ia64/Kconfig
Auto-merging MAINTAINERS
Removing Documentation/ia64/kvm.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/ia64/kvm/kvm-ia64.c
arch/ia64/kvm/kvm-ia64.c: needs merge
rm 'arch/ia64/kvm/kvm-ia64.c'
$ git commit -v -a
[master de8b5befacd4] Merge remote-tracking branch 'kvm/linux-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ia64/kvm.txt | 83 --
Documentation/virtual/kvm/api.txt | 85 +-
Documentation/virtual/kvm/devices/vm.txt | 10 +-
Documentation/virtual/kvm/msr.txt | 2 +-
MAINTAINERS | 9 -
arch/ia64/Kconfig | 3 -
arch/ia64/Makefile | 1 -
arch/ia64/include/asm/kvm_host.h | 609 --------
arch/ia64/include/asm/pvclock-abi.h | 48 -
arch/ia64/include/uapi/asm/kvm.h | 268 ----
arch/ia64/kvm/Kconfig | 66 -
arch/ia64/kvm/Makefile | 67 -
arch/ia64/kvm/asm-offsets.c | 241 ----
arch/ia64/kvm/irq.h | 33 -
arch/ia64/kvm/kvm-ia64.c | 1942 --------------------------
arch/ia64/kvm/kvm_fw.c | 674 ---------
arch/ia64/kvm/kvm_lib.c | 21 -
arch/ia64/kvm/kvm_minstate.h | 266 ----
arch/ia64/kvm/lapic.h | 30 -
arch/ia64/kvm/memcpy.S | 1 -
arch/ia64/kvm/memset.S | 1 -
arch/ia64/kvm/misc.h | 94 --
arch/ia64/kvm/mmio.c | 336 -----
arch/ia64/kvm/optvfault.S | 1090 ---------------
arch/ia64/kvm/process.c | 1024 --------------
arch/ia64/kvm/trampoline.S | 1038 --------------
arch/ia64/kvm/vcpu.c | 2209 ------------------------------
arch/ia64/kvm/vcpu.h | 752 ----------
arch/ia64/kvm/vmm.c | 99 --
arch/ia64/kvm/vmm_ivt.S | 1392 -------------------
arch/ia64/kvm/vti.h | 290 ----
arch/ia64/kvm/vtlb.c | 640 ---------
arch/s390/include/asm/kvm_host.h | 9 +
arch/s390/include/asm/sigp.h | 1 +
arch/s390/kvm/gaccess.c | 40 +-
arch/s390/kvm/interrupt.c | 2 +-
arch/s390/kvm/kvm-s390.c | 8 +
arch/s390/kvm/priv.c | 72 +-
arch/s390/kvm/sigp.c | 269 ++--
arch/s390/mm/pgtable.c | 2 +-
arch/x86/include/asm/kvm_host.h | 46 +-
arch/x86/include/asm/xsave.h | 1 +
arch/x86/kernel/kvmclock.c | 19 +-
arch/x86/kvm/Makefile | 7 +-
{virt => arch/x86}/kvm/assigned-dev.c | 0
arch/x86/kvm/cpuid.c | 14 +-
arch/x86/kvm/emulate.c | 352 +++--
{virt => arch/x86}/kvm/ioapic.c | 12 -
{virt => arch/x86}/kvm/ioapic.h | 4 +-
{virt => arch/x86}/kvm/iommu.c | 0
{virt => arch/x86}/kvm/irq_comm.c | 45 +-
arch/x86/kvm/lapic.c | 174 ++-
arch/x86/kvm/lapic.h | 12 +-
arch/x86/kvm/mmu.c | 7 +-
arch/x86/kvm/svm.c | 18 +-
arch/x86/kvm/trace.h | 37 +
arch/x86/kvm/vmx.c | 524 +++----
arch/x86/kvm/x86.c | 133 +-
arch/x86/kvm/x86.h | 3 +-
include/linux/kvm_host.h | 48 +-
include/uapi/linux/kvm.h | 11 -
virt/kvm/eventfd.c | 7 -
virt/kvm/kvm_main.c | 107 +-
63 files changed, 1095 insertions(+), 14313 deletions(-)
delete mode 100644 Documentation/ia64/kvm.txt
delete mode 100644 arch/ia64/include/asm/kvm_host.h
delete mode 100644 arch/ia64/include/asm/pvclock-abi.h
delete mode 100644 arch/ia64/include/uapi/asm/kvm.h
delete mode 100644 arch/ia64/kvm/Kconfig
delete mode 100644 arch/ia64/kvm/Makefile
delete mode 100644 arch/ia64/kvm/asm-offsets.c
delete mode 100644 arch/ia64/kvm/irq.h
delete mode 100644 arch/ia64/kvm/kvm-ia64.c
delete mode 100644 arch/ia64/kvm/kvm_fw.c
delete mode 100644 arch/ia64/kvm/kvm_lib.c
delete mode 100644 arch/ia64/kvm/kvm_minstate.h
delete mode 100644 arch/ia64/kvm/lapic.h
delete mode 100644 arch/ia64/kvm/memcpy.S
delete mode 100644 arch/ia64/kvm/memset.S
delete mode 100644 arch/ia64/kvm/misc.h
delete mode 100644 arch/ia64/kvm/mmio.c
delete mode 100644 arch/ia64/kvm/optvfault.S
delete mode 100644 arch/ia64/kvm/process.c
delete mode 100644 arch/ia64/kvm/trampoline.S
delete mode 100644 arch/ia64/kvm/vcpu.c
delete mode 100644 arch/ia64/kvm/vcpu.h
delete mode 100644 arch/ia64/kvm/vmm.c
delete mode 100644 arch/ia64/kvm/vmm_ivt.S
delete mode 100644 arch/ia64/kvm/vti.h
delete mode 100644 arch/ia64/kvm/vtlb.c
rename {virt => arch/x86}/kvm/assigned-dev.c (100%)
rename {virt => arch/x86}/kvm/ioapic.c (98%)
rename {virt => arch/x86}/kvm/ioapic.h (94%)
rename {virt => arch/x86}/kvm/iommu.c (100%)
rename {virt => arch/x86}/kvm/irq_comm.c (89%)
Merging kvm-arm/next (016ed39c54b8 arm/arm64: KVM: vgic: kick the specific vcpu instead of iterating through all)
$ git merge kvm-arm/next
Auto-merging virt/kvm/arm/vgic.c
Auto-merging include/linux/kvm_host.h
CONFLICT (modify/delete): arch/ia64/kvm/kvm-ia64.c deleted in HEAD and modified in kvm-arm/next. Version kvm-arm/next of arch/ia64/kvm/kvm-ia64.c left in tree.
Auto-merging arch/arm/kvm/mmu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/ia64/kvm/kvm-ia64.c
arch/ia64/kvm/kvm-ia64.c: needs merge
rm 'arch/ia64/kvm/kvm-ia64.c'
$ git commit -v -a
[master b379d1e42d8a] Merge remote-tracking branch 'kvm-arm/next'
$ git diff -M --stat --summary HEAD^..
arch/arm/include/asm/kvm_mmu.h | 5 +++--
arch/arm/kvm/mmio.c | 15 +++++++++------
arch/arm/kvm/mmu.c | 27 +++++++++++++++++++++------
arch/arm64/include/asm/kvm_mmu.h | 5 +++--
include/linux/kvm_host.h | 1 +
virt/kvm/arm/vgic.c | 20 +++++++++++++-------
6 files changed, 50 insertions(+), 23 deletions(-)
Merging kvm-ppc/kvm-ppc-next (8d0eff638564 KVM: PPC: Pass enum to kvmppc_get_last_inst)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1)
$ git merge oprofile/for-next
Already up-to-date.
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 (689562c293a6 swiotlb-xen: remove BUG_ON in xen_bus_to_phys)
$ git merge xen-tip/linux-next
Removing arch/arm/xen/mm32.c
Merge made by the 'recursive' strategy.
arch/arm/include/asm/device.h | 1 +
arch/arm/include/asm/dma-mapping.h | 7 +
arch/arm/include/asm/xen/page-coherent.h | 66 ++++++++--
arch/arm/include/asm/xen/page.h | 4 +
arch/arm/xen/Makefile | 2 +-
arch/arm/xen/enlighten.c | 5 -
arch/arm/xen/mm.c | 121 +++++++++++++++++
arch/arm/xen/mm32.c | 202 -----------------------------
arch/arm64/include/asm/device.h | 1 +
arch/arm64/include/asm/dma-mapping.h | 7 +
arch/arm64/include/asm/xen/page-coherent.h | 44 +------
arch/x86/include/asm/xen/page-coherent.h | 4 +-
arch/x86/include/asm/xen/page.h | 7 +
drivers/xen/swiotlb-xen.c | 19 +--
include/xen/interface/features.h | 3 -
include/xen/interface/grant_table.h | 19 +++
16 files changed, 239 insertions(+), 273 deletions(-)
delete mode 100644 arch/arm/xen/mm32.c
Merging percpu/for-next (bfaa047a9415 Merge branch 'for-3.18-fixes' into for-next)
$ git merge percpu/for-next
Auto-merging kernel/time/tick-sched.c
Merge made by the 'recursive' strategy.
arch/arm64/kernel/psci.c | 4 ++--
include/linux/percpu-refcount.h | 4 +---
kernel/irq_work.c | 4 ++--
kernel/time/tick-sched.c | 2 +-
mm/percpu.c | 2 +-
5 files changed, 7 insertions(+), 9 deletions(-)
Merging workqueues/for-next (e09c2c295468 workqueue: apply __WQ_ORDERED to create_singlethread_workqueue())
$ git merge workqueues/for-next
Already up-to-date.
Merging drivers-x86/for-next (ba98b33a5709 Sony-laptop: Deletion of an unnecessary check before the function call "pci_dev_put")
$ git merge drivers-x86/for-next
Auto-merging drivers/platform/x86/intel_ips.c
Merge made by the 'recursive' strategy.
drivers/platform/x86/Kconfig | 12 ++
drivers/platform/x86/Makefile | 1 +
drivers/platform/x86/asus-laptop.c | 3 +-
drivers/platform/x86/asus-nb-wmi.c | 9 ++
drivers/platform/x86/asus-wmi.c | 3 +-
drivers/platform/x86/dell-laptop.c | 2 +-
drivers/platform/x86/dell-wireless.c | 159 +++++++++++++++++++++++++
drivers/platform/x86/dell-wmi.c | 159 ++++++++++++++++++++-----
drivers/platform/x86/eeepc-laptop.c | 213 ++++++++++++++++++----------------
drivers/platform/x86/fujitsu-laptop.c | 6 +-
drivers/platform/x86/hp_accel.c | 1 +
drivers/platform/x86/ideapad-laptop.c | 3 +-
drivers/platform/x86/intel_ips.c | 2 +-
drivers/platform/x86/intel_oaktrail.c | 3 +-
drivers/platform/x86/msi-laptop.c | 2 +-
drivers/platform/x86/msi-wmi.c | 3 +-
drivers/platform/x86/sony-laptop.c | 6 +-
drivers/platform/x86/toshiba_acpi.c | 26 +----
18 files changed, 442 insertions(+), 171 deletions(-)
create mode 100644 drivers/platform/x86/dell-wireless.c
Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries)
$ git merge chrome-platform/for-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 (a63b87838a59 Merge remote-tracking branches 'regmap/topic/ac97' and 'regmap/topic/headers' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
drivers/base/regmap/regcache-flat.c | 2 +-
drivers/base/regmap/regcache-lzo.c | 2 +-
drivers/base/regmap/regcache-rbtree.c | 4 +--
drivers/base/regmap/regcache.c | 63 +++++++++++++++++++----------------
4 files changed, 38 insertions(+), 33 deletions(-)
Merging hsi/for-next (d95dc9e38810 HSI: nokia-modem: fix error handling of irq_of_parse_and_map)
$ git merge hsi/for-next
Merge made by the 'recursive' strategy.
drivers/hsi/clients/nokia-modem.c | 8 ++++----
drivers/hsi/controllers/omap_ssi_port.c | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
Merging leds/for-next (7a8685accb95 leds: lp8860: Introduce TI lp8860 4 channel LED driver)
$ git merge leds/for-next
Auto-merging include/linux/leds.h
Merge made by the 'recursive' strategy.
.../devicetree/bindings/leds/leds-lp8860.txt | 29 ++
drivers/leds/Kconfig | 10 +
drivers/leds/Makefile | 1 +
drivers/leds/led-class.c | 29 +-
drivers/leds/led-core.c | 36 +-
drivers/leds/led-triggers.c | 16 +-
drivers/leds/leds-lp8860.c | 491 +++++++++++++++++++++
drivers/leds/leds-regulator.c | 18 +-
drivers/leds/leds-syscon.c | 71 +--
drivers/leds/leds.h | 20 +-
drivers/leds/trigger/ledtrig-backlight.c | 8 +-
drivers/leds/trigger/ledtrig-default-on.c | 2 +-
drivers/leds/trigger/ledtrig-gpio.c | 6 +-
drivers/leds/trigger/ledtrig-heartbeat.c | 2 +-
drivers/leds/trigger/ledtrig-oneshot.c | 4 +-
drivers/leds/trigger/ledtrig-transient.c | 10 +-
include/linux/leds.h | 40 ++
17 files changed, 713 insertions(+), 80 deletions(-)
create mode 100644 Documentation/devicetree/bindings/leds/leds-lp8860.txt
create mode 100644 drivers/leds/leds-lp8860.c
Merging ipmi/for-next (ee0a40fd288e Change ACPI IPMI support to "default y")
$ git merge ipmi/for-next
Resolved 'arch/powerpc/include/asm/opal.h' using previous resolution.
Resolved 'arch/powerpc/platforms/powernv/opal-wrappers.S' using previous resolution.
Auto-merging include/linux/i2c.h
Auto-merging drivers/i2c/i2c-core.c
Auto-merging drivers/acpi/Kconfig
Auto-merging arch/powerpc/platforms/powernv/opal-wrappers.S
CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/opal-wrappers.S
Auto-merging arch/powerpc/include/asm/opal.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/opal.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b87c7b50f22f] Merge remote-tracking branch 'ipmi/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/IPMI.txt | 74 +-
drivers/acpi/Kconfig | 2 +-
drivers/char/ipmi/Kconfig | 16 +
drivers/char/ipmi/Makefile | 2 +
drivers/char/ipmi/ipmi_msghandler.c | 560 +++++-----
drivers/char/ipmi/ipmi_powernv.c | 307 ++++++
drivers/char/ipmi/ipmi_si_intf.c | 500 ++++-----
drivers/char/ipmi/ipmi_ssif.c | 1938 +++++++++++++++++++++++++++++++++++
drivers/i2c/i2c-core.c | 46 +-
include/linux/i2c.h | 3 +
include/linux/ipmi.h | 6 +-
include/linux/ipmi_smi.h | 10 +-
12 files changed, 2934 insertions(+), 530 deletions(-)
create mode 100644 drivers/char/ipmi/ipmi_powernv.c
create mode 100644 drivers/char/ipmi/ipmi_ssif.c
Merging driver-core/driver-core-next (daa3d67fa3b5 firmware class: Deletion of an unnecessary check before the function call "vunmap")
$ git merge driver-core/driver-core-next
Auto-merging sound/sparc/cs4231.c
Auto-merging sound/soc/ux500/mop500.c
Auto-merging sound/soc/txx9/txx9aclc.c
Auto-merging sound/soc/txx9/txx9aclc-ac97.c
Auto-merging sound/soc/tegra/tegra_rt5640.c
Auto-merging sound/soc/tegra/tegra20_ac97.c
Auto-merging sound/soc/soc-core.c
Auto-merging sound/soc/sh/hac.c
Auto-merging sound/soc/samsung/snow.c
Auto-merging sound/soc/samsung/odroidx2_max98090.c
Auto-merging sound/soc/samsung/i2s.c
Auto-merging sound/soc/samsung/ac97.c
Auto-merging sound/soc/rockchip/rockchip_i2s.c
Auto-merging sound/soc/pxa/pxa2xx-ac97.c
Auto-merging sound/soc/pxa/pxa-ssp.c
Auto-merging sound/soc/pxa/mioa701_wm9713.c
Auto-merging sound/soc/nuc900/nuc900-ac97.c
Auto-merging sound/soc/mxs/mxs-sgtl5000.c
Auto-merging sound/soc/mxs/mxs-saif.c
Auto-merging sound/soc/jz4740/qi_lb60.c
Auto-merging sound/soc/intel/sst-mfld-platform-pcm.c
Auto-merging sound/soc/intel/sst-haswell-pcm.c
CONFLICT (content): Merge conflict in sound/soc/intel/sst-haswell-pcm.c
Auto-merging sound/soc/intel/broadwell.c
Auto-merging sound/soc/generic/simple-card.c
Auto-merging sound/soc/fsl/mpc5200_psc_ac97.c
Auto-merging sound/soc/fsl/imx-wm8962.c
Auto-merging sound/soc/fsl/imx-ssi.c
Auto-merging sound/soc/fsl/imx-spdif.c
Auto-merging sound/soc/fsl/imx-sgtl5000.c
Auto-merging sound/soc/fsl/fsl_ssi.c
Auto-merging sound/soc/fsl/fsl_esai.c
Auto-merging sound/soc/fsl/fsl_dma.c
Auto-merging sound/soc/fsl/eukrea-tlv320.c
Auto-merging sound/soc/davinci/davinci-mcasp.c
Auto-merging sound/soc/codecs/wm9713.c
Auto-merging sound/soc/codecs/wm9712.c
Auto-merging sound/soc/codecs/wm9705.c
Auto-merging sound/soc/codecs/wm8994.c
Auto-merging sound/soc/codecs/wm8400.c
Auto-merging sound/soc/codecs/wm8350.c
Auto-merging sound/soc/codecs/wm5102.c
Auto-merging sound/soc/codecs/wl1273.c
Auto-merging sound/soc/codecs/uda134x.c
Auto-merging sound/soc/codecs/twl6040.c
Auto-merging sound/soc/codecs/twl4030.c
Auto-merging sound/soc/codecs/stac9766.c
Auto-merging sound/soc/codecs/sn95031.c
Auto-merging sound/soc/codecs/sirf-audio-codec.c
Auto-merging sound/soc/codecs/hdmi.c
Auto-merging sound/soc/codecs/cq93vc.c
Auto-merging sound/soc/codecs/ad1980.c
Auto-merging sound/soc/codecs/ac97.c
Auto-merging sound/soc/codecs/ab8500-codec.c
Auto-merging sound/soc/cirrus/ep93xx-ac97.c
Auto-merging sound/soc/blackfin/bf5xx-ac97.c
Auto-merging sound/soc/au1x/psc-ac97.c
Auto-merging sound/soc/au1x/ac97c.c
Auto-merging sound/mips/sgio2audio.c
Auto-merging sound/drivers/virmidi.c
Auto-merging sound/drivers/mts64.c
Auto-merging net/rfkill/rfkill-gpio.c
Auto-merging net/dsa/dsa.c
Auto-merging include/linux/debugfs.h
Auto-merging fs/pstore/ram.c
Auto-merging fs/debugfs/file.c
Auto-merging drivers/watchdog/s3c2410_wdt.c
Auto-merging drivers/video/fbdev/sm501fb.c
Auto-merging drivers/video/fbdev/simplefb.c
Auto-merging drivers/video/fbdev/omap2/dss/sdi.c
Auto-merging drivers/video/fbdev/omap2/dss/hdmi5.c
Auto-merging drivers/video/fbdev/omap2/dss/hdmi4.c
Auto-merging drivers/video/fbdev/omap2/dss/dss.c
Auto-merging drivers/video/fbdev/omap2/dss/dsi.c
Auto-merging drivers/video/fbdev/omap2/dss/dpi.c
Auto-merging drivers/video/fbdev/omap2/dss/dispc.c
Auto-merging drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c
Auto-merging drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c
Auto-merging drivers/video/fbdev/exynos/exynos_mipi_dsi.c
Auto-merging drivers/usb/dwc2/gadget.c
Auto-merging drivers/tty/serial/of_serial.c
Auto-merging drivers/thermal/samsung/exynos_tmu.c
Auto-merging drivers/thermal/imx_thermal.c
Auto-merging drivers/thermal/armada_thermal.c
CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/staging/media/omap24xx/omap24xxcam.c left in tree.
Auto-merging drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
Auto-merging drivers/spi/spi-sirf.c
Auto-merging drivers/spi/spi-s3c64xx.c
Auto-merging drivers/spi/spi-rockchip.c
Auto-merging drivers/spi/spi-pxa2xx.c
Auto-merging drivers/spi/spi-mxs.c
Auto-merging drivers/spi/spi-gpio.c
Auto-merging drivers/spi/spi-atmel.c
Auto-merging drivers/soc/ti/knav_qmss_queue.c
Auto-merging drivers/scsi/ufs/ufshcd-pltfrm.c
Auto-merging drivers/rtc/rtc-at91sam9.c
Auto-merging drivers/regulator/wm8994-regulator.c
Auto-merging drivers/regulator/vexpress.c
Auto-merging drivers/regulator/twl-regulator.c
Auto-merging drivers/regulator/tps65218-regulator.c
Auto-merging drivers/regulator/tps65090-regulator.c
Auto-merging drivers/regulator/ti-abb-regulator.c
Auto-merging drivers/regulator/stw481x-vmmc.c
Auto-merging drivers/regulator/s5m8767.c
Auto-merging drivers/regulator/s2mps11.c
Auto-merging drivers/regulator/s2mpa01.c
Auto-merging drivers/regulator/rk808-regulator.c
Auto-merging drivers/regulator/qcom_rpm-regulator.c
Auto-merging drivers/regulator/pwm-regulator.c
Auto-merging drivers/regulator/max8998.c
Auto-merging drivers/regulator/max8997.c
Auto-merging drivers/regulator/max77802.c
Auto-merging drivers/regulator/max77693.c
Auto-merging drivers/regulator/max77686.c
Auto-merging drivers/regulator/gpio-regulator.c
Auto-merging drivers/regulator/fixed.c
Auto-merging drivers/regulator/dummy.c
Auto-merging drivers/regulator/da9063-regulator.c
Auto-merging drivers/regulator/da9052-regulator.c
Auto-merging drivers/regulator/arizona-micsupp.c
Auto-merging drivers/regulator/arizona-ldo1.c
Auto-merging drivers/regulator/anatop-regulator.c
Auto-merging drivers/regulator/88pm8607.c
Auto-merging drivers/power/reset/keystone-reset.c
Auto-merging drivers/power/reset/brcmstb-reboot.c
Auto-merging drivers/power/gpio-charger.c
Auto-merging drivers/power/charger-manager.c
Auto-merging drivers/power/ab8500_fg.c
Auto-merging drivers/platform/x86/sony-laptop.c
Auto-merging drivers/platform/x86/msi-laptop.c
Auto-merging drivers/platform/x86/intel_oaktrail.c
Auto-merging drivers/platform/x86/ideapad-laptop.c
Auto-merging drivers/platform/x86/fujitsu-laptop.c
Auto-merging drivers/platform/x86/eeepc-laptop.c
Auto-merging drivers/platform/x86/dell-laptop.c
Auto-merging drivers/platform/x86/asus-laptop.c
Auto-merging drivers/platform/x86/acer-wmi.c
Auto-merging drivers/pinctrl/spear/pinctrl-plgpio.c
Auto-merging drivers/pinctrl/pinctrl-baytrail.c
Auto-merging drivers/pci/pci-sysfs.c
Auto-merging drivers/pci/host/pcie-xilinx.c
Auto-merging drivers/pci/host/pcie-spear13xx.c
Auto-merging drivers/pci/host/pcie-rcar.c
Auto-merging drivers/pci/host/pci-xgene.c
Auto-merging drivers/pci/host/pci-tegra.c
Auto-merging drivers/pci/host/pci-mvebu.c
Auto-merging drivers/pci/host/pci-keystone.c
Auto-merging drivers/pci/host/pci-imx6.c
Auto-merging drivers/pci/host/pci-host-generic.c
Auto-merging drivers/pci/host/pci-exynos.c
Auto-merging drivers/pci/host/pci-dra7xx.c
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
Auto-merging drivers/net/wireless/ath/wcn36xx/main.c
Auto-merging drivers/net/wireless/ath/ath9k/pci.c
Auto-merging drivers/net/wireless/ath/ath9k/debug.h
Auto-merging drivers/net/wireless/ath/ath9k/debug.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/debug.c
Auto-merging drivers/net/irda/ali-ircc.c
Auto-merging drivers/net/ieee802154/fakelb.c
CONFLICT (modify/delete): drivers/net/ieee802154/fakehard.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/net/ieee802154/fakehard.c left in tree.
Auto-merging drivers/net/ethernet/wiznet/w5300.c
Auto-merging drivers/net/ethernet/wiznet/w5100.c
Auto-merging drivers/net/ethernet/sun/sunhme.c
Auto-merging drivers/net/ethernet/smsc/smsc911x.c
Auto-merging drivers/net/ethernet/smsc/smc91x.c
Auto-merging drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c
Auto-merging drivers/net/ethernet/natsemi/macsonic.c
Auto-merging drivers/net/ethernet/marvell/mv643xx_eth.c
Auto-merging drivers/net/ethernet/ibm/emac/core.c
Auto-merging drivers/net/ethernet/freescale/gianfar.c
Auto-merging drivers/net/ethernet/freescale/fec_main.c
Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c
Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c
Auto-merging drivers/net/can/xilinx_can.c
Auto-merging drivers/net/can/rcar_can.c
Auto-merging drivers/net/can/c_can/c_can_platform.c
Auto-merging drivers/mtd/spi-nor/fsl-quadspi.c
Auto-merging drivers/mtd/nand/orion_nand.c
Auto-merging drivers/mtd/nand/omap2.c
Auto-merging drivers/mtd/nand/mxc_nand.c
Auto-merging drivers/mtd/nand/gpio.c
Auto-merging drivers/mtd/nand/fsl_ifc_nand.c
Auto-merging drivers/mtd/nand/atmel_nand.c
Auto-merging drivers/mtd/devices/docg3.c
CONFLICT (content): Merge conflict in drivers/mtd/devices/docg3.c
Auto-merging drivers/mmc/host/sdhci-acpi.c
Auto-merging drivers/mfd/twl4030-power.c
Auto-merging drivers/mfd/tc6393xb.c
Auto-merging drivers/mfd/t7l66xb.c
Auto-merging drivers/mfd/syscon.c
CONFLICT (content): Merge conflict in drivers/mfd/syscon.c
Auto-merging drivers/mfd/db8500-prcmu.c
Auto-merging drivers/mfd/ab8500-sysctrl.c
CONFLICT (modify/delete): drivers/memory/tegra30-mc.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/memory/tegra30-mc.c left in tree.
Auto-merging drivers/memory/omap-gpmc.c
Auto-merging drivers/media/radio/si4713/radio-platform-si4713.c
Auto-merging drivers/media/platform/vim2m.c
Auto-merging drivers/media/platform/soc_camera/soc_camera_platform.c
Auto-merging drivers/media/platform/soc_camera/soc_camera.c
Auto-merging drivers/media/platform/soc_camera/sh_mobile_csi2.c
Auto-merging drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
Auto-merging drivers/media/platform/soc_camera/rcar_vin.c
Auto-merging drivers/media/platform/soc_camera/mx3_camera.c
Auto-merging drivers/media/platform/soc_camera/atmel-isi.c
Auto-merging drivers/media/platform/sh_vou.c
Auto-merging drivers/media/platform/s5p-tv/sdo_drv.c
Auto-merging drivers/media/platform/s5p-tv/hdmi_drv.c
Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c
Auto-merging drivers/media/platform/s3c-camif/camif-core.c
Auto-merging drivers/media/platform/exynos4-is/mipi-csis.c
Auto-merging drivers/media/platform/exynos4-is/fimc-lite.c
Auto-merging drivers/media/platform/exynos4-is/fimc-is.c
Auto-merging drivers/media/platform/exynos4-is/fimc-core.c
Auto-merging drivers/media/platform/exynos-gsc/gsc-core.c
Auto-merging drivers/media/platform/davinci/vpfe_capture.c
Auto-merging drivers/media/platform/davinci/vpbe_display.c
Auto-merging drivers/media/platform/davinci/vpbe.c
Auto-merging drivers/media/platform/coda/coda-common.c
Auto-merging drivers/media/platform/blackfin/bfin_capture.c
Auto-merging drivers/leds/leds-regulator.c
Auto-merging drivers/leds/leds-gpio.c
CONFLICT (content): Merge conflict in drivers/leds/leds-gpio.c
Auto-merging drivers/iommu/tegra-smmu.c
CONFLICT (content): Merge conflict in drivers/iommu/tegra-smmu.c
Auto-merging drivers/iommu/ipmmu-vmsa.c
Auto-merging drivers/iommu/exynos-iommu.c
Auto-merging drivers/iommu/arm-smmu.c
Auto-merging drivers/input/touchscreen/ucb1400_ts.c
Auto-merging drivers/input/serio/altera_ps2.c
Auto-merging drivers/input/mouse/navpoint.c
Auto-merging drivers/input/misc/twl6040-vibra.c
Auto-merging drivers/input/misc/twl4030-vibra.c
Auto-merging drivers/input/misc/twl4030-pwrbutton.c
Auto-merging drivers/input/misc/sirfsoc-onkey.c
Auto-merging drivers/input/misc/pwm-beeper.c
Auto-merging drivers/input/misc/pmic8xxx-pwrkey.c
Auto-merging drivers/input/misc/pm8xxx-vibrator.c
Auto-merging drivers/input/misc/palmas-pwrbutton.c
Auto-merging drivers/input/misc/max8997_haptic.c
Auto-merging drivers/input/misc/max8925_onkey.c
Auto-merging drivers/input/misc/max77693-haptic.c
Auto-merging drivers/input/misc/88pm860x_onkey.c
Auto-merging drivers/input/keyboard/pxa27x_keypad.c
Auto-merging drivers/input/keyboard/lpc32xx-keys.c
Auto-merging drivers/input/keyboard/gpio_keys_polled.c
CONFLICT (content): Merge conflict in drivers/input/keyboard/gpio_keys_polled.c
Auto-merging drivers/i2c/busses/scx200_acb.c
Auto-merging drivers/i2c/busses/i2c-xiic.c
Auto-merging drivers/i2c/busses/i2c-simtec.c
Auto-merging drivers/i2c/busses/i2c-sh_mobile.c
Auto-merging drivers/i2c/busses/i2c-s3c2410.c
Auto-merging drivers/i2c/busses/i2c-rk3x.c
Auto-merging drivers/i2c/busses/i2c-Recorded preimage for 'drivers/net/wireless/ath/ath9k/debug.c'
Resolved 'drivers/base/Makefile' using previous resolution.
Resolved 'drivers/bus/omap_l3_noc.c' using previous resolution.
Resolved 'drivers/hwmon/ibmpowernv.c' using previous resolution.
Resolved 'drivers/input/keyboard/gpio_keys_polled.c' using previous resolution.
Resolved 'drivers/iommu/tegra-smmu.c' using previous resolution.
Resolved 'drivers/leds/leds-gpio.c' using previous resolution.
Resolved 'drivers/mfd/syscon.c' using previous resolution.
Resolved 'drivers/mtd/devices/docg3.c' using previous resolution.
Resolved 'sound/soc/intel/sst-haswell-pcm.c' using previous resolution.
pxa.c
Auto-merging drivers/i2c/busses/i2c-pmcmsp.c
Auto-merging drivers/i2c/busses/i2c-parport-light.c
Auto-merging drivers/i2c/busses/i2c-omap.c
Auto-merging drivers/i2c/busses/i2c-mxs.c
Auto-merging drivers/i2c/busses/i2c-mpc.c
Auto-merging drivers/i2c/busses/i2c-isch.c
Auto-merging drivers/i2c/busses/i2c-imx.c
Auto-merging drivers/i2c/busses/i2c-exynos5.c
Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
Auto-merging drivers/i2c/busses/i2c-davinci.c
Auto-merging drivers/i2c/busses/i2c-cpm.c
Auto-merging drivers/i2c/busses/i2c-au1550.c
Auto-merging drivers/i2c/busses/i2c-at91.c
Auto-merging drivers/hwmon/ntc_thermistor.c
Auto-merging drivers/hwmon/iio_hwmon.c
Auto-merging drivers/hwmon/ibmpowernv.c
CONFLICT (content): Merge conflict in drivers/hwmon/ibmpowernv.c
Auto-merging drivers/hsi/controllers/omap_ssi_port.c
Auto-merging drivers/gpu/drm/tilcdc/tilcdc_drv.c
Auto-merging drivers/gpu/drm/rcar-du/rcar_du_drv.c
Auto-merging drivers/gpu/drm/panel/panel-simple.c
Auto-merging drivers/gpu/drm/msm/msm_drv.c
Auto-merging drivers/gpu/drm/imx/parallel-display.c
Auto-merging drivers/gpu/drm/imx/imx-tve.c
Auto-merging drivers/gpu/drm/imx/imx-ldb.c
Auto-merging drivers/gpu/drm/imx/imx-hdmi.c
Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
Auto-merging drivers/gpu/drm/exynos/exynos_drm_drv.c
Auto-merging drivers/gpio/gpio-spear-spics.c
Auto-merging drivers/gpio/gpio-sch.c
Auto-merging drivers/gpio/gpio-msm-v1.c
Auto-merging drivers/edac/ppc4xx_edac.c
Auto-merging drivers/dma/sirf-dma.c
Auto-merging drivers/dma/sh/shdmac.c
Auto-merging drivers/dma/sa11x0-dma.c
Auto-merging drivers/dma/omap-dma.c
Auto-merging drivers/dma/fsldma.c
Auto-merging drivers/dma/edma.c
Auto-merging drivers/crypto/ux500/hash/hash_core.c
Auto-merging drivers/crypto/ux500/cryp/cryp_core.c
Auto-merging drivers/crypto/caam/jr.c
Auto-merging drivers/crypto/bfin_crc.c
Auto-merging drivers/cpuidle/cpuidle-zynq.c
Auto-merging drivers/cpuidle/cpuidle-ux500.c
Auto-merging drivers/cpuidle/cpuidle-mvebu-v7.c
Auto-merging drivers/cpuidle/cpuidle-kirkwood.c
Auto-merging drivers/cpuidle/cpuidle-exynos.c
Auto-merging drivers/cpuidle/cpuidle-calxeda.c
Auto-merging drivers/cpuidle/cpuidle-at91.c
Auto-merging drivers/cpufreq/cpufreq-dt.c
Auto-merging drivers/clk/clk-s2mps11.c
Auto-merging drivers/char/ipmi/ipmi_si_intf.c
Auto-merging drivers/char/hw_random/atmel-rng.c
Auto-merging drivers/bus/omap_l3_noc.c
CONFLICT (content): Merge conflict in drivers/bus/omap_l3_noc.c
Auto-merging drivers/bus/brcmstb_gisb.c
Auto-merging drivers/base/platform.c
Auto-merging drivers/base/core.c
Auto-merging drivers/base/Makefile
CONFLICT (content): Merge conflict in drivers/base/Makefile
Auto-merging drivers/ata/sata_rcar.c
Auto-merging drivers/ata/ahci_sunxi.c
Auto-merging drivers/acpi/apei/ghes.c
Auto-merging arch/sparc/kernel/pci_schizo.c
Auto-merging arch/powerpc/sysdev/qe_lib/qe.c
Auto-merging arch/powerpc/sysdev/ppc4xx_msi.c
Auto-merging arch/powerpc/sysdev/ppc4xx_hsta_msi.c
Auto-merging arch/powerpc/sysdev/fsl_rio.c
Auto-merging arch/powerpc/sysdev/fsl_msi.c
Auto-merging arch/powerpc/platforms/cell/axon_msi.c
Auto-merging arch/powerpc/platforms/85xx/sgy_cts1000.c
Auto-merging arch/mips/pci/pci-rt3883.c
Auto-merging arch/mips/pci/pci-ar724x.c
Auto-merging arch/mips/pci/pci-ar71xx.c
Auto-merging arch/mips/lantiq/xway/xrx200_phy_fw.c
Auto-merging arch/arm/mach-pxa/pxa3xx-ulpi.c
Auto-merging arch/arm/mach-imx/mmdc.c
Auto-merging arch/arm/mach-davinci/cpuidle.c
Auto-merging arch/arm/common/sa1111.c
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/memory/tegra30-mc.c drivers/net/ieee802154/fakehard.c drivers/staging/media/omap24xx/omap24xxcam.c
drivers/memory/tegra30-mc.c: needs merge
drivers/net/ieee802154/fakehard.c: needs merge
drivers/staging/media/omap24xx/omap24xxcam.c: needs merge
rm 'drivers/memory/tegra30-mc.c'
rm 'drivers/net/ieee802154/fakehard.c'
rm 'drivers/staging/media/omap24xx/omap24xxcam.c'
$ git commit -v -a
Recorded resolution for 'drivers/net/wireless/ath/ath9k/debug.c'.
[master 62c121d37eb6] Merge remote-tracking branch 'driver-core/driver-core-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-devices-system-cpu | 47 ++
arch/arm/common/sa1111.c | 1 -
arch/arm/mach-davinci/cpuidle.c | 1 -
arch/arm/mach-davinci/pm.c | 1 -
arch/arm/mach-imx/mmdc.c | 1 -
arch/arm/mach-msm/clock-pcom.c | 1 -
arch/arm/mach-msm/smd.c | 1 -
arch/arm/mach-prima2/pm.c | 1 -
arch/arm/mach-prima2/rstc.c | 1 -
arch/arm/mach-prima2/rtciobrg.c | 1 -
arch/arm/mach-pxa/pxa3xx-ulpi.c | 1 -
arch/arm/mach-pxa/tosa-bt.c | 1 -
arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 1 -
arch/arm/mach-sa1100/neponset.c | 1 -
arch/arm/mach-u300/regulator.c | 1 -
arch/arm/plat-pxa/ssp.c | 1 -
arch/arm/plat-samsung/adc.c | 1 -
arch/mips/lantiq/xway/dcdc.c | 1 -
arch/mips/lantiq/xway/dma.c | 1 -
arch/mips/lantiq/xway/gptu.c | 1 -
arch/mips/lantiq/xway/xrx200_phy_fw.c | 1 -
arch/mips/mti-sead3/leds-sead3.c | 1 -
arch/mips/mti-sead3/sead3-i2c-drv.c | 1 -
arch/mips/pci/pci-alchemy.c | 1 -
arch/mips/pci/pci-ar71xx.c | 1 -
arch/mips/pci/pci-ar724x.c | 1 -
arch/mips/pci/pci-lantiq.c | 1 -
arch/mips/pci/pci-rt3883.c | 1 -
arch/mips/ralink/timer.c | 1 -
arch/mips/txx9/rbtx4939/setup.c | 1 -
arch/powerpc/kernel/of_platform.c | 1 -
arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 -
arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 1 -
arch/powerpc/platforms/82xx/ep8248e.c | 1 -
arch/powerpc/platforms/83xx/suspend.c | 1 -
arch/powerpc/platforms/85xx/sgy_cts1000.c | 1 -
arch/powerpc/platforms/cell/axon_msi.c | 1 -
arch/powerpc/platforms/pasemi/gpio_mdio.c | 1 -
arch/powerpc/sysdev/axonram.c | 1 -
arch/powerpc/sysdev/fsl_85xx_l2ctlr.c | 1 -
arch/powerpc/sysdev/fsl_msi.c | 1 -
arch/powerpc/sysdev/fsl_pmc.c | 1 -
arch/powerpc/sysdev/fsl_rio.c | 1 -
arch/powerpc/sysdev/mpic_msgr.c | 1 -
arch/powerpc/sysdev/pmi.c | 1 -
arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 1 -
arch/powerpc/sysdev/ppc4xx_msi.c | 1 -
arch/powerpc/sysdev/qe_lib/qe.c | 1 -
arch/s390/appldata/appldata_base.c | 1 -
arch/sparc/include/asm/parport.h | 1 -
arch/sparc/kernel/apc.c | 1 -
arch/sparc/kernel/auxio_64.c | 1 -
arch/sparc/kernel/central.c | 2 -
arch/sparc/kernel/chmc.c | 1 -
arch/sparc/kernel/leon_pci_grpci1.c | 1 -
arch/sparc/kernel/leon_pci_grpci2.c | 1 -
arch/sparc/kernel/pci_fire.c | 1 -
arch/sparc/kernel/pci_psycho.c | 1 -
arch/sparc/kernel/pci_sabre.c | 1 -
arch/sparc/kernel/pci_schizo.c | 1 -
arch/sparc/kernel/pci_sun4v.c | 1 -
arch/sparc/kernel/pmc.c | 1 -
arch/sparc/kernel/power.c | 1 -
arch/sparc/kernel/time_32.c | 1 -
arch/sparc/kernel/time_64.c | 3 -
arch/x86/kernel/cpu/perf_event_amd_iommu.c | 5 +-
arch/x86/kernel/cpu/perf_event_amd_uncore.c | 6 +-
arch/x86/kernel/cpu/perf_event_intel_rapl.c | 6 +-
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 6 +-
arch/x86/platform/iris/iris.c | 1 -
arch/x86/platform/olpc/olpc-xo1-pm.c | 2 -
drivers/acpi/acpi_pad.c | 8 +-
drivers/acpi/apei/ghes.c | 1 -
drivers/amba/tegra-ahb.c | 1 -
drivers/ata/ahci_da850.c | 1 -
drivers/ata/ahci_imx.c | 1 -
drivers/ata/ahci_mvebu.c | 1 -
drivers/ata/ahci_platform.c | 1 -
drivers/ata/ahci_st.c | 1 -
drivers/ata/ahci_sunxi.c | 1 -
drivers/ata/ahci_xgene.c | 1 -
drivers/ata/pata_arasan_cf.c | 1 -
drivers/ata/pata_at32.c | 1 -
drivers/ata/pata_at91.c | 1 -
drivers/ata/pata_bf54x.c | 1 -
drivers/ata/pata_ep93xx.c | 1 -
drivers/ata/pata_imx.c | 1 -
drivers/ata/pata_ixp4xx_cf.c | 1 -
drivers/ata/pata_mpc52xx.c | 1 -
drivers/ata/pata_octeon_cf.c | 1 -
drivers/ata/pata_of_platform.c | 1 -
drivers/ata/pata_palmld.c | 1 -
drivers/ata/pata_platform.c | 1 -
drivers/ata/pata_pxa.c | 1 -
drivers/ata/pata_rb532_cf.c | 1 -
drivers/ata/pata_samsung_cf.c | 1 -
drivers/ata/sata_dwc_460ex.c | 1 -
drivers/ata/sata_fsl.c | 1 -
drivers/ata/sata_highbank.c | 1 -
drivers/ata/sata_mv.c | 1 -
drivers/ata/sata_rcar.c | 1 -
drivers/atm/fore200e.c | 1 -
drivers/base/Makefile | 2 +-
drivers/base/bus.c | 8 +-
drivers/base/cacheinfo.c | 539 +++++++++++++++++++++
drivers/base/core.c | 38 +-
drivers/base/cpu.c | 59 ++-
drivers/base/devcoredump.c | 56 ++-
drivers/base/firmware_class.c | 7 +-
drivers/base/node.c | 14 +-
drivers/base/platform.c | 22 +-
drivers/base/topology.c | 71 +--
drivers/block/amiflop.c | 1 -
drivers/block/mg_disk.c | 1 -
drivers/block/swim.c | 1 -
drivers/bluetooth/btwilink.c | 1 -
drivers/bus/brcmstb_gisb.c | 1 -
drivers/bus/imx-weim.c | 1 -
drivers/bus/omap-ocp2scp.c | 1 -
drivers/bus/omap_l3_noc.c | 1 -
drivers/char/hw_random/atmel-rng.c | 1 -
drivers/char/hw_random/bcm2835-rng.c | 1 -
drivers/char/hw_random/bcm63xx-rng.c | 1 -
drivers/char/hw_random/exynos-rng.c | 1 -
drivers/char/hw_random/msm-rng.c | 1 -
drivers/char/hw_random/mxc-rnga.c | 1 -
drivers/char/hw_random/n2-drv.c | 1 -
drivers/char/hw_random/octeon-rng.c | 1 -
drivers/char/hw_random/omap-rng.c | 1 -
drivers/char/hw_random/omap3-rom-rng.c | 1 -
drivers/char/hw_random/pasemi-rng.c | 1 -
drivers/char/hw_random/ppc4xx-rng.c | 1 -
drivers/char/hw_random/timeriomem-rng.c | 1 -
drivers/char/hw_random/tx4939-rng.c | 1 -
drivers/char/ipmi/ipmi_si_intf.c | 1 -
drivers/char/sonypi.c | 1 -
drivers/char/tb0219.c | 1 -
drivers/char/tpm/tpm_atmel.c | 1 -
drivers/char/tpm/tpm_nsc.c | 1 -
drivers/char/tpm/tpm_tis.c | 1 -
drivers/char/xillybus/xillybus_of.c | 1 -
drivers/clk/clk-axm5516.c | 1 -
drivers/clk/clk-ppc-corenet.c | 1 -
drivers/clk/clk-s2mps11.c | 1 -
drivers/clk/qcom/gcc-apq8084.c | 1 -
drivers/clk/qcom/gcc-ipq806x.c | 1 -
drivers/clk/qcom/gcc-msm8660.c | 1 -
drivers/clk/qcom/gcc-msm8960.c | 1 -
drivers/clk/qcom/gcc-msm8974.c | 1 -
drivers/clk/samsung/clk-exynos-audss.c | 1 -
drivers/clk/samsung/clk-s5pv210-audss.c | 1 -
drivers/clk/ux500/abx500-clk.c | 1 -
drivers/clk/x86/clk-lpt.c | 1 -
drivers/cpufreq/arm_big_little_dt.c | 1 -
drivers/cpufreq/cpufreq-dt.c | 1 -
drivers/cpufreq/davinci-cpufreq.c | 1 -
drivers/cpufreq/dbx500-cpufreq.c | 1 -
drivers/cpufreq/exynos-cpufreq.c | 1 -
drivers/cpufreq/exynos5440-cpufreq.c | 1 -
drivers/cpufreq/imx6q-cpufreq.c | 1 -
drivers/cpufreq/integrator-cpufreq.c | 1 -
drivers/cpufreq/kirkwood-cpufreq.c | 1 -
drivers/cpufreq/loongson2_cpufreq.c | 1 -
drivers/cpufreq/omap-cpufreq.c | 1 -
drivers/cpufreq/s5pv210-cpufreq.c | 1 -
drivers/cpufreq/spear-cpufreq.c | 1 -
drivers/cpufreq/vexpress-spc-cpufreq.c | 1 -
drivers/cpuidle/cpuidle-at91.c | 1 -
drivers/cpuidle/cpuidle-calxeda.c | 1 -
drivers/cpuidle/cpuidle-clps711x.c | 1 -
drivers/cpuidle/cpuidle-exynos.c | 1 -
drivers/cpuidle/cpuidle-kirkwood.c | 1 -
drivers/cpuidle/cpuidle-mvebu-v7.c | 3 -
drivers/cpuidle/cpuidle-ux500.c | 1 -
drivers/cpuidle/cpuidle-zynq.c | 1 -
drivers/crypto/amcc/crypto4xx_core.c | 1 -
drivers/crypto/atmel-aes.c | 1 -
drivers/crypto/atmel-sha.c | 1 -
drivers/crypto/atmel-tdes.c | 1 -
drivers/crypto/bfin_crc.c | 1 -
drivers/crypto/caam/ctrl.c | 1 -
drivers/crypto/caam/jr.c | 1 -
drivers/crypto/ccp/ccp-platform.c | 1 -
drivers/crypto/mv_cesa.c | 1 -
drivers/crypto/mxs-dcp.c | 1 -
drivers/crypto/n2_core.c | 2 -
drivers/crypto/omap-aes.c | 1 -
drivers/crypto/omap-des.c | 1 -
drivers/crypto/omap-sham.c | 1 -
drivers/crypto/qce/core.c | 1 -
drivers/crypto/s5p-sss.c | 1 -
drivers/crypto/sahara.c | 1 -
drivers/crypto/talitos.c | 1 -
drivers/crypto/ux500/cryp/cryp_core.c | 1 -
drivers/crypto/ux500/hash/hash_core.c | 1 -
drivers/devfreq/exynos/exynos4_bus.c | 1 -
drivers/devfreq/exynos/exynos5_bus.c | 1 -
drivers/dma/bestcomm/bestcomm.c | 1 -
drivers/dma/edma.c | 1 -
drivers/dma/fsl-edma.c | 1 -
drivers/dma/fsldma.c | 1 -
drivers/dma/imx-dma.c | 1 -
drivers/dma/ipu/ipu_idmac.c | 1 -
drivers/dma/moxart-dma.c | 1 -
drivers/dma/mv_xor.c | 1 -
drivers/dma/omap-dma.c | 1 -
drivers/dma/ppc4xx/adma.c | 1 -
drivers/dma/sa11x0-dma.c | 1 -
drivers/dma/sh/shdmac.c | 1 -
drivers/dma/sirf-dma.c | 1 -
drivers/dma/ste_dma40.c | 1 -
drivers/edac/cell_edac.c | 1 -
drivers/edac/mpc85xx_edac.c | 2 -
drivers/edac/ppc4xx_edac.c | 1 -
drivers/edac/tile_edac.c | 1 -
drivers/extcon/extcon-adc-jack.c | 1 -
drivers/extcon/extcon-arizona.c | 1 -
drivers/extcon/extcon-gpio.c | 1 -
drivers/extcon/extcon-max14577.c | 1 -
drivers/extcon/extcon-max77693.c | 1 -
drivers/extcon/extcon-max8997.c | 1 -
drivers/extcon/extcon-palmas.c | 1 -
drivers/firmware/dcdbas.c | 1 -
drivers/gpio/gpio-adp5520.c | 1 -
drivers/gpio/gpio-bcm-kona.c | 1 -
drivers/gpio/gpio-clps711x.c | 1 -
drivers/gpio/gpio-crystalcove.c | 1 -
drivers/gpio/gpio-cs5535.c | 1 -
drivers/gpio/gpio-da9052.c | 1 -
drivers/gpio/gpio-da9055.c | 1 -
drivers/gpio/gpio-davinci.c | 1 -
drivers/gpio/gpio-dwapb.c | 1 -
drivers/gpio/gpio-em.c | 1 -
drivers/gpio/gpio-ep93xx.c | 1 -
drivers/gpio/gpio-f7188x.c | 1 -
drivers/gpio/gpio-ge.c | 1 -
drivers/gpio/gpio-grgpio.c | 1 -
drivers/gpio/gpio-ich.c | 1 -
drivers/gpio/gpio-iop.c | 1 -
drivers/gpio/gpio-janz-ttl.c | 1 -
drivers/gpio/gpio-kempld.c | 1 -
drivers/gpio/gpio-lp3943.c | 1 -
drivers/gpio/gpio-lpc32xx.c | 1 -
drivers/gpio/gpio-lynxpoint.c | 1 -
drivers/gpio/gpio-mm-lantiq.c | 1 -
drivers/gpio/gpio-moxart.c | 1 -
drivers/gpio/gpio-mpc5200.c | 2 -
drivers/gpio/gpio-msic.c | 1 -
drivers/gpio/gpio-msm-v1.c | 1 -
drivers/gpio/gpio-msm-v2.c | 1 -
drivers/gpio/gpio-mvebu.c | 1 -
drivers/gpio/gpio-mxc.c | 1 -
drivers/gpio/gpio-mxs.c | 1 -
drivers/gpio/gpio-octeon.c | 1 -
drivers/gpio/gpio-rc5t583.c | 1 -
drivers/gpio/gpio-sch.c | 1 -
drivers/gpio/gpio-spear-spics.c | 1 -
drivers/gpio/gpio-sta2x11.c | 1 -
drivers/gpio/gpio-stp-xway.c | 1 -
drivers/gpio/gpio-syscon.c | 1 -
drivers/gpio/gpio-tb10x.c | 1 -
drivers/gpio/gpio-tegra.c | 1 -
drivers/gpio/gpio-timberdale.c | 1 -
drivers/gpio/gpio-tps65912.c | 1 -
drivers/gpio/gpio-ts5500.c | 1 -
drivers/gpio/gpio-twl4030.c | 1 -
drivers/gpio/gpio-twl6040.c | 1 -
drivers/gpio/gpio-tz1090-pdc.c | 1 -
drivers/gpio/gpio-tz1090.c | 1 -
drivers/gpio/gpio-vr41xx.c | 1 -
drivers/gpio/gpio-vx855.c | 1 -
drivers/gpio/gpio-xgene.c | 1 -
drivers/gpio/gpio-xtensa.c | 1 -
drivers/gpio/gpio-zevio.c | 1 -
drivers/gpu/drm/armada/armada_drv.c | 1 -
drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 -
drivers/gpu/drm/imx/imx-drm-core.c | 1 -
drivers/gpu/drm/imx/imx-hdmi.c | 1 -
drivers/gpu/drm/imx/imx-ldb.c | 1 -
drivers/gpu/drm/imx/imx-tve.c | 1 -
drivers/gpu/drm/imx/parallel-display.c | 1 -
drivers/gpu/drm/msm/msm_drv.c | 1 -
drivers/gpu/drm/omapdrm/omap_drv.c | 1 -
drivers/gpu/drm/panel/panel-simple.c | 1 -
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 1 -
drivers/gpu/drm/shmobile/shmob_drm_drv.c | 1 -
drivers/gpu/drm/sti/sti_compositor.c | 1 -
drivers/gpu/drm/sti/sti_drm_drv.c | 2 -
drivers/gpu/drm/tilcdc/tilcdc_drv.c | 1 -
drivers/hsi/controllers/omap_ssi.c | 1 -
drivers/hsi/controllers/omap_ssi_port.c | 1 -
drivers/hwmon/abituguru.c | 1 -
drivers/hwmon/abituguru3.c | 1 -
drivers/hwmon/abx500.c | 1 -
drivers/hwmon/applesmc.c | 1 -
drivers/hwmon/coretemp.c | 1 -
drivers/hwmon/da9052-hwmon.c | 1 -
drivers/hwmon/da9055-hwmon.c | 1 -
drivers/hwmon/dme1737.c | 1 -
drivers/hwmon/f71805f.c | 1 -
drivers/hwmon/f71882fg.c | 1 -
drivers/hwmon/i5k_amb.c | 1 -
drivers/hwmon/ibmpowernv.c | 1 -
drivers/hwmon/iio_hwmon.c | 1 -
drivers/hwmon/it87.c | 1 -
drivers/hwmon/jz4740-hwmon.c | 1 -
drivers/hwmon/lm78.c | 1 -
drivers/hwmon/max197.c | 1 -
drivers/hwmon/mc13783-adc.c | 1 -
drivers/hwmon/menf21bmc_hwmon.c | 1 -
drivers/hwmon/nct6683.c | 1 -
drivers/hwmon/nct6775.c | 1 -
drivers/hwmon/ntc_thermistor.c | 1 -
drivers/hwmon/pc87360.c | 1 -
drivers/hwmon/pc87427.c | 1 -
drivers/hwmon/s3c-hwmon.c | 1 -
drivers/hwmon/sch5627.c | 1 -
drivers/hwmon/sch5636.c | 1 -
drivers/hwmon/sht15.c | 1 -
drivers/hwmon/sis5595.c | 1 -
drivers/hwmon/smsc47b397.c | 1 -
drivers/hwmon/smsc47m1.c | 1 -
drivers/hwmon/twl4030-madc-hwmon.c | 1 -
drivers/hwmon/ultra45_env.c | 1 -
drivers/hwmon/vexpress.c | 1 -
drivers/hwmon/via-cputemp.c | 1 -
drivers/hwmon/via686a.c | 1 -
drivers/hwmon/vt1211.c | 1 -
drivers/hwmon/vt8231.c | 1 -
drivers/hwmon/w83627ehf.c | 1 -
drivers/hwmon/w83627hf.c | 1 -
drivers/hwmon/w83781d.c | 1 -
drivers/hwmon/wm831x-hwmon.c | 1 -
drivers/hwmon/wm8350-hwmon.c | 1 -
drivers/hwspinlock/omap_hwspinlock.c | 1 -
drivers/hwspinlock/u8500_hsem.c | 1 -
drivers/i2c/busses/i2c-at91.c | 1 -
drivers/i2c/busses/i2c-au1550.c | 1 -
drivers/i2c/busses/i2c-bcm-kona.c | 1 -
drivers/i2c/busses/i2c-bcm2835.c | 1 -
drivers/i2c/busses/i2c-bfin-twi.c | 1 -
drivers/i2c/busses/i2c-cadence.c | 1 -
drivers/i2c/busses/i2c-cbus-gpio.c | 1 -
drivers/i2c/busses/i2c-cpm.c | 1 -
drivers/i2c/busses/i2c-davinci.c | 1 -
drivers/i2c/busses/i2c-designware-platdrv.c | 1 -
drivers/i2c/busses/i2c-efm32.c | 1 -
drivers/i2c/busses/i2c-exynos5.c | 1 -
drivers/i2c/busses/i2c-gpio.c | 1 -
drivers/i2c/busses/i2c-highlander.c | 1 -
drivers/i2c/busses/i2c-ibm_iic.c | 1 -
drivers/i2c/busses/i2c-imx.c | 1 -
drivers/i2c/busses/i2c-iop3xx.c | 1 -
drivers/i2c/busses/i2c-isch.c | 1 -
drivers/i2c/busses/i2c-kempld.c | 1 -
drivers/i2c/busses/i2c-mpc.c | 1 -
drivers/i2c/busses/i2c-mv64xxx.c | 1 -
drivers/i2c/busses/i2c-mxs.c | 1 -
drivers/i2c/busses/i2c-ocores.c | 1 -
drivers/i2c/busses/i2c-octeon.c | 1 -
drivers/i2c/busses/i2c-omap.c | 1 -
drivers/i2c/busses/i2c-parport-light.c | 1 -
drivers/i2c/busses/i2c-pca-platform.c | 1 -
drivers/i2c/busses/i2c-pmcmsp.c | 1 -
drivers/i2c/busses/i2c-pnx.c | 1 -
drivers/i2c/busses/i2c-puv3.c | 1 -
drivers/i2c/busses/i2c-pxa.c | 1 -
drivers/i2c/busses/i2c-qup.c | 1 -
drivers/i2c/busses/i2c-rcar.c | 1 -
drivers/i2c/busses/i2c-riic.c | 1 -
drivers/i2c/busses/i2c-rk3x.c | 1 -
drivers/i2c/busses/i2c-s3c2410.c | 1 -
drivers/i2c/busses/i2c-sh7760.c | 1 -
drivers/i2c/busses/i2c-sh_mobile.c | 1 -
drivers/i2c/busses/i2c-simtec.c | 1 -
drivers/i2c/busses/i2c-sirf.c | 1 -
drivers/i2c/busses/i2c-st.c | 1 -
drivers/i2c/busses/i2c-stu300.c | 1 -
drivers/i2c/busses/i2c-sun6i-p2wi.c | 1 -
drivers/i2c/busses/i2c-tegra.c | 1 -
drivers/i2c/busses/i2c-versatile.c | 1 -
drivers/i2c/busses/i2c-wmt.c | 1 -
drivers/i2c/busses/i2c-xiic.c | 1 -
drivers/i2c/busses/i2c-xlr.c | 1 -
drivers/i2c/busses/scx200_acb.c | 1 -
drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 1 -
drivers/i2c/muxes/i2c-mux-gpio.c | 1 -
drivers/i2c/muxes/i2c-mux-pinctrl.c | 1 -
drivers/ide/au1xxx-ide.c | 1 -
drivers/ide/gayle.c | 1 -
drivers/ide/ide_platform.c | 1 -
drivers/ide/palm_bk3710.c | 1 -
drivers/ide/tx4938ide.c | 1 -
drivers/ide/tx4939ide.c | 1 -
drivers/iio/adc/rockchip_saradc.c | 1 -
drivers/input/keyboard/adp5520-keys.c | 1 -
drivers/input/keyboard/amikbd.c | 1 -
drivers/input/keyboard/bf54x-keys.c | 1 -
drivers/input/keyboard/clps711x-keypad.c | 1 -
drivers/input/keyboard/davinci_keyscan.c | 1 -
drivers/input/keyboard/ep93xx_keypad.c | 1 -
drivers/input/keyboard/goldfish_events.c | 1 -
drivers/input/keyboard/gpio_keys.c | 1 -
drivers/input/keyboard/gpio_keys_polled.c | 1 -
drivers/input/keyboard/imx_keypad.c | 1 -
drivers/input/keyboard/jornada680_kbd.c | 1 -
drivers/input/keyboard/jornada720_kbd.c | 1 -
drivers/input/keyboard/lpc32xx-keys.c | 1 -
drivers/input/keyboard/matrix_keypad.c | 1 -
drivers/input/keyboard/nomadik-ske-keypad.c | 1 -
drivers/input/keyboard/nspire-keypad.c | 1 -
drivers/input/keyboard/omap-keypad.c | 1 -
drivers/input/keyboard/omap4-keypad.c | 1 -
drivers/input/keyboard/pmic8xxx-keypad.c | 1 -
drivers/input/keyboard/pxa27x_keypad.c | 1 -
drivers/input/keyboard/pxa930_rotary.c | 1 -
drivers/input/keyboard/samsung-keypad.c | 1 -
drivers/input/keyboard/spear-keyboard.c | 1 -
drivers/input/keyboard/tc3589x-keypad.c | 1 -
drivers/input/keyboard/tegra-kbc.c | 1 -
drivers/input/keyboard/twl4030_keypad.c | 1 -
drivers/input/keyboard/w90p910_keypad.c | 1 -
drivers/input/misc/88pm80x_onkey.c | 1 -
drivers/input/misc/88pm860x_onkey.c | 1 -
drivers/input/misc/ab8500-ponkey.c | 1 -
drivers/input/misc/arizona-haptics.c | 1 -
drivers/input/misc/bfin_rotary.c | 1 -
drivers/input/misc/cobalt_btns.c | 1 -
drivers/input/misc/da9052_onkey.c | 1 -
drivers/input/misc/da9055_onkey.c | 1 -
drivers/input/misc/dm355evm_keys.c | 1 -
drivers/input/misc/gpio-beeper.c | 1 -
drivers/input/misc/gpio_tilt_polled.c | 1 -
drivers/input/misc/ideapad_slidebar.c | 1 -
drivers/input/misc/ixp4xx-beeper.c | 1 -
drivers/input/misc/m68kspkr.c | 1 -
drivers/input/misc/max77693-haptic.c | 1 -
drivers/input/misc/max8925_onkey.c | 1 -
drivers/input/misc/max8997_haptic.c | 1 -
drivers/input/misc/mc13783-pwrbutton.c | 1 -
drivers/input/misc/palmas-pwrbutton.c | 1 -
drivers/input/misc/pcap_keys.c | 1 -
drivers/input/misc/pcspkr.c | 1 -
drivers/input/misc/pm8xxx-vibrator.c | 1 -
drivers/input/misc/pmic8xxx-pwrkey.c | 1 -
drivers/input/misc/pwm-beeper.c | 1 -
drivers/input/misc/rb532_button.c | 1 -
drivers/input/misc/retu-pwrbutton.c | 1 -
drivers/input/misc/rotary_encoder.c | 1 -
drivers/input/misc/sgi_btns.c | 1 -
drivers/input/misc/sirfsoc-onkey.c | 1 -
drivers/input/misc/soc_button_array.c | 1 -
drivers/input/misc/sparcspkr.c | 2 -
drivers/input/misc/twl4030-pwrbutton.c | 1 -
drivers/input/misc/twl4030-vibra.c | 1 -
drivers/input/misc/twl6040-vibra.c | 1 -
drivers/input/misc/wistron_btns.c | 1 -
drivers/input/misc/wm831x-on.c | 1 -
drivers/input/mouse/amimouse.c | 1 -
drivers/input/mouse/gpio_mouse.c | 1 -
drivers/input/mouse/navpoint.c | 1 -
drivers/input/serio/altera_ps2.c | 1 -
drivers/input/serio/apbps2.c | 1 -
drivers/input/serio/arc_ps2.c | 1 -
drivers/input/serio/at32psif.c | 1 -
drivers/input/serio/ct82c710.c | 1 -
drivers/input/serio/i8042-sparcio.h | 1 -
drivers/input/serio/i8042.c | 1 -
drivers/input/serio/maceps2.c | 1 -
drivers/input/serio/olpc_apsp.c | 1 -
drivers/input/serio/q40kbd.c | 1 -
drivers/input/serio/rpckbd.c | 1 -
drivers/input/serio/xilinx_ps2.c | 1 -
drivers/input/touchscreen/88pm860x-ts.c | 1 -
drivers/input/touchscreen/atmel-wm97xx.c | 1 -
drivers/input/touchscreen/da9034-ts.c | 1 -
drivers/input/touchscreen/da9052_tsi.c | 1 -
drivers/input/touchscreen/intel-mid-touch.c | 1 -
drivers/input/touchscreen/jornada720_ts.c | 1 -
drivers/input/touchscreen/lpc32xx_ts.c | 1 -
drivers/input/touchscreen/mc13783_ts.c | 1 -
drivers/input/touchscreen/pcap_ts.c | 1 -
drivers/input/touchscreen/s3c2410_ts.c | 1 -
drivers/input/touchscreen/stmpe-ts.c | 1 -
drivers/input/touchscreen/sun4i-ts.c | 1 -
drivers/input/touchscreen/ti_am335x_tsc.c | 1 -
drivers/input/touchscreen/tps6507x-ts.c | 1 -
drivers/input/touchscreen/ucb1400_ts.c | 1 -
drivers/input/touchscreen/w90p910_ts.c | 1 -
drivers/input/touchscreen/wm831x-ts.c | 1 -
drivers/iommu/arm-smmu.c | 1 -
drivers/iommu/exynos-iommu.c | 1 -
drivers/iommu/fsl_pamu.c | 1 -
drivers/iommu/ipmmu-vmsa.c | 1 -
drivers/iommu/shmobile-ipmmu.c | 1 -
drivers/iommu/tegra-gart.c | 1 -
drivers/irqchip/irq-keystone.c | 1 -
drivers/irqchip/irq-renesas-intc-irqpin.c | 1 -
drivers/irqchip/irq-renesas-irqc.c | 1 -
drivers/leds/leds-88pm860x.c | 1 -
drivers/leds/leds-adp5520.c | 1 -
drivers/leds/leds-asic3.c | 1 -
drivers/leds/leds-clevo-mail.c | 1 -
drivers/leds/leds-cobalt-qube.c | 1 -
drivers/leds/leds-cobalt-raq.c | 1 -
drivers/leds/leds-da903x.c | 1 -
drivers/leds/leds-da9052.c | 1 -
drivers/leds/leds-gpio.c | 1 -
drivers/leds/leds-hp6xx.c | 1 -
drivers/leds/leds-lm3533.c | 1 -
drivers/leds/leds-lp8788.c | 1 -
drivers/leds/leds-lt3593.c | 1 -
drivers/leds/leds-max8997.c | 1 -
drivers/leds/leds-mc13783.c | 1 -
drivers/leds/leds-menf21bmc.c | 1 -
drivers/leds/leds-net48xx.c | 1 -
drivers/leds/leds-netxbig.c | 1 -
drivers/leds/leds-ns2.c | 1 -
drivers/leds/leds-ot200.c | 1 -
drivers/leds/leds-pwm.c | 1 -
drivers/leds/leds-rb532.c | 1 -
drivers/leds/leds-regulator.c | 1 -
drivers/leds/leds-s3c24xx.c | 1 -
drivers/leds/leds-sunfire.c | 2 -
drivers/leds/leds-wm831x-status.c | 1 -
drivers/leds/leds-wm8350.c | 1 -
drivers/leds/leds-wrap.c | 1 -
drivers/macintosh/smu.c | 1 -
drivers/macintosh/therm_pm72.c | 1 -
drivers/macintosh/therm_windtunnel.c | 1 -
drivers/macintosh/windfarm_pm81.c | 1 -
drivers/macintosh/windfarm_pm91.c | 1 -
drivers/mailbox/omap-mailbox.c | 1 -
drivers/media/platform/blackfin/bfin_capture.c | 1 -
drivers/media/platform/coda/coda-common.c | 1 -
drivers/media/platform/davinci/dm355_ccdc.c | 1 -
drivers/media/platform/davinci/dm644x_ccdc.c | 1 -
drivers/media/platform/davinci/isif.c | 1 -
drivers/media/platform/davinci/vpbe.c | 1 -
drivers/media/platform/davinci/vpbe_display.c | 1 -
drivers/media/platform/davinci/vpbe_osd.c | 1 -
drivers/media/platform/davinci/vpbe_venc.c | 1 -
drivers/media/platform/davinci/vpfe_capture.c | 1 -
drivers/media/platform/davinci/vpif.c | 1 -
drivers/media/platform/davinci/vpif_capture.c | 1 -
drivers/media/platform/davinci/vpif_display.c | 1 -
drivers/media/platform/davinci/vpss.c | 1 -
drivers/media/platform/exynos-gsc/gsc-core.c | 1 -
drivers/media/platform/exynos4-is/fimc-core.c | 1 -
drivers/media/platform/exynos4-is/fimc-is-i2c.c | 1 -
drivers/media/platform/exynos4-is/fimc-is.c | 1 -
drivers/media/platform/exynos4-is/fimc-lite.c | 1 -
drivers/media/platform/exynos4-is/media-dev.c | 1 -
drivers/media/platform/exynos4-is/mipi-csis.c | 1 -
drivers/media/platform/fsl-viu.c | 1 -
drivers/media/platform/m2m-deinterlace.c | 1 -
drivers/media/platform/marvell-ccic/mmp-driver.c | 1 -
drivers/media/platform/mx2_emmaprp.c | 1 -
drivers/media/platform/omap3isp/isp.c | 1 -
drivers/media/platform/s3c-camif/camif-core.c | 1 -
drivers/media/platform/s5p-g2d/g2d.c | 1 -
drivers/media/platform/s5p-jpeg/jpeg-core.c | 1 -
drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 -
drivers/media/platform/s5p-tv/hdmi_drv.c | 1 -
drivers/media/platform/s5p-tv/mixer_drv.c | 1 -
drivers/media/platform/s5p-tv/sdo_drv.c | 1 -
drivers/media/platform/sh_veu.c | 1 -
drivers/media/platform/sh_vou.c | 1 -
drivers/media/platform/soc_camera/atmel-isi.c | 1 -
drivers/media/platform/soc_camera/mx3_camera.c | 1 -
drivers/media/platform/soc_camera/rcar_vin.c | 1 -
.../platform/soc_camera/sh_mobile_ceu_camera.c | 1 -
drivers/media/platform/soc_camera/sh_mobile_csi2.c | 1 -
drivers/media/platform/soc_camera/soc_camera.c | 1 -
.../platform/soc_camera/soc_camera_platform.c | 1 -
drivers/media/platform/ti-vpe/vpe.c | 1 -
drivers/media/platform/timblogiw.c | 1 -
drivers/media/platform/vim2m.c | 1 -
drivers/media/platform/vsp1/vsp1_drv.c | 1 -
drivers/media/radio/radio-si476x.c | 1 -
drivers/media/radio/radio-timb.c | 1 -
drivers/media/radio/radio-wl1273.c | 1 -
drivers/media/radio/si4713/radio-platform-si4713.c | 1 -
drivers/media/rc/gpio-ir-recv.c | 1 -
drivers/media/rc/img-ir/img-ir-core.c | 1 -
drivers/media/rc/sunxi-cir.c | 1 -
drivers/memory/atmel-sdramc.c | 1 -
drivers/memory/fsl-corenet-cf.c | 1 -
drivers/memory/mvebu-devbus.c | 1 -
drivers/memory/omap-gpmc.c | 1 -
drivers/memory/tegra20-mc.c | 1 -
drivers/memory/ti-aemif.c | 1 -
drivers/memstick/host/rtsx_pci_ms.c | 1 -
drivers/memstick/host/rtsx_usb_ms.c | 1 -
drivers/mfd/ab3100-otp.c | 1 -
drivers/mfd/ab8500-core.c | 1 -
drivers/mfd/ab8500-debugfs.c | 1 -
drivers/mfd/ab8500-gpadc.c | 1 -
drivers/mfd/ab8500-sysctrl.c | 1 -
drivers/mfd/davinci_voicecodec.c | 1 -
drivers/mfd/db8500-prcmu.c | 1 -
drivers/mfd/intel_msic.c | 1 -
drivers/mfd/jz4740-adc.c | 1 -
drivers/mfd/kempld-core.c | 1 -
drivers/mfd/mcp-sa11x0.c | 1 -
drivers/mfd/omap-usb-host.c | 1 -
drivers/mfd/omap-usb-tll.c | 1 -
drivers/mfd/pm8921-core.c | 1 -
drivers/mfd/sm501.c | 1 -
drivers/mfd/ssbi.c | 1 -
drivers/mfd/sta2x11-mfd.c | 4 -
drivers/mfd/sun6i-prcm.c | 1 -
drivers/mfd/syscon.c | 1 -
drivers/mfd/t7l66xb.c | 1 -
drivers/mfd/tc6393xb.c | 1 -
drivers/mfd/ti_am335x_tscadc.c | 1 -
drivers/mfd/tps65911-comparator.c | 1 -
drivers/mfd/twl4030-audio.c | 1 -
drivers/mfd/twl4030-power.c | 1 -
drivers/misc/arm-charlcd.c | 1 -
drivers/misc/atmel-ssc.c | 1 -
drivers/misc/carma/carma-fpga-program.c | 1 -
drivers/misc/carma/carma-fpga.c | 1 -
drivers/misc/cs5535-mfgpt.c | 1 -
drivers/misc/eeprom/sunxi_sid.c | 1 -
drivers/misc/mic/card/mic_x100.c | 1 -
drivers/misc/ti-st/st_kim.c | 1 -
drivers/mmc/host/au1xmmc.c | 1 -
drivers/mmc/host/davinci_mmc.c | 1 -
drivers/mmc/host/sdhci-acpi.c | 1 -
drivers/mmc/host/tmio_mmc.c | 1 -
drivers/mmc/host/usdhi6rol0.c | 1 -
drivers/mmc/host/wbsd.c | 1 -
drivers/mmc/host/wmt-sdmmc.c | 1 -
drivers/mtd/devices/bcm47xxsflash.c | 1 -
drivers/mtd/devices/docg3.c | 1 -
drivers/mtd/devices/spear_smi.c | 1 -
drivers/mtd/devices/st_spi_fsm.c | 1 -
drivers/mtd/maps/ixp4xx.c | 1 -
drivers/mtd/maps/lantiq-flash.c | 1 -
drivers/mtd/maps/physmap.c | 1 -
drivers/mtd/maps/physmap_of.c | 1 -
drivers/mtd/maps/plat-ram.c | 1 -
drivers/mtd/maps/pxa2xx-flash.c | 1 -
drivers/mtd/maps/rbtx4939-flash.c | 1 -
drivers/mtd/maps/sa1100-flash.c | 1 -
drivers/mtd/maps/sun_uflash.c | 1 -
drivers/mtd/nand/ams-delta.c | 1 -
drivers/mtd/nand/atmel_nand.c | 2 -
drivers/mtd/nand/au1550nd.c | 1 -
drivers/mtd/nand/bcm47xxnflash/main.c | 1 -
drivers/mtd/nand/bf5xx_nand.c | 1 -
drivers/mtd/nand/davinci_nand.c | 1 -
drivers/mtd/nand/denali_dt.c | 1 -
drivers/mtd/nand/docg4.c | 1 -
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/fsmc_nand.c | 1 -
drivers/mtd/nand/gpio.c | 1 -
drivers/mtd/nand/jz4740_nand.c | 1 -
drivers/mtd/nand/lpc32xx_mlc.c | 1 -
drivers/mtd/nand/lpc32xx_slc.c | 1 -
drivers/mtd/nand/mpc5121_nfc.c | 1 -
drivers/mtd/nand/mxc_nand.c | 1 -
drivers/mtd/nand/ndfc.c | 1 -
drivers/mtd/nand/nuc900_nand.c | 1 -
drivers/mtd/nand/omap2.c | 1 -
drivers/mtd/nand/omap_elm.c | 1 -
drivers/mtd/nand/orion_nand.c | 1 -
drivers/mtd/nand/pasemi_nand.c | 1 -
drivers/mtd/nand/plat_nand.c | 1 -
drivers/mtd/nand/s3c2410.c | 1 -
drivers/mtd/nand/sh_flctl.c | 1 -
drivers/mtd/nand/sharpsl.c | 1 -
drivers/mtd/nand/socrates_nand.c | 1 -
drivers/mtd/nand/txx9ndfmc.c | 1 -
drivers/mtd/onenand/generic.c | 1 -
drivers/mtd/onenand/omap2.c | 1 -
drivers/mtd/spi-nor/fsl-quadspi.c | 1 -
drivers/net/can/at91_can.c | 1 -
drivers/net/can/bfin_can.c | 1 -
drivers/net/can/c_can/c_can_platform.c | 1 -
drivers/net/can/cc770/cc770_isa.c | 1 -
drivers/net/can/cc770/cc770_platform.c | 1 -
drivers/net/can/flexcan.c | 1 -
drivers/net/can/grcan.c | 1 -
drivers/net/can/janz-ican3.c | 1 -
drivers/net/can/mscan/mpc5xxx_can.c | 1 -
drivers/net/can/rcar_can.c | 1 -
drivers/net/can/sja1000/sja1000_isa.c | 1 -
drivers/net/can/sja1000/sja1000_platform.c | 1 -
drivers/net/can/softing/softing_main.c | 1 -
drivers/net/can/ti_hecc.c | 1 -
drivers/net/can/xilinx_can.c | 1 -
drivers/net/ethernet/8390/ax88796.c | 1 -
drivers/net/ethernet/8390/mcf8390.c | 1 -
drivers/net/ethernet/8390/ne.c | 1 -
drivers/net/ethernet/adi/bfin_mac.c | 2 -
drivers/net/ethernet/aeroflex/greth.c | 1 -
drivers/net/ethernet/altera/altera_tse_main.c | 1 -
drivers/net/ethernet/amd/au1000_eth.c | 1 -
drivers/net/ethernet/amd/sunlance.c | 1 -
drivers/net/ethernet/apple/macmace.c | 1 -
drivers/net/ethernet/broadcom/bcmsysport.c | 1 -
drivers/net/ethernet/broadcom/genet/bcmgenet.c | 1 -
drivers/net/ethernet/broadcom/sb1250-mac.c | 1 -
drivers/net/ethernet/cadence/at91_ether.c | 1 -
drivers/net/ethernet/cadence/macb.c | 1 -
drivers/net/ethernet/cirrus/cs89x0.c | 1 -
drivers/net/ethernet/cirrus/ep93xx_eth.c | 1 -
drivers/net/ethernet/davicom/dm9000.c | 1 -
drivers/net/ethernet/ethoc.c | 1 -
drivers/net/ethernet/faraday/ftgmac100.c | 1 -
drivers/net/ethernet/faraday/ftmac100.c | 1 -
drivers/net/ethernet/freescale/fec_main.c | 1 -
drivers/net/ethernet/freescale/fec_mpc52xx.c | 1 -
.../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 -
.../net/ethernet/freescale/fs_enet/mii-bitbang.c | 1 -
drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 1 -
drivers/net/ethernet/freescale/fsl_pq_mdio.c | 1 -
drivers/net/ethernet/freescale/gianfar.c | 1 -
drivers/net/ethernet/freescale/gianfar_ptp.c | 1 -
drivers/net/ethernet/freescale/ucc_geth.c | 1 -
drivers/net/ethernet/i825xx/sni_82596.c | 1 -
drivers/net/ethernet/ibm/emac/core.c | 1 -
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/lantiq_etop.c | 1 -
drivers/net/ethernet/marvell/mv643xx_eth.c | 2 -
drivers/net/ethernet/micrel/ks8695net.c | 1 -
drivers/net/ethernet/micrel/ks8842.c | 1 -
drivers/net/ethernet/micrel/ks8851_mll.c | 1 -
drivers/net/ethernet/moxa/moxart_ether.c | 1 -
drivers/net/ethernet/natsemi/jazzsonic.c | 1 -
drivers/net/ethernet/natsemi/macsonic.c | 1 -
drivers/net/ethernet/netx-eth.c | 1 -
drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 -
drivers/net/ethernet/octeon/octeon_mgmt.c | 1 -
drivers/net/ethernet/s6gmac.c | 1 -
.../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 1 -
drivers/net/ethernet/seeq/sgiseeq.c | 1 -
drivers/net/ethernet/sgi/meth.c | 1 -
drivers/net/ethernet/smsc/smc911x.c | 1 -
drivers/net/ethernet/smsc/smc91x.c | 1 -
drivers/net/ethernet/smsc/smsc911x.c | 1 -
drivers/net/ethernet/sun/niu.c | 1 -
drivers/net/ethernet/sun/sunbmac.c | 1 -
drivers/net/ethernet/sun/sunhme.c | 1 -
drivers/net/ethernet/sun/sunqe.c | 1 -
drivers/net/ethernet/tundra/tsi108_eth.c | 1 -
drivers/net/ethernet/via/via-rhine.c | 1 -
drivers/net/ethernet/via/via-velocity.c | 1 -
drivers/net/ethernet/wiznet/w5100.c | 1 -
drivers/net/ethernet/wiznet/w5300.c | 1 -
drivers/net/ieee802154/fakelb.c | 1 -
drivers/net/irda/ali-ircc.c | 1 -
drivers/net/irda/au1k_ir.c | 1 -
drivers/net/irda/pxaficp_ir.c | 1 -
drivers/net/irda/sa1100_ir.c | 1 -
drivers/net/phy/mdio-bcm-unimac.c | 1 -
drivers/net/phy/mdio-gpio.c | 1 -
drivers/net/phy/mdio-mux-gpio.c | 1 -
drivers/net/phy/mdio-mux-mmioreg.c | 1 -
drivers/net/phy/mdio-octeon.c | 1 -
drivers/net/wireless/ath/ath9k/ahb.c | 2 +-
drivers/net/wireless/ath/ath9k/debug.c | 419 +++++-----------
drivers/net/wireless/ath/ath9k/debug.h | 11 +-
drivers/net/wireless/ath/ath9k/pci.c | 1 +
drivers/net/wireless/ath/wcn36xx/main.c | 1 -
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 1 -
drivers/net/wireless/mac80211_hwsim.c | 1 -
drivers/net/wireless/rt2x00/rt2800soc.c | 1 -
drivers/net/wireless/ti/wl12xx/main.c | 1 -
drivers/net/wireless/ti/wl18xx/main.c | 1 -
drivers/nfc/nfcwilink.c | 1 -
drivers/parport/parport_amiga.c | 1 -
drivers/parport/parport_ax88796.c | 1 -
drivers/parport/parport_pc.c | 1 -
drivers/parport/parport_sunbpp.c | 1 -
drivers/pci/host/pci-dra7xx.c | 1 -
drivers/pci/host/pci-exynos.c | 1 -
drivers/pci/host/pci-host-generic.c | 1 -
drivers/pci/host/pci-imx6.c | 1 -
drivers/pci/host/pci-keystone.c | 1 -
drivers/pci/host/pci-mvebu.c | 1 -
drivers/pci/host/pci-rcar-gen2.c | 1 -
drivers/pci/host/pci-tegra.c | 1 -
drivers/pci/host/pci-xgene.c | 1 -
drivers/pci/host/pcie-rcar.c | 1 -
drivers/pci/host/pcie-spear13xx.c | 1 -
drivers/pci/host/pcie-xilinx.c | 1 -
drivers/pci/pci-sysfs.c | 39 +-
drivers/pcmcia/at91_cf.c | 1 -
drivers/pcmcia/bfin_cf_pcmcia.c | 1 -
drivers/pcmcia/db1xxx_ss.c | 1 -
drivers/pcmcia/electra_cf.c | 1 -
drivers/pcmcia/i82365.c | 1 -
drivers/pcmcia/m32r_cfc.c | 1 -
drivers/pcmcia/m32r_pcc.c | 1 -
drivers/pcmcia/omap_cf.c | 1 -
drivers/pcmcia/pxa2xx_base.c | 1 -
drivers/pcmcia/pxa2xx_viper.c | 1 -
drivers/pcmcia/sa1100_generic.c | 1 -
drivers/pcmcia/tcic.c | 1 -
drivers/pcmcia/vrc4171_card.c | 1 -
drivers/pcmcia/xxs1500_ss.c | 1 -
drivers/pinctrl/berlin/berlin-bg2.c | 1 -
drivers/pinctrl/berlin/berlin-bg2cd.c | 1 -
drivers/pinctrl/berlin/berlin-bg2q.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx1.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx21.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx23.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx25.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx27.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx28.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx35.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx50.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx51.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx53.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx6dl.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx6q.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx6sl.c | 1 -
drivers/pinctrl/freescale/pinctrl-imx6sx.c | 1 -
drivers/pinctrl/freescale/pinctrl-vf610.c | 1 -
drivers/pinctrl/mvebu/pinctrl-armada-370.c | 1 -
drivers/pinctrl/mvebu/pinctrl-armada-375.c | 1 -
drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 1 -
drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 1 -
drivers/pinctrl/mvebu/pinctrl-dove.c | 1 -
drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 1 -
drivers/pinctrl/mvebu/pinctrl-orion.c | 1 -
drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 -
drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 -
drivers/pinctrl/pinctrl-as3722.c | 1 -
drivers/pinctrl/pinctrl-at91.c | 2 -
drivers/pinctrl/pinctrl-baytrail.c | 1 -
drivers/pinctrl/pinctrl-bcm281xx.c | 1 -
drivers/pinctrl/pinctrl-bcm2835.c | 1 -
drivers/pinctrl/pinctrl-falcon.c | 1 -
drivers/pinctrl/pinctrl-palmas.c | 1 -
drivers/pinctrl/pinctrl-rockchip.c | 1 -
drivers/pinctrl/pinctrl-single.c | 1 -
drivers/pinctrl/pinctrl-st.c | 1 -
drivers/pinctrl/pinctrl-tb10x.c | 1 -
drivers/pinctrl/pinctrl-tegra114.c | 1 -
drivers/pinctrl/pinctrl-tegra124.c | 1 -
drivers/pinctrl/pinctrl-tegra20.c | 1 -
drivers/pinctrl/pinctrl-tegra30.c | 1 -
drivers/pinctrl/pinctrl-tz1090-pdc.c | 1 -
drivers/pinctrl/pinctrl-tz1090.c | 1 -
drivers/pinctrl/pinctrl-u300.c | 1 -
drivers/pinctrl/pinctrl-xway.c | 1 -
drivers/pinctrl/qcom/pinctrl-apq8064.c | 1 -
drivers/pinctrl/qcom/pinctrl-apq8084.c | 1 -
drivers/pinctrl/qcom/pinctrl-ipq8064.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8960.c | 1 -
drivers/pinctrl/qcom/pinctrl-msm8x74.c | 1 -
drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1 -
drivers/pinctrl/samsung/pinctrl-samsung.c | 1 -
drivers/pinctrl/sh-pfc/core.c | 1 -
drivers/pinctrl/sirf/pinctrl-sirf.c | 1 -
drivers/pinctrl/spear/pinctrl-plgpio.c | 1 -
drivers/pinctrl/spear/pinctrl-spear1310.c | 1 -
drivers/pinctrl/spear/pinctrl-spear1340.c | 1 -
drivers/pinctrl/spear/pinctrl-spear300.c | 1 -
drivers/pinctrl/spear/pinctrl-spear310.c | 1 -
drivers/pinctrl/spear/pinctrl-spear320.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 1 -
drivers/pinctrl/sunxi/pinctrl-sun8i-a23.c | 1 -
drivers/pinctrl/vt8500/pinctrl-vt8500.c | 1 -
drivers/pinctrl/vt8500/pinctrl-wm8505.c | 1 -
drivers/pinctrl/vt8500/pinctrl-wm8650.c | 1 -
drivers/pinctrl/vt8500/pinctrl-wm8750.c | 1 -
drivers/pinctrl/vt8500/pinctrl-wm8850.c | 1 -
drivers/platform/chrome/chromeos_laptop.c | 1 -
drivers/platform/x86/acer-wmi.c | 1 -
drivers/platform/x86/acerhdf.c | 1 -
drivers/platform/x86/alienware-wmi.c | 1 -
drivers/platform/x86/amilo-rfkill.c | 1 -
drivers/platform/x86/asus-laptop.c | 1 -
drivers/platform/x86/compal-laptop.c | 1 -
drivers/platform/x86/dell-laptop.c | 1 -
drivers/platform/x86/eeepc-laptop.c | 1 -
drivers/platform/x86/fujitsu-laptop.c | 1 -
drivers/platform/x86/hdaps.c | 1 -
drivers/platform/x86/hp-wmi.c | 1 -
drivers/platform/x86/ideapad-laptop.c | 1 -
drivers/platform/x86/intel_mid_powerbtn.c | 1 -
drivers/platform/x86/intel_mid_thermal.c | 1 -
drivers/platform/x86/intel_oaktrail.c | 1 -
drivers/platform/x86/intel_pmic_gpio.c | 1 -
drivers/platform/x86/msi-laptop.c | 1 -
drivers/platform/x86/samsung-q10.c | 1 -
drivers/platform/x86/sony-laptop.c | 1 -
drivers/platform/x86/tc1100-wmi.c | 1 -
drivers/platform/x86/thinkpad_acpi.c | 2 -
drivers/platform/x86/xo1-rfkill.c | 1 -
drivers/power/88pm860x_battery.c | 1 -
drivers/power/88pm860x_charger.c | 1 -
drivers/power/ab8500_btemp.c | 1 -
drivers/power/ab8500_charger.c | 1 -
drivers/power/ab8500_fg.c | 1 -
drivers/power/abx500_chargalg.c | 1 -
drivers/power/bq27x00_battery.c | 1 -
drivers/power/charger-manager.c | 1 -
drivers/power/da9030_battery.c | 1 -
drivers/power/da9052-battery.c | 1 -
drivers/power/generic-adc-battery.c | 1 -
drivers/power/gpio-charger.c | 1 -
drivers/power/intel_mid_battery.c | 1 -
drivers/power/jz4740-battery.c | 1 -
drivers/power/lp8788-charger.c | 1 -
drivers/power/max14577_charger.c | 1 -
drivers/power/max8903_charger.c | 1 -
drivers/power/max8997_charger.c | 1 -
drivers/power/max8998_charger.c | 1 -
drivers/power/olpc_battery.c | 1 -
drivers/power/reset/as3722-poweroff.c | 1 -
drivers/power/reset/brcmstb-reboot.c | 1 -
drivers/power/reset/gpio-poweroff.c | 1 -
drivers/power/reset/gpio-restart.c | 1 -
drivers/power/reset/keystone-reset.c | 1 -
drivers/power/reset/ltc2952-poweroff.c | 1 -
drivers/power/reset/qnap-poweroff.c | 1 -
drivers/power/reset/restart-poweroff.c | 1 -
drivers/power/rx51_battery.c | 1 -
drivers/power/tps65090-charger.c | 1 -
drivers/power/twl4030_charger.c | 1 -
drivers/power/wm97xx_battery.c | 1 -
drivers/pps/clients/pps-gpio.c | 1 -
drivers/pwm/pwm-ab8500.c | 1 -
drivers/pwm/pwm-atmel-tcb.c | 1 -
drivers/pwm/pwm-bfin.c | 1 -
drivers/pwm/pwm-clps711x.c | 1 -
drivers/pwm/pwm-imx.c | 1 -
drivers/pwm/pwm-jz4740.c | 1 -
drivers/pwm/pwm-lp3943.c | 1 -
drivers/pwm/pwm-lpc32xx.c | 1 -
drivers/pwm/pwm-mxs.c | 1 -
drivers/pwm/pwm-puv3.c | 1 -
drivers/pwm/pwm-pxa.c | 1 -
drivers/pwm/pwm-renesas-tpu.c | 1 -
drivers/pwm/pwm-samsung.c | 1 -
drivers/pwm/pwm-spear.c | 1 -
drivers/pwm/pwm-tegra.c | 1 -
drivers/pwm/pwm-tiecap.c | 1 -
drivers/pwm/pwm-tiehrpwm.c | 1 -
drivers/pwm/pwm-tipwmss.c | 1 -
drivers/pwm/pwm-vt8500.c | 1 -
drivers/regulator/88pm800.c | 1 -
drivers/regulator/88pm8607.c | 1 -
drivers/regulator/aat2870-regulator.c | 1 -
drivers/regulator/ab3100.c | 1 -
drivers/regulator/ab8500-ext.c | 1 -
drivers/regulator/ab8500.c | 1 -
drivers/regulator/anatop-regulator.c | 1 -
drivers/regulator/arizona-ldo1.c | 1 -
drivers/regulator/arizona-micsupp.c | 1 -
drivers/regulator/as3711-regulator.c | 1 -
drivers/regulator/as3722-regulator.c | 1 -
drivers/regulator/axp20x-regulator.c | 1 -
drivers/regulator/bcm590xx-regulator.c | 1 -
drivers/regulator/da903x.c | 1 -
drivers/regulator/da9052-regulator.c | 1 -
drivers/regulator/da9055-regulator.c | 1 -
drivers/regulator/da9063-regulator.c | 1 -
drivers/regulator/db8500-prcmu.c | 1 -
drivers/regulator/dummy.c | 1 -
drivers/regulator/fixed.c | 1 -
drivers/regulator/gpio-regulator.c | 1 -
drivers/regulator/hi6421-regulator.c | 1 -
drivers/regulator/lp8788-buck.c | 1 -
drivers/regulator/lp8788-ldo.c | 2 -
drivers/regulator/max14577.c | 1 -
drivers/regulator/max77686.c | 1 -
drivers/regulator/max77693.c | 1 -
drivers/regulator/max77802.c | 1 -
drivers/regulator/max8907-regulator.c | 1 -
drivers/regulator/max8925-regulator.c | 1 -
drivers/regulator/max8997.c | 1 -
drivers/regulator/max8998.c | 1 -
drivers/regulator/mc13783-regulator.c | 1 -
drivers/regulator/mc13892-regulator.c | 1 -
drivers/regulator/palmas-regulator.c | 1 -
drivers/regulator/pbias-regulator.c | 1 -
drivers/regulator/pcap-regulator.c | 1 -
drivers/regulator/pwm-regulator.c | 1 -
drivers/regulator/qcom_rpm-regulator.c | 1 -
drivers/regulator/rc5t583-regulator.c | 1 -
drivers/regulator/rk808-regulator.c | 1 -
drivers/regulator/s2mpa01.c | 1 -
drivers/regulator/s2mps11.c | 1 -
drivers/regulator/s5m8767.c | 1 -
drivers/regulator/stw481x-vmmc.c | 1 -
drivers/regulator/ti-abb-regulator.c | 1 -
drivers/regulator/tps6105x-regulator.c | 1 -
drivers/regulator/tps6507x-regulator.c | 1 -
drivers/regulator/tps65090-regulator.c | 1 -
drivers/regulator/tps65218-regulator.c | 1 -
drivers/regulator/tps6586x-regulator.c | 1 -
drivers/regulator/tps65910-regulator.c | 1 -
drivers/regulator/tps65912-regulator.c | 1 -
drivers/regulator/tps80031-regulator.c | 1 -
drivers/regulator/twl-regulator.c | 1 -
drivers/regulator/vexpress.c | 1 -
drivers/regulator/virtual.c | 1 -
drivers/regulator/wm831x-dcdc.c | 4 -
drivers/regulator/wm831x-isink.c | 1 -
drivers/regulator/wm831x-ldo.c | 3 -
drivers/regulator/wm8994-regulator.c | 1 -
drivers/remoteproc/da8xx_remoteproc.c | 1 -
drivers/remoteproc/omap_remoteproc.c | 1 -
drivers/remoteproc/ste_modem_rproc.c | 1 -
drivers/reset/reset-socfpga.c | 1 -
drivers/reset/reset-sunxi.c | 1 -
drivers/reset/sti/reset-stih415.c | 1 -
drivers/reset/sti/reset-stih416.c | 1 -
drivers/rtc/rtc-88pm80x.c | 1 -
drivers/rtc/rtc-88pm860x.c | 1 -
drivers/rtc/rtc-ab3100.c | 1 -
drivers/rtc/rtc-ab8500.c | 1 -
drivers/rtc/rtc-at32ap700x.c | 1 -
drivers/rtc/rtc-at91rm9200.c | 1 -
drivers/rtc/rtc-at91sam9.c | 1 -
drivers/rtc/rtc-au1xxx.c | 1 -
drivers/rtc/rtc-bfin.c | 1 -
drivers/rtc/rtc-bq4802.c | 1 -
drivers/rtc/rtc-coh901331.c | 1 -
drivers/rtc/rtc-da9052.c | 1 -
drivers/rtc/rtc-da9055.c | 1 -
drivers/rtc/rtc-da9063.c | 1 -
drivers/rtc/rtc-davinci.c | 1 -
drivers/rtc/rtc-dm355evm.c | 1 -
drivers/rtc/rtc-ds1216.c | 1 -
drivers/rtc/rtc-ds1286.c | 1 -
drivers/rtc/rtc-ds1302.c | 1 -
drivers/rtc/rtc-ds1511.c | 1 -
drivers/rtc/rtc-ds1553.c | 1 -
drivers/rtc/rtc-ds1742.c | 1 -
drivers/rtc/rtc-ds2404.c | 1 -
drivers/rtc/rtc-efi.c | 1 -
drivers/rtc/rtc-ep93xx.c | 1 -
drivers/rtc/rtc-generic.c | 1 -
drivers/rtc/rtc-hid-sensor-time.c | 1 -
drivers/rtc/rtc-imxdi.c | 1 -
drivers/rtc/rtc-jz4740.c | 1 -
drivers/rtc/rtc-lp8788.c | 1 -
drivers/rtc/rtc-lpc32xx.c | 1 -
drivers/rtc/rtc-ls1x.c | 1 -
drivers/rtc/rtc-m48t35.c | 1 -
drivers/rtc/rtc-m48t59.c | 1 -
drivers/rtc/rtc-m48t86.c | 1 -
drivers/rtc/rtc-max77686.c | 1 -
drivers/rtc/rtc-max77802.c | 1 -
drivers/rtc/rtc-max8907.c | 1 -
drivers/rtc/rtc-max8925.c | 1 -
drivers/rtc/rtc-max8997.c | 1 -
drivers/rtc/rtc-max8998.c | 1 -
drivers/rtc/rtc-mc13xxx.c | 1 -
drivers/rtc/rtc-moxart.c | 1 -
drivers/rtc/rtc-mpc5121.c | 1 -
drivers/rtc/rtc-msm6242.c | 1 -
drivers/rtc/rtc-mv.c | 1 -
drivers/rtc/rtc-mxc.c | 1 -
drivers/rtc/rtc-nuc900.c | 1 -
drivers/rtc/rtc-omap.c | 1 -
drivers/rtc/rtc-palmas.c | 1 -
drivers/rtc/rtc-pcap.c | 1 -
drivers/rtc/rtc-pm8xxx.c | 1 -
drivers/rtc/rtc-ps3.c | 1 -
drivers/rtc/rtc-puv3.c | 1 -
drivers/rtc/rtc-rc5t583.c | 1 -
drivers/rtc/rtc-rp5c01.c | 1 -
drivers/rtc/rtc-rs5c313.c | 1 -
drivers/rtc/rtc-s3c.c | 1 -
drivers/rtc/rtc-s5m.c | 1 -
drivers/rtc/rtc-sh.c | 1 -
drivers/rtc/rtc-sirfsoc.c | 1 -
drivers/rtc/rtc-snvs.c | 1 -
drivers/rtc/rtc-starfire.c | 1 -
drivers/rtc/rtc-stk17ta8.c | 1 -
drivers/rtc/rtc-stmp3xxx.c | 1 -
drivers/rtc/rtc-sun4v.c | 1 -
drivers/rtc/rtc-sunxi.c | 1 -
drivers/rtc/rtc-tegra.c | 1 -
drivers/rtc/rtc-test.c | 1 -
drivers/rtc/rtc-tile.c | 1 -
drivers/rtc/rtc-tps6586x.c | 1 -
drivers/rtc/rtc-tps65910.c | 1 -
drivers/rtc/rtc-tps80031.c | 1 -
drivers/rtc/rtc-twl.c | 1 -
drivers/rtc/rtc-tx4939.c | 1 -
drivers/rtc/rtc-v3020.c | 1 -
drivers/rtc/rtc-vr41xx.c | 1 -
drivers/rtc/rtc-vt8500.c | 1 -
drivers/rtc/rtc-xgene.c | 1 -
drivers/s390/block/dcssblk.c | 1 -
drivers/s390/block/xpram.c | 1 -
drivers/s390/char/monwriter.c | 1 -
drivers/s390/char/sclp.c | 1 -
drivers/sbus/char/bbc_i2c.c | 1 -
drivers/sbus/char/display7seg.c | 1 -
drivers/sbus/char/envctrl.c | 1 -
drivers/sbus/char/flash.c | 1 -
drivers/sbus/char/uctrl.c | 1 -
drivers/scsi/a3000.c | 1 -
drivers/scsi/a4000t.c | 1 -
drivers/scsi/bvme6000_scsi.c | 1 -
drivers/scsi/jazz_esp.c | 1 -
drivers/scsi/mac_esp.c | 1 -
drivers/scsi/mvme16x_scsi.c | 1 -
drivers/scsi/qlogicpti.c | 1 -
drivers/scsi/sgiwd93.c | 1 -
drivers/scsi/sni_53c710.c | 1 -
drivers/scsi/sun3x_esp.c | 1 -
drivers/scsi/sun_esp.c | 1 -
drivers/scsi/ufs/ufshcd-pltfrm.c | 1 -
drivers/soc/qcom/qcom_gsbi.c | 1 -
drivers/soc/tegra/fuse/fuse-tegra20.c | 1 -
drivers/soc/tegra/fuse/fuse-tegra30.c | 1 -
drivers/soc/ti/knav_dma.c | 1 -
drivers/soc/ti/knav_qmss_queue.c | 1 -
drivers/spi/spi-adi-v3.c | 1 -
drivers/spi/spi-altera.c | 1 -
drivers/spi/spi-ath79.c | 1 -
drivers/spi/spi-atmel.c | 1 -
drivers/spi/spi-au1550.c | 1 -
drivers/spi/spi-bcm2835.c | 1 -
drivers/spi/spi-bcm63xx-hsspi.c | 1 -
drivers/spi/spi-bcm63xx.c | 1 -
drivers/spi/spi-bfin-sport.c | 1 -
drivers/spi/spi-bfin5xx.c | 1 -
drivers/spi/spi-clps711x.c | 1 -
drivers/spi/spi-davinci.c | 1 -
drivers/spi/spi-dw-mmio.c | 1 -
drivers/spi/spi-efm32.c | 1 -
drivers/spi/spi-ep93xx.c | 1 -
drivers/spi/spi-falcon.c | 1 -
drivers/spi/spi-fsl-espi.c | 1 -
drivers/spi/spi-fsl-spi.c | 2 -
drivers/spi/spi-gpio.c | 1 -
drivers/spi/spi-imx.c | 1 -
drivers/spi/spi-mpc512x-psc.c | 1 -
drivers/spi/spi-mpc52xx-psc.c | 1 -
drivers/spi/spi-mpc52xx.c | 1 -
drivers/spi/spi-mxs.c | 1 -
drivers/spi/spi-nuc900.c | 1 -
drivers/spi/spi-oc-tiny.c | 1 -
drivers/spi/spi-octeon.c | 1 -
drivers/spi/spi-omap-100k.c | 1 -
drivers/spi/spi-omap-uwire.c | 1 -
drivers/spi/spi-omap2-mcspi.c | 1 -
drivers/spi/spi-orion.c | 1 -
drivers/spi/spi-ppc4xx.c | 1 -
drivers/spi/spi-pxa2xx.c | 1 -
drivers/spi/spi-qup.c | 1 -
drivers/spi/spi-rockchip.c | 1 -
drivers/spi/spi-rspi.c | 1 -
drivers/spi/spi-s3c24xx.c | 1 -
drivers/spi/spi-s3c64xx.c | 1 -
drivers/spi/spi-sh-hspi.c | 1 -
drivers/spi/spi-sh-msiof.c | 1 -
drivers/spi/spi-sh-sci.c | 1 -
drivers/spi/spi-sh.c | 1 -
drivers/spi/spi-sirf.c | 1 -
drivers/spi/spi-sun4i.c | 1 -
drivers/spi/spi-sun6i.c | 1 -
drivers/spi/spi-tegra114.c | 1 -
drivers/spi/spi-tegra20-sflash.c | 1 -
drivers/spi/spi-tegra20-slink.c | 1 -
drivers/spi/spi-ti-qspi.c | 1 -
drivers/spi/spi-topcliff-pch.c | 1 -
drivers/spi/spi-txx9.c | 1 -
drivers/spi/spi-xtensa-xtfpga.c | 1 -
drivers/spmi/spmi-pmic-arb.c | 1 -
drivers/staging/android/timed_gpio.c | 1 -
drivers/staging/emxx_udc/emxx_udc.c | 1 -
drivers/staging/iio/adc/ad7606_par.c | 1 -
drivers/staging/iio/adc/lpc32xx_adc.c | 1 -
drivers/staging/iio/adc/mxs-lradc.c | 1 -
drivers/staging/iio/adc/spear_adc.c | 1 -
drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 1 -
.../staging/iio/trigger/iio-trig-periodic-rtc.c | 1 -
.../staging/media/davinci_vpfe/vpfe_mc_capture.c | 1 -
drivers/staging/media/lirc/lirc_parallel.c | 1 -
drivers/staging/media/lirc/lirc_serial.c | 1 -
drivers/staging/media/lirc/lirc_sir.c | 1 -
drivers/staging/media/omap4iss/iss.c | 1 -
drivers/staging/netlogic/xlr_net.c | 1 -
drivers/staging/nvec/nvec.c | 1 -
drivers/staging/nvec/nvec_kbd.c | 1 -
drivers/staging/nvec/nvec_paz00.c | 1 -
drivers/staging/nvec/nvec_power.c | 1 -
drivers/staging/nvec/nvec_ps2.c | 1 -
drivers/staging/octeon-usb/octeon-hcd.c | 1 -
drivers/staging/octeon/ethernet.c | 1 -
drivers/staging/ozwpan/ozhcd.c | 1 -
drivers/thermal/armada_thermal.c | 1 -
drivers/thermal/db8500_cpufreq_cooling.c | 1 -
drivers/thermal/db8500_thermal.c | 1 -
drivers/thermal/dove_thermal.c | 1 -
drivers/thermal/imx_thermal.c | 1 -
drivers/thermal/kirkwood_thermal.c | 1 -
drivers/thermal/samsung/exynos_tmu.c | 1 -
drivers/thermal/spear_thermal.c | 1 -
drivers/thermal/st/st_thermal_memmap.c | 1 -
drivers/thermal/st/st_thermal_syscfg.c | 1 -
drivers/tty/amiserial.c | 1 -
drivers/tty/ehv_bytechan.c | 1 -
drivers/tty/hvc/hvc_opal.c | 1 -
drivers/tty/hvc/hvc_tile.c | 1 -
drivers/tty/serial/8250/8250_core.c | 1 -
drivers/tty/serial/8250/8250_dw.c | 1 -
drivers/tty/serial/8250/8250_em.c | 1 -
drivers/tty/serial/altera_jtaguart.c | 1 -
drivers/tty/serial/altera_uart.c | 1 -
drivers/tty/serial/apbuart.c | 1 -
drivers/tty/serial/ar933x_uart.c | 1 -
drivers/tty/serial/arc_uart.c | 1 -
drivers/tty/serial/atmel_serial.c | 1 -
drivers/tty/serial/bcm63xx_uart.c | 1 -
drivers/tty/serial/bfin_uart.c | 1 -
drivers/tty/serial/clps711x.c | 1 -
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 1 -
drivers/tty/serial/efm32-uart.c | 1 -
drivers/tty/serial/fsl_lpuart.c | 1 -
drivers/tty/serial/imx.c | 1 -
drivers/tty/serial/lantiq.c | 1 -
drivers/tty/serial/lpc32xx_hs.c | 1 -
drivers/tty/serial/mcf.c | 1 -
drivers/tty/serial/meson_uart.c | 1 -
drivers/tty/serial/mpc52xx_uart.c | 1 -
drivers/tty/serial/mpsc.c | 1 -
drivers/tty/serial/msm_serial.c | 1 -
drivers/tty/serial/msm_serial_hs.c | 1 -
drivers/tty/serial/mxs-auart.c | 1 -
drivers/tty/serial/netx-serial.c | 1 -
drivers/tty/serial/of_serial.c | 1 -
drivers/tty/serial/pmac_zilog.c | 1 -
drivers/tty/serial/pnx8xxx_uart.c | 1 -
drivers/tty/serial/pxa.c | 1 -
drivers/tty/serial/sa1100.c | 1 -
drivers/tty/serial/samsung.c | 1 -
drivers/tty/serial/sccnxp.c | 1 -
drivers/tty/serial/serial_txx9.c | 1 -
drivers/tty/serial/sh-sci.c | 1 -
drivers/tty/serial/sirfsoc_uart.c | 1 -
drivers/tty/serial/st-asc.c | 1 -
drivers/tty/serial/sunhv.c | 1 -
drivers/tty/serial/sunsab.c | 1 -
drivers/tty/serial/sunsu.c | 1 -
drivers/tty/serial/sunzilog.c | 1 -
drivers/tty/serial/timbuart.c | 1 -
drivers/tty/serial/ucc_uart.c | 1 -
drivers/tty/serial/vr41xx_siu.c | 1 -
drivers/tty/serial/vt8500_serial.c | 1 -
drivers/uio/uio_dmem_genirq.c | 1 -
drivers/uio/uio_pdrv_genirq.c | 1 -
drivers/uio/uio_pruss.c | 1 -
drivers/usb/c67x00/c67x00-drv.c | 1 -
drivers/usb/chipidea/ci_hdrc_imx.c | 1 -
drivers/usb/chipidea/ci_hdrc_zevio.c | 1 -
drivers/usb/chipidea/core.c | 1 -
drivers/usb/chipidea/usbmisc_imx.c | 1 -
drivers/usb/dwc2/gadget.c | 1 -
drivers/usb/gadget/legacy/hid.c | 1 -
drivers/usb/gadget/udc/at91_udc.c | 1 -
drivers/usb/gadget/udc/atmel_usba_udc.c | 1 -
drivers/usb/gadget/udc/bcm63xx_udc.c | 1 -
drivers/usb/gadget/udc/dummy_hcd.c | 2 -
drivers/usb/gadget/udc/fotg210-udc.c | 1 -
drivers/usb/gadget/udc/fsl_qe_udc.c | 1 -
drivers/usb/gadget/udc/fsl_udc_core.c | 1 -
drivers/usb/gadget/udc/fusb300_udc.c | 1 -
drivers/usb/gadget/udc/gr_udc.c | 1 -
drivers/usb/gadget/udc/lpc32xx_udc.c | 1 -
drivers/usb/gadget/udc/m66592-udc.c | 1 -
drivers/usb/gadget/udc/mv_u3d_core.c | 1 -
drivers/usb/gadget/udc/mv_udc_core.c | 1 -
drivers/usb/gadget/udc/net2272.c | 1 -
drivers/usb/gadget/udc/omap_udc.c | 1 -
drivers/usb/gadget/udc/pxa25x_udc.c | 1 -
drivers/usb/gadget/udc/pxa27x_udc.c | 1 -
drivers/usb/gadget/udc/s3c-hsudc.c | 1 -
drivers/usb/gadget/udc/s3c2410_udc.c | 1 -
drivers/usb/host/ehci-exynos.c | 1 -
drivers/usb/host/ehci-orion.c | 1 -
drivers/usb/host/ehci-platform.c | 1 -
drivers/usb/host/ehci-w90x900.c | 1 -
drivers/usb/host/fhci-hcd.c | 1 -
drivers/usb/host/fsl-mph-dr-of.c | 1 -
drivers/usb/host/isp116x-hcd.c | 1 -
drivers/usb/host/isp1362-hcd.c | 1 -
drivers/usb/host/isp1760-if.c | 1 -
drivers/usb/host/ohci-at91.c | 1 -
drivers/usb/host/ohci-exynos.c | 1 -
drivers/usb/host/ohci-nxp.c | 1 -
drivers/usb/host/ohci-omap.c | 1 -
drivers/usb/host/ohci-platform.c | 1 -
drivers/usb/host/ohci-pxa27x.c | 1 -
drivers/usb/host/ohci-s3c2410.c | 1 -
drivers/usb/host/ohci-spear.c | 1 -
drivers/usb/host/r8a66597-hcd.c | 1 -
drivers/usb/host/u132-hcd.c | 1 -
drivers/usb/misc/usb3503.c | 1 -
drivers/usb/musb/musb_core.c | 1 -
drivers/usb/phy/phy-ab8500-usb.c | 1 -
drivers/usb/phy/phy-am335x-control.c | 1 -
drivers/usb/phy/phy-am335x.c | 1 -
drivers/usb/phy/phy-generic.c | 1 -
drivers/usb/phy/phy-gpio-vbus-usb.c | 1 -
drivers/usb/phy/phy-isp1301-omap.c | 1 -
drivers/usb/phy/phy-keystone.c | 1 -
drivers/usb/phy/phy-mv-usb.c | 1 -
drivers/usb/phy/phy-mxs-usb.c | 1 -
drivers/usb/phy/phy-omap-otg.c | 1 -
drivers/usb/phy/phy-tahvo.c | 1 -
drivers/usb/phy/phy-tegra-usb.c | 1 -
drivers/usb/phy/phy-twl6030-usb.c | 1 -
drivers/usb/usbip/vhci_hcd.c | 1 -
drivers/video/fbdev/amifb.c | 1 -
drivers/video/fbdev/atmel_lcdfb.c | 1 -
drivers/video/fbdev/au1100fb.c | 1 -
drivers/video/fbdev/au1200fb.c | 1 -
drivers/video/fbdev/auo_k1900fb.c | 1 -
drivers/video/fbdev/auo_k1901fb.c | 1 -
drivers/video/fbdev/bf537-lq035.c | 1 -
drivers/video/fbdev/bf54x-lq043fb.c | 1 -
drivers/video/fbdev/bfin-t350mcqb-fb.c | 1 -
drivers/video/fbdev/broadsheetfb.c | 1 -
drivers/video/fbdev/bw2.c | 1 -
drivers/video/fbdev/cg14.c | 1 -
drivers/video/fbdev/cg3.c | 1 -
drivers/video/fbdev/cg6.c | 1 -
drivers/video/fbdev/clps711x-fb.c | 1 -
drivers/video/fbdev/clps711xfb.c | 1 -
drivers/video/fbdev/cobalt_lcdfb.c | 1 -
drivers/video/fbdev/da8xx-fb.c | 1 -
drivers/video/fbdev/efifb.c | 1 -
drivers/video/fbdev/ep93xx-fb.c | 1 -
drivers/video/fbdev/exynos/exynos_mipi_dsi.c | 1 -
drivers/video/fbdev/ffb.c | 1 -
drivers/video/fbdev/fsl-diu-fb.c | 1 -
drivers/video/fbdev/grvga.c | 1 -
drivers/video/fbdev/hecubafb.c | 1 -
drivers/video/fbdev/hitfb.c | 1 -
drivers/video/fbdev/imxfb.c | 1 -
drivers/video/fbdev/leo.c | 1 -
drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 1 -
drivers/video/fbdev/metronomefb.c | 1 -
drivers/video/fbdev/mmp/fb/mmpfb.c | 1 -
drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 1 -
drivers/video/fbdev/mx3fb.c | 1 -
drivers/video/fbdev/nuc900fb.c | 1 -
drivers/video/fbdev/omap/lcd_ams_delta.c | 1 -
drivers/video/fbdev/omap/lcd_h3.c | 1 -
drivers/video/fbdev/omap/lcd_htcherald.c | 1 -
drivers/video/fbdev/omap/lcd_inn1510.c | 1 -
drivers/video/fbdev/omap/lcd_inn1610.c | 1 -
drivers/video/fbdev/omap/lcd_osk.c | 1 -
drivers/video/fbdev/omap/lcd_palmte.c | 1 -
drivers/video/fbdev/omap/lcd_palmtt.c | 1 -
drivers/video/fbdev/omap/lcd_palmz71.c | 1 -
drivers/video/fbdev/omap/omapfb_main.c | 1 -
.../fbdev/omap2/displays-new/connector-analog-tv.c | 1 -
.../video/fbdev/omap2/displays-new/connector-dvi.c | 1 -
.../fbdev/omap2/displays-new/connector-hdmi.c | 1 -
.../fbdev/omap2/displays-new/encoder-tfp410.c | 1 -
.../fbdev/omap2/displays-new/encoder-tpd12s015.c | 1 -
drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 1 -
.../video/fbdev/omap2/displays-new/panel-dsi-cm.c | 1 -
.../omap2/displays-new/panel-sharp-ls037v7dw01.c | 1 -
drivers/video/fbdev/omap2/dss/core.c | 1 -
drivers/video/fbdev/omap2/dss/dispc.c | 1 -
drivers/video/fbdev/omap2/dss/dpi.c | 1 -
drivers/video/fbdev/omap2/dss/dsi.c | 1 -
drivers/video/fbdev/omap2/dss/dss.c | 1 -
drivers/video/fbdev/omap2/dss/hdmi4.c | 1 -
drivers/video/fbdev/omap2/dss/hdmi5.c | 1 -
drivers/video/fbdev/omap2/dss/rfbi.c | 1 -
drivers/video/fbdev/omap2/dss/sdi.c | 1 -
drivers/video/fbdev/omap2/dss/venc.c | 1 -
drivers/video/fbdev/omap2/omapfb/omapfb-main.c | 1 -
drivers/video/fbdev/p9100.c | 1 -
drivers/video/fbdev/platinumfb.c | 1 -
drivers/video/fbdev/pxa168fb.c | 1 -
drivers/video/fbdev/pxa3xx-gcu.c | 1 -
drivers/video/fbdev/pxafb.c | 1 -
drivers/video/fbdev/s3c-fb.c | 1 -
drivers/video/fbdev/s3c2410fb.c | 2 -
drivers/video/fbdev/sa1100fb.c | 1 -
drivers/video/fbdev/sh7760fb.c | 1 -
drivers/video/fbdev/sh_mobile_lcdcfb.c | 1 -
drivers/video/fbdev/sh_mobile_meram.c | 1 -
drivers/video/fbdev/simplefb.c | 1 -
drivers/video/fbdev/sm501fb.c | 1 -
drivers/video/fbdev/sunxvr1000.c | 1 -
drivers/video/fbdev/tcx.c | 1 -
drivers/video/fbdev/vesafb.c | 1 -
drivers/video/fbdev/vt8500lcdfb.c | 1 -
drivers/video/fbdev/wm8505fb.c | 1 -
drivers/video/fbdev/wmt_ge_rops.c | 1 -
drivers/video/fbdev/xilinxfb.c | 1 -
drivers/virtio/virtio_mmio.c | 1 -
drivers/w1/masters/mxc_w1.c | 1 -
drivers/w1/masters/w1-gpio.c | 1 -
drivers/watchdog/acquirewdt.c | 1 -
drivers/watchdog/advantechwdt.c | 1 -
drivers/watchdog/ar7_wdt.c | 1 -
drivers/watchdog/at32ap700x_wdt.c | 1 -
drivers/watchdog/at91rm9200_wdt.c | 1 -
drivers/watchdog/at91sam9_wdt.c | 1 -
drivers/watchdog/ath79_wdt.c | 1 -
drivers/watchdog/bcm2835_wdt.c | 1 -
drivers/watchdog/bcm47xx_wdt.c | 1 -
drivers/watchdog/bcm63xx_wdt.c | 1 -
drivers/watchdog/bcm_kona_wdt.c | 1 -
drivers/watchdog/bfin_wdt.c | 1 -
drivers/watchdog/coh901327_wdt.c | 1 -
drivers/watchdog/cpwd.c | 1 -
drivers/watchdog/davinci_wdt.c | 1 -
drivers/watchdog/dw_wdt.c | 1 -
drivers/watchdog/ep93xx_wdt.c | 1 -
drivers/watchdog/gef_wdt.c | 1 -
drivers/watchdog/geodewdt.c | 1 -
drivers/watchdog/gpio_wdt.c | 1 -
drivers/watchdog/iTCO_wdt.c | 1 -
drivers/watchdog/ib700wdt.c | 1 -
drivers/watchdog/ie6xx_wdt.c | 1 -
drivers/watchdog/imx2_wdt.c | 1 -
drivers/watchdog/intel-mid_wdt.c | 1 -
drivers/watchdog/jz4740_wdt.c | 1 -
drivers/watchdog/kempld_wdt.c | 1 -
drivers/watchdog/ks8695_wdt.c | 1 -
drivers/watchdog/lantiq_wdt.c | 1 -
drivers/watchdog/max63xx_wdt.c | 1 -
drivers/watchdog/menf21bmc_wdt.c | 1 -
drivers/watchdog/moxart_wdt.c | 1 -
drivers/watchdog/mpc8xxx_wdt.c | 1 -
drivers/watchdog/mv64x60_wdt.c | 1 -
drivers/watchdog/nuc900_wdt.c | 1 -
drivers/watchdog/nv_tco.c | 1 -
drivers/watchdog/omap_wdt.c | 1 -
drivers/watchdog/orion_wdt.c | 1 -
drivers/watchdog/pnx4008_wdt.c | 1 -
drivers/watchdog/rdc321x_wdt.c | 1 -
drivers/watchdog/riowd.c | 1 -
drivers/watchdog/rt2880_wdt.c | 1 -
drivers/watchdog/s3c2410_wdt.c | 1 -
drivers/watchdog/sch311x_wdt.c | 1 -
drivers/watchdog/shwdt.c | 1 -
drivers/watchdog/sirfsoc_wdt.c | 1 -
drivers/watchdog/sp5100_tco.c | 1 -
drivers/watchdog/sunxi_wdt.c | 1 -
drivers/watchdog/tegra_wdt.c | 1 -
drivers/watchdog/ts72xx_wdt.c | 1 -
drivers/watchdog/twl4030_wdt.c | 1 -
drivers/watchdog/txx9wdt.c | 1 -
drivers/watchdog/ux500_wdt.c | 1 -
drivers/watchdog/xen_wdt.c | 1 -
drivers/zorro/zorro.c | 1 -
fs/debugfs/file.c | 54 +++
fs/kernfs/file.c | 73 ++-
fs/pstore/ram.c | 1 -
fs/sysfs/file.c | 59 ++-
include/linux/bitmap.h | 3 +
include/linux/cacheinfo.h | 100 ++++
include/linux/cpu.h | 4 +
include/linux/cpumask.h | 17 +
include/linux/debugfs.h | 16 +-
include/linux/device.h | 35 ++
include/linux/kernfs.h | 8 +
include/linux/platform_device.h | 12 +-
include/linux/sysfs.h | 9 +
lib/bitmap.c | 29 ++
lib/kobject.c | 2 +-
net/dsa/dsa.c | 1 -
net/rfkill/rfkill-gpio.c | 1 -
net/rfkill/rfkill-regulator.c | 1 -
scripts/coccinelle/api/platform_no_drv_owner.cocci | 106 ++++
sound/arm/pxa2xx-ac97.c | 1 -
sound/atmel/abdac.c | 1 -
sound/atmel/ac97c.c | 1 -
sound/drivers/aloop.c | 1 -
sound/drivers/dummy.c | 1 -
sound/drivers/ml403-ac97cr.c | 1 -
sound/drivers/mpu401/mpu401.c | 1 -
sound/drivers/mtpav.c | 1 -
sound/drivers/mts64.c | 1 -
sound/drivers/pcsp/pcsp.c | 1 -
sound/drivers/portman2x4.c | 1 -
sound/drivers/serial-u16550.c | 1 -
sound/drivers/virmidi.c | 1 -
sound/mips/hal2.c | 1 -
sound/mips/sgio2audio.c | 1 -
sound/oss/dmasound/dmasound_paula.c | 1 -
sound/ppc/powermac.c | 1 -
sound/sh/aica.c | 1 -
sound/sh/sh_dac_audio.c | 1 -
sound/soc/adi/axi-i2s.c | 1 -
sound/soc/adi/axi-spdif.c | 1 -
sound/soc/atmel/atmel_wm8904.c | 1 -
sound/soc/atmel/sam9g20_wm8731.c | 1 -
sound/soc/atmel/sam9x5_wm8731.c | 1 -
sound/soc/au1x/ac97c.c | 1 -
sound/soc/au1x/db1000.c | 1 -
sound/soc/au1x/db1200.c | 1 -
sound/soc/au1x/dbdma2.c | 1 -
sound/soc/au1x/dma.c | 1 -
sound/soc/au1x/i2sc.c | 1 -
sound/soc/au1x/psc-ac97.c | 1 -
sound/soc/au1x/psc-i2s.c | 1 -
sound/soc/bcm/bcm2835-i2s.c | 1 -
sound/soc/blackfin/bf5xx-ac97-pcm.c | 1 -
sound/soc/blackfin/bf5xx-ac97.c | 1 -
sound/soc/blackfin/bf5xx-ad1836.c | 1 -
sound/soc/blackfin/bf5xx-i2s-pcm.c | 1 -
sound/soc/blackfin/bf5xx-i2s.c | 1 -
sound/soc/blackfin/bf6xx-i2s.c | 1 -
sound/soc/blackfin/bfin-eval-adau1373.c | 1 -
sound/soc/blackfin/bfin-eval-adau1701.c | 1 -
sound/soc/blackfin/bfin-eval-adau1x61.c | 1 -
sound/soc/blackfin/bfin-eval-adau1x81.c | 1 -
sound/soc/blackfin/bfin-eval-adav80x.c | 1 -
sound/soc/cirrus/edb93xx.c | 1 -
sound/soc/cirrus/ep93xx-ac97.c | 1 -
sound/soc/cirrus/ep93xx-i2s.c | 1 -
sound/soc/cirrus/simone.c | 1 -
sound/soc/cirrus/snappercl15.c | 1 -
sound/soc/codecs/88pm860x-codec.c | 1 -
sound/soc/codecs/ab8500-codec.c | 1 -
sound/soc/codecs/ac97.c | 1 -
sound/soc/codecs/ad1980.c | 1 -
sound/soc/codecs/ad73311.c | 1 -
sound/soc/codecs/ads117x.c | 1 -
sound/soc/codecs/ak4554.c | 1 -
sound/soc/codecs/ak5386.c | 1 -
sound/soc/codecs/bt-sco.c | 1 -
sound/soc/codecs/cq93vc.c | 1 -
sound/soc/codecs/cx20442.c | 1 -
sound/soc/codecs/dmic.c | 1 -
sound/soc/codecs/hdmi.c | 1 -
sound/soc/codecs/jz4740.c | 1 -
sound/soc/codecs/mc13783.c | 1 -
sound/soc/codecs/pcm3008.c | 1 -
sound/soc/codecs/si476x.c | 1 -
sound/soc/codecs/sirf-audio-codec.c | 1 -
sound/soc/codecs/sn95031.c | 1 -
sound/soc/codecs/spdif_receiver.c | 1 -
sound/soc/codecs/spdif_transmitter.c | 1 -
sound/soc/codecs/stac9766.c | 1 -
sound/soc/codecs/twl4030.c | 1 -
sound/soc/codecs/twl6040.c | 1 -
sound/soc/codecs/uda134x.c | 1 -
sound/soc/codecs/wl1273.c | 1 -
sound/soc/codecs/wm5102.c | 1 -
sound/soc/codecs/wm5110.c | 1 -
sound/soc/codecs/wm8350.c | 1 -
sound/soc/codecs/wm8400.c | 1 -
sound/soc/codecs/wm8727.c | 1 -
sound/soc/codecs/wm8782.c | 1 -
sound/soc/codecs/wm8994.c | 1 -
sound/soc/codecs/wm8997.c | 1 -
sound/soc/codecs/wm9705.c | 1 -
sound/soc/codecs/wm9712.c | 1 -
sound/soc/codecs/wm9713.c | 1 -
sound/soc/davinci/davinci-evm.c | 1 -
sound/soc/davinci/davinci-i2s.c | 1 -
sound/soc/davinci/davinci-mcasp.c | 1 -
sound/soc/davinci/davinci-vcif.c | 1 -
sound/soc/dwc/designware_i2s.c | 1 -
sound/soc/fsl/eukrea-tlv320.c | 1 -
sound/soc/fsl/fsl_dma.c | 1 -
sound/soc/fsl/fsl_esai.c | 1 -
sound/soc/fsl/fsl_sai.c | 1 -
sound/soc/fsl/fsl_spdif.c | 1 -
sound/soc/fsl/fsl_ssi.c | 1 -
sound/soc/fsl/imx-audmux.c | 1 -
sound/soc/fsl/imx-mc13783.c | 1 -
sound/soc/fsl/imx-sgtl5000.c | 1 -
sound/soc/fsl/imx-spdif.c | 1 -
sound/soc/fsl/imx-ssi.c | 1 -
sound/soc/fsl/imx-wm8962.c | 1 -
sound/soc/fsl/mpc5200_psc_ac97.c | 1 -
sound/soc/fsl/mpc5200_psc_i2s.c | 1 -
sound/soc/fsl/mpc8610_hpcd.c | 1 -
sound/soc/fsl/mx27vis-aic32x4.c | 1 -
sound/soc/fsl/p1022_ds.c | 1 -
sound/soc/fsl/p1022_rdk.c | 1 -
sound/soc/fsl/pcm030-audio-fabric.c | 1 -
sound/soc/generic/simple-card.c | 1 -
sound/soc/intel/broadwell.c | 1 -
sound/soc/intel/byt-max98090.c | 1 -
sound/soc/intel/byt-rt5640.c | 1 -
sound/soc/intel/haswell.c | 1 -
sound/soc/intel/mfld_machine.c | 1 -
sound/soc/intel/sst-acpi.c | 1 -
sound/soc/intel/sst-baytrail-pcm.c | 1 -
sound/soc/intel/sst-haswell-pcm.c | 1 -
sound/soc/intel/sst-mfld-platform-pcm.c | 1 -
sound/soc/jz4740/jz4740-i2s.c | 1 -
sound/soc/jz4740/qi_lb60.c | 1 -
sound/soc/kirkwood/armada-370-db.c | 1 -
sound/soc/kirkwood/kirkwood-i2s.c | 1 -
sound/soc/mxs/mxs-saif.c | 1 -
sound/soc/mxs/mxs-sgtl5000.c | 1 -
sound/soc/nuc900/nuc900-ac97.c | 1 -
sound/soc/nuc900/nuc900-pcm.c | 1 -
sound/soc/omap/ams-delta.c | 1 -
sound/soc/omap/omap-abe-twl6040.c | 1 -
sound/soc/omap/omap-dmic.c | 1 -
sound/soc/omap/omap-hdmi-card.c | 1 -
sound/soc/omap/omap-hdmi.c | 1 -
sound/soc/omap/omap-mcbsp.c | 1 -
sound/soc/omap/omap-mcpdm.c | 1 -
sound/soc/omap/omap-twl4030.c | 1 -
sound/soc/omap/rx51.c | 1 -
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/hx4700.c | 1 -
sound/soc/pxa/imote2.c | 1 -
sound/soc/pxa/mioa701_wm9713.c | 1 -
sound/soc/pxa/mmp-pcm.c | 1 -
sound/soc/pxa/mmp-sspa.c | 1 -
sound/soc/pxa/palm27x.c | 1 -
sound/soc/pxa/poodle.c | 1 -
sound/soc/pxa/pxa-ssp.c | 1 -
sound/soc/pxa/pxa2xx-ac97.c | 1 -
sound/soc/pxa/pxa2xx-i2s.c | 1 -
sound/soc/pxa/pxa2xx-pcm.c | 1 -
sound/soc/pxa/tosa.c | 1 -
sound/soc/pxa/ttc-dkb.c | 1 -
sound/soc/rockchip/rockchip_i2s.c | 1 -
sound/soc/samsung/ac97.c | 1 -
sound/soc/samsung/bells.c | 1 -
sound/soc/samsung/i2s.c | 1 -
sound/soc/samsung/idma.c | 1 -
sound/soc/samsung/littlemill.c | 1 -
sound/soc/samsung/lowland.c | 1 -
sound/soc/samsung/odroidx2_max98090.c | 1 -
sound/soc/samsung/pcm.c | 1 -
sound/soc/samsung/s3c2412-i2s.c | 1 -
sound/soc/samsung/s3c24xx-i2s.c | 1 -
sound/soc/samsung/s3c24xx_simtec_hermes.c | 1 -
sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 1 -
sound/soc/samsung/s3c24xx_uda134x.c | 1 -
sound/soc/samsung/smdk_wm8580pcm.c | 1 -
sound/soc/samsung/smdk_wm8994.c | 1 -
sound/soc/samsung/smdk_wm8994pcm.c | 1 -
sound/soc/samsung/snow.c | 1 -
sound/soc/samsung/spdif.c | 1 -
sound/soc/samsung/speyside.c | 1 -
sound/soc/samsung/tobermory.c | 1 -
sound/soc/sh/dma-sh7760.c | 1 -
sound/soc/sh/hac.c | 1 -
sound/soc/sh/siu_dai.c | 1 -
sound/soc/sh/ssi.c | 1 -
sound/soc/sirf/sirf-audio-port.c | 1 -
sound/soc/sirf/sirf-audio.c | 1 -
sound/soc/sirf/sirf-usp.c | 1 -
sound/soc/soc-core.c | 1 -
sound/soc/soc-utils.c | 1 -
sound/soc/spear/spdif_in.c | 1 -
sound/soc/spear/spdif_out.c | 1 -
sound/soc/tegra/tegra20_ac97.c | 1 -
sound/soc/tegra/tegra20_das.c | 1 -
sound/soc/tegra/tegra20_i2s.c | 1 -
sound/soc/tegra/tegra20_spdif.c | 1 -
sound/soc/tegra/tegra30_ahub.c | 1 -
sound/soc/tegra/tegra30_i2s.c | 1 -
sound/soc/tegra/tegra_alc5632.c | 1 -
sound/soc/tegra/tegra_max98090.c | 1 -
sound/soc/tegra/tegra_rt5640.c | 1 -
sound/soc/tegra/tegra_wm8753.c | 1 -
sound/soc/tegra/tegra_wm8903.c | 1 -
sound/soc/tegra/tegra_wm9712.c | 1 -
sound/soc/tegra/trimslice.c | 1 -
sound/soc/txx9/txx9aclc-ac97.c | 1 -
sound/soc/txx9/txx9aclc-generic.c | 1 -
sound/soc/txx9/txx9aclc.c | 1 -
sound/soc/ux500/mop500.c | 1 -
sound/soc/ux500/ux500_msp_dai.c | 1 -
sound/sparc/amd7930.c | 1 -
sound/sparc/cs4231.c | 1 -
sound/sparc/dbri.c | 1 -
1697 files changed, 1403 insertions(+), 2181 deletions(-)
create mode 100644 drivers/base/cacheinfo.c
create mode 100644 include/linux/cacheinfo.h
create mode 100644 scripts/coccinelle/api/platform_no_drv_owner.cocci
$ git am -3 mv
/usr/lib/git-core/git-am: 211: /usr/lib/git-core/git-am: cannot open mv: No such file
$ git am -3 ../patches/0001-debugfs-predeclare-struct-device.patch
Applying: debugfs: predeclare struct device
Merging tty/tty-next (50d1e7d1077b serial: pxa: hold port.lock when reporting modem line changes)
$ git merge tty/tty-next
Resolved 'Documentation/devicetree/bindings/serial/pl011.txt' using previous resolution.
Resolved 'drivers/tty/n_tty.c' using previous resolution.
Resolved 'drivers/tty/serial/of_serial.c' using previous resolution.
Auto-merging kernel/exit.c
Auto-merging include/linux/kernel.h
Auto-merging drivers/tty/serial/timbuart.c
Auto-merging drivers/tty/serial/sunzilog.c
Auto-merging drivers/tty/serial/sunsu.c
Auto-merging drivers/tty/serial/sunsab.c
Auto-merging drivers/tty/serial/sirfsoc_uart.c
Auto-merging drivers/tty/serial/sh-sci.c
Auto-merging drivers/tty/serial/samsung.c
Auto-merging drivers/tty/serial/sa1100.c
Auto-merging drivers/tty/serial/pxa.c
Auto-merging drivers/tty/serial/pnx8xxx_uart.c
Auto-merging drivers/tty/serial/pmac_zilog.c
Auto-merging drivers/tty/serial/of_serial.c
CONFLICT (content): Merge conflict in drivers/tty/serial/of_serial.c
Auto-merging drivers/tty/serial/mxs-auart.c
Auto-merging drivers/tty/serial/msm_serial.c
Auto-merging drivers/tty/serial/mpsc.c
Auto-merging drivers/tty/serial/mcf.c
Auto-merging drivers/tty/serial/lantiq.c
Auto-merging drivers/tty/serial/imx.c
Auto-merging drivers/tty/serial/fsl_lpuart.c
Auto-merging drivers/tty/serial/cpm_uart/cpm_uart_core.c
Auto-merging drivers/tty/serial/clps711x.c
Auto-merging drivers/tty/serial/bfin_uart.c
Auto-merging drivers/tty/serial/bcm63xx_uart.c
Auto-merging drivers/tty/serial/atmel_serial.c
Auto-merging drivers/tty/serial/ar933x_uart.c
Auto-merging drivers/tty/serial/Kconfig
Auto-merging drivers/tty/serial/8250/8250_em.c
Auto-merging drivers/tty/serial/8250/8250_dw.c
Auto-merging drivers/tty/serial/8250/8250_core.c
Auto-merging drivers/tty/n_tty.c
CONFLICT (content): Merge conflict in drivers/tty/n_tty.c
Auto-merging drivers/tty/ehv_bytechan.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/serial/pl011.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/serial/pl011.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d7cc746f3a20] Merge remote-tracking branch 'tty/tty-next'
$ git diff -M --stat --summary HEAD^..
.../devicetree/bindings/serial/bcm63xx-uart.txt | 30 +
.../devicetree/bindings/serial/fsl-mxs-auart.txt | 10 +-
.../devicetree/bindings/serial/of-serial.txt | 1 +
Documentation/devicetree/bindings/serial/pl011.txt | 5 +
.../devicetree/bindings/serial/qcom,msm-uartdm.txt | 69 +-
.../bindings/serial/renesas,sci-serial.txt | 9 +-
.../devicetree/bindings/serial/sirf-uart.txt | 16 +-
Documentation/serial/driver | 6 +-
MAINTAINERS | 6 +
arch/blackfin/include/asm/bfin_serial.h | 7 +-
arch/um/drivers/line.c | 6 +-
drivers/parport/parport_serial.c | 10 +
drivers/tty/ehv_bytechan.c | 4 +-
drivers/tty/goldfish.c | 6 +-
drivers/tty/hvc/hvcs.c | 2 +-
drivers/tty/hvc/hvsi_lib.c | 3 +-
drivers/tty/ipwireless/hardware.c | 12 +-
drivers/tty/isicom.c | 14 +-
drivers/tty/n_tty.c | 81 +-
drivers/tty/pty.c | 87 +-
drivers/tty/serial/8250/8250.h | 9 +-
drivers/tty/serial/8250/8250_core.c | 112 +-
drivers/tty/serial/8250/8250_dma.c | 39 +-
drivers/tty/serial/8250/8250_dw.c | 69 +-
drivers/tty/serial/8250/8250_em.c | 4 +-
drivers/tty/serial/8250/8250_fintek.c | 8 +-
drivers/tty/serial/8250/8250_hp300.c | 4 -
drivers/tty/serial/8250/8250_mtk.c | 4 +-
drivers/tty/serial/8250/8250_omap.c | 1281 ++++++++++++++++++++
drivers/tty/serial/8250/8250_pci.c | 198 ++-
drivers/tty/serial/8250/Kconfig | 11 +-
drivers/tty/serial/8250/Makefile | 1 +
drivers/tty/serial/Kconfig | 24 +-
drivers/tty/serial/amba-pl010.c | 60 +-
drivers/tty/serial/amba-pl011.c | 48 +-
drivers/tty/serial/ar933x_uart.c | 30 +-
drivers/tty/serial/atmel_serial.c | 230 ++--
drivers/tty/serial/bcm63xx_uart.c | 55 +-
drivers/tty/serial/bfin_sport_uart.c | 5 +-
drivers/tty/serial/bfin_uart.c | 5 +-
drivers/tty/serial/clps711x.c | 5 +-
drivers/tty/serial/cpm_uart/cpm_uart_core.c | 48 +-
drivers/tty/serial/crisv10.c | 12 -
drivers/tty/serial/crisv10.h | 1 -
drivers/tty/serial/earlycon.c | 2 +-
drivers/tty/serial/fsl_lpuart.c | 25 +-
drivers/tty/serial/icom.c | 4 +-
drivers/tty/serial/imx.c | 153 ++-
drivers/tty/serial/ip22zilog.c | 18 +-
drivers/tty/serial/jsm/Makefile | 2 +-
drivers/tty/serial/jsm/jsm.h | 101 +-
drivers/tty/serial/jsm/jsm_cls.c | 982 +++++++++++++++
drivers/tty/serial/jsm/jsm_driver.c | 156 ++-
drivers/tty/serial/jsm/jsm_neo.c | 36 +-
drivers/tty/serial/jsm/jsm_tty.c | 39 +-
drivers/tty/serial/lantiq.c | 4 +-
drivers/tty/serial/m32r_sio.c | 42 +-
drivers/tty/serial/max310x.c | 77 +-
drivers/tty/serial/mcf.c | 42 +-
drivers/tty/serial/men_z135_uart.c | 1 +
drivers/tty/serial/mfd.c | 2 +-
drivers/tty/serial/mpsc.c | 39 +-
drivers/tty/serial/mrst_max3110.c | 27 +-
drivers/tty/serial/msm_serial.c | 111 +-
drivers/tty/serial/msm_serial.h | 2 +
drivers/tty/serial/mxs-auart.c | 250 +++-
drivers/tty/serial/of_serial.c | 75 +-
drivers/tty/serial/omap-serial.c | 93 +-
drivers/tty/serial/pmac_zilog.c | 9 +-
drivers/tty/serial/pnx8xxx_uart.c | 48 +-
drivers/tty/serial/pxa.c | 3 +
drivers/tty/serial/sa1100.c | 45 +-
drivers/tty/serial/samsung.c | 90 +-
drivers/tty/serial/sc16is7xx.c | 57 +-
drivers/tty/serial/serial-tegra.c | 36 +-
drivers/tty/serial/serial_core.c | 116 +-
drivers/tty/serial/sh-sci.c | 5 +-
drivers/tty/serial/sirfsoc_uart.c | 34 +-
drivers/tty/serial/sirfsoc_uart.h | 4 +
drivers/tty/serial/sunsab.c | 36 +-
drivers/tty/serial/sunsu.c | 39 +-
drivers/tty/serial/sunzilog.c | 24 +-
drivers/tty/serial/timbuart.c | 2 +
drivers/tty/serial/xilinx_uartps.c | 22 +-
drivers/tty/tty_buffer.c | 10 +-
drivers/tty/tty_io.c | 440 +++----
drivers/tty/tty_ioctl.c | 38 +-
drivers/tty/tty_ldisc.c | 111 +-
drivers/tty/tty_mutex.c | 49 +-
drivers/tty/tty_port.c | 10 +-
drivers/tty/vt/keyboard.c | 6 +-
drivers/tty/vt/vt.c | 22 +-
include/linux/kernel.h | 3 -
include/linux/serial_8250.h | 3 -
include/linux/serial_bcm63xx.h | 2 -
include/linux/serial_core.h | 67 +-
include/linux/tty.h | 28 +-
include/uapi/linux/serial_core.h | 3 +-
include/uapi/linux/serial_reg.h | 1 +
include/uapi/linux/tty_flags.h | 19 +-
include/uapi/linux/vt.h | 3 -
kernel/exit.c | 21 -
102 files changed, 4744 insertions(+), 1592 deletions(-)
create mode 100644 Documentation/devicetree/bindings/serial/bcm63xx-uart.txt
create mode 100644 drivers/tty/serial/8250/8250_omap.c
create mode 100644 drivers/tty/serial/jsm/jsm_cls.c
Merging usb/usb-next (842f57baab18 Merge tag 'for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy into usb-testing)
$ git merge usb/usb-next
Resolved 'drivers/usb/chipidea/core.c' using previous resolution.
Resolved 'drivers/usb/dwc2/gadget.c' using previous resolution.
Resolved 'drivers/usb/dwc3/ep0.c' using previous resolution.
Resolved 'drivers/usb/gadget/udc/pxa27x_udc.c' using previous resolution.
Removing include/linux/platform_data/dwc3-exynos.h
Auto-merging include/linux/pci_ids.h
Auto-merging drivers/usb/usbip/vhci_hcd.c
Auto-merging drivers/usb/serial/usb-serial-simple.c
Auto-merging drivers/usb/phy/phy-tegra-usb.c
Auto-merging drivers/usb/phy/phy-tahvo.c
Auto-merging drivers/usb/phy/phy-mxs-usb.c
Auto-merging drivers/usb/phy/phy-mv-usb.c
Auto-merging drivers/usb/phy/phy-isp1301-omap.c
Auto-merging drivers/usb/phy/phy-gpio-vbus-usb.c
Auto-merging drivers/usb/phy/phy-generic.c
Auto-merging drivers/usb/phy/phy-am335x-control.c
Auto-merging drivers/usb/phy/phy-ab8500-usb.c
Auto-merging drivers/usb/musb/musb_core.c
Auto-merging drivers/usb/misc/usb3503.c
Auto-merging drivers/usb/host/xhci-plat.c
Auto-merging drivers/usb/host/ohci-spear.c
Auto-merging drivers/usb/host/ohci-pxa27x.c
Auto-merging drivers/usb/host/ohci-platform.c
Auto-merging drivers/usb/host/ohci-omap.c
Removing drivers/usb/host/ohci-octeon.c
Auto-merging drivers/usb/host/ohci-exynos.c
Auto-merging drivers/usb/host/ohci-at91.c
Removing drivers/usb/host/octeon2-common.c
Auto-merging drivers/usb/host/ehci-w90x900.c
Auto-merging drivers/usb/host/ehci-platform.c
Auto-merging drivers/usb/host/ehci-orion.c
Removing drivers/usb/host/ehci-octeon.c
Auto-merging drivers/usb/host/ehci-exynos.c
Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c
Auto-merging drivers/usb/gadget/udc/s3c-hsudc.c
Auto-merging drivers/usb/gadget/udc/pxa27x_udc.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/pxa27x_udc.c
Auto-merging drivers/usb/gadget/udc/pxa25x_udc.c
Auto-merging drivers/usb/gadget/udc/omap_udc.c
Auto-merging drivers/usb/gadget/udc/net2272.c
Auto-merging drivers/usb/gadget/udc/mv_udc_core.c
Auto-merging drivers/usb/gadget/udc/mv_u3d_core.c
Auto-merging drivers/usb/gadget/udc/m66592-udc.c
Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c
Auto-merging drivers/usb/gadget/udc/gr_udc.c
Auto-merging drivers/usb/gadget/udc/fusb300_udc.c
Auto-merging drivers/usb/gadget/udc/fsl_udc_core.c
Auto-merging drivers/usb/gadget/udc/fsl_qe_udc.c
Auto-merging drivers/usb/gadget/udc/fotg210-udc.c
Auto-merging drivers/usb/gadget/udc/dummy_hcd.c
Auto-merging drivers/usb/gadget/udc/bcm63xx_udc.c
Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c
Auto-merging drivers/usb/gadget/udc/at91_udc.c
Auto-merging drivers/usb/gadget/legacy/hid.c
Auto-merging drivers/usb/gadget/function/f_hid.c
Auto-merging drivers/usb/dwc3/ep0.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/ep0.c
Auto-merging drivers/usb/dwc2/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c
Auto-merging drivers/usb/chipidea/usbmisc_imx.c
Auto-merging drivers/usb/chipidea/core.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/core.c
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
Auto-merging arch/arm/boot/dts/am4372.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 72be360c87e8] Merge remote-tracking branch 'usb/usb-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/stable/sysfs-class-udc | 93 +
Documentation/ABI/testing/configfs-usb-gadget-hid | 11 +
Documentation/ABI/testing/configfs-usb-gadget-midi | 12 +
Documentation/devicetree/bindings/ata/marvell.txt | 6 +
.../devicetree/bindings/phy/berlin-sata-phy.txt | 4 +-
.../devicetree/bindings/phy/berlin-usb-phy.txt | 16 +
.../devicetree/bindings/phy/phy-miphy28lp.txt | 128 ++
.../devicetree/bindings/phy/phy-mvebu.txt | 43 +
.../devicetree/bindings/phy/samsung-phy.txt | 6 +
.../devicetree/bindings/usb/ci-hdrc-usb2.txt | 24 +
Documentation/devicetree/bindings/usb/dwc3.txt | 23 +
.../devicetree/bindings/usb/exynos-usb.txt | 6 +-
Documentation/devicetree/bindings/usb/pxa-usb.txt | 22 +
Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +
Documentation/phy.txt | 60 +-
Documentation/usb/gadget_hid.txt | 7 +
Documentation/usb/usb-serial.txt | 2 +-
arch/arm/boot/dts/am4372.dtsi | 4 +
arch/mips/cavium-octeon/octeon-platform.c | 274 ++-
arch/mips/configs/cavium_octeon_defconfig | 3 +
drivers/pci/quirks.c | 20 +
drivers/phy/Kconfig | 23 +-
drivers/phy/Makefile | 3 +
drivers/phy/phy-armada375-usb2.c | 158 ++
drivers/phy/phy-bcm-kona-usb2.c | 2 +-
drivers/phy/phy-berlin-sata.c | 36 +-
drivers/phy/phy-berlin-usb.c | 223 +++
drivers/phy/phy-core.c | 115 +-
drivers/phy/phy-exynos-dp-video.c | 2 +-
drivers/phy/phy-exynos-mipi-video.c | 2 +-
drivers/phy/phy-exynos5-usbdrd.c | 139 +-
drivers/phy/phy-exynos5250-sata.c | 2 +-
drivers/phy/phy-hix5hd2-sata.c | 7 +-
drivers/phy/phy-miphy28lp.c | 1283 +++++++++++++
drivers/phy/phy-miphy365x.c | 7 +-
drivers/phy/phy-mvebu-sata.c | 2 +-
drivers/phy/phy-omap-usb2.c | 16 +-
drivers/phy/phy-qcom-apq8064-sata.c | 3 +-
drivers/phy/phy-qcom-ipq806x-sata.c | 3 +-
drivers/phy/phy-rcar-gen2.c | 2 +-
drivers/phy/phy-samsung-usb2.c | 3 +-
drivers/phy/phy-spear1310-miphy.c | 2 +-
drivers/phy/phy-spear1340-miphy.c | 2 +-
drivers/phy/phy-stih407-usb.c | 2 +-
drivers/phy/phy-stih41x-usb.c | 7 +-
drivers/phy/phy-sun4i-usb.c | 11 +-
drivers/phy/phy-ti-pipe3.c | 2 +-
drivers/phy/phy-twl4030-usb.c | 15 +-
drivers/phy/phy-xgene.c | 2 +-
drivers/pinctrl/pinctrl-tegra-xusb.c | 4 +-
drivers/usb/chipidea/Makefile | 1 +
drivers/usb/chipidea/ci.h | 10 +-
drivers/usb/chipidea/ci_hdrc_imx.c | 45 +-
drivers/usb/chipidea/ci_hdrc_msm.c | 9 +-
drivers/usb/chipidea/ci_hdrc_usb2.c | 115 ++
drivers/usb/chipidea/core.c | 225 ++-
drivers/usb/chipidea/debug.c | 2 +-
drivers/usb/chipidea/host.c | 78 +-
drivers/usb/chipidea/otg_fsm.c | 41 +-
drivers/usb/chipidea/udc.c | 22 +-
drivers/usb/chipidea/usbmisc_imx.c | 6 +-
drivers/usb/class/cdc-acm.c | 17 +-
drivers/usb/class/cdc-acm.h | 1 -
drivers/usb/class/usbtmc.c | 4 +-
drivers/usb/common/usb-otg-fsm.c | 8 +-
drivers/usb/core/hcd.c | 7 +-
drivers/usb/core/hub.c | 18 +-
drivers/usb/dwc2/Kconfig | 68 +-
drivers/usb/dwc2/Makefile | 32 +-
drivers/usb/dwc2/core.c | 10 -
drivers/usb/dwc2/core.h | 197 +-
drivers/usb/dwc2/core_intr.c | 17 +-
drivers/usb/dwc2/gadget.c | 386 ++--
drivers/usb/dwc2/hcd.c | 94 +-
drivers/usb/dwc2/hcd.h | 10 -
drivers/usb/dwc2/pci.c | 7 +
drivers/usb/dwc2/platform.c | 44 +-
drivers/usb/dwc3/Kconfig | 2 +-
drivers/usb/dwc3/core.c | 251 ++-
drivers/usb/dwc3/core.h | 89 +-
drivers/usb/dwc3/dwc3-exynos.c | 44 +-
drivers/usb/dwc3/dwc3-keystone.c | 6 +-
drivers/usb/dwc3/dwc3-omap.c | 20 +-
drivers/usb/dwc3/dwc3-pci.c | 35 +
drivers/usb/dwc3/dwc3-st.c | 2 +-
drivers/usb/dwc3/ep0.c | 26 +-
drivers/usb/dwc3/gadget.c | 68 +-
drivers/usb/dwc3/host.c | 22 +-
drivers/usb/dwc3/platform_data.h | 20 +
drivers/usb/dwc3/trace.h | 20 +-
drivers/usb/gadget/Kconfig | 61 +
drivers/usb/gadget/composite.c | 64 +-
drivers/usb/gadget/configfs.c | 5 +-
drivers/usb/gadget/function/Makefile | 4 +
drivers/usb/gadget/function/f_hid.c | 374 +++-
drivers/usb/gadget/function/f_midi.c | 364 +++-
drivers/usb/gadget/function/f_ncm.c | 3 +
drivers/usb/gadget/function/f_rndis.c | 3 +-
drivers/usb/gadget/function/u_hid.h | 42 +
drivers/usb/gadget/function/u_midi.h | 40 +
drivers/usb/gadget/function/u_uac1.c | 3 -
drivers/usb/gadget/legacy/Kconfig | 2 +
drivers/usb/gadget/legacy/dbgp.c | 26 +-
drivers/usb/gadget/legacy/gmidi.c | 43 +-
drivers/usb/gadget/legacy/hid.c | 79 +-
drivers/usb/gadget/legacy/printer.c | 65 +-
drivers/usb/gadget/udc/Kconfig | 2 +
drivers/usb/gadget/udc/Makefile | 1 +
drivers/usb/gadget/udc/amd5536udc.c | 12 +-
drivers/usb/gadget/udc/at91_udc.c | 89 +-
drivers/usb/gadget/udc/atmel_usba_udc.c | 25 +-
drivers/usb/gadget/udc/bcm63xx_udc.c | 13 +-
drivers/usb/gadget/udc/bdc/Kconfig | 21 +
drivers/usb/gadget/udc/bdc/Makefile | 8 +
drivers/usb/gadget/udc/bdc/bdc.h | 490 +++++
drivers/usb/gadget/udc/bdc/bdc_cmd.c | 376 ++++
drivers/usb/gadget/udc/bdc/bdc_cmd.h | 29 +
drivers/usb/gadget/udc/bdc/bdc_core.c | 533 ++++++
drivers/usb/gadget/udc/bdc/bdc_dbg.c | 123 ++
drivers/usb/gadget/udc/bdc/bdc_dbg.h | 37 +
drivers/usb/gadget/udc/bdc/bdc_ep.c | 2023 ++++++++++++++++++++
drivers/usb/gadget/udc/bdc/bdc_ep.h | 22 +
drivers/usb/gadget/udc/bdc/bdc_pci.c | 132 ++
drivers/usb/gadget/udc/bdc/bdc_udc.c | 587 ++++++
drivers/usb/gadget/udc/dummy_hcd.c | 36 +-
drivers/usb/gadget/udc/fotg210-udc.c | 3 +-
drivers/usb/gadget/udc/fsl_qe_udc.c | 13 +-
drivers/usb/gadget/udc/fsl_udc_core.c | 19 +-
drivers/usb/gadget/udc/fusb300_udc.c | 3 +-
drivers/usb/gadget/udc/goku_udc.c | 6 +-
drivers/usb/gadget/udc/gr_udc.c | 8 +-
drivers/usb/gadget/udc/lpc32xx_udc.c | 11 +-
drivers/usb/gadget/udc/m66592-udc.c | 5 +-
drivers/usb/gadget/udc/mv_u3d_core.c | 5 +-
drivers/usb/gadget/udc/mv_udc_core.c | 32 +-
drivers/usb/gadget/udc/net2272.c | 66 +-
drivers/usb/gadget/udc/net2280.c | 65 +-
drivers/usb/gadget/udc/omap_udc.c | 6 +-
drivers/usb/gadget/udc/pch_udc.c | 11 +-
drivers/usb/gadget/udc/pxa25x_udc.c | 43 +-
drivers/usb/gadget/udc/pxa27x_udc.c | 152 +-
drivers/usb/gadget/udc/pxa27x_udc.h | 6 +-
drivers/usb/gadget/udc/r8a66597-udc.c | 10 +-
drivers/usb/gadget/udc/s3c-hsudc.c | 16 +-
drivers/usb/gadget/udc/s3c2410_udc.c | 6 +-
drivers/usb/gadget/udc/udc-core.c | 28 +-
drivers/usb/gadget/udc/udc-xilinx.c | 3 +-
drivers/usb/host/Kconfig | 18 +-
drivers/usb/host/Makefile | 1 -
drivers/usb/host/ehci-atmel.c | 13 +-
drivers/usb/host/ehci-exynos.c | 12 +-
drivers/usb/host/ehci-fsl.c | 12 +-
drivers/usb/host/ehci-hcd.c | 14 +-
drivers/usb/host/ehci-hub.c | 45 +-
drivers/usb/host/ehci-msm.c | 10 +-
drivers/usb/host/ehci-mv.c | 13 -
drivers/usb/host/ehci-mxc.c | 11 +-
drivers/usb/host/ehci-octeon.c | 188 --
drivers/usb/host/ehci-orion.c | 14 +-
drivers/usb/host/ehci-platform.c | 27 +-
drivers/usb/host/ehci-sead3.c | 5 +-
drivers/usb/host/ehci-sh.c | 16 +-
drivers/usb/host/ehci-spear.c | 9 +-
drivers/usb/host/ehci-tegra.c | 11 +-
drivers/usb/host/ehci-w90x900.c | 17 +-
drivers/usb/host/ehci.h | 2 +
drivers/usb/host/fotg210.h | 62 +-
drivers/usb/host/fusbh200.h | 62 +-
drivers/usb/host/imx21-hcd.c | 6 +-
drivers/usb/host/octeon2-common.c | 200 --
drivers/usb/host/ohci-at91.c | 15 +-
drivers/usb/host/ohci-da8xx.c | 7 +-
drivers/usb/host/ohci-exynos.c | 11 +-
drivers/usb/host/ohci-hcd.c | 5 -
drivers/usb/host/ohci-jz4740.c | 13 +-
drivers/usb/host/ohci-octeon.c | 202 --
drivers/usb/host/ohci-omap.c | 2 +-
drivers/usb/host/ohci-platform.c | 53 +-
drivers/usb/host/ohci-pxa27x.c | 11 +-
drivers/usb/host/ohci-spear.c | 11 +-
drivers/usb/host/ohci.h | 19 +-
drivers/usb/host/oxu210hp-hcd.c | 1 -
drivers/usb/host/pci-quirks.c | 12 +-
drivers/usb/host/uhci-platform.c | 6 +-
drivers/usb/host/xhci-plat.c | 10 +-
drivers/usb/misc/adutux.c | 5 -
drivers/usb/misc/sisusbvga/sisusb.c | 3 +-
drivers/usb/misc/usb3503.c | 8 +-
drivers/usb/misc/yurex.c | 6 +-
drivers/usb/musb/Kconfig | 5 +-
drivers/usb/musb/am35x.c | 32 +-
drivers/usb/musb/blackfin.c | 74 +-
drivers/usb/musb/da8xx.c | 30 +-
drivers/usb/musb/davinci.c | 22 +-
drivers/usb/musb/jz4740.c | 2 +
drivers/usb/musb/musb_core.c | 335 +++-
drivers/usb/musb/musb_core.h | 87 +-
drivers/usb/musb/musb_cppi41.c | 10 +-
drivers/usb/musb/musb_debugfs.c | 57 +-
drivers/usb/musb/musb_dsps.c | 37 +-
drivers/usb/musb/musb_gadget.c | 58 +-
drivers/usb/musb/musb_host.c | 8 +-
drivers/usb/musb/musb_io.h | 106 +-
drivers/usb/musb/musb_regs.h | 26 -
drivers/usb/musb/musb_virthub.c | 23 +-
drivers/usb/musb/musbhsdma.c | 7 +-
drivers/usb/musb/omap2430.c | 52 +-
drivers/usb/musb/tusb6010.c | 102 +-
drivers/usb/musb/ux500.c | 16 +-
drivers/usb/musb/ux500_dma.c | 11 +-
drivers/usb/phy/phy-ab8500-usb.c | 33 +-
drivers/usb/phy/phy-am335x-control.c | 4 +-
drivers/usb/phy/phy-fsl-usb.c | 27 +-
drivers/usb/phy/phy-fsl-usb.h | 2 +-
drivers/usb/phy/phy-generic.c | 8 +-
drivers/usb/phy/phy-gpio-vbus-usb.c | 16 +-
drivers/usb/phy/phy-isp1301-omap.c | 104 +-
drivers/usb/phy/phy-msm-usb.c | 107 +-
drivers/usb/phy/phy-mv-usb.c | 56 +-
drivers/usb/phy/phy-mxs-usb.c | 4 +-
drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +-
drivers/usb/phy/phy-rcar-usb.c | 12 +-
drivers/usb/phy/phy-tahvo.c | 34 +-
drivers/usb/phy/phy-tegra-usb.c | 9 +-
drivers/usb/phy/phy-ulpi.c | 6 +-
drivers/usb/phy/phy.c | 16 +-
drivers/usb/renesas_usbhs/common.c | 14 +-
drivers/usb/renesas_usbhs/common.h | 7 +-
drivers/usb/renesas_usbhs/fifo.c | 111 +-
drivers/usb/renesas_usbhs/fifo.h | 10 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 41 +-
drivers/usb/renesas_usbhs/mod_host.c | 2 +-
drivers/usb/renesas_usbhs/pipe.c | 8 +-
drivers/usb/renesas_usbhs/rcar2.c | 73 +-
drivers/usb/serial/Kconfig | 5 +-
drivers/usb/serial/keyspan_pda.c | 16 +-
drivers/usb/serial/kobil_sct.c | 2 +-
drivers/usb/serial/mos7720.c | 4 +-
drivers/usb/serial/mos7840.c | 4 +-
drivers/usb/serial/qcserial.c | 33 +
drivers/usb/serial/usb-serial-simple.c | 10 +
drivers/usb/storage/debug.c | 7 +-
drivers/usb/storage/debug.h | 10 +-
drivers/usb/storage/initializers.c | 3 +-
drivers/usb/storage/transport.c | 17 +-
drivers/usb/storage/uas.c | 64 +-
drivers/usb/storage/usb.c | 36 +-
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/uwb/rsv.c | 4 +-
include/dt-bindings/phy/phy.h | 1 +
include/linux/pci_ids.h | 1 +
include/linux/phy/phy.h | 52 +-
include/linux/platform_data/dwc3-exynos.h | 24 -
include/linux/usb/chipidea.h | 5 +-
include/linux/usb/composite.h | 7 +
include/linux/usb/ehci-dbgp.h | 83 +
include/linux/usb/ehci_def.h | 65 +-
include/linux/usb/gadget.h | 5 +-
include/linux/usb/hcd.h | 3 +
include/linux/usb/otg.h | 7 +-
include/linux/usb/phy.h | 6 +-
include/linux/usb/renesas_usbhs.h | 4 +
262 files changed, 11195 insertions(+), 3445 deletions(-)
create mode 100644 Documentation/ABI/stable/sysfs-class-udc
create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-hid
create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-midi
create mode 100644 Documentation/devicetree/bindings/phy/berlin-usb-phy.txt
create mode 100644 Documentation/devicetree/bindings/phy/phy-miphy28lp.txt
create mode 100644 Documentation/devicetree/bindings/phy/phy-mvebu.txt
create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
create mode 100644 drivers/phy/phy-armada375-usb2.c
create mode 100644 drivers/phy/phy-berlin-usb.c
create mode 100644 drivers/phy/phy-miphy28lp.c
create mode 100644 drivers/usb/chipidea/ci_hdrc_usb2.c
create mode 100644 drivers/usb/gadget/function/u_hid.h
create mode 100644 drivers/usb/gadget/function/u_midi.h
create mode 100644 drivers/usb/gadget/udc/bdc/Kconfig
create mode 100644 drivers/usb/gadget/udc/bdc/Makefile
create mode 100644 drivers/usb/gadget/udc/bdc/bdc.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_cmd.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_cmd.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_core.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_dbg.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_dbg.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_ep.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_ep.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_pci.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_udc.c
delete mode 100644 drivers/usb/host/ehci-octeon.c
delete mode 100644 drivers/usb/host/octeon2-common.c
delete mode 100644 drivers/usb/host/ohci-octeon.c
delete mode 100644 include/linux/platform_data/dwc3-exynos.h
create mode 100644 include/linux/usb/ehci-dbgp.h
$ git reset --hard HEAD^
HEAD is now at d7cc746f3a20 Merge remote-tracking branch 'tty/tty-next'
Merging next-20141128 version of usb
$ git merge -m next-20141128/usb fc625960edecfb57e62c2975d1f155155e28e6ba
Resolved 'drivers/usb/chipidea/core.c' using previous resolution.
Resolved 'drivers/usb/dwc2/gadget.c' using previous resolution.
Resolved 'drivers/usb/dwc3/ep0.c' using previous resolution.
Resolved 'drivers/usb/gadget/udc/pxa27x_udc.c' using previous resolution.
Removing include/linux/platform_data/dwc3-exynos.h
Auto-merging include/linux/pci_ids.h
Auto-merging drivers/usb/usbip/vhci_hcd.c
Auto-merging drivers/usb/serial/usb-serial-simple.c
Auto-merging drivers/usb/phy/phy-tegra-usb.c
Auto-merging drivers/usb/phy/phy-tahvo.c
Auto-merging drivers/usb/phy/phy-mxs-usb.c
Auto-merging drivers/usb/phy/phy-mv-usb.c
Auto-merging drivers/usb/phy/phy-isp1301-omap.c
Auto-merging drivers/usb/phy/phy-gpio-vbus-usb.c
Auto-merging drivers/usb/phy/phy-generic.c
Auto-merging drivers/usb/phy/phy-am335x-control.c
Auto-merging drivers/usb/phy/phy-ab8500-usb.c
Auto-merging drivers/usb/musb/musb_core.c
Auto-merging drivers/usb/misc/usb3503.c
Auto-merging drivers/usb/host/xhci-plat.c
Auto-merging drivers/usb/host/ohci-spear.c
Auto-merging drivers/usb/host/ohci-pxa27x.c
Auto-merging drivers/usb/host/ohci-platform.c
Auto-merging drivers/usb/host/ohci-omap.c
Removing drivers/usb/host/ohci-octeon.c
Auto-merging drivers/usb/host/ohci-exynos.c
Auto-merging drivers/usb/host/ohci-at91.c
Removing drivers/usb/host/octeon2-common.c
Auto-merging drivers/usb/host/ehci-w90x900.c
Auto-merging drivers/usb/host/ehci-platform.c
Auto-merging drivers/usb/host/ehci-orion.c
Removing drivers/usb/host/ehci-octeon.c
Auto-merging drivers/usb/host/ehci-exynos.c
Auto-merging drivers/usb/gadget/udc/s3c2410_udc.c
Auto-merging drivers/usb/gadget/udc/s3c-hsudc.c
Auto-merging drivers/usb/gadget/udc/pxa27x_udc.c
CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/pxa27x_udc.c
Auto-merging drivers/usb/gadget/udc/pxa25x_udc.c
Auto-merging drivers/usb/gadget/udc/omap_udc.c
Auto-merging drivers/usb/gadget/udc/net2272.c
Auto-merging drivers/usb/gadget/udc/mv_udc_core.c
Auto-merging drivers/usb/gadget/udc/mv_u3d_core.c
Auto-merging drivers/usb/gadget/udc/m66592-udc.c
Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c
Auto-merging drivers/usb/gadget/udc/gr_udc.c
Auto-merging drivers/usb/gadget/udc/fusb300_udc.c
Auto-merging drivers/usb/gadget/udc/fsl_udc_core.c
Auto-merging drivers/usb/gadget/udc/fsl_qe_udc.c
Auto-merging drivers/usb/gadget/udc/fotg210-udc.c
Auto-merging drivers/usb/gadget/udc/dummy_hcd.c
Auto-merging drivers/usb/gadget/udc/bcm63xx_udc.c
Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c
Auto-merging drivers/usb/gadget/udc/at91_udc.c
Auto-merging drivers/usb/gadget/legacy/hid.c
Auto-merging drivers/usb/gadget/function/f_hid.c
Auto-merging drivers/usb/dwc3/ep0.c
CONFLICT (content): Merge conflict in drivers/usb/dwc3/ep0.c
Auto-merging drivers/usb/dwc2/gadget.c
CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c
Auto-merging drivers/usb/chipidea/usbmisc_imx.c
Auto-merging drivers/usb/chipidea/core.c
CONFLICT (content): Merge conflict in drivers/usb/chipidea/core.c
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
Auto-merging arch/arm/boot/dts/am4372.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d5e8ba233594] next-20141128/usb
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/stable/sysfs-class-udc | 93 +
Documentation/ABI/testing/configfs-usb-gadget-hid | 11 +
Documentation/ABI/testing/configfs-usb-gadget-midi | 12 +
.../devicetree/bindings/usb/ci-hdrc-usb2.txt | 24 +
Documentation/devicetree/bindings/usb/dwc3.txt | 23 +
.../devicetree/bindings/usb/exynos-usb.txt | 6 +-
Documentation/devicetree/bindings/usb/pxa-usb.txt | 22 +
Documentation/devicetree/bindings/usb/usb-ohci.txt | 2 +
Documentation/usb/gadget_hid.txt | 7 +
Documentation/usb/usb-serial.txt | 2 +-
arch/arm/boot/dts/am4372.dtsi | 4 +
arch/mips/cavium-octeon/octeon-platform.c | 274 ++-
arch/mips/configs/cavium_octeon_defconfig | 3 +
drivers/pci/quirks.c | 20 +
drivers/phy/phy-omap-usb2.c | 14 +-
drivers/phy/phy-twl4030-usb.c | 6 +-
drivers/usb/chipidea/Makefile | 1 +
drivers/usb/chipidea/ci.h | 10 +-
drivers/usb/chipidea/ci_hdrc_imx.c | 45 +-
drivers/usb/chipidea/ci_hdrc_msm.c | 9 +-
drivers/usb/chipidea/ci_hdrc_usb2.c | 115 ++
drivers/usb/chipidea/core.c | 225 ++-
drivers/usb/chipidea/debug.c | 2 +-
drivers/usb/chipidea/host.c | 78 +-
drivers/usb/chipidea/otg_fsm.c | 41 +-
drivers/usb/chipidea/udc.c | 22 +-
drivers/usb/chipidea/usbmisc_imx.c | 6 +-
drivers/usb/class/cdc-acm.c | 17 +-
drivers/usb/class/cdc-acm.h | 1 -
drivers/usb/class/usbtmc.c | 4 +-
drivers/usb/common/usb-otg-fsm.c | 8 +-
drivers/usb/core/hcd.c | 7 +-
drivers/usb/core/hub.c | 18 +-
drivers/usb/dwc2/Kconfig | 68 +-
drivers/usb/dwc2/Makefile | 32 +-
drivers/usb/dwc2/core.c | 10 -
drivers/usb/dwc2/core.h | 197 +-
drivers/usb/dwc2/core_intr.c | 17 +-
drivers/usb/dwc2/gadget.c | 386 ++--
drivers/usb/dwc2/hcd.c | 94 +-
drivers/usb/dwc2/hcd.h | 10 -
drivers/usb/dwc2/pci.c | 7 +
drivers/usb/dwc2/platform.c | 44 +-
drivers/usb/dwc3/Kconfig | 2 +-
drivers/usb/dwc3/core.c | 251 ++-
drivers/usb/dwc3/core.h | 89 +-
drivers/usb/dwc3/dwc3-exynos.c | 44 +-
drivers/usb/dwc3/dwc3-keystone.c | 6 +-
drivers/usb/dwc3/dwc3-omap.c | 20 +-
drivers/usb/dwc3/dwc3-pci.c | 35 +
drivers/usb/dwc3/dwc3-st.c | 2 +-
drivers/usb/dwc3/ep0.c | 26 +-
drivers/usb/dwc3/gadget.c | 68 +-
drivers/usb/dwc3/platform_data.h | 20 +
drivers/usb/dwc3/trace.h | 20 +-
drivers/usb/gadget/Kconfig | 61 +
drivers/usb/gadget/composite.c | 64 +-
drivers/usb/gadget/configfs.c | 5 +-
drivers/usb/gadget/function/Makefile | 4 +
drivers/usb/gadget/function/f_hid.c | 374 +++-
drivers/usb/gadget/function/f_midi.c | 364 +++-
drivers/usb/gadget/function/f_ncm.c | 3 +
drivers/usb/gadget/function/f_rndis.c | 3 +-
drivers/usb/gadget/function/u_hid.h | 42 +
drivers/usb/gadget/function/u_midi.h | 40 +
drivers/usb/gadget/function/u_uac1.c | 3 -
drivers/usb/gadget/legacy/Kconfig | 2 +
drivers/usb/gadget/legacy/dbgp.c | 26 +-
drivers/usb/gadget/legacy/gmidi.c | 43 +-
drivers/usb/gadget/legacy/hid.c | 79 +-
drivers/usb/gadget/legacy/printer.c | 65 +-
drivers/usb/gadget/udc/Kconfig | 2 +
drivers/usb/gadget/udc/Makefile | 1 +
drivers/usb/gadget/udc/amd5536udc.c | 12 +-
drivers/usb/gadget/udc/at91_udc.c | 89 +-
drivers/usb/gadget/udc/atmel_usba_udc.c | 25 +-
drivers/usb/gadget/udc/bcm63xx_udc.c | 13 +-
drivers/usb/gadget/udc/bdc/Kconfig | 21 +
drivers/usb/gadget/udc/bdc/Makefile | 8 +
drivers/usb/gadget/udc/bdc/bdc.h | 490 +++++
drivers/usb/gadget/udc/bdc/bdc_cmd.c | 376 ++++
drivers/usb/gadget/udc/bdc/bdc_cmd.h | 29 +
drivers/usb/gadget/udc/bdc/bdc_core.c | 533 ++++++
drivers/usb/gadget/udc/bdc/bdc_dbg.c | 123 ++
drivers/usb/gadget/udc/bdc/bdc_dbg.h | 37 +
drivers/usb/gadget/udc/bdc/bdc_ep.c | 2023 ++++++++++++++++++++
drivers/usb/gadget/udc/bdc/bdc_ep.h | 22 +
drivers/usb/gadget/udc/bdc/bdc_pci.c | 132 ++
drivers/usb/gadget/udc/bdc/bdc_udc.c | 587 ++++++
drivers/usb/gadget/udc/dummy_hcd.c | 36 +-
drivers/usb/gadget/udc/fotg210-udc.c | 3 +-
drivers/usb/gadget/udc/fsl_qe_udc.c | 13 +-
drivers/usb/gadget/udc/fsl_udc_core.c | 19 +-
drivers/usb/gadget/udc/fusb300_udc.c | 3 +-
drivers/usb/gadget/udc/goku_udc.c | 6 +-
drivers/usb/gadget/udc/gr_udc.c | 8 +-
drivers/usb/gadget/udc/lpc32xx_udc.c | 11 +-
drivers/usb/gadget/udc/m66592-udc.c | 5 +-
drivers/usb/gadget/udc/mv_u3d_core.c | 5 +-
drivers/usb/gadget/udc/mv_udc_core.c | 32 +-
drivers/usb/gadget/udc/net2272.c | 66 +-
drivers/usb/gadget/udc/net2280.c | 65 +-
drivers/usb/gadget/udc/omap_udc.c | 6 +-
drivers/usb/gadget/udc/pch_udc.c | 11 +-
drivers/usb/gadget/udc/pxa25x_udc.c | 43 +-
drivers/usb/gadget/udc/pxa27x_udc.c | 152 +-
drivers/usb/gadget/udc/pxa27x_udc.h | 6 +-
drivers/usb/gadget/udc/r8a66597-udc.c | 10 +-
drivers/usb/gadget/udc/s3c-hsudc.c | 16 +-
drivers/usb/gadget/udc/s3c2410_udc.c | 6 +-
drivers/usb/gadget/udc/udc-core.c | 28 +-
drivers/usb/gadget/udc/udc-xilinx.c | 3 +-
drivers/usb/host/Kconfig | 18 +-
drivers/usb/host/Makefile | 1 -
drivers/usb/host/ehci-atmel.c | 13 +-
drivers/usb/host/ehci-exynos.c | 12 +-
drivers/usb/host/ehci-fsl.c | 12 +-
drivers/usb/host/ehci-hcd.c | 14 +-
drivers/usb/host/ehci-hub.c | 45 +-
drivers/usb/host/ehci-msm.c | 10 +-
drivers/usb/host/ehci-mv.c | 13 -
drivers/usb/host/ehci-mxc.c | 11 +-
drivers/usb/host/ehci-octeon.c | 188 --
drivers/usb/host/ehci-orion.c | 14 +-
drivers/usb/host/ehci-platform.c | 27 +-
drivers/usb/host/ehci-sead3.c | 5 +-
drivers/usb/host/ehci-sh.c | 16 +-
drivers/usb/host/ehci-spear.c | 9 +-
drivers/usb/host/ehci-tegra.c | 11 +-
drivers/usb/host/ehci-w90x900.c | 17 +-
drivers/usb/host/ehci.h | 2 +
drivers/usb/host/fotg210.h | 62 +-
drivers/usb/host/fusbh200.h | 62 +-
drivers/usb/host/imx21-hcd.c | 6 +-
drivers/usb/host/octeon2-common.c | 200 --
drivers/usb/host/ohci-at91.c | 15 +-
drivers/usb/host/ohci-da8xx.c | 7 +-
drivers/usb/host/ohci-exynos.c | 11 +-
drivers/usb/host/ohci-hcd.c | 5 -
drivers/usb/host/ohci-jz4740.c | 13 +-
drivers/usb/host/ohci-octeon.c | 202 --
drivers/usb/host/ohci-omap.c | 2 +-
drivers/usb/host/ohci-platform.c | 53 +-
drivers/usb/host/ohci-pxa27x.c | 11 +-
drivers/usb/host/ohci-spear.c | 11 +-
drivers/usb/host/ohci.h | 19 +-
drivers/usb/host/oxu210hp-hcd.c | 1 -
drivers/usb/host/pci-quirks.c | 12 +-
drivers/usb/host/uhci-platform.c | 6 +-
drivers/usb/host/xhci-plat.c | 10 +-
drivers/usb/misc/adutux.c | 5 -
drivers/usb/misc/sisusbvga/sisusb.c | 3 +-
drivers/usb/misc/usb3503.c | 8 +-
drivers/usb/misc/yurex.c | 6 +-
drivers/usb/musb/Kconfig | 5 +-
drivers/usb/musb/am35x.c | 32 +-
drivers/usb/musb/blackfin.c | 74 +-
drivers/usb/musb/da8xx.c | 30 +-
drivers/usb/musb/davinci.c | 22 +-
drivers/usb/musb/jz4740.c | 2 +
drivers/usb/musb/musb_core.c | 335 +++-
drivers/usb/musb/musb_core.h | 87 +-
drivers/usb/musb/musb_cppi41.c | 10 +-
drivers/usb/musb/musb_debugfs.c | 57 +-
drivers/usb/musb/musb_dsps.c | 37 +-
drivers/usb/musb/musb_gadget.c | 58 +-
drivers/usb/musb/musb_host.c | 8 +-
drivers/usb/musb/musb_io.h | 106 +-
drivers/usb/musb/musb_regs.h | 26 -
drivers/usb/musb/musb_virthub.c | 23 +-
drivers/usb/musb/musbhsdma.c | 7 +-
drivers/usb/musb/omap2430.c | 52 +-
drivers/usb/musb/tusb6010.c | 102 +-
drivers/usb/musb/ux500.c | 16 +-
drivers/usb/musb/ux500_dma.c | 11 +-
drivers/usb/phy/phy-ab8500-usb.c | 33 +-
drivers/usb/phy/phy-am335x-control.c | 4 +-
drivers/usb/phy/phy-fsl-usb.c | 27 +-
drivers/usb/phy/phy-fsl-usb.h | 2 +-
drivers/usb/phy/phy-generic.c | 8 +-
drivers/usb/phy/phy-gpio-vbus-usb.c | 16 +-
drivers/usb/phy/phy-isp1301-omap.c | 104 +-
drivers/usb/phy/phy-msm-usb.c | 107 +-
drivers/usb/phy/phy-mv-usb.c | 56 +-
drivers/usb/phy/phy-mxs-usb.c | 4 +-
drivers/usb/phy/phy-rcar-gen2-usb.c | 4 +-
drivers/usb/phy/phy-rcar-usb.c | 12 +-
drivers/usb/phy/phy-tahvo.c | 34 +-
drivers/usb/phy/phy-tegra-usb.c | 9 +-
drivers/usb/phy/phy-ulpi.c | 6 +-
drivers/usb/phy/phy.c | 16 +-
drivers/usb/renesas_usbhs/common.c | 14 +-
drivers/usb/renesas_usbhs/common.h | 7 +-
drivers/usb/renesas_usbhs/fifo.c | 111 +-
drivers/usb/renesas_usbhs/fifo.h | 10 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 41 +-
drivers/usb/renesas_usbhs/mod_host.c | 2 +-
drivers/usb/renesas_usbhs/pipe.c | 8 +-
drivers/usb/renesas_usbhs/rcar2.c | 73 +-
drivers/usb/serial/Kconfig | 5 +-
drivers/usb/serial/keyspan_pda.c | 16 +-
drivers/usb/serial/kobil_sct.c | 2 +-
drivers/usb/serial/mos7720.c | 4 +-
drivers/usb/serial/mos7840.c | 4 +-
drivers/usb/serial/qcserial.c | 33 +
drivers/usb/serial/usb-serial-simple.c | 10 +
drivers/usb/storage/debug.c | 7 +-
drivers/usb/storage/debug.h | 10 +-
drivers/usb/storage/initializers.c | 3 +-
drivers/usb/storage/transport.c | 17 +-
drivers/usb/storage/uas.c | 64 +-
drivers/usb/storage/usb.c | 36 +-
drivers/usb/usbip/vhci_hcd.c | 9 +-
drivers/uwb/rsv.c | 4 +-
include/linux/pci_ids.h | 1 +
include/linux/platform_data/dwc3-exynos.h | 24 -
include/linux/usb/chipidea.h | 5 +-
include/linux/usb/composite.h | 7 +
include/linux/usb/ehci-dbgp.h | 83 +
include/linux/usb/ehci_def.h | 65 +-
include/linux/usb/gadget.h | 5 +-
include/linux/usb/hcd.h | 3 +
include/linux/usb/otg.h | 7 +-
include/linux/usb/phy.h | 6 +-
include/linux/usb/renesas_usbhs.h | 4 +
225 files changed, 9003 insertions(+), 3241 deletions(-)
create mode 100644 Documentation/ABI/stable/sysfs-class-udc
create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-hid
create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-midi
create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt
create mode 100644 drivers/usb/chipidea/ci_hdrc_usb2.c
create mode 100644 drivers/usb/gadget/function/u_hid.h
create mode 100644 drivers/usb/gadget/function/u_midi.h
create mode 100644 drivers/usb/gadget/udc/bdc/Kconfig
create mode 100644 drivers/usb/gadget/udc/bdc/Makefile
create mode 100644 drivers/usb/gadget/udc/bdc/bdc.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_cmd.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_cmd.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_core.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_dbg.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_dbg.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_ep.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_ep.h
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_pci.c
create mode 100644 drivers/usb/gadget/udc/bdc/bdc_udc.c
delete mode 100644 drivers/usb/host/ehci-octeon.c
delete mode 100644 drivers/usb/host/octeon2-common.c
delete mode 100644 drivers/usb/host/ohci-octeon.c
delete mode 100644 include/linux/platform_data/dwc3-exynos.h
create mode 100644 include/linux/usb/ehci-dbgp.h
Merging usb-gadget/next (ebf3992061db usb: musb: Use IS_ENABLED for tusb6010)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (e7181d005e84 USB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (aa9d9be96d33 staging: unisys: remove pointless macros)
$ git merge staging/staging-next
Auto-merging include/uapi/linux/android/binder.h
Auto-merging include/uapi/linux/Kbuild
Auto-merging drivers/staging/vt6656/main_usb.c
Removing drivers/staging/vt6655/wroute.h
Removing drivers/staging/vt6655/wroute.c
Removing drivers/staging/vt6655/wpactl.h
Removing drivers/staging/vt6655/wpactl.c
Removing drivers/staging/vt6655/wpa2.h
Removing drivers/staging/vt6655/wpa2.c
Removing drivers/staging/vt6655/wpa.h
Removing drivers/staging/vt6655/wpa.c
Removing drivers/staging/vt6655/wmgr.h
Removing drivers/staging/vt6655/wmgr.c
Removing drivers/staging/vt6655/wctl.h
Removing drivers/staging/vt6655/wctl.c
Removing drivers/staging/vt6655/wcmd.h
Removing drivers/staging/vt6655/wcmd.c
Removing drivers/staging/vt6655/vntwifi.h
Removing drivers/staging/vt6655/vntwifi.c
Removing drivers/staging/vt6655/vntconfiguration.dat
Removing drivers/staging/vt6655/ttype.h
Removing drivers/staging/vt6655/tkip.h
Removing drivers/staging/vt6655/tkip.c
Removing drivers/staging/vt6655/tether.h
Removing drivers/staging/vt6655/tether.c
Removing drivers/staging/vt6655/tcrc.h
Removing drivers/staging/vt6655/tcrc.c
Removing drivers/staging/vt6655/rc4.h
Removing drivers/staging/vt6655/rc4.c
Removing drivers/staging/vt6655/michael.h
Removing drivers/staging/vt6655/michael.c
Removing drivers/staging/vt6655/iwctl.h
Removing drivers/staging/vt6655/iwctl.c
Removing drivers/staging/vt6655/iowpa.h
Removing drivers/staging/vt6655/ioctl.h
Removing drivers/staging/vt6655/ioctl.c
Removing drivers/staging/vt6655/iocmd.h
Removing drivers/staging/vt6655/hostap.h
Removing drivers/staging/vt6655/hostap.c
Removing drivers/staging/vt6655/datarate.h
Removing drivers/staging/vt6655/datarate.c
Removing drivers/staging/vt6655/country.h
Removing drivers/staging/vt6655/bssdb.h
Removing drivers/staging/vt6655/bssdb.c
Removing drivers/staging/vt6655/aes_ccmp.h
Removing drivers/staging/vt6655/aes_ccmp.c
Removing drivers/staging/vt6655/IEEE11h.h
Removing drivers/staging/vt6655/IEEE11h.c
Removing drivers/staging/vt6655/80211mgr.h
Removing drivers/staging/vt6655/80211mgr.c
Removing drivers/staging/vt6655/80211hdr.h
Auto-merging drivers/staging/skein/skein_base.h
Auto-merging drivers/staging/skein/skein_base.c
Auto-merging drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
Removing drivers/staging/rtl8723au/include/rtw_led.h
Removing drivers/staging/rtl8723au/include/rtl8723a_led.h
Removing drivers/staging/rtl8723au/hal/rtl8723au_led.c
Removing drivers/staging/rtl8723au/core/rtw_led.c
Auto-merging drivers/staging/rtl8188eu/os_dep/usb_intf.c
Auto-merging drivers/staging/rtl8188eu/core/rtw_wlan_util.c
Auto-merging drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
Auto-merging drivers/staging/rtl8188eu/core/rtw_cmd.c
Auto-merging drivers/staging/ozwpan/ozhcd.c
Auto-merging drivers/staging/octeon/ethernet.c
Auto-merging drivers/staging/octeon-usb/octeon-hcd.c
Auto-merging drivers/staging/media/omap4iss/iss_csi2.c
Auto-merging drivers/staging/media/omap4iss/iss.c
CONFLICT (modify/delete): drivers/staging/media/omap24xx/tcm825x.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap24xx/tcm825x.c left in tree.
CONFLICT (modify/delete): drivers/staging/media/omap24xx/omap24xxcam.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/omap24xx/omap24xxcam.c left in tree.
Auto-merging drivers/staging/media/lirc/lirc_zilog.c
Auto-merging drivers/staging/media/lirc/lirc_sir.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_imon.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_imon.c
CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_igorplugusb.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/lirc/lirc_igorplugusb.c left in tree.
Auto-merging drivers/staging/media/davinci_vpfe/dm365_resizer.c
Auto-merging drivers/staging/media/davinci_vpfe/dm365_isif.c
Auto-merging drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Auto-merging drivers/staging/media/davinci_vpfe/dm365_ipipe_hw.c
Auto-merging drivers/staging/lustre/lustre/llite/xattr.c
Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c
Auto-merging drivers/staging/lustre/lustre/llite/statahead.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/statahead.c
Auto-merging drivers/staging/lustre/lustre/llite/namei.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/namei.c
Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
Auto-merging drivers/staging/lustre/lustre/llite/llite_mmap.c
Auto-merging drivers/staging/lustre/lustre/llite/llite_lib.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_lib.c
Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/llite_internal.h
Auto-merging drivers/staging/lustre/lustre/llite/file.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/file.c
Auto-merging drivers/staging/lustre/lustre/llite/dir.c
Auto-merging drivers/staging/lustre/lustre/llite/dcache.c
CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/dcache.c
Auto-merging drivers/staging/lustre/lustre/libcfs/tracefile.c
Auto-merging drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
Auto-merging drivers/staging/iio/adc/spear_adc.c
Auto-merging drivers/staging/iio/adc/mxs-lradc.c
Auto-merging drivers/staging/iio/adc/lpc32xx_adc.c
Auto-merging drivers/staging/emxx_udc/emxx_udc.c
Removing drivers/staging/comedi/drivers/addi_apci_3200.c
Removing drivers/staging/comedi/drivers/addi_apci_035.c
Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
Removing drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
Removing drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
Removing drivers/staging/comedi/drivers/addi-data/addi_common.h
Removing drivers/staging/comedi/drivers/addi-data/addi_common.c
Removing drivers/staging/bcm/vendorspecificextn.h
Removing drivers/staging/bcm/vendorspecificextn.c
Removing drivers/staging/bcm/target_params.h
Removing drivers/staging/bcm/sort.c
Removing drivers/staging/bcm/nvm.h
Removing drivers/staging/bcm/nvm.c
Removing drivers/staging/bcm/led_control.h
Removing drivers/staging/bcm/led_control.c
Removing drivers/staging/bcm/hostmibs.c
Removing drivers/staging/bcm/headers.h
Removing drivers/staging/bcm/cntrl_SignalingInterface.h
Removing drivers/staging/bcm/Typedefs.h
Removing drivers/staging/bcm/Transmit.c
Removing drivers/staging/bcm/TODO
Removing drivers/staging/bcm/Queue.h
Removing drivers/staging/bcm/Qos.c
Removing drivers/staging/bcm/Prototypes.h
Removing drivers/staging/bcm/Protocol.h
Removing drivers/staging/bcm/PHSModule.h
Removing drivers/staging/bcm/PHSModule.c
Removing drivers/staging/bcm/PHSDefines.h
Removing drivers/staging/bcm/Misc.c
Removing drivers/staging/bcm/Makefile
Removing drivers/staging/bcm/Macros.h
Removing drivers/staging/bcm/LeakyBucket.c
Removing drivers/staging/bcm/Kconfig
Removing drivers/staging/bcm/Ioctl.h
Removing drivers/staging/bcm/InterfaceTx.h
Removing drivers/staging/bcm/InterfaceTx.c
Removing drivers/staging/bcm/InterfaceRx.h
Removing drivers/staging/bcm/InterfaceRx.c
Removing drivers/staging/bcm/InterfaceMisc.h
Removing drivers/staging/bcm/InterfaceMisc.c
Removing drivers/staging/bcm/InterfaceMacros.h
Removing drivers/staging/bcm/InterfaceIsr.h
Removing drivers/staging/bcm/InterfaceIsr.c
Removing drivers/staging/bcm/InterfaceInit.h
Removing drivers/staging/bcm/InterfaceInit.c
Removing drivers/staging/bcm/InterfaceIdleMode.h
Removing drivers/staging/bcm/InterfaceIdleMode.c
Removing drivers/staging/bcm/InterfaceDld.c
Removing drivers/staging/bcm/InterfaceAdapter.h
Removing drivers/staging/bcm/IPv6ProtocolHdr.h
Removing drivers/staging/bcm/IPv6Protocol.c
Removing drivers/staging/bcm/HostMIBSInterface.h
Removing drivers/staging/bcm/HandleControlPacket.c
Removing drivers/staging/bcm/Debug.h
ReResolved 'drivers/staging/lustre/lustre/llite/dcache.c' using previous resolution.
Resolved 'drivers/staging/lustre/lustre/llite/file.c' using previous resolution.
Resolved 'drivers/staging/lustre/lustre/llite/llite_internal.h' using previous resolution.
Resolved 'drivers/staging/lustre/lustre/llite/llite_lib.c' using previous resolution.
Resolved 'drivers/staging/lustre/lustre/llite/namei.c' using previous resolution.
Resolved 'drivers/staging/lustre/lustre/llite/statahead.c' using previous resolution.
Resolved 'drivers/staging/media/lirc/lirc_imon.c' using previous resolution.
Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution.
moving drivers/staging/bcm/DDRInit.h
Removing drivers/staging/bcm/DDRInit.c
Removing drivers/staging/bcm/CmHost.h
Removing drivers/staging/bcm/CmHost.c
Removing drivers/staging/bcm/Bcmnet.c
Removing drivers/staging/bcm/Bcmchar.c
Removing drivers/staging/bcm/Adapter.h
Auto-merging drivers/staging/android/timed_gpio.c
Removing drivers/staging/android/binder.h
Auto-merging drivers/staging/Makefile
Auto-merging drivers/staging/Kconfig
Auto-merging drivers/iio/adc/rockchip_saradc.c
Auto-merging drivers/iio/adc/Makefile
Auto-merging drivers/iio/adc/Kconfig
Auto-merging drivers/gpu/drm/imx/parallel-display.c
Auto-merging drivers/gpu/drm/imx/ipuv3-plane.h
Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c
Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c
Auto-merging drivers/gpu/drm/imx/imx-tve.c
Auto-merging drivers/gpu/drm/imx/imx-ldb.c
Auto-merging drivers/gpu/drm/imx/imx-drm-core.c
Auto-merging drivers/gpu/drm/imx/Kconfig
Auto-merging drivers/android/binder.c
Auto-merging drivers/Kconfig
Auto-merging arch/arm/boot/dts/exynos5420.dtsi
Auto-merging arch/arm/boot/dts/exynos5250.dtsi
Auto-merging arch/arm/boot/dts/exynos4x12.dtsi
Auto-merging arch/arm/boot/dts/exynos3250.dtsi
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/media/lirc/lirc_igorplugusb.c drivers/staging/media/omap24xx/omap24xxcam.c drivers/staging/media/omap24xx/tcm825x.c
drivers/staging/media/lirc/lirc_igorplugusb.c: needs merge
drivers/staging/media/omap24xx/omap24xxcam.c: needs merge
drivers/staging/media/omap24xx/tcm825x.c: needs merge
rm 'drivers/staging/media/lirc/lirc_igorplugusb.c'
rm 'drivers/staging/media/omap24xx/omap24xxcam.c'
rm 'drivers/staging/media/omap24xx/tcm825x.c'
$ git commit -v -a
[master 4cab0b50e35f] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-bus-iio | 23 +
.../devicetree/bindings/arm/samsung/exynos-adc.txt | 11 +-
.../devicetree/bindings/iio/adc/qcom,spmi-iadc.txt | 46 +
.../bindings/iio/adc/rockchip-saradc.txt | 2 +-
MAINTAINERS | 7 -
arch/arm/boot/dts/exynos3250.dtsi | 3 +-
arch/arm/boot/dts/exynos4x12.dtsi | 3 +-
arch/arm/boot/dts/exynos5250.dtsi | 3 +-
arch/arm/boot/dts/exynos5420.dtsi | 3 +-
drivers/Kconfig | 2 +
drivers/Makefile | 1 +
drivers/android/Kconfig | 37 +
drivers/android/Makefile | 3 +
drivers/{staging => }/android/binder.c | 6 +-
drivers/{staging => }/android/binder_trace.h | 0
drivers/gpu/drm/imx/Kconfig | 7 +-
drivers/gpu/drm/imx/imx-drm-core.c | 5 +-
drivers/gpu/drm/imx/imx-ldb.c | 5 -
drivers/gpu/drm/imx/imx-tve.c | 8 +-
drivers/gpu/drm/imx/ipuv3-crtc.c | 5 -
drivers/gpu/drm/imx/ipuv3-plane.c | 43 +-
drivers/gpu/drm/imx/ipuv3-plane.h | 2 +
drivers/gpu/drm/imx/parallel-display.c | 13 +-
drivers/iio/accel/st_accel.h | 3 +-
drivers/iio/accel/st_accel_core.c | 22 +-
drivers/iio/accel/st_accel_i2c.c | 3 +-
drivers/iio/accel/st_accel_spi.c | 3 +-
drivers/iio/adc/Kconfig | 14 +
drivers/iio/adc/Makefile | 1 +
drivers/iio/adc/exynos_adc.c | 62 +-
drivers/iio/adc/mcp320x.c | 222 +-
drivers/iio/adc/qcom-spmi-iadc.c | 595 ++
drivers/iio/adc/rockchip_saradc.c | 64 +-
drivers/iio/adc/vf610_adc.c | 45 +-
drivers/iio/common/st_sensors/st_sensors_core.c | 126 +-
drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 +
drivers/iio/common/st_sensors/st_sensors_spi.c | 1 +
drivers/iio/gyro/st_gyro.h | 3 +-
drivers/iio/gyro/st_gyro_core.c | 19 +-
drivers/iio/gyro/st_gyro_i2c.c | 4 +-
drivers/iio/gyro/st_gyro_spi.c | 4 +-
drivers/iio/humidity/Kconfig | 10 +
drivers/iio/humidity/Makefile | 1 +
drivers/iio/humidity/si7020.c | 161 +
drivers/iio/inkern.c | 33 +-
drivers/iio/magnetometer/st_magn.h | 3 +-
drivers/iio/magnetometer/st_magn_core.c | 18 +-
drivers/iio/magnetometer/st_magn_i2c.c | 3 +-
drivers/iio/magnetometer/st_magn_spi.c | 3 +-
drivers/iio/pressure/Kconfig | 11 +
drivers/iio/pressure/Makefile | 1 +
drivers/iio/pressure/bmp280.c | 455 +
drivers/iio/pressure/st_pressure.h | 3 +-
drivers/iio/pressure/st_pressure_buffer.c | 12 +-
drivers/iio/pressure/st_pressure_core.c | 49 +-
drivers/iio/pressure/st_pressure_i2c.c | 11 +-
drivers/iio/pressure/st_pressure_spi.c | 11 +-
drivers/iio/proximity/as3935.c | 16 +-
drivers/staging/Kconfig | 4 +-
drivers/staging/Makefile | 2 +-
drivers/staging/android/Kconfig | 30 -
drivers/staging/android/Makefile | 1 -
drivers/staging/android/TODO | 7 +
drivers/staging/android/binder.h | 30 -
drivers/staging/android/ion/ion.c | 10 +-
drivers/staging/android/ion/ion.h | 2 +-
drivers/staging/android/ion/ion_dummy_driver.c | 6 +-
drivers/staging/android/ion/ion_page_pool.c | 2 +-
drivers/staging/android/ion/ion_priv.h | 4 +-
drivers/staging/android/ion/tegra/tegra_ion.c | 6 +-
drivers/staging/android/sync_debug.c | 5 +-
drivers/staging/android/timed_gpio.c | 7 +-
drivers/staging/bcm/Adapter.h | 474 -
drivers/staging/bcm/Bcmchar.c | 2652 -----
drivers/staging/bcm/Bcmnet.c | 240 -
drivers/staging/bcm/CmHost.c | 2254 ----
drivers/staging/bcm/CmHost.h | 62 -
drivers/staging/bcm/DDRInit.c | 1355 ---
drivers/staging/bcm/DDRInit.h | 9 -
drivers/staging/bcm/Debug.h | 242 -
drivers/staging/bcm/HandleControlPacket.c | 241 -
drivers/staging/bcm/HostMIBSInterface.h | 192 -
drivers/staging/bcm/IPv6Protocol.c | 476 -
drivers/staging/bcm/IPv6ProtocolHdr.h | 85 -
drivers/staging/bcm/InterfaceAdapter.h | 79 -
drivers/staging/bcm/InterfaceDld.c | 317 -
drivers/staging/bcm/InterfaceIdleMode.c | 274 -
drivers/staging/bcm/InterfaceIdleMode.h | 15 -
drivers/staging/bcm/InterfaceInit.c | 729 --
drivers/staging/bcm/InterfaceInit.h | 26 -
drivers/staging/bcm/InterfaceIsr.c | 190 -
drivers/staging/bcm/InterfaceIsr.h | 15 -
drivers/staging/bcm/InterfaceMacros.h | 18 -
drivers/staging/bcm/InterfaceMisc.c | 247 -
drivers/staging/bcm/InterfaceMisc.h | 42 -
drivers/staging/bcm/InterfaceRx.c | 289 -
drivers/staging/bcm/InterfaceRx.h | 7 -
drivers/staging/bcm/InterfaceTx.c | 213 -
drivers/staging/bcm/InterfaceTx.h | 7 -
drivers/staging/bcm/Ioctl.h | 226 -
drivers/staging/bcm/Kconfig | 6 -
drivers/staging/bcm/LeakyBucket.c | 364 -
drivers/staging/bcm/Macros.h | 352 -
drivers/staging/bcm/Makefile | 12 -
drivers/staging/bcm/Misc.c | 1587 ---
drivers/staging/bcm/PHSDefines.h | 94 -
drivers/staging/bcm/PHSModule.c | 1703 ---
drivers/staging/bcm/PHSModule.h | 59 -
drivers/staging/bcm/Protocol.h | 128 -
drivers/staging/bcm/Prototypes.h | 217 -
drivers/staging/bcm/Qos.c | 1200 ---
drivers/staging/bcm/Queue.h | 29 -
drivers/staging/bcm/TODO | 26 -
drivers/staging/bcm/Transmit.c | 271 -
drivers/staging/bcm/Typedefs.h | 47 -
drivers/staging/bcm/cntrl_SignalingInterface.h | 311 -
drivers/staging/bcm/headers.h | 78 -
drivers/staging/bcm/hostmibs.c | 164 -
drivers/staging/bcm/led_control.c | 952 --
drivers/staging/bcm/led_control.h | 84 -
drivers/staging/bcm/nvm.c | 4661 --------
drivers/staging/bcm/nvm.h | 286 -
drivers/staging/bcm/sort.c | 52 -
drivers/staging/bcm/target_params.h | 57 -
drivers/staging/bcm/vendorspecificextn.c | 145 -
drivers/staging/bcm/vendorspecificextn.h | 18 -
drivers/staging/clocking-wizard/Kconfig | 9 +
drivers/staging/clocking-wizard/Makefile | 1 +
drivers/staging/clocking-wizard/TODO | 12 +
.../clocking-wizard/clk-xlnx-clock-wizard.c | 335 +
drivers/staging/clocking-wizard/dt-binding.txt | 30 +
drivers/staging/comedi/Kconfig | 28 +-
drivers/staging/comedi/Makefile | 7 +-
drivers/staging/comedi/comedi.h | 13 +-
drivers/staging/comedi/comedi_buf.c | 157 +-
drivers/staging/comedi/comedi_compat32.c | 2 +
drivers/staging/comedi/comedi_fops.c | 279 +-
drivers/staging/comedi/comedi_pci.c | 16 +
drivers/staging/comedi/comedi_pcmcia.c | 16 +
drivers/staging/comedi/comedi_usb.c | 16 +
drivers/staging/comedi/comedidev.h | 139 +-
drivers/staging/comedi/drivers.c | 102 +-
drivers/staging/comedi/drivers/Makefile | 1 -
.../staging/comedi/drivers/addi-data/addi_common.c | 274 -
.../staging/comedi/drivers/addi-data/addi_common.h | 144 -
.../staging/comedi/drivers/addi-data/addi_eeprom.c | 360 -
.../comedi/drivers/addi-data/hwdrv_apci035.c | 480 -
.../comedi/drivers/addi-data/hwdrv_apci1500.c | 28 +-
.../comedi/drivers/addi-data/hwdrv_apci1564.c | 381 +-
.../comedi/drivers/addi-data/hwdrv_apci3120.c | 2050 ----
.../comedi/drivers/addi-data/hwdrv_apci3200.c | 3003 ------
drivers/staging/comedi/drivers/addi_apci_035.c | 77 -
drivers/staging/comedi/drivers/addi_apci_1032.c | 5 +-
drivers/staging/comedi/drivers/addi_apci_1500.c | 117 +-
drivers/staging/comedi/drivers/addi_apci_1516.c | 2 +-
drivers/staging/comedi/drivers/addi_apci_1564.c | 268 +-
drivers/staging/comedi/drivers/addi_apci_16xx.c | 2 +-
drivers/staging/comedi/drivers/addi_apci_2032.c | 32 +-
drivers/staging/comedi/drivers/addi_apci_2200.c | 2 +-
drivers/staging/comedi/drivers/addi_apci_3120.c | 1153 +-
drivers/staging/comedi/drivers/addi_apci_3200.c | 125 -
drivers/staging/comedi/drivers/addi_apci_3501.c | 7 +-
drivers/staging/comedi/drivers/addi_apci_3xxx.c | 11 +-
drivers/staging/comedi/drivers/addi_tcw.h | 56 +
drivers/staging/comedi/drivers/addi_watchdog.c | 32 +-
drivers/staging/comedi/drivers/adl_pci6208.c | 1 -
drivers/staging/comedi/drivers/adl_pci9111.c | 40 +-
drivers/staging/comedi/drivers/adl_pci9118.c | 67 +-
drivers/staging/comedi/drivers/adv_pci1710.c | 76 +-
drivers/staging/comedi/drivers/adv_pci1723.c | 338 +-
drivers/staging/comedi/drivers/adv_pci1724.c | 471 +-
drivers/staging/comedi/drivers/adv_pci_dio.c | 8 +-
drivers/staging/comedi/drivers/aio_aio12_8.c | 1 -
drivers/staging/comedi/drivers/amcc_s5933.h | 2 +
.../staging/comedi/drivers/amplc_dio200_common.c | 34 +-
.../staging/comedi/drivers/amplc_pc236_common.c | 5 +-
drivers/staging/comedi/drivers/amplc_pc263.c | 2 +-
drivers/staging/comedi/drivers/amplc_pci224.c | 53 +-
drivers/staging/comedi/drivers/amplc_pci230.c | 193 +-
drivers/staging/comedi/drivers/amplc_pci263.c | 2 +-
drivers/staging/comedi/drivers/c6xdigio.c | 2 +-
drivers/staging/comedi/drivers/cb_das16_cs.c | 1 -
drivers/staging/comedi/drivers/cb_pcidas.c | 283 +-
drivers/staging/comedi/drivers/cb_pcidas64.c | 295 +-
drivers/staging/comedi/drivers/cb_pcimdas.c | 83 +-
drivers/staging/comedi/drivers/comedi_bond.c | 9 +-
drivers/staging/comedi/drivers/comedi_fc.h | 43 -
drivers/staging/comedi/drivers/comedi_parport.c | 5 +-
drivers/staging/comedi/drivers/comedi_test.c | 63 +-
drivers/staging/comedi/drivers/dac02.c | 1 -
drivers/staging/comedi/drivers/daqboard2000.c | 1 -
drivers/staging/comedi/drivers/das08.c | 3 +-
drivers/staging/comedi/drivers/das16.c | 23 +-
drivers/staging/comedi/drivers/das16m1.c | 7 +-
drivers/staging/comedi/drivers/das1800.c | 62 +-
drivers/staging/comedi/drivers/das6402.c | 202 +-
drivers/staging/comedi/drivers/das800.c | 38 +-
drivers/staging/comedi/drivers/dmm32at.c | 702 +-
drivers/staging/comedi/drivers/dt2801.c | 1 -
drivers/staging/comedi/drivers/dt2811.c | 1 -
drivers/staging/comedi/drivers/dt2814.c | 2 +-
drivers/staging/comedi/drivers/dt282x.c | 62 +-
drivers/staging/comedi/drivers/dt3000.c | 9 +-
drivers/staging/comedi/drivers/dt9812.c | 4 +-
drivers/staging/comedi/drivers/dyna_pci10xx.c | 4 +-
drivers/staging/comedi/drivers/fl512.c | 1 -
drivers/staging/comedi/drivers/gsc_hpdi.c | 8 +-
drivers/staging/comedi/drivers/icp_multi.c | 9 +-
drivers/staging/comedi/drivers/ii_pci20kc.c | 1 -
drivers/staging/comedi/drivers/me4000.c | 120 +-
drivers/staging/comedi/drivers/me_daq.c | 5 +-
drivers/staging/comedi/drivers/mf6x4.c | 1 -
drivers/staging/comedi/drivers/mite.c | 9 +-
drivers/staging/comedi/drivers/multiq3.c | 1 -
drivers/staging/comedi/drivers/ni_6527.c | 8 +-
drivers/staging/comedi/drivers/ni_65xx.c | 9 +-
drivers/staging/comedi/drivers/ni_660x.c | 2 +-
drivers/staging/comedi/drivers/ni_670x.c | 1 -
drivers/staging/comedi/drivers/ni_at_a2150.c | 21 +-
drivers/staging/comedi/drivers/ni_at_ao.c | 56 +-
drivers/staging/comedi/drivers/ni_atmio16d.c | 8 +-
drivers/staging/comedi/drivers/ni_labpc.h | 6 -
drivers/staging/comedi/drivers/ni_labpc_common.c | 152 +-
drivers/staging/comedi/drivers/ni_labpc_isadma.c | 7 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 164 +-
drivers/staging/comedi/drivers/ni_pcidio.c | 14 +-
drivers/staging/comedi/drivers/ni_stc.h | 2 +-
drivers/staging/comedi/drivers/ni_tiocmd.c | 6 +-
drivers/staging/comedi/drivers/ni_usb6501.c | 2 +-
drivers/staging/comedi/drivers/pcl711.c | 25 +-
drivers/staging/comedi/drivers/pcl726.c | 6 +-
drivers/staging/comedi/drivers/pcl812.c | 40 +-
drivers/staging/comedi/drivers/pcl816.c | 26 +-
drivers/staging/comedi/drivers/pcl818.c | 34 +-
drivers/staging/comedi/drivers/pcmmio.c | 32 +-
drivers/staging/comedi/drivers/pcmuio.c | 34 +-
drivers/staging/comedi/drivers/quatech_daqp_cs.c | 38 +-
drivers/staging/comedi/drivers/rtd520.c | 77 +-
drivers/staging/comedi/drivers/rti800.c | 1 -
drivers/staging/comedi/drivers/rti802.c | 1 -
drivers/staging/comedi/drivers/s526.c | 1 -
drivers/staging/comedi/drivers/s626.c | 38 +-
drivers/staging/comedi/drivers/serial2002.c | 4 +-
drivers/staging/comedi/drivers/usbdux.c | 400 +-
drivers/staging/comedi/drivers/usbduxfast.c | 145 +-
drivers/staging/comedi/drivers/usbduxsigma.c | 350 +-
drivers/staging/comedi/drivers/vmk80xx.c | 8 +-
drivers/staging/comedi/range.c | 36 +-
drivers/staging/cptm1217/clearpad_tm1217.c | 2 +-
drivers/staging/dgap/dgap.c | 10566 +++++++++----------
drivers/staging/dgap/dgap.h | 3 -
drivers/staging/dgnc/dgnc_cls.c | 30 +-
drivers/staging/dgnc/dgnc_driver.c | 33 +-
drivers/staging/dgnc/dgnc_driver.h | 61 +-
drivers/staging/dgnc/dgnc_kcompat.h | 18 -
drivers/staging/dgnc/dgnc_neo.c | 30 +-
drivers/staging/dgnc/dgnc_sysfs.c | 37 -
drivers/staging/dgnc/dgnc_tty.c | 146 +-
drivers/staging/dgnc/dgnc_tty.h | 2 -
drivers/staging/emxx_udc/emxx_udc.c | 7 +-
drivers/staging/ft1000/ft1000-pcmcia/boot.h | 34 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 30 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 50 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 208 +-
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 934 +-
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 1204 ++-
.../staging/ft1000/ft1000-usb/ft1000_download.c | 400 +-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 436 +-
drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 60 +-
drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 97 +-
drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 4 +-
drivers/staging/fwserial/fwserial.c | 3 -
drivers/staging/gdm724x/gdm_lte.c | 10 +-
drivers/staging/gdm724x/gdm_mux.h | 8 +-
drivers/staging/gdm72xx/gdm_wimax.c | 6 +-
drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 57 +-
drivers/staging/iio/Documentation/generic_buffer.c | 81 +-
.../staging/iio/Documentation/iio_event_monitor.c | 32 +-
drivers/staging/iio/Documentation/iio_utils.h | 7 +
drivers/staging/iio/Documentation/lsiio.c | 20 +-
drivers/staging/iio/accel/Kconfig | 39 +-
drivers/staging/iio/accel/lis3l02dq_ring.c | 1 +
drivers/staging/iio/adc/ad7192.c | 3 +-
drivers/staging/iio/adc/ad7280a.c | 2 +-
drivers/staging/iio/adc/ad7606_spi.c | 2 +-
drivers/staging/iio/adc/ad7816.c | 3 +-
drivers/staging/iio/adc/lpc32xx_adc.c | 2 +-
drivers/staging/iio/adc/mxs-lradc.c | 6 +-
drivers/staging/iio/adc/spear_adc.c | 4 +-
drivers/staging/iio/addac/Kconfig | 9 +
drivers/staging/iio/addac/adt7316.h | 3 +-
drivers/staging/iio/gyro/Kconfig | 5 +-
drivers/staging/iio/light/tsl2x7x_core.c | 17 +-
drivers/staging/iio/meter/Kconfig | 15 +
drivers/staging/iio/trigger/Kconfig | 5 +-
.../staging/iio/trigger/iio-trig-periodic-rtc.c | 3 +-
.../lustre/include/linux/libcfs/libcfs_debug.h | 12 -
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 17 +-
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 34 +-
.../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 3 +-
.../staging/lustre/lnet/klnds/socklnd/socklnd.c | 60 +-
.../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 89 +-
.../lustre/lnet/klnds/socklnd/socklnd_proto.c | 15 +-
drivers/staging/lustre/lnet/lnet/api-ni.c | 18 +-
drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +-
drivers/staging/lustre/lnet/lnet/lib-move.c | 98 +-
drivers/staging/lustre/lnet/lnet/lib-ptl.c | 3 +-
drivers/staging/lustre/lnet/lnet/lo.c | 8 +-
drivers/staging/lustre/lnet/lnet/module.c | 10 +-
drivers/staging/lustre/lnet/lnet/router.c | 52 +-
drivers/staging/lustre/lnet/lnet/router_proc.c | 25 +-
drivers/staging/lustre/lnet/selftest/brw_test.c | 8 +-
drivers/staging/lustre/lnet/selftest/conctl.c | 34 +-
drivers/staging/lustre/lnet/selftest/conrpc.c | 20 +-
drivers/staging/lustre/lnet/selftest/console.c | 6 +-
drivers/staging/lustre/lnet/selftest/framework.c | 75 +-
drivers/staging/lustre/lnet/selftest/module.c | 19 +-
drivers/staging/lustre/lnet/selftest/ping_test.c | 2 +-
drivers/staging/lustre/lnet/selftest/rpc.c | 63 +-
drivers/staging/lustre/lnet/selftest/timer.c | 8 +-
drivers/staging/lustre/lustre/Kconfig | 2 +-
drivers/staging/lustre/lustre/include/dt_object.h | 4 +-
.../lustre/lustre/include/linux/lustre_compat25.h | 8 +-
drivers/staging/lustre/lustre/include/linux/obd.h | 3 +-
.../staging/lustre/lustre/include/lprocfs_status.h | 8 +-
drivers/staging/lustre/lustre/include/lu_object.h | 4 +-
.../staging/lustre/lustre/include/lustre_capa.h | 2 +-
.../staging/lustre/lustre/include/lustre_disk.h | 3 +-
drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 +-
.../staging/lustre/lustre/include/lustre_eacl.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_lib.h | 2 +-
drivers/staging/lustre/lustre/include/lustre_net.h | 7 +-
drivers/staging/lustre/lustre/include/obd_class.h | 2 +-
drivers/staging/lustre/lustre/ldlm/interval_tree.c | 5 +
drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +-
drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 10 +-
drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 8 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 7 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 219 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 28 +-
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 63 +-
drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 78 +-
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 45 +-
drivers/staging/lustre/lustre/libcfs/debug.c | 18 +-
drivers/staging/lustre/lustre/libcfs/fail.c | 24 +-
drivers/staging/lustre/lustre/libcfs/hash.c | 28 +-
drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 2 +-
.../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 32 +-
.../lustre/lustre/libcfs/linux/linux-debug.c | 6 +-
.../lustre/lustre/libcfs/linux/linux-proc.c | 2 +-
.../lustre/lustre/libcfs/linux/linux-tcpip.c | 3 +-
drivers/staging/lustre/lustre/libcfs/tracefile.c | 38 +-
drivers/staging/lustre/lustre/llite/dcache.c | 4 +-
drivers/staging/lustre/lustre/llite/dir.c | 96 +-
drivers/staging/lustre/lustre/llite/file.c | 25 +-
drivers/staging/lustre/lustre/llite/llite_capa.c | 3 +-
drivers/staging/lustre/lustre/llite/llite_close.c | 16 +-
.../staging/lustre/lustre/llite/llite_internal.h | 30 +-
drivers/staging/lustre/lustre/llite/llite_lib.c | 114 +-
drivers/staging/lustre/lustre/llite/llite_mmap.c | 9 +-
drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 7 +-
drivers/staging/lustre/lustre/llite/lloop.c | 8 +-
drivers/staging/lustre/lustre/llite/lproc_llite.c | 89 +-
drivers/staging/lustre/lustre/llite/namei.c | 12 +-
drivers/staging/lustre/lustre/llite/rw.c | 22 +-
drivers/staging/lustre/lustre/llite/rw26.c | 6 +-
drivers/staging/lustre/lustre/llite/statahead.c | 13 +-
drivers/staging/lustre/lustre/llite/super25.c | 2 +-
drivers/staging/lustre/lustre/llite/symlink.c | 4 +-
drivers/staging/lustre/lustre/llite/vvp_io.c | 7 +-
drivers/staging/lustre/lustre/llite/vvp_page.c | 3 +-
drivers/staging/lustre/lustre/llite/xattr.c | 6 +-
drivers/staging/lustre/lustre/llite/xattr_cache.c | 5 +-
drivers/staging/lustre/lustre/lmv/lmv_fld.c | 3 +-
drivers/staging/lustre/lustre/lmv/lmv_intent.c | 8 +-
drivers/staging/lustre/lustre/lmv/lmv_internal.h | 4 +-
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 41 +-
drivers/staging/lustre/lustre/lov/lov_ea.c | 5 +-
drivers/staging/lustre/lustre/lov/lov_obd.c | 35 +-
drivers/staging/lustre/lustre/lov/lov_pack.c | 3 +-
drivers/staging/lustre/lustre/mdc/mdc_lib.c | 4 +-
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 4 +-
drivers/staging/lustre/lustre/mgc/mgc_request.c | 14 +-
drivers/staging/lustre/lustre/obdclass/acl.c | 8 +-
drivers/staging/lustre/lustre/obdclass/capa.c | 14 +-
drivers/staging/lustre/lustre/obdclass/cl_io.c | 3 +-
drivers/staging/lustre/lustre/obdclass/cl_lock.c | 3 +-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 6 +-
drivers/staging/lustre/lustre/obdclass/debug.c | 12 +-
drivers/staging/lustre/lustre/obdclass/dt_object.c | 15 +-
drivers/staging/lustre/lustre/obdclass/genops.c | 28 +-
.../lustre/lustre/obdclass/linux/linux-module.c | 4 +-
.../lustre/lustre/obdclass/linux/linux-sysctl.c | 5 +-
drivers/staging/lustre/lustre/obdclass/llog.c | 4 +-
drivers/staging/lustre/lustre/obdclass/llog_cat.c | 10 +-
drivers/staging/lustre/lustre/obdclass/llog_obd.c | 2 +-
drivers/staging/lustre/lustre/obdclass/llog_swab.c | 3 +-
.../lustre/lustre/obdclass/lprocfs_status.c | 14 +-
drivers/staging/lustre/lustre/obdclass/lu_object.c | 3 +-
.../staging/lustre/lustre/obdclass/obd_config.c | 11 +-
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 38 +-
.../staging/lustre/lustre/obdecho/echo_client.c | 140 +-
drivers/staging/lustre/lustre/osc/osc_cache.c | 176 +-
.../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +-
drivers/staging/lustre/lustre/osc/osc_lock.c | 6 +-
drivers/staging/lustre/lustre/osc/osc_object.c | 3 +-
drivers/staging/lustre/lustre/osc/osc_page.c | 11 +-
drivers/staging/lustre/lustre/osc/osc_request.c | 51 +-
drivers/staging/lustre/lustre/ptlrpc/client.c | 48 +-
drivers/staging/lustre/lustre/ptlrpc/events.c | 7 +-
drivers/staging/lustre/lustre/ptlrpc/import.c | 115 +-
drivers/staging/lustre/lustre/ptlrpc/layout.c | 35 +-
drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 3 +-
.../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 18 +-
drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 7 +-
drivers/staging/lustre/lustre/ptlrpc/nrs.c | 33 +-
.../staging/lustre/lustre/ptlrpc/pack_generic.c | 59 +-
drivers/staging/lustre/lustre/ptlrpc/pinger.c | 22 +-
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 7 +-
drivers/staging/lustre/lustre/ptlrpc/recover.c | 7 +-
drivers/staging/lustre/lustre/ptlrpc/sec.c | 27 +-
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 3 +-
drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 18 -
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 4 +-
drivers/staging/lustre/lustre/ptlrpc/service.c | 90 +-
drivers/staging/media/cxd2099/cxd2099.c | 2 +-
drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 4 +-
.../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 62 +-
.../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 58 +-
drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 4 +-
drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 2 +-
drivers/staging/media/davinci_vpfe/dm365_isif.c | 11 +-
drivers/staging/media/davinci_vpfe/dm365_isif.h | 6 +-
drivers/staging/media/davinci_vpfe/dm365_resizer.c | 8 +-
drivers/staging/media/davinci_vpfe/dm365_resizer.h | 2 +-
drivers/staging/media/lirc/lirc_bt829.c | 14 +-
drivers/staging/media/lirc/lirc_imon.c | 30 +-
drivers/staging/media/lirc/lirc_sasem.c | 5 +-
drivers/staging/media/lirc/lirc_sir.c | 18 +-
drivers/staging/media/lirc/lirc_zilog.c | 137 +-
drivers/staging/media/omap4iss/iss.c | 4 +-
drivers/staging/media/omap4iss/iss_csi2.c | 2 +-
drivers/staging/octeon-usb/octeon-hcd.c | 69 +-
drivers/staging/octeon/ethernet-rx.c | 107 +-
drivers/staging/octeon/ethernet-tx.c | 11 +
drivers/staging/octeon/ethernet.c | 8 +-
drivers/staging/octeon/octeon-ethernet.h | 1 -
drivers/staging/olpc_dcon/olpc_dcon.c | 3 +-
drivers/staging/ozwpan/ozhcd.c | 22 +-
drivers/staging/ozwpan/ozusbsvc1.c | 12 +-
drivers/staging/panel/TODO | 1 -
drivers/staging/panel/panel.c | 152 +-
drivers/staging/rtl8188eu/core/rtw_ap.c | 17 +-
drivers/staging/rtl8188eu/core/rtw_cmd.c | 9 +-
drivers/staging/rtl8188eu/core/rtw_debug.c | 14 +-
drivers/staging/rtl8188eu/core/rtw_efuse.c | 47 +-
drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 16 +-
drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 1 -
drivers/staging/rtl8188eu/core/rtw_led.c | 12 +-
drivers/staging/rtl8188eu/core/rtw_mlme.c | 10 +-
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 34 +-
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 7 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 20 +-
drivers/staging/rtl8188eu/core/rtw_security.c | 24 +-
drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +-
drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 1 -
drivers/staging/rtl8188eu/core/rtw_xmit.c | 14 +-
drivers/staging/rtl8188eu/hal/bb_cfg.c | 4 +-
drivers/staging/rtl8188eu/hal/fw.c | 8 +-
drivers/staging/rtl8188eu/hal/mac_cfg.c | 2 +-
drivers/staging/rtl8188eu/hal/odm.c | 8 +-
drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 2 +-
drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 2 +-
drivers/staging/rtl8188eu/hal/phy.c | 2 +-
drivers/staging/rtl8188eu/hal/rf.c | 2 +-
drivers/staging/rtl8188eu/hal/rf_cfg.c | 4 +-
drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 6 +-
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 30 +-
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 2 +-
drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 2 +-
drivers/staging/rtl8188eu/hal/usb_halinit.c | 4 +-
drivers/staging/rtl8188eu/include/ieee80211_ext.h | 20 +-
drivers/staging/rtl8188eu/include/odm_debug.h | 31 +-
drivers/staging/rtl8188eu/include/osdep_service.h | 4 +-
drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +-
drivers/staging/rtl8188eu/include/rtw_led.h | 8 +-
drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 26 +-
drivers/staging/rtl8188eu/include/wifi.h | 36 +-
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 31 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 11 +-
drivers/staging/rtl8188eu/os_dep/osdep_service.c | 2 +-
drivers/staging/rtl8188eu/os_dep/rtw_android.c | 41 +-
drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 -
drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 8 +-
drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 10 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 +-
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 -
drivers/staging/rtl8192e/rtl819x_BAProc.c | 23 +-
drivers/staging/rtl8192e/rtllib.h | 6 +-
drivers/staging/rtl8192e/rtllib_rx.c | 4 -
drivers/staging/rtl8192e/rtllib_softmac.c | 12 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 22 +-
.../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 26 +-
.../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 2 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 3 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +-
.../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 20 +-
.../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 11 +-
drivers/staging/rtl8192u/r8192U_core.c | 22 +-
drivers/staging/rtl8192u/r8192U_dm.c | 91 -
drivers/staging/rtl8192u/r8192U_wx.c | 6 -
drivers/staging/rtl8192u/r819xU_firmware.c | 20 +-
drivers/staging/rtl8192u/r819xU_firmware.h | 8 +-
drivers/staging/rtl8192u/r819xU_phy.c | 1 +
drivers/staging/rtl8712/hal_init.c | 11 +-
drivers/staging/rtl8712/ieee80211.c | 17 +-
drivers/staging/rtl8712/osdep_service.h | 8 +-
drivers/staging/rtl8712/recv_linux.c | 2 +-
drivers/staging/rtl8712/rtl8712_cmd.c | 13 +-
drivers/staging/rtl8712/rtl8712_efuse.c | 43 +-
drivers/staging/rtl8712/rtl8712_recv.c | 15 +-
drivers/staging/rtl8712/rtl871x_cmd.c | 58 +-
drivers/staging/rtl8712/rtl871x_io.c | 6 +-
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 23 +-
drivers/staging/rtl8712/rtl871x_ioctl_set.c | 24 +-
drivers/staging/rtl8712/rtl871x_mlme.c | 27 +-
drivers/staging/rtl8712/rtl871x_mp.c | 4 +-
drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 3 -
drivers/staging/rtl8712/rtl871x_pwrctrl.c | 4 +-
drivers/staging/rtl8712/rtl871x_recv.c | 19 +-
drivers/staging/rtl8712/rtl871x_recv.h | 3 -
drivers/staging/rtl8712/rtl871x_security.c | 10 +-
drivers/staging/rtl8712/rtl871x_sta_mgt.c | 11 +-
drivers/staging/rtl8712/rtl871x_xmit.c | 15 +-
drivers/staging/rtl8712/usb_intf.c | 16 +-
drivers/staging/rtl8712/usb_ops_linux.c | 9 +-
drivers/staging/rtl8712/xmit_linux.c | 4 +-
drivers/staging/rtl8723au/Makefile | 2 -
drivers/staging/rtl8723au/core/rtw_ap.c | 159 +-
drivers/staging/rtl8723au/core/rtw_cmd.c | 181 +-
drivers/staging/rtl8723au/core/rtw_efuse.c | 23 +-
drivers/staging/rtl8723au/core/rtw_ieee80211.c | 4 +-
drivers/staging/rtl8723au/core/rtw_led.c | 1893 ----
drivers/staging/rtl8723au/core/rtw_mlme.c | 72 +-
drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 67 +-
drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 8 +-
drivers/staging/rtl8723au/core/rtw_recv.c | 63 +-
drivers/staging/rtl8723au/core/rtw_security.c | 98 +-
drivers/staging/rtl8723au/core/rtw_sreset.c | 2 +-
drivers/staging/rtl8723au/core/rtw_wlan_util.c | 15 +-
drivers/staging/rtl8723au/core/rtw_xmit.c | 75 +-
.../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 2 +-
drivers/staging/rtl8723au/hal/hal_com.c | 4 +-
.../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 38 +-
drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 7 +-
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 348 +-
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 3 +-
drivers/staging/rtl8723au/hal/rtl8723au_led.c | 124 -
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 19 +-
drivers/staging/rtl8723au/hal/usb_halinit.c | 25 +-
.../staging/rtl8723au/include/Hal8723UHWImg_CE.h | 2 +-
drivers/staging/rtl8723au/include/drv_types.h | 2 -
drivers/staging/rtl8723au/include/odm_debug.h | 30 +-
drivers/staging/rtl8723au/include/rtl8723a_dm.h | 3 +-
drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 -
drivers/staging/rtl8723au/include/rtl8723a_led.h | 30 -
drivers/staging/rtl8723au/include/rtl8723a_recv.h | 3 +-
drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 1 -
drivers/staging/rtl8723au/include/rtw_cmd.h | 4 +-
drivers/staging/rtl8723au/include/rtw_ht.h | 3 +-
drivers/staging/rtl8723au/include/rtw_led.h | 181 -
drivers/staging/rtl8723au/include/rtw_mlme.h | 2 +-
drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 6 +-
drivers/staging/rtl8723au/include/rtw_xmit.h | 16 +-
drivers/staging/rtl8723au/include/wlan_bssdef.h | 21 +-
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 20 +-
drivers/staging/rtl8723au/os_dep/os_intfs.c | 19 +-
drivers/staging/rtl8723au/os_dep/usb_intf.c | 29 +-
drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 23 -
drivers/staging/rts5208/ms.c | 4 +-
drivers/staging/rts5208/rtsx.c | 4 +-
drivers/staging/rts5208/rtsx_chip.c | 459 +-
drivers/staging/rts5208/rtsx_scsi.c | 3 +-
drivers/staging/rts5208/rtsx_transport.c | 8 +-
drivers/staging/rts5208/rtsx_transport.h | 2 +-
drivers/staging/skein/Kconfig | 24 +-
drivers/staging/skein/Makefile | 13 +-
drivers/staging/skein/skein_api.c | 2 +-
drivers/staging/skein/skein_api.h | 2 +-
drivers/staging/skein/{skein.c => skein_base.c} | 23 +-
drivers/staging/skein/{skein.h => skein_base.h} | 39 +-
drivers/staging/skein/skein_block.c | 932 +-
drivers/staging/skein/skein_block.h | 2 +-
drivers/staging/skein/skein_generic.c | 216 +
drivers/staging/skein/skein_iv.h | 2 +-
drivers/staging/skein/threefish_api.h | 2 +-
drivers/staging/slicoss/slicoss.c | 7 +-
drivers/staging/speakup/kobjects.c | 6 +-
drivers/staging/speakup/main.c | 2 +-
drivers/staging/speakup/speakup_dtlk.c | 2 +-
drivers/staging/speakup/speakup_keypc.c | 2 +-
drivers/staging/unisys/channels/channel.c | 114 +-
drivers/staging/unisys/channels/chanstub.c | 8 +-
drivers/staging/unisys/channels/chanstub.h | 8 +-
.../unisys/common-spar/include/channels/channel.h | 505 +-
.../common-spar/include/channels/channel_guid.h | 27 +-
.../include/channels/controlframework.h | 47 +-
.../include/channels/controlvmchannel.h | 623 +-
.../common-spar/include/channels/diagchannel.h | 168 +-
.../common-spar/include/channels/iochannel.h | 292 +-
.../common-spar/include/channels/vbuschannel.h | 80 +-
.../unisys/common-spar/include/vbusdeviceinfo.h | 37 +-
.../unisys/common-spar/include/vmcallinterface.h | 47 +-
drivers/staging/unisys/include/timskmod.h | 16 +-
drivers/staging/unisys/include/uisqueue.h | 75 +-
drivers/staging/unisys/include/uisutils.h | 162 +-
drivers/staging/unisys/include/vbushelper.h | 16 +-
drivers/staging/unisys/uislib/uislib.c | 521 +-
drivers/staging/unisys/uislib/uisqueue.c | 8 +-
drivers/staging/unisys/uislib/uisutils.c | 107 +-
drivers/staging/unisys/virthba/virthba.c | 104 +-
drivers/staging/unisys/virthba/virthba.h | 4 -
drivers/staging/unisys/virtpci/virtpci.c | 332 +-
drivers/staging/unisys/virtpci/virtpci.h | 20 +-
drivers/staging/unisys/visorchannel/globals.h | 1 -
drivers/staging/unisys/visorchannel/visorchannel.h | 2 +-
.../unisys/visorchannel/visorchannel_funcs.c | 301 +-
drivers/staging/unisys/visorchipset/file.c | 6 +-
drivers/staging/unisys/visorchipset/parser.c | 52 +-
drivers/staging/unisys/visorchipset/testing.h | 5 +-
drivers/staging/unisys/visorchipset/visorchipset.h | 275 +-
.../unisys/visorchipset/visorchipset_main.c | 703 +-
drivers/staging/unisys/visorutil/charqueue.c | 40 +-
drivers/staging/unisys/visorutil/charqueue.h | 17 +-
drivers/staging/unisys/visorutil/easyproc.c | 6 +-
drivers/staging/unisys/visorutil/memregion.h | 28 +-
.../staging/unisys/visorutil/memregion_direct.c | 64 +-
drivers/staging/unisys/visorutil/periodic_work.c | 19 +-
drivers/staging/unisys/visorutil/procobjecttree.c | 15 +-
drivers/staging/unisys/visorutil/visorkmodutils.c | 26 +-
drivers/staging/vme/devices/Kconfig | 3 +
drivers/staging/vme/devices/vme_pio2_gpio.c | 4 +-
drivers/staging/vt6655/80211hdr.h | 318 -
drivers/staging/vt6655/80211mgr.c | 1019 --
drivers/staging/vt6655/80211mgr.h | 725 --
drivers/staging/vt6655/IEEE11h.c | 141 -
drivers/staging/vt6655/IEEE11h.h | 42 -
drivers/staging/vt6655/Kconfig | 4 +-
drivers/staging/vt6655/Makefile | 23 +-
drivers/staging/vt6655/aes_ccmp.c | 374 -
drivers/staging/vt6655/aes_ccmp.h | 37 -
drivers/staging/vt6655/baseband.c | 777 +-
drivers/staging/vt6655/baseband.h | 39 +-
drivers/staging/vt6655/bssdb.c | 1512 ---
drivers/staging/vt6655/bssdb.h | 326 -
drivers/staging/vt6655/card.c | 1259 +--
drivers/staging/vt6655/card.h | 120 +-
drivers/staging/vt6655/channel.c | 844 +-
drivers/staging/vt6655/channel.h | 22 +-
drivers/staging/vt6655/country.h | 161 -
drivers/staging/vt6655/datarate.c | 410 -
drivers/staging/vt6655/datarate.h | 78 -
drivers/staging/vt6655/desc.h | 134 +-
drivers/staging/vt6655/device.h | 476 +-
drivers/staging/vt6655/device_cfg.h | 2 -
drivers/staging/vt6655/device_main.c | 2635 ++---
drivers/staging/vt6655/dpc.c | 1312 +--
drivers/staging/vt6655/dpc.h | 10 +-
drivers/staging/vt6655/hostap.c | 765 --
drivers/staging/vt6655/hostap.h | 58 -
drivers/staging/vt6655/iocmd.h | 408 -
drivers/staging/vt6655/ioctl.c | 658 --
drivers/staging/vt6655/ioctl.h | 36 -
drivers/staging/vt6655/iowpa.h | 130 -
drivers/staging/vt6655/iwctl.c | 1937 ----
drivers/staging/vt6655/iwctl.h | 206 -
drivers/staging/vt6655/key.c | 838 +-
drivers/staging/vt6655/key.h | 131 +-
drivers/staging/vt6655/mac.c | 714 --
drivers/staging/vt6655/mac.h | 40 -
drivers/staging/vt6655/mib.c | 423 -
drivers/staging/vt6655/mib.h | 261 -
drivers/staging/vt6655/michael.c | 148 -
drivers/staging/vt6655/michael.h | 52 -
drivers/staging/vt6655/power.c | 208 +-
drivers/staging/vt6655/power.h | 16 -
drivers/staging/vt6655/rc4.c | 88 -
drivers/staging/vt6655/rc4.h | 47 -
drivers/staging/vt6655/rf.c | 381 +-
drivers/staging/vt6655/rf.h | 9 +-
drivers/staging/vt6655/rxtx.c | 2110 +---
drivers/staging/vt6655/rxtx.h | 52 +-
drivers/staging/vt6655/srom.c | 1 -
drivers/staging/vt6655/srom.h | 2 -
drivers/staging/vt6655/tcrc.c | 191 -
drivers/staging/vt6655/tcrc.h | 50 -
drivers/staging/vt6655/tether.c | 105 -
drivers/staging/vt6655/tether.h | 192 -
drivers/staging/vt6655/tkip.c | 268 -
drivers/staging/vt6655/tkip.h | 57 -
drivers/staging/vt6655/tmacro.h | 2 -
drivers/staging/vt6655/ttype.h | 42 -
drivers/staging/vt6655/upc.h | 1 -
drivers/staging/vt6655/vntconfiguration.dat | 1 -
drivers/staging/vt6655/vntwifi.c | 700 --
drivers/staging/vt6655/vntwifi.h | 273 -
drivers/staging/vt6655/wcmd.c | 1023 --
drivers/staging/vt6655/wcmd.h | 123 -
drivers/staging/vt6655/wctl.c | 233 -
drivers/staging/vt6655/wctl.h | 105 -
drivers/staging/vt6655/wmgr.c | 4602 --------
drivers/staging/vt6655/wmgr.h | 420 -
drivers/staging/vt6655/wpa.c | 300 -
drivers/staging/vt6655/wpa.h | 83 -
drivers/staging/vt6655/wpa2.c | 359 -
drivers/staging/vt6655/wpa2.h | 77 -
drivers/staging/vt6655/wpactl.c | 896 --
drivers/staging/vt6655/wpactl.h | 64 -
drivers/staging/vt6655/wroute.c | 187 -
drivers/staging/vt6655/wroute.h | 45 -
drivers/staging/vt6656/main_usb.c | 10 +-
drivers/staging/wlan-ng/hfa384x.h | 3 +
drivers/staging/wlan-ng/hfa384x_usb.c | 6 +-
drivers/staging/wlan-ng/p80211conv.c | 2 +-
drivers/staging/wlan-ng/p80211hdr.h | 2 +-
drivers/staging/wlan-ng/p80211netdev.c | 4 +-
drivers/staging/wlan-ng/prism2fw.c | 9 +-
drivers/staging/xgifb/XGI_main_26.c | 2 +-
drivers/staging/xgifb/vb_def.h | 1 -
drivers/staging/xgifb/vb_setmode.c | 2 +-
drivers/staging/xgifb/vb_util.c | 5 +-
include/linux/iio/common/st_sensors.h | 10 +-
include/linux/iio/iio.h | 8 +
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/android/Kbuild | 2 +
.../uapi => include/uapi/linux/android}/binder.h | 1 +
737 files changed, 21307 insertions(+), 82751 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-iadc.txt
create mode 100644 drivers/android/Kconfig
create mode 100644 drivers/android/Makefile
rename drivers/{staging => }/android/binder.c (99%)
rename drivers/{staging => }/android/binder_trace.h (100%)
create mode 100644 drivers/iio/adc/qcom-spmi-iadc.c
create mode 100644 drivers/iio/humidity/si7020.c
create mode 100644 drivers/iio/pressure/bmp280.c
delete mode 100644 drivers/staging/android/binder.h
delete mode 100644 drivers/staging/bcm/Adapter.h
delete mode 100644 drivers/staging/bcm/Bcmchar.c
delete mode 100644 drivers/staging/bcm/Bcmnet.c
delete mode 100644 drivers/staging/bcm/CmHost.c
delete mode 100644 drivers/staging/bcm/CmHost.h
delete mode 100644 drivers/staging/bcm/DDRInit.c
delete mode 100644 drivers/staging/bcm/DDRInit.h
delete mode 100644 drivers/staging/bcm/Debug.h
delete mode 100644 drivers/staging/bcm/HandleControlPacket.c
delete mode 100644 drivers/staging/bcm/HostMIBSInterface.h
delete mode 100644 drivers/staging/bcm/IPv6Protocol.c
delete mode 100644 drivers/staging/bcm/IPv6ProtocolHdr.h
delete mode 100644 drivers/staging/bcm/InterfaceAdapter.h
delete mode 100644 drivers/staging/bcm/InterfaceDld.c
delete mode 100644 drivers/staging/bcm/InterfaceIdleMode.c
delete mode 100644 drivers/staging/bcm/InterfaceIdleMode.h
delete mode 100644 drivers/staging/bcm/InterfaceInit.c
delete mode 100644 drivers/staging/bcm/InterfaceInit.h
delete mode 100644 drivers/staging/bcm/InterfaceIsr.c
delete mode 100644 drivers/staging/bcm/InterfaceIsr.h
delete mode 100644 drivers/staging/bcm/InterfaceMacros.h
delete mode 100644 drivers/staging/bcm/InterfaceMisc.c
delete mode 100644 drivers/staging/bcm/InterfaceMisc.h
delete mode 100644 drivers/staging/bcm/InterfaceRx.c
delete mode 100644 drivers/staging/bcm/InterfaceRx.h
delete mode 100644 drivers/staging/bcm/InterfaceTx.c
delete mode 100644 drivers/staging/bcm/InterfaceTx.h
delete mode 100644 drivers/staging/bcm/Ioctl.h
delete mode 100644 drivers/staging/bcm/Kconfig
delete mode 100644 drivers/staging/bcm/LeakyBucket.c
delete mode 100644 drivers/staging/bcm/Macros.h
delete mode 100644 drivers/staging/bcm/Makefile
delete mode 100644 drivers/staging/bcm/Misc.c
delete mode 100644 drivers/staging/bcm/PHSDefines.h
delete mode 100644 drivers/staging/bcm/PHSModule.c
delete mode 100644 drivers/staging/bcm/PHSModule.h
delete mode 100644 drivers/staging/bcm/Protocol.h
delete mode 100644 drivers/staging/bcm/Prototypes.h
delete mode 100644 drivers/staging/bcm/Qos.c
delete mode 100644 drivers/staging/bcm/Queue.h
delete mode 100644 drivers/staging/bcm/TODO
delete mode 100644 drivers/staging/bcm/Transmit.c
delete mode 100644 drivers/staging/bcm/Typedefs.h
delete mode 100644 drivers/staging/bcm/cntrl_SignalingInterface.h
delete mode 100644 drivers/staging/bcm/headers.h
delete mode 100644 drivers/staging/bcm/hostmibs.c
delete mode 100644 drivers/staging/bcm/led_control.c
delete mode 100644 drivers/staging/bcm/led_control.h
delete mode 100644 drivers/staging/bcm/nvm.c
delete mode 100644 drivers/staging/bcm/nvm.h
delete mode 100644 drivers/staging/bcm/sort.c
delete mode 100644 drivers/staging/bcm/target_params.h
delete mode 100644 drivers/staging/bcm/vendorspecificextn.c
delete mode 100644 drivers/staging/bcm/vendorspecificextn.h
create mode 100644 drivers/staging/clocking-wizard/Kconfig
create mode 100644 drivers/staging/clocking-wizard/Makefile
create mode 100644 drivers/staging/clocking-wizard/TODO
create mode 100644 drivers/staging/clocking-wizard/clk-xlnx-clock-wizard.c
create mode 100644 drivers/staging/clocking-wizard/dt-binding.txt
delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.c
delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_common.h
delete mode 100644 drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3120.c
delete mode 100644 drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
delete mode 100644 drivers/staging/comedi/drivers/addi_apci_035.c
delete mode 100644 drivers/staging/comedi/drivers/addi_apci_3200.c
create mode 100644 drivers/staging/comedi/drivers/addi_tcw.h
delete mode 100644 drivers/staging/rtl8723au/core/rtw_led.c
delete mode 100644 drivers/staging/rtl8723au/hal/rtl8723au_led.c
delete mode 100644 drivers/staging/rtl8723au/include/rtl8723a_led.h
delete mode 100644 drivers/staging/rtl8723au/include/rtw_led.h
rename drivers/staging/skein/{skein.c => skein_base.c} (97%)
rename drivers/staging/skein/{skein.h => skein_base.h} (92%)
create mode 100644 drivers/staging/skein/skein_generic.c
delete mode 100644 drivers/staging/vt6655/80211hdr.h
delete mode 100644 drivers/staging/vt6655/80211mgr.c
delete mode 100644 drivers/staging/vt6655/80211mgr.h
delete mode 100644 drivers/staging/vt6655/IEEE11h.c
delete mode 100644 drivers/staging/vt6655/IEEE11h.h
delete mode 100644 drivers/staging/vt6655/aes_ccmp.c
delete mode 100644 drivers/staging/vt6655/aes_ccmp.h
delete mode 100644 drivers/staging/vt6655/bssdb.c
delete mode 100644 drivers/staging/vt6655/bssdb.h
delete mode 100644 drivers/staging/vt6655/country.h
delete mode 100644 drivers/staging/vt6655/datarate.c
delete mode 100644 drivers/staging/vt6655/datarate.h
delete mode 100644 drivers/staging/vt6655/hostap.c
delete mode 100644 drivers/staging/vt6655/hostap.h
delete mode 100644 drivers/staging/vt6655/iocmd.h
delete mode 100644 drivers/staging/vt6655/ioctl.c
delete mode 100644 drivers/staging/vt6655/ioctl.h
delete mode 100644 drivers/staging/vt6655/iowpa.h
delete mode 100644 drivers/staging/vt6655/iwctl.c
delete mode 100644 drivers/staging/vt6655/iwctl.h
delete mode 100644 drivers/staging/vt6655/michael.c
delete mode 100644 drivers/staging/vt6655/michael.h
delete mode 100644 drivers/staging/vt6655/rc4.c
delete mode 100644 drivers/staging/vt6655/rc4.h
delete mode 100644 drivers/staging/vt6655/tcrc.c
delete mode 100644 drivers/staging/vt6655/tcrc.h
delete mode 100644 drivers/staging/vt6655/tether.c
delete mode 100644 drivers/staging/vt6655/tether.h
delete mode 100644 drivers/staging/vt6655/tkip.c
delete mode 100644 drivers/staging/vt6655/tkip.h
delete mode 100644 drivers/staging/vt6655/ttype.h
delete mode 100644 drivers/staging/vt6655/vntconfiguration.dat
delete mode 100644 drivers/staging/vt6655/vntwifi.c
delete mode 100644 drivers/staging/vt6655/vntwifi.h
delete mode 100644 drivers/staging/vt6655/wcmd.c
delete mode 100644 drivers/staging/vt6655/wcmd.h
delete mode 100644 drivers/staging/vt6655/wctl.c
delete mode 100644 drivers/staging/vt6655/wctl.h
delete mode 100644 drivers/staging/vt6655/wmgr.c
delete mode 100644 drivers/staging/vt6655/wmgr.h
delete mode 100644 drivers/staging/vt6655/wpa.c
delete mode 100644 drivers/staging/vt6655/wpa.h
delete mode 100644 drivers/staging/vt6655/wpa2.c
delete mode 100644 drivers/staging/vt6655/wpa2.h
delete mode 100644 drivers/staging/vt6655/wpactl.c
delete mode 100644 drivers/staging/vt6655/wpactl.h
delete mode 100644 drivers/staging/vt6655/wroute.c
delete mode 100644 drivers/staging/vt6655/wroute.h
create mode 100644 include/uapi/linux/android/Kbuild
rename {drivers/staging/android/uapi => include/uapi/linux/android}/binder.h (99%)
Merging char-misc/char-misc-next (91905b6f4afe parport: parport_pc, do not remove parent devices early)
$ git merge char-misc/char-misc-next
Recorded preimage for 'drivers/misc/cxl/irq.c'
Resolved 'arch/arm/mach-omap2/Kconfig' using previous resolution.
Resolved 'drivers/Makefile' using previous resolution.
Removing scripts/checkkconfigsymbols.sh
Auto-merging include/linux/amba/bus.h
Auto-merging drivers/parport/parport_pc.c
Removing drivers/misc/fuse/Makefile
Auto-merging drivers/misc/cxl/irq.c
CONFLICT (content): Merge conflict in drivers/misc/cxl/irq.c
Auto-merging drivers/misc/carma/carma-fpga.c
Auto-merging drivers/misc/carma/carma-fpga-program.c
Auto-merging drivers/misc/atmel-ssc.c
Auto-merging drivers/extcon/extcon-max77693.c
Auto-merging drivers/extcon/extcon-max14577.c
Auto-merging drivers/amba/bus.c
Auto-merging drivers/Makefile
CONFLICT (content): Merge conflict in drivers/Makefile
Removing arch/arm/mach-omap2/emu.c
Auto-merging arch/arm/mach-omap2/Makefile
Auto-merging arch/arm/mach-omap2/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Kconfig
CONFLICT (modify/delete): arch/arm/kernel/etm.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of arch/arm/kernel/etm.c left in tree.
Auto-merging arch/arm/kernel/Makefile
Removing arch/arm/include/asm/hardware/coresight.h
Auto-merging arch/arm/Kconfig.debug
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f arch/arm/kernel/etm.c
arch/arm/kernel/etm.c: needs merge
rm 'arch/arm/kernel/etm.c'
$ git commit -v -a
Recorded resolution for 'drivers/misc/cxl/irq.c'.
[master dd3ce123146b] Merge remote-tracking branch 'char-misc/char-misc-next'
$ git diff -M --stat --summary HEAD^..
.../ABI/testing/sysfs-bus-coresight-devices-etb10 | 24 +
.../ABI/testing/sysfs-bus-coresight-devices-etm3x | 253 +++
.../ABI/testing/sysfs-bus-coresight-devices-funnel | 12 +
.../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 +
Documentation/DocBook/uio-howto.tmpl | 2 +-
.../devicetree/bindings/arm/coresight.txt | 204 +++
Documentation/trace/coresight.txt | 299 +++
MAINTAINERS | 9 +
arch/arm/Kconfig.debug | 63 +-
arch/arm/boot/dts/hip04.dtsi | 717 ++++++++
arch/arm/boot/dts/omap3-beagle-xm.dts | 28 +
arch/arm/boot/dts/omap3-beagle.dts | 28 +
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 199 ++
arch/arm/include/asm/hardware/coresight.h | 157 --
arch/arm/include/asm/hardware/cp14.h | 542 ++++++
arch/arm/kernel/Makefile | 1 -
arch/arm/kernel/etm.c | 654 -------
arch/arm/kernel/hw_breakpoint.c | 4 +-
arch/arm/mach-omap2/Kconfig | 8 -
arch/arm/mach-omap2/Makefile | 1 -
arch/arm/mach-omap2/emu.c | 50 -
drivers/Makefile | 1 +
drivers/amba/bus.c | 2 +-
drivers/char/hangcheck-timer.c | 4 +-
drivers/char/i8k.c | 26 +-
drivers/connector/connector.c | 6 +
drivers/coresight/Makefile | 11 +
drivers/coresight/coresight-etb10.c | 537 ++++++
drivers/coresight/coresight-etm-cp14.c | 591 ++++++
drivers/coresight/coresight-etm.h | 251 +++
drivers/coresight/coresight-etm3x.c | 1928 ++++++++++++++++++++
drivers/coresight/coresight-funnel.c | 268 +++
drivers/coresight/coresight-priv.h | 63 +
drivers/coresight/coresight-replicator.c | 137 ++
drivers/coresight/coresight-tmc.c | 776 ++++++++
drivers/coresight/coresight-tpiu.c | 217 +++
drivers/coresight/coresight.c | 717 ++++++++
drivers/coresight/of_coresight.c | 204 +++
drivers/extcon/extcon-class.c | 14 +-
drivers/extcon/extcon-max14577.c | 2 +-
drivers/extcon/extcon-max77693.c | 12 +-
drivers/hv/channel_mgmt.c | 11 +-
drivers/hv/hv_balloon.c | 10 +-
drivers/hv/hv_kvp.c | 9 +-
drivers/hv/hv_snapshot.c | 28 +-
drivers/misc/atmel-ssc.c | 4 +-
drivers/misc/carma/Kconfig | 6 +-
drivers/misc/carma/carma-fpga-program.c | 104 +-
drivers/misc/carma/carma-fpga.c | 98 +-
drivers/misc/fuse/Makefile | 1 -
drivers/misc/genwqe/card_utils.c | 2 +
drivers/misc/mei/amthif.c | 34 +-
drivers/misc/mei/bus.c | 4 +-
drivers/misc/mei/client.c | 2 +-
drivers/misc/mei/debugfs.c | 8 +-
drivers/misc/mei/hbm.c | 23 +-
drivers/misc/mei/hbm.h | 4 +-
drivers/misc/mei/hw-me-regs.h | 12 +-
drivers/misc/mei/hw-me.c | 49 +-
drivers/misc/mei/hw-me.h | 10 +-
drivers/misc/mei/hw-txe.c | 7 +-
drivers/misc/mei/init.c | 38 +-
drivers/misc/mei/interrupt.c | 12 +-
drivers/misc/mei/main.c | 43 +-
drivers/misc/mei/mei_dev.h | 39 +-
drivers/misc/mei/nfc.c | 52 +-
drivers/misc/mei/pci-me.c | 12 +-
drivers/misc/mei/pci-txe.c | 1 +
drivers/misc/mei/wd.c | 9 +-
drivers/misc/pch_phub.c | 2 +
drivers/parport/parport_pc.c | 7 +-
drivers/pcmcia/sa1111_badge4.c | 2 +-
drivers/pcmcia/sa1111_generic.c | 4 +-
drivers/pcmcia/sa1111_generic.h | 4 +-
drivers/pcmcia/sa1111_jornada720.c | 3 +-
drivers/uio/uio.c | 4 +-
drivers/w1/masters/ds2490.c | 2 +-
drivers/w1/slaves/w1_bq27000.c | 4 +-
drivers/w1/w1.c | 2 +-
drivers/w1/w1_family.h | 1 +
drivers/w1/w1_netlink.c | 2 +-
include/linux/amba/bus.h | 1 +
include/linux/coresight.h | 263 +++
include/linux/io.h | 4 +-
include/linux/spmi.h | 3 -
include/linux/uio_driver.h | 2 +-
include/uapi/linux/hyperv.h | 1 +
lib/devres.c | 4 +-
scripts/checkkconfigsymbols.py | 139 ++
scripts/checkkconfigsymbols.sh | 59 -
tools/hv/hv_fcopy_daemon.c | 33 +-
tools/hv/hv_kvp_daemon.c | 48 +-
tools/hv/hv_vss_daemon.c | 95 +-
93 files changed, 9174 insertions(+), 1177 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-etb10
create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-etm3x
create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-funnel
create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-tmc
create mode 100644 Documentation/devicetree/bindings/arm/coresight.txt
create mode 100644 Documentation/trace/coresight.txt
delete mode 100644 arch/arm/include/asm/hardware/coresight.h
create mode 100644 arch/arm/include/asm/hardware/cp14.h
delete mode 100644 arch/arm/kernel/etm.c
delete mode 100644 arch/arm/mach-omap2/emu.c
create mode 100644 drivers/coresight/Makefile
create mode 100644 drivers/coresight/coresight-etb10.c
create mode 100644 drivers/coresight/coresight-etm-cp14.c
create mode 100644 drivers/coresight/coresight-etm.h
create mode 100644 drivers/coresight/coresight-etm3x.c
create mode 100644 drivers/coresight/coresight-funnel.c
create mode 100644 drivers/coresight/coresight-priv.h
create mode 100644 drivers/coresight/coresight-replicator.c
create mode 100644 drivers/coresight/coresight-tmc.c
create mode 100644 drivers/coresight/coresight-tpiu.c
create mode 100644 drivers/coresight/coresight.c
create mode 100644 drivers/coresight/of_coresight.c
delete mode 100644 drivers/misc/fuse/Makefile
create mode 100644 include/linux/coresight.h
create mode 100644 scripts/checkkconfigsymbols.py
delete mode 100755 scripts/checkkconfigsymbols.sh
Merging cgroup/for-next (eeecbd197151 cgroup: implement cgroup_get_e_css())
$ git merge cgroup/for-next
Auto-merging mm/page_alloc.c
Auto-merging mm/hugetlb.c
Auto-merging kernel/cpuset.c
Auto-merging include/linux/cgroup.h
Merge made by the 'recursive' strategy.
include/linux/cgroup.h | 4 ++
include/linux/cpuset.h | 37 ++---------
kernel/cgroup.c | 175 ++++++++++++++++++++++++++++++++++---------------
kernel/cpuset.c | 162 ++++++++++++++++-----------------------------
mm/hugetlb.c | 2 +-
mm/oom_kill.c | 2 +-
mm/page_alloc.c | 6 +-
mm/slab.c | 2 +-
mm/slub.c | 3 +-
mm/vmscan.c | 5 +-
10 files changed, 200 insertions(+), 198 deletions(-)
Merging scsi/for-next (68a899759b2b Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-next)
$ git merge scsi/for-next
Resolved 'drivers/usb/storage/uas.c' using previous resolution.
Auto-merging include/scsi/scsi_host.h
Auto-merging include/scsi/libsas.h
Auto-merging include/linux/libata.h
Auto-merging include/linux/blkdev.h
Auto-merging include/linux/blk-mq.h
Auto-merging drivers/usb/storage/uas.c
CONFLICT (content): Merge conflict in drivers/usb/storage/uas.c
Auto-merging drivers/usb/storage/debug.c
Auto-merging drivers/target/target_core_pr.c
Removing drivers/scsi/tmscsim.h
Removing drivers/scsi/tmscsim.c
Removing drivers/scsi/sun3_NCR5380.c
Auto-merging drivers/scsi/scsi_lib.c
Auto-merging drivers/scsi/ps3rom.c
Auto-merging drivers/scsi/mvsas/mv_sas.c
Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c
Removing drivers/scsi/mac_scsi.h
Auto-merging drivers/scsi/mac_scsi.c
Auto-merging drivers/scsi/libsas/sas_ata.c
Auto-merging drivers/scsi/isci/task.c
Auto-merging drivers/scsi/fcoe/fcoe.c
Auto-merging drivers/scsi/cxgbi/cxgb4i/cxgb4i.c
Auto-merging drivers/scsi/csiostor/csio_scsi.c
Removing drivers/scsi/atari_scsi.h
Auto-merging drivers/scsi/aic94xx/aic94xx_task.c
Auto-merging drivers/scsi/aha152x.c
Auto-merging drivers/block/nvme-scsi.c
Auto-merging drivers/ata/libata-scsi.c
Auto-merging block/blk-mq.c
Auto-merging block/blk-mq-tag.c
Auto-merging MAINTAINERS
Auto-merging Documentation/block/biodoc.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3ce1827dee9a] Merge remote-tracking branch 'scsi/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/stable/sysfs-driver-ib_srp | 25 +-
Documentation/block/biodoc.txt | 4 -
Documentation/scsi/libsas.txt | 82 +-
Documentation/scsi/scsi_mid_low_api.txt | 66 +-
Documentation/scsi/st.txt | 8 +-
Documentation/scsi/wd719x.txt | 21 +
MAINTAINERS | 17 +-
arch/m68k/atari/config.c | 27 +
arch/m68k/atari/stdma.c | 61 +-
arch/m68k/include/asm/atari_stdma.h | 4 +-
arch/m68k/include/asm/macintosh.h | 4 +
arch/m68k/mac/config.c | 146 +-
arch/m68k/sun3/config.c | 60 +
block/blk-core.c | 4 +-
block/blk-mq-tag.c | 28 +
block/blk-mq.c | 2 +
block/scsi_ioctl.c | 2 +-
drivers/ata/libata-scsi.c | 19 +-
drivers/ata/sata_nv.c | 2 +-
drivers/block/nvme-scsi.c | 4 +-
drivers/infiniband/ulp/iser/iscsi_iser.c | 3 +-
drivers/infiniband/ulp/srp/ib_srp.c | 1100 ++++++----
drivers/infiniband/ulp/srp/ib_srp.h | 75 +-
drivers/message/fusion/mptsas.c | 1 +
drivers/message/fusion/mptscsih.c | 22 +-
drivers/message/fusion/mptscsih.h | 3 +-
drivers/misc/eeprom/eeprom_93cx6.c | 62 +-
drivers/misc/enclosure.c | 44 +-
drivers/s390/scsi/zfcp_aux.c | 6 +-
drivers/s390/scsi/zfcp_ccw.c | 32 +-
drivers/s390/scsi/zfcp_def.h | 3 +-
drivers/s390/scsi/zfcp_erp.c | 7 -
drivers/s390/scsi/zfcp_ext.h | 1 +
drivers/s390/scsi/zfcp_fc.c | 52 +-
drivers/s390/scsi/zfcp_fc.h | 14 +-
drivers/s390/scsi/zfcp_fsf.c | 3 +-
drivers/s390/scsi/zfcp_scsi.c | 26 +-
drivers/s390/scsi/zfcp_sysfs.c | 66 +-
drivers/scsi/3w-9xxx.c | 15 +-
drivers/scsi/3w-sas.c | 15 +-
drivers/scsi/3w-xxxx.c | 15 +-
drivers/scsi/53c700.c | 51 +-
drivers/scsi/BusLogic.c | 4 +-
drivers/scsi/Kconfig | 18 +-
drivers/scsi/Makefile | 3 +-
drivers/scsi/NCR5380.c | 310 +--
drivers/scsi/NCR5380.h | 78 +-
drivers/scsi/aacraid/aachba.c | 4 +-
drivers/scsi/aacraid/linit.c | 20 +-
drivers/scsi/advansys.c | 11 +-
drivers/scsi/aha152x.c | 992 ++-------
drivers/scsi/aha1740.c | 2 +-
drivers/scsi/aic7xxx/aic79xx_osm.c | 19 +-
drivers/scsi/aic7xxx/aic7xxx_osm.c | 23 +-
drivers/scsi/aic94xx/aic94xx.h | 2 +-
drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +-
drivers/scsi/aic94xx/aic94xx_init.c | 13 +-
drivers/scsi/aic94xx/aic94xx_task.c | 13 +-
drivers/scsi/am53c974.c | 586 +++++
drivers/scsi/arcmsr/arcmsr_hba.c | 9 +-
drivers/scsi/arm/acornscsi.c | 12 +-
drivers/scsi/arm/cumana_1.c | 18 +-
drivers/scsi/arm/fas216.c | 39 +-
drivers/scsi/arm/oak.c | 23 +-
drivers/scsi/atari_NCR5380.c | 986 +++++----
drivers/scsi/atari_scsi.c | 673 +++---
drivers/scsi/atari_scsi.h | 60 -
drivers/scsi/be2iscsi/be_main.c | 4 +-
drivers/scsi/bfa/bfad_debugfs.c | 30 +-
drivers/scsi/bfa/bfad_im.c | 18 +-
drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 9 +-
drivers/scsi/bnx2fc/bnx2fc_io.c | 18 +-
drivers/scsi/bnx2i/bnx2i_iscsi.c | 3 +-
drivers/scsi/ch.c | 36 +-
drivers/scsi/constants.c | 596 +++---
drivers/scsi/csiostor/csio_scsi.c | 37 +-
drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 3 +-
drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 3 +-
drivers/scsi/device_handler/scsi_dh.c | 55 +-
drivers/scsi/device_handler/scsi_dh_alua.c | 82 +-
drivers/scsi/device_handler/scsi_dh_emc.c | 86 +-
drivers/scsi/device_handler/scsi_dh_hp_sw.c | 81 +-
drivers/scsi/device_handler/scsi_dh_rdac.c | 82 +-
drivers/scsi/dmx3191d.c | 31 +-
drivers/scsi/dpt_i2o.c | 4 +-
drivers/scsi/dtc.c | 85 +-
drivers/scsi/dtc.h | 26 +-
drivers/scsi/eata.c | 8 +-
drivers/scsi/esas2r/esas2r.h | 5 -
drivers/scsi/esas2r/esas2r_ioctl.c | 22 +-
drivers/scsi/esas2r/esas2r_main.c | 64 +-
drivers/scsi/esp_scsi.c | 428 ++--
drivers/scsi/esp_scsi.h | 22 +-
drivers/scsi/fcoe/fcoe.c | 6 +-
drivers/scsi/fnic/fnic.h | 2 +-
drivers/scsi/fnic/fnic_fcs.c | 5 +
drivers/scsi/fnic/fnic_main.c | 23 +-
drivers/scsi/fnic/fnic_scsi.c | 43 +-
drivers/scsi/fnic/fnic_trace.c | 4 +-
drivers/scsi/g_NCR5380.c | 224 +-
drivers/scsi/g_NCR5380.h | 26 +-
drivers/scsi/gdth.c | 5 +-
drivers/scsi/hosts.c | 5 +-
drivers/scsi/hpsa.c | 509 ++---
drivers/scsi/hpsa.h | 33 +-
drivers/scsi/hpsa_cmd.h | 34 +-
drivers/scsi/hptiop.c | 8 +-
drivers/scsi/ibmvscsi/ibmvfc.c | 58 +-
drivers/scsi/ibmvscsi/ibmvscsi.c | 11 +-
drivers/scsi/ipr.c | 175 +-
drivers/scsi/ipr.h | 2 +-
drivers/scsi/ips.c | 2 +-
drivers/scsi/isci/init.c | 4 +-
drivers/scsi/isci/task.c | 147 +-
drivers/scsi/isci/task.h | 1 -
drivers/scsi/iscsi_tcp.c | 3 +-
drivers/scsi/libfc/fc_fcp.c | 52 +-
drivers/scsi/libiscsi.c | 19 -
drivers/scsi/libsas/sas_ata.c | 9 +-
drivers/scsi/libsas/sas_expander.c | 2 +-
drivers/scsi/libsas/sas_init.c | 21 -
drivers/scsi/libsas/sas_internal.h | 2 -
drivers/scsi/libsas/sas_scsi_host.c | 223 +-
drivers/scsi/lpfc/lpfc_scsi.c | 158 +-
drivers/scsi/mac_scsi.c | 552 +++--
drivers/scsi/mac_scsi.h | 74 -
drivers/scsi/megaraid.c | 8 +-
drivers/scsi/megaraid/megaraid_mbox.c | 23 +-
drivers/scsi/megaraid/megaraid_sas.h | 23 +-
drivers/scsi/megaraid/megaraid_sas_base.c | 164 +-
drivers/scsi/megaraid/megaraid_sas_fp.c | 33 +-
drivers/scsi/megaraid/megaraid_sas_fusion.c | 112 +-
drivers/scsi/megaraid/megaraid_sas_fusion.h | 18 +-
drivers/scsi/mpt2sas/mpt2sas_scsih.c | 82 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 84 +-
drivers/scsi/mvsas/mv_init.c | 24 +-
drivers/scsi/mvsas/mv_sas.c | 109 +-
drivers/scsi/mvsas/mv_sas.h | 10 +-
drivers/scsi/ncr53c8xx.c | 5 +-
drivers/scsi/osd/osd_uld.c | 2 +-
drivers/scsi/osst.c | 29 +-
drivers/scsi/pas16.c | 106 +-
drivers/scsi/pas16.h | 21 +-
drivers/scsi/pm8001/pm8001_init.c | 4 +-
drivers/scsi/pm8001/pm8001_sas.c | 22 +-
drivers/scsi/pm8001/pm8001_sas.h | 3 +-
drivers/scsi/pmcraid.c | 94 +-
drivers/scsi/ps3rom.c | 4 -
drivers/scsi/qla1280.c | 5 +-
drivers/scsi/qla2xxx/qla_gbl.h | 2 -
drivers/scsi/qla2xxx/qla_iocb.c | 92 +-
drivers/scsi/qla2xxx/qla_mr.c | 13 -
drivers/scsi/qla2xxx/qla_nx2.c | 2 +-
drivers/scsi/qla2xxx/qla_os.c | 83 +-
drivers/scsi/qla4xxx/ql4_iocb.c | 10 -
drivers/scsi/qla4xxx/ql4_os.c | 35 +-
drivers/scsi/scsi.c | 211 +-
drivers/scsi/scsi_debug.c | 2007 ++++++++++++------
drivers/scsi/scsi_error.c | 211 +-
drivers/scsi/scsi_ioctl.c | 74 +-
drivers/scsi/scsi_lib.c | 165 +-
drivers/scsi/scsi_logging.h | 1 +
drivers/scsi/scsi_priv.h | 2 -
drivers/scsi/scsi_scan.c | 27 +-
drivers/scsi/scsi_sysfs.c | 18 +-
drivers/scsi/scsi_trace.c | 2 +-
drivers/scsi/scsi_transport_spi.c | 23 +
drivers/scsi/scsicam.c | 4 +-
drivers/scsi/sd.c | 114 +-
drivers/scsi/sd.h | 6 +-
drivers/scsi/ses.c | 2 +-
drivers/scsi/sg.c | 62 +-
drivers/scsi/sr.c | 19 +-
drivers/scsi/sr.h | 3 +-
drivers/scsi/sr_ioctl.c | 10 +-
drivers/scsi/st.c | 47 +-
drivers/scsi/stex.c | 30 +-
drivers/scsi/storvsc_drv.c | 6 +-
drivers/scsi/sun3_NCR5380.c | 2933 --------------------------
drivers/scsi/sun3_scsi.c | 512 ++---
drivers/scsi/sun3_scsi.h | 84 -
drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +-
drivers/scsi/t128.c | 83 +-
drivers/scsi/t128.h | 23 +-
drivers/scsi/tmscsim.c | 2620 -----------------------
drivers/scsi/tmscsim.h | 551 -----
drivers/scsi/u14-34f.c | 10 +-
drivers/scsi/ufs/ufshcd.c | 39 +-
drivers/scsi/virtio_scsi.c | 40 +-
drivers/scsi/vmw_pvscsi.c | 32 +-
drivers/scsi/wd7000.c | 1 -
drivers/scsi/wd719x.c | 996 +++++++++
drivers/scsi/wd719x.h | 249 +++
drivers/target/loopback/tcm_loop.c | 75 +-
drivers/target/target_core_alua.c | 2 +-
drivers/target/target_core_pr.c | 2 +-
drivers/target/target_core_sbc.c | 2 +-
drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +-
drivers/usb/storage/debug.c | 10 +-
drivers/usb/storage/uas.c | 5 +-
drivers/xen/xen-scsiback.c | 4 -
include/linux/blk-mq.h | 17 +
include/linux/blkdev.h | 1 -
include/linux/eeprom_93cx6.h | 4 +
include/linux/libata.h | 4 +-
include/scsi/libfc.h | 2 -
include/scsi/libiscsi.h | 2 -
include/scsi/libsas.h | 17 +-
include/scsi/scsi.h | 12 +-
include/scsi/scsi_cmnd.h | 6 +-
include/scsi/scsi_dbg.h | 28 +-
include/scsi/scsi_device.h | 21 +-
include/scsi/scsi_driver.h | 1 -
include/scsi/scsi_eh.h | 24 +-
include/scsi/scsi_host.h | 39 +-
include/scsi/scsi_ioctl.h | 4 +-
include/scsi/scsi_tcq.h | 87 +-
include/scsi/scsi_transport_spi.h | 1 +
include/scsi/sg.h | 5 +-
include/trace/events/scsi.h | 2 +-
include/trace/events/target.h | 2 +-
tools/lib/traceevent/plugin_scsi.c | 9 +-
222 files changed, 8449 insertions(+), 14787 deletions(-)
create mode 100644 Documentation/scsi/wd719x.txt
create mode 100644 drivers/scsi/am53c974.c
delete mode 100644 drivers/scsi/atari_scsi.h
delete mode 100644 drivers/scsi/mac_scsi.h
delete mode 100644 drivers/scsi/sun3_NCR5380.c
delete mode 100644 drivers/scsi/tmscsim.c
delete mode 100644 drivers/scsi/tmscsim.h
create mode 100644 drivers/scsi/wd719x.c
create mode 100644 drivers/scsi/wd719x.h
Merging target-updates/for-next (697835872811 tcm_loop: Fix wrong I_T nexus association)
$ git merge target-updates/for-next
Auto-merging drivers/target/loopback/tcm_loop.c
Merge made by the 'recursive' strategy.
drivers/target/iscsi/iscsi_target_transport.c | 3 +-
drivers/target/loopback/tcm_loop.c | 66 ++---
drivers/target/loopback/tcm_loop.h | 7 +-
drivers/target/target_core_configfs.c | 344 +++++++-------------------
drivers/target/target_core_device.c | 90 +++----
drivers/target/target_core_file.c | 42 ++++
drivers/target/target_core_hba.c | 7 +-
drivers/target/target_core_iblock.c | 42 ++++
drivers/target/target_core_internal.h | 28 ---
drivers/target/target_core_pscsi.c | 26 ++
drivers/target/target_core_rd.c | 41 +++
drivers/target/target_core_user.c | 42 ++++
include/target/target_core_backend.h | 43 ++++
include/target/target_core_backend_configfs.h | 120 +++++++++
14 files changed, 511 insertions(+), 390 deletions(-)
create mode 100644 include/target/target_core_backend_configfs.h
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS)
$ 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 (0878e5c4dd02 pinctrl: rockchip: Fix enable/disable/mask/unmask)
$ git merge pinctrl/for-next
Resolved 'arch/arm/boot/dts/ste-nomadik-stn8815.dtsi' using previous resolution.
Resolved 'drivers/pinctrl/pinctrl-rockchip.c' using previous resolution.
Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c
Auto-merging drivers/pinctrl/pinctrl-tb10x.c
Auto-merging drivers/pinctrl/pinctrl-st.c
Auto-merging drivers/pinctrl/pinctrl-rockchip.c
CONFLICT (content): Merge conflict in drivers/pinctrl/pinctrl-rockchip.c
Auto-merging drivers/pinctrl/pinctrl-bcm281xx.c
Auto-merging drivers/pinctrl/pinctrl-at91.c
Auto-merging drivers/pinctrl/nomadik/pinctrl-nomadik.c
Auto-merging drivers/pinctrl/nomadik/pinctrl-abx500.c
Auto-merging drivers/pinctrl/intel/pinctrl-baytrail.c
Auto-merging drivers/gpio/gpiolib-acpi.c
Auto-merging drivers/gpio/gpio-tz1090.c
Auto-merging arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
Auto-merging arch/arm/boot/dts/ste-nomadik-s8815.dts
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 559cdb236083] Merge remote-tracking branch 'pinctrl/for-next'
$ git diff -M --stat --summary HEAD^..
.../bindings/pinctrl/img,tz1090-pinctrl.txt | 2 +-
.../devicetree/bindings/pinctrl/meson,pinctrl.txt | 96 ++
.../bindings/pinctrl/pinctrl-bindings.txt | 2 +-
.../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 215 +++
.../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 162 +++
.../bindings/pinctrl/samsung-pinctrl.txt | 3 +
.../devicetree/bindings/pinctrl/ste,abx500.txt | 184 +--
MAINTAINERS | 8 +-
arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 64 +-
arch/arm/boot/dts/ste-href-ab8500.dtsi | 162 +--
arch/arm/boot/dts/ste-href-ab8505.dtsi | 90 +-
arch/arm/boot/dts/ste-href-family-pinctrl.dtsi | 230 +--
arch/arm/boot/dts/ste-href-stuib.dtsi | 4 +-
arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 12 +-
arch/arm/boot/dts/ste-hrefprev60.dtsi | 20 +-
arch/arm/boot/dts/ste-hrefv60plus.dtsi | 42 +-
arch/arm/boot/dts/ste-nomadik-s8815.dts | 8 +-
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 30 +-
arch/arm/boot/dts/ste-snowball.dts | 36 +-
drivers/gpio/gpio-tz1090.c | 2 +-
drivers/gpio/gpiolib-acpi.c | 62 +-
drivers/pinctrl/Kconfig | 13 +-
drivers/pinctrl/Makefile | 2 +-
drivers/pinctrl/freescale/pinctrl-imx.c | 72 +
drivers/pinctrl/freescale/pinctrl-mxs.c | 25 +
drivers/pinctrl/intel/Kconfig | 27 +
drivers/pinctrl/intel/Makefile | 4 +
drivers/pinctrl/{ => intel}/pinctrl-baytrail.c | 7 +-
drivers/pinctrl/intel/pinctrl-cherryview.c | 1519 ++++++++++++++++++++
drivers/pinctrl/nomadik/pinctrl-abx500.c | 33 +-
drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 4 +-
drivers/pinctrl/nomadik/pinctrl-nomadik.c | 18 +-
drivers/pinctrl/pinconf-generic.c | 71 +-
drivers/pinctrl/pinctrl-at91.c | 4 +-
drivers/pinctrl/pinctrl-at91.h | 72 +
drivers/pinctrl/pinctrl-bcm281xx.c | 5 -
drivers/pinctrl/pinctrl-rockchip.c | 173 ++-
drivers/pinctrl/pinctrl-st.c | 2 +-
drivers/pinctrl/pinctrl-tb10x.c | 8 +-
drivers/pinctrl/pinctrl-tegra-xusb.c | 19 +-
drivers/pinctrl/qcom/Kconfig | 13 +
drivers/pinctrl/qcom/Makefile | 2 +
drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 933 ++++++++++++
drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 949 ++++++++++++
drivers/pinctrl/samsung/pinctrl-exynos.c | 376 +++--
drivers/pinctrl/samsung/pinctrl-exynos.h | 3 +
drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 30 +-
drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 31 +-
drivers/pinctrl/samsung/pinctrl-samsung.c | 131 +-
drivers/pinctrl/samsung/pinctrl-samsung.h | 82 +-
drivers/pinctrl/sunxi/Kconfig | 4 +
drivers/pinctrl/sunxi/Makefile | 1 +
drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c | 749 ++++++++++
drivers/pinctrl/sunxi/pinctrl-sunxi.h | 1 +
include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 142 ++
include/dt-bindings/pinctrl/qcom,pmic-mpp.h | 44 +
56 files changed, 6197 insertions(+), 806 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,pmic-mpp.txt
create mode 100644 drivers/pinctrl/intel/Kconfig
create mode 100644 drivers/pinctrl/intel/Makefile
rename drivers/pinctrl/{ => intel}/pinctrl-baytrail.c (99%)
create mode 100644 drivers/pinctrl/intel/pinctrl-cherryview.c
create mode 100644 drivers/pinctrl/pinctrl-at91.h
create mode 100644 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c
create mode 100644 drivers/pinctrl/qcom/pinctrl-spmi-mpp.c
create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun9i-a80.c
create mode 100644 include/dt-bindings/pinctrl/qcom,pmic-gpio.h
create mode 100644 include/dt-bindings/pinctrl/qcom,pmic-mpp.h
$ git am -3 ../patches/0001-pinctrl-nomadik-fix-up-for-binding-changes.patch
Applying: pinctrl: nomadik: fix up for binding changes
$ git reset HEAD^
Unstaged changes after reset:
M arch/arm/boot/dts/ste-nomadik-s8815.dts
$ git add -A .
$ git commit -v -a --amend
[master a2d5acb87dbd] Merge remote-tracking branch 'pinctrl/for-next'
Date: Mon Dec 1 19:45:48 2014 +1100
Merging vhost/linux-next (970379f59d81 vhost: move memory pointer to VQs)
$ git merge vhost/linux-next
Resolved 'drivers/vhost/net.c' using previous resolution.
Auto-merging drivers/vhost/net.c
CONFLICT (content): Merge conflict in drivers/vhost/net.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6cf2deca7514] Merge remote-tracking branch 'vhost/linux-next'
$ git diff -M --stat --summary HEAD^..
Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
drivers/rpmsg/virtio_rpmsg_bus.c | 44 +++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 14 deletions(-)
Merging gpio/for-next (0fac0914776b seria: mctrl_gpio: use gpiod_set_array function)
$ git merge gpio/for-next
Auto-merging include/linux/gpio/consumer.h
Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c
Auto-merging drivers/pinctrl/pinctrl-at91.c
Auto-merging drivers/net/phy/mdio-mux-gpio.c
Auto-merging drivers/gpio/gpiolib.c
Auto-merging drivers/gpio/gpiolib-acpi.c
Auto-merging drivers/gpio/gpio-vr41xx.c
Auto-merging drivers/gpio/gpio-tegra.c
Auto-merging drivers/gpio/gpio-tb10x.c
Auto-merging drivers/gpio/gpio-stp-xway.c
Auto-merging drivers/gpio/gpio-mxs.c
Auto-merging drivers/gpio/gpio-mvebu.c
Auto-merging drivers/gpio/gpio-grgpio.c
Auto-merging drivers/gpio/gpio-em.c
Auto-merging drivers/gpio/gpio-dwapb.c
Auto-merging drivers/gpio/gpio-davinci.c
Auto-merging drivers/gpio/gpio-cs5535.c
Auto-merging drivers/gpio/gpio-bcm-kona.c
Auto-merging drivers/gpio/Makefile
Auto-merging drivers/gpio/Kconfig
Auto-merging Documentation/gpio/consumer.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/gpio/gpio-74xx-mmio.txt | 30 +++
.../devicetree/bindings/gpio/gpio-vf610.txt | 55 ++++
Documentation/devicetree/bindings/gpio/gpio.txt | 40 ++-
.../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 4 +-
Documentation/gpio/consumer.txt | 27 ++
Documentation/gpio/driver.txt | 4 +-
drivers/gpio/Kconfig | 23 ++
drivers/gpio/Makefile | 2 +
drivers/gpio/gpio-74xx-mmio.c | 170 ++++++++++++
drivers/gpio/gpio-amd8111.c | 1 +
drivers/gpio/gpio-bcm-kona.c | 4 +-
drivers/gpio/gpio-cs5535.c | 11 +-
drivers/gpio/gpio-davinci.c | 5 -
drivers/gpio/gpio-dwapb.c | 4 +-
drivers/gpio/gpio-em.c | 11 +-
drivers/gpio/gpio-grgpio.c | 1 +
drivers/gpio/gpio-mcp23s08.c | 14 +-
drivers/gpio/gpio-mpc8xxx.c | 27 ++
drivers/gpio/gpio-mvebu.c | 99 +++++++
drivers/gpio/gpio-mxs.c | 13 +
drivers/gpio/gpio-omap.c | 2 +-
drivers/gpio/gpio-rcar.c | 27 +-
drivers/gpio/gpio-stp-xway.c | 8 +-
drivers/gpio/gpio-tb10x.c | 7 +-
drivers/gpio/gpio-tegra.c | 4 +-
drivers/gpio/gpio-vf610.c | 295 +++++++++++++++++++++
drivers/gpio/gpio-vr41xx.c | 4 +-
drivers/gpio/gpiolib-acpi.c | 6 +-
drivers/gpio/gpiolib-sysfs.c | 6 +-
drivers/gpio/gpiolib.c | 239 +++++++++++++++--
drivers/net/phy/mdio-mux-gpio.c | 37 +--
drivers/pinctrl/pinctrl-at91.c | 4 +-
drivers/pinctrl/samsung/pinctrl-exynos.c | 4 +-
drivers/pinctrl/sunxi/pinctrl-sunxi.c | 6 +-
drivers/tty/serial/serial_mctrl_gpio.c | 12 +-
include/linux/gpio.h | 7 +-
include/linux/gpio/consumer.h | 40 ++-
include/linux/gpio/driver.h | 8 +-
38 files changed, 1113 insertions(+), 148 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-74xx-mmio.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-vf610.txt
create mode 100644 drivers/gpio/gpio-74xx-mmio.c
create mode 100644 drivers/gpio/gpio-vf610.c
Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (06e4cb6b1d5c pwm: samsung: Allow Samsung PWM driver to be enabled on Exynos7)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/pwm/atmel-hlcdc-pwm.txt | 29 +++
.../devicetree/bindings/pwm/pwm-bcm2835.txt | 30 +++
drivers/pwm/Kconfig | 22 +-
drivers/pwm/Makefile | 2 +
drivers/pwm/pwm-atmel-hlcdc.c | 259 +++++++++++++++++++++
drivers/pwm/pwm-bcm2835.c | 205 ++++++++++++++++
6 files changed, 546 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/pwm/atmel-hlcdc-pwm.txt
create mode 100644 Documentation/devicetree/bindings/pwm/pwm-bcm2835.txt
create mode 100644 drivers/pwm/pwm-atmel-hlcdc.c
create mode 100644 drivers/pwm/pwm-bcm2835.c
Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning)
$ git merge dma-buf/for-next
Merge made by the 'recursive' strategy.
Merging userns/for-next (a1998908ba46 nfs: fix kernel warning when removing proc entry)
$ git merge userns/for-next
Resolved 'fs/nfs/client.c' using previous resolution.
Auto-merging fs/nfs/client.c
CONFLICT (content): Merge conflict in fs/nfs/client.c
Auto-merging fs/namespace.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 268837a53507] Merge remote-tracking branch 'userns/for-next'
$ git diff -M --stat --summary HEAD^..
fs/namespace.c | 9 ++++
.../selftests/mount/unprivileged-remount-test.c | 51 ++++++++++++----------
2 files changed, 36 insertions(+), 24 deletions(-)
Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make)
$ git merge ktest/for-next
Merge made by the 'recursive' strategy.
tools/testing/ktest/ktest.pl | 37 ++++++++++++++++++++++++++-----------
1 file changed, 26 insertions(+), 11 deletions(-)
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 (ffa3a37a6111 Merge tag 'ib-mfd-regulator-clk-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into clk-next)
$ git merge clk/clk-next
Auto-merging drivers/clk/clk-s2mps11.c
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/marvell,mmp2.txt | 21 +
.../devicetree/bindings/clock/marvell,pxa168.txt | 21 +
.../devicetree/bindings/clock/marvell,pxa910.txt | 21 +
.../bindings/clock/renesas,cpg-div6-clocks.txt | 18 +-
.../bindings/clock/renesas,cpg-mstp-clocks.txt | 8 +-
MAINTAINERS | 3 +-
arch/arm/boot/dts/Makefile | 3 +
arch/arm/boot/dts/mmp2-brownstone.dts | 2 +-
arch/arm/boot/dts/mmp2.dtsi | 29 +-
arch/arm/boot/dts/pxa168-aspenite.dts | 2 +-
arch/arm/boot/dts/pxa168.dtsi | 27 +-
arch/arm/boot/dts/pxa910-dkb.dts | 2 +-
arch/arm/boot/dts/pxa910.dtsi | 28 +-
arch/arm/mach-mmp/Kconfig | 12 +-
arch/arm/mach-mmp/mmp-dt.c | 57 +--
arch/arm/mach-mmp/mmp2-dt.c | 26 +-
drivers/clk/clk-mux.c | 2 +-
drivers/clk/clk-s2mps11.c | 2 +-
drivers/clk/clk.c | 2 +-
drivers/clk/hisilicon/clk-hi3620.c | 70 +--
drivers/clk/mmp/Makefile | 7 +-
drivers/clk/mmp/clk-frac.c | 74 ++-
drivers/clk/mmp/clk-gate.c | 133 ++++++
drivers/clk/mmp/clk-mix.c | 513 +++++++++++++++++++++
drivers/clk/mmp/clk-mmp2.c | 6 +-
drivers/clk/mmp/clk-of-mmp2.c | 334 ++++++++++++++
drivers/clk/mmp/clk-of-pxa168.c | 279 +++++++++++
drivers/clk/mmp/clk-of-pxa910.c | 301 ++++++++++++
drivers/clk/mmp/clk-pxa168.c | 6 +-
drivers/clk/mmp/clk-pxa910.c | 6 +-
drivers/clk/mmp/clk.c | 192 ++++++++
drivers/clk/mmp/clk.h | 226 ++++++++-
drivers/clk/mmp/reset.c | 99 ++++
drivers/clk/mmp/reset.h | 31 ++
drivers/clk/pxa/Makefile | 1 +
drivers/clk/pxa/clk-pxa.c | 45 +-
drivers/clk/pxa/clk-pxa.h | 9 +-
drivers/clk/pxa/clk-pxa25x.c | 273 +++++++++++
drivers/clk/pxa/clk-pxa27x.c | 9 +-
drivers/clk/rockchip/Makefile | 1 +
drivers/clk/rockchip/clk-mmc-phase.c | 154 +++++++
drivers/clk/rockchip/clk-pll.c | 81 +++-
drivers/clk/rockchip/clk-rk3188.c | 79 ++--
drivers/clk/rockchip/clk-rk3288.c | 246 ++++++----
drivers/clk/rockchip/clk.c | 20 +-
drivers/clk/rockchip/clk.h | 45 +-
drivers/clk/shmobile/clk-div6.c | 113 ++++-
include/dt-bindings/clock/marvell,mmp2.h | 74 +++
include/dt-bindings/clock/marvell,pxa168.h | 57 +++
include/dt-bindings/clock/marvell,pxa910.h | 54 +++
include/dt-bindings/clock/rk3288-cru.h | 13 +
51 files changed, 3493 insertions(+), 344 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/marvell,mmp2.txt
create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa168.txt
create mode 100644 Documentation/devicetree/bindings/clock/marvell,pxa910.txt
create mode 100644 drivers/clk/mmp/clk-gate.c
create mode 100644 drivers/clk/mmp/clk-mix.c
create mode 100644 drivers/clk/mmp/clk-of-mmp2.c
create mode 100644 drivers/clk/mmp/clk-of-pxa168.c
create mode 100644 drivers/clk/mmp/clk-of-pxa910.c
create mode 100644 drivers/clk/mmp/clk.c
create mode 100644 drivers/clk/mmp/reset.c
create mode 100644 drivers/clk/mmp/reset.h
create mode 100644 drivers/clk/pxa/clk-pxa25x.c
create mode 100644 drivers/clk/rockchip/clk-mmc-phase.c
create mode 100644 include/dt-bindings/clock/marvell,mmp2.h
create mode 100644 include/dt-bindings/clock/marvell,pxa168.h
create mode 100644 include/dt-bindings/clock/marvell,pxa910.h
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access)
$ git merge lzo-update/lzo-update
Auto-merging lib/lzo/lzo1x_decompress_safe.c
Merge made by the 'recursive' strategy.
lib/lzo/lzo1x_decompress_safe.c | 4 ++++
lib/lzo/lzodefs.h | 6 ++++++
2 files changed, 10 insertions(+)
Merging aio/master (d3785cf42979 Merge ../aio-fixes)
$ git merge aio/master
Auto-merging include/linux/fs.h
Merge made by the 'recursive' strategy.
fs/aio.c | 33 +++++++++++++++++++++++++++++++--
include/linux/fs.h | 1 +
mm/mremap.c | 3 ++-
3 files changed, 34 insertions(+), 3 deletions(-)
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL)
$ git merge documentation/for-next
Already up-to-date.
Merging kselftest/next (a2f19efd2e10 selftests/user: add install target to enable installing test)
$ git merge kselftest/next
Resolved 'tools/testing/selftests/net/Makefile' using previous resolution.
Resolved 'tools/testing/selftests/user/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/user/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/user/Makefile
Auto-merging tools/testing/selftests/net/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/net/Makefile
Auto-merging Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7d56755fd6bc] Merge remote-tracking branch 'kselftest/next'
$ git diff -M --stat --summary HEAD^..
Makefile | 21 +++++++++-
tools/testing/selftests/Makefile | 31 +++++++++++++-
tools/testing/selftests/breakpoints/Makefile | 22 +++++++++-
tools/testing/selftests/cpu-hotplug/Makefile | 17 +++++++-
.../{on-off-test.sh => cpu-on-off-test.sh} | 0
tools/testing/selftests/efivarfs/Makefile | 19 ++++++++-
tools/testing/selftests/firmware/Makefile | 49 ++++++++++++++--------
tools/testing/selftests/ipc/Makefile | 22 +++++++++-
tools/testing/selftests/kcmp/Makefile | 22 +++++++++-
tools/testing/selftests/memfd/Makefile | 20 +++++++--
tools/testing/selftests/memory-hotplug/Makefile | 17 +++++++-
.../{on-off-test.sh => mem-on-off-test.sh} | 0
tools/testing/selftests/mount/Makefile | 15 ++++++-
tools/testing/selftests/mqueue/Makefile | 20 +++++++--
tools/testing/selftests/net/Makefile | 23 ++++++++--
tools/testing/selftests/ptrace/Makefile | 19 +++++++--
tools/testing/selftests/sysctl/Makefile | 23 +++++++++-
tools/testing/selftests/timers/Makefile | 15 ++++++-
tools/testing/selftests/user/Makefile | 15 ++++++-
tools/testing/selftests/vm/Makefile | 14 ++++++-
20 files changed, 336 insertions(+), 48 deletions(-)
rename tools/testing/selftests/cpu-hotplug/{on-off-test.sh => cpu-on-off-test.sh} (100%)
rename tools/testing/selftests/memory-hotplug/{on-off-test.sh => mem-on-off-test.sh} (100%)
Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c)
$ git merge y2038/y2038
Resolved 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' using previous resolution.
Resolved 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' using previous resolution.
Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 1e82bdb839a4] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +--
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +--
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +--
drivers/staging/ft1000/ft1000.h | 4 +-
drivers/staging/gdm72xx/gdm_sdio.c | 13 +++---
drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++----------
drivers/staging/media/lirc/lirc_sasem.c | 20 +++++-----
drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++----------------
kernel/cpuset.c | 12 ++++--
10 files changed, 69 insertions(+), 87 deletions(-)
Merging akpm-current/current (8895b8fe5776 shmdt: use i_size_read() instead of ->i_size)
$ git merge --no-ff akpm-current/current
Resolved 'Documentation/devicetree/bindings/i2c/trivial-devices.txt' using previous resolution.
Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution.
Resolved 'drivers/rtc/rtc-omap.c' using previous resolution.
Resolved 'drivers/usb/storage/debug.c' using previous resolution.
Resolved 'fs/ocfs2/inode.h' using previous resolution.
Resolved 'kernel/exit.c' using previous resolution.
Resolved 'kernel/printk/printk.c' using previous resolution.
Resolved 'mm/hugetlb.c' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
Auto-merging mm/zswap.c
Auto-merging mm/zbud.c
Auto-merging mm/vmscan.c
Auto-merging mm/slub.c
Auto-merging mm/slab.c
Auto-merging mm/rmap.c
Removing mm/page_cgroup.c
Auto-merging mm/page_alloc.c
Auto-merging mm/oom_kill.c
Auto-merging mm/mremap.c
Auto-merging mm/mmap.c
Auto-merging mm/memory.c
Auto-merging mm/memory-failure.c
Auto-merging mm/memcontrol.c
Auto-merging mm/madvise.c
Auto-merging mm/ksm.c
Auto-merging mm/hugetlb.c
CONFLICT (content): Merge conflict in mm/hugetlb.c
Auto-merging mm/huge_memory.c
Auto-merging mm/fremap.c
Auto-merging lib/bitmap.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/sys_ni.c
Auto-merging kernel/sched/core.c
Removing kernel/res_counter.c
Auto-merging kernel/printk/printk.c
CONFLICT (content): Merge conflict in kernel/printk/printk.c
Auto-merging kernel/gcov/Kconfig
Auto-merging kernel/fork.c
Auto-merging kernel/exit.c
CONFLICT (content): Merge conflict in kernel/exit.c
Auto-merging kernel/events/uprobes.c
Removing ipc/ipcns_notifier.c
Auto-merging init/main.c
Auto-merging init/Kconfig
Auto-merging include/net/sock.h
Auto-merging include/linux/syscalls.h
Auto-merging include/linux/sched.h
Removing include/linux/res_counter.h
Auto-merging include/linux/printk.h
Auto-merging include/linux/percpu-refcount.h
Removing include/linux/page_cgroup.h
Removing include/linux/page-debug-flags.h
Auto-merging include/linux/mmu_notifier.h
Auto-merging include/linux/mm_types.h
Auto-merging include/linux/mm.h
Auto-merging include/linux/kernel.h
Auto-merging include/linux/hugetlb.h
Auto-merging include/linux/fs.h
Auto-merging include/linux/cgroup.h
Auto-merging include/linux/bitmap.h
Auto-merging fs/seq_file.c
Auto-merging fs/proc/task_mmu.c
Auto-merging fs/proc/base.c
Auto-merging fs/ocfs2/super.c
Auto-merging fs/ocfs2/journal.c
Auto-merging fs/ocfs2/inode.h
CONFLICT (content): Merge conflict in fs/ocfs2/inode.h
Auto-merging fs/ocfs2/dlmglue.c
Auto-merging fs/ocfs2/dir.c
Auto-merging fs/inode.c
Auto-merging fs/exec.c
Auto-merging fs/cifs/smb2pdu.h
Auto-merging fs/cifs/smb2pdu.c
Auto-merging fs/cifs/smb2ops.c
Auto-merging fs/cifs/file.c
Auto-merging fs/befs/linuxvfs.c
Auto-merging fs/affs/amigaffs.c
Auto-merging drivers/usb/storage/debug.c
CONFLICT (content): Merge conflict in drivers/usb/storage/debug.c
Auto-merging drivers/tty/vt/keyboard.c
Auto-merging drivers/staging/android/ashmem.c
Auto-merging drivers/rtc/rtc-sirfsoc.c
Auto-merging drivers/rtc/rtc-omap.c
CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c
Auto-merging drivers/rtc/Kconfig
Auto-merging drivers/leds/Kconfig
Auto-merging drivers/iommu/amd_iommu_v2.c
Auto-merging block/genhd.c
Auto-merging block/bio.c
Auto-merging arch/x86/mm/pageattr.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
Auto-merging arch/x86/kernel/entry_64.S
Auto-merging arch/x86/include/asm/pgtable.h
Auto-merging arch/x86/Kconfig
Auto-merging arch/tile/kernel/setup.c
Auto-merging arch/powerpc/platforms/cell/spufs/inode.c
Auto-merging arch/powerpc/mm/pgtable_32.c
Auto-merging arch/powerpc/mm/hash_utils_64.c
Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
Auto-merging arch/powerpc/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/boot/dts/am33xx.dtsi
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt
Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/i2c/trivial-devices.txt
Removing Documentation/cgroups/resource_counter.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 44adf7090778] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
Documentation/cgroups/hugetlb.txt | 2 +-
Documentation/cgroups/memory.txt | 26 +-
Documentation/cgroups/resource_counter.txt | 197 ---
.../devicetree/bindings/i2c/trivial-devices.txt | 2 +-
.../devicetree/bindings/rtc/maxim,ds1307.txt | 23 +
Documentation/devicetree/bindings/rtc/rtc-omap.txt | 9 +-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
Documentation/filesystems/vfat.txt | 10 +
Documentation/kdump/kdump.txt | 7 +
Documentation/kernel-parameters.txt | 21 +-
Documentation/leds/leds-class.txt | 3 -
Documentation/printk-formats.txt | 6 +
Documentation/sysctl/kernel.txt | 50 +-
Documentation/vm/page_owner.txt | 81 +
MAINTAINERS | 6 +-
arch/arm/Kconfig | 1 +
arch/arm/boot/dts/am335x-boneblack.dts | 4 +
arch/arm/boot/dts/am33xx.dtsi | 2 +-
arch/arm/include/asm/pgtable-3level.h | 1 +
arch/arm64/Kconfig | 1 +
arch/arm64/include/asm/pgtable.h | 3 +
arch/ia64/kernel/perfmon.c | 2 +-
arch/microblaze/Kconfig | 1 +
arch/powerpc/Kconfig | 1 +
arch/powerpc/include/asm/pgtable-ppc64.h | 3 +
arch/powerpc/mm/hash_utils_64.c | 2 +-
arch/powerpc/mm/pgtable_32.c | 2 +-
arch/powerpc/platforms/cell/spufs/inode.c | 4 +-
arch/s390/Kconfig | 1 +
arch/s390/mm/pageattr.c | 2 +-
arch/sh/Kconfig | 1 +
arch/sparc/include/asm/pgtable_64.h | 23 +
arch/sparc/include/uapi/asm/unistd.h | 3 +-
arch/sparc/kernel/syscalls.S | 10 +
arch/sparc/kernel/systbls_32.S | 1 +
arch/sparc/kernel/systbls_64.S | 2 +
arch/sparc/mm/init_64.c | 2 +-
arch/tile/kernel/early_printk.c | 19 +-
arch/tile/kernel/setup.c | 45 +-
arch/x86/Kconfig | 1 +
arch/x86/ia32/audit.c | 1 +
arch/x86/ia32/ia32entry.S | 1 +
arch/x86/include/asm/pgtable.h | 10 +
arch/x86/kernel/audit_64.c | 1 +
arch/x86/kernel/entry_64.S | 28 +
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/mm/pageattr.c | 2 +-
arch/x86/syscalls/syscall_32.tbl | 1 +
arch/x86/syscalls/syscall_64.tbl | 2 +
arch/x86/um/sys_call_table_64.c | 1 +
block/bio.c | 54 +-
block/genhd.c | 2 +-
drivers/base/Kconfig | 8 +-
drivers/base/memory.c | 4 +-
drivers/block/zram/zram_drv.c | 76 +-
drivers/block/zram/zram_drv.h | 4 +-
drivers/input/Kconfig | 9 +
drivers/input/Makefile | 3 +
drivers/input/evdev.c | 2 +-
drivers/input/input.c | 9 +
drivers/input/leds.c | 272 +++
drivers/iommu/amd_iommu_v2.c | 84 +-
drivers/leds/Kconfig | 3 -
drivers/misc/ti-st/st_core.c | 2 +-
drivers/rtc/Kconfig | 8 +
drivers/rtc/interface.c | 8 +
drivers/rtc/rtc-ds1307.c | 149 +-
drivers/rtc/rtc-ds1374.c | 283 +++
drivers/rtc/rtc-isl12057.c | 408 ++++-
drivers/rtc/rtc-omap.c | 547 +++---
drivers/rtc/rtc-pcf8563.c | 55 +-
drivers/rtc/rtc-sirfsoc.c | 50 +-
drivers/staging/android/ashmem.c | 3 +-
drivers/tty/Kconfig | 4 +
drivers/tty/vt/keyboard.c | 110 +-
drivers/usb/storage/debug.c | 2 +-
drivers/video/backlight/backlight.c | 2 -
fs/affs/affs.h | 2 +
fs/affs/amigaffs.c | 28 +-
fs/affs/file.c | 76 +-
fs/befs/linuxvfs.c | 4 -
fs/binfmt_em86.c | 4 +
fs/binfmt_misc.c | 397 +++--
fs/binfmt_script.c | 10 +
fs/char_dev.c | 1 -
fs/cifs/cifsacl.c | 2 +-
fs/cifs/cifssmb.c | 20 +-
fs/cifs/file.c | 4 +-
fs/cifs/sess.c | 2 +-
fs/cifs/smb2file.c | 4 +-
fs/cifs/smb2misc.c | 38 +-
fs/cifs/smb2ops.c | 2 +-
fs/cifs/smb2pdu.c | 2 +-
fs/cifs/smb2pdu.h | 28 +-
fs/drop_caches.c | 11 +-
fs/exec.c | 113 +-
fs/ext4/fsync.c | 5 +-
fs/fat/cache.c | 38 +-
fs/fat/fat.h | 5 +
fs/fat/file.c | 65 +
fs/fat/inode.c | 80 +-
fs/fat/namei_vfat.c | 20 +-
fs/file.c | 2 +-
fs/hfsplus/catalog.c | 89 +-
fs/hfsplus/dir.c | 11 +-
fs/hfsplus/hfsplus_fs.h | 4 +-
fs/hfsplus/super.c | 4 +-
fs/hugetlbfs/inode.c | 14 +-
fs/inode.c | 2 +-
fs/mpage.c | 23 +-
fs/namei.c | 2 +-
fs/ncpfs/ioctl.c | 1 -
fs/ocfs2/alloc.c | 28 +-
fs/ocfs2/alloc.h | 2 +-
fs/ocfs2/aops.c | 275 ++-
fs/ocfs2/cluster/heartbeat.c | 4 +-
fs/ocfs2/cluster/tcp.c | 2 +-
fs/ocfs2/dir.c | 4 +-
fs/ocfs2/dlm/dlmast.c | 6 +-
fs/ocfs2/dlm/dlmmaster.c | 34 +-
fs/ocfs2/dlm/dlmrecovery.c | 18 +-
fs/ocfs2/dlm/dlmthread.c | 10 +
fs/ocfs2/dlmglue.c | 37 +-
fs/ocfs2/file.c | 114 +-
fs/ocfs2/file.h | 9 +
fs/ocfs2/inode.c | 13 +-
fs/ocfs2/inode.h | 2 +
fs/ocfs2/journal.c | 115 +-
fs/ocfs2/journal.h | 5 +
fs/ocfs2/move_extents.c | 3 -
fs/ocfs2/namei.c | 348 ++++
fs/ocfs2/namei.h | 5 +
fs/ocfs2/ocfs2.h | 21 +
fs/ocfs2/ocfs2_fs.h | 5 +-
fs/ocfs2/ocfs2_trace.h | 3 +
fs/ocfs2/slot_map.c | 2 +-
fs/ocfs2/super.c | 5 +-
fs/ocfs2/xattr.c | 2 +-
fs/proc/array.c | 47 +-
fs/proc/base.c | 3 +
fs/proc/generic.c | 163 +-
fs/proc/internal.h | 11 +-
fs/proc/proc_net.c | 1 +
fs/proc/root.c | 1 +
fs/proc/task_mmu.c | 104 +-
fs/seq_file.c | 6 +-
include/linux/binfmts.h | 4 +
include/linux/bitmap.h | 36 +-
include/linux/cgroup.h | 26 +
include/linux/compaction.h | 10 +-
include/linux/compat.h | 3 +
include/linux/crc64_ecma.h | 56 +
include/linux/fault-inject.h | 17 +-
include/linux/file.h | 1 -
include/linux/fs.h | 24 +-
include/linux/gfp.h | 11 +-
include/linux/huge_mm.h | 4 +
include/linux/hugetlb.h | 3 +-
include/linux/hugetlb_cgroup.h | 1 -
include/linux/input.h | 28 +
include/linux/ipc_namespace.h | 20 -
include/linux/kern_levels.h | 13 +
include/linux/kernel.h | 1 +
include/linux/kexec.h | 2 +
include/linux/kmemleak.h | 2 +
include/linux/memcontrol.h | 54 +-
include/linux/mm.h | 42 +-
include/linux/mm_types.h | 17 +-
include/linux/mmu_notifier.h | 2 +-
include/linux/mmzone.h | 14 +-
include/linux/oom.h | 5 -
include/linux/page-debug-flags.h | 32 -
include/linux/page_cgroup.h | 105 --
include/linux/page_counter.h | 51 +
include/linux/page_ext.h | 84 +
include/linux/page_owner.h | 38 +
include/linux/percpu-refcount.h | 47 +-
include/linux/printk.h | 1 -
include/linux/ptrace.h | 2 +-
include/linux/ratelimit.h | 12 +-
include/linux/res_counter.h | 223 ---
include/linux/rmap.h | 9 +-
include/linux/sched.h | 11 +-
include/linux/shrinker.h | 2 -
include/linux/slab.h | 4 -
include/linux/stacktrace.h | 5 +
include/linux/string.h | 1 +
include/linux/swap.h | 8 -
include/linux/swap_cgroup.h | 42 +
include/linux/syscalls.h | 5 +
include/linux/vm_event_item.h | 2 +
include/net/sock.h | 26 +-
include/uapi/asm-generic/mman-common.h | 1 +
include/uapi/asm-generic/unistd.h | 4 +-
include/uapi/linux/msg.h | 28 +-
include/uapi/linux/sem.h | 18 +-
include/uapi/linux/sysctl.h | 1 +
init/Kconfig | 40 +-
init/main.c | 12 +-
ipc/Makefile | 2 +-
ipc/ipc_sysctl.c | 93 +-
ipc/ipcns_notifier.c | 92 -
ipc/msg.c | 36 +-
ipc/namespace.c | 22 -
ipc/sem.c | 28 +-
ipc/shm.c | 21 +-
ipc/util.c | 40 -
kernel/Makefile | 1 -
kernel/events/uprobes.c | 6 +-
kernel/exit.c | 242 +--
kernel/fork.c | 4 +-
kernel/gcov/Kconfig | 5 +-
kernel/kexec.c | 2 +-
kernel/kmod.c | 43 +-
kernel/panic.c | 13 +
kernel/printk/printk.c | 49 +-
kernel/ptrace.c | 23 +-
kernel/res_counter.c | 211 ---
kernel/sched/core.c | 4 +-
kernel/stacktrace.c | 32 +
kernel/sys_ni.c | 3 +
kernel/sysctl.c | 15 +-
kernel/sysctl_binary.c | 1 +
lib/Kconfig | 7 +
lib/Kconfig.debug | 16 +
lib/Makefile | 1 +
lib/audit.c | 3 +
lib/bitmap.c | 24 +-
lib/crc64_ecma.c | 341 ++++
lib/decompress.c | 4 +-
lib/decompress_bunzip2.c | 2 +-
lib/dma-debug.c | 43 +-
lib/dynamic_debug.c | 4 +-
lib/fault-inject.c | 21 +-
lib/show_mem.c | 2 +-
lib/vsprintf.c | 20 +-
mm/Kconfig.debug | 10 +
mm/Makefile | 6 +-
mm/cma.c | 19 +-
mm/compaction.c | 139 +-
mm/debug-pagealloc.c | 45 +-
mm/debug.c | 5 +-
mm/filemap.c | 10 +-
mm/filemap_xip.c | 23 +-
mm/fremap.c | 4 +-
mm/frontswap.c | 6 +-
mm/huge_memory.c | 36 +-
mm/hugetlb.c | 30 +-
mm/hugetlb_cgroup.c | 103 +-
mm/internal.h | 7 +-
mm/ksm.c | 7 +-
mm/madvise.c | 159 ++
mm/memblock.c | 43 +-
mm/memcontrol.c | 1851 ++++++--------------
mm/memory-failure.c | 19 +-
mm/memory.c | 17 +-
mm/memory_hotplug.c | 4 +-
mm/mempolicy.c | 10 +-
mm/mincore.c | 7 +-
mm/mmap.c | 34 +-
mm/mremap.c | 6 +-
mm/nommu.c | 50 +-
mm/oom_kill.c | 4 +-
mm/page-writeback.c | 4 +-
mm/page_alloc.c | 256 ++-
mm/page_cgroup.c | 530 ------
mm/page_counter.c | 192 ++
mm/page_ext.c | 394 +++++
mm/page_isolation.c | 26 +-
mm/page_owner.c | 311 ++++
mm/rmap.c | 74 +-
mm/slab.c | 23 +-
mm/slab.h | 8 +-
mm/slab_common.c | 40 +-
mm/slub.c | 21 +-
mm/swap_cgroup.c | 208 +++
mm/swap_state.c | 1 -
mm/swapfile.c | 2 +-
mm/util.c | 30 +
mm/vmacache.c | 2 +
mm/vmalloc.c | 3 +-
mm/vmpressure.c | 8 +-
mm/vmscan.c | 290 ++-
mm/vmstat.c | 103 ++
mm/zbud.c | 2 +-
mm/zsmalloc.c | 175 +-
mm/zswap.c | 9 +-
net/ipv4/tcp_memcontrol.c | 87 +-
scripts/checkpatch.pl | 263 ++-
scripts/kernel-doc | 2 +-
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/exec/.gitignore | 9 +
tools/testing/selftests/exec/Makefile | 25 +
tools/testing/selftests/exec/execveat.c | 397 +++++
tools/vm/Makefile | 4 +-
tools/vm/page_owner_sort.c | 144 ++
usr/Kconfig | 24 +-
297 files changed, 9094 insertions(+), 5225 deletions(-)
delete mode 100644 Documentation/cgroups/resource_counter.txt
create mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds1307.txt
create mode 100644 Documentation/vm/page_owner.txt
create mode 100644 drivers/input/leds.c
create mode 100644 include/linux/crc64_ecma.h
delete mode 100644 include/linux/page-debug-flags.h
delete mode 100644 include/linux/page_cgroup.h
create mode 100644 include/linux/page_counter.h
create mode 100644 include/linux/page_ext.h
create mode 100644 include/linux/page_owner.h
delete mode 100644 include/linux/res_counter.h
create mode 100644 include/linux/swap_cgroup.h
delete mode 100644 ipc/ipcns_notifier.c
delete mode 100644 kernel/res_counter.c
create mode 100644 lib/crc64_ecma.c
delete mode 100644 mm/page_cgroup.c
create mode 100644 mm/page_counter.c
create mode 100644 mm/page_ext.c
create mode 100644 mm/page_owner.c
create mode 100644 mm/swap_cgroup.c
create mode 100644 tools/testing/selftests/exec/.gitignore
create mode 100644 tools/testing/selftests/exec/Makefile
create mode 100644 tools/testing/selftests/exec/execveat.c
create mode 100644 tools/vm/page_owner_sort.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: drivers/gpio/gpio-zevio.c: fix build
Applying: slab: fix cpuset check in fallback_alloc
Applying: slub: fix cpuset check in get_any_partial
Applying: mm/cma: make kmemleak ignore CMA regions
Applying: mm: cma: split cma-reserved in dmesg log
Applying: fs: proc: include cma info in proc/meminfo
Applying: lib/show_mem.c: adds cma reserved information
Applying: lib-show_mem-this-patch-adds-cma-reserved-infromation-fix
Applying: fallocate: create FAN_MODIFY and IN_MODIFY events
Applying: tools/testing/selftests/Makefile: alphasort the TARGETS list
Applying: fsnotify: unify inode and mount marks handling
Applying: fsnotify: remove destroy_list from fsnotify_mark
Applying: mm: replace remap_file_pages() syscall with emulation
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
Applying: mm: add strictlimit knob
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ ad72b8afd6ed...984907efd4a7 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (984907efd4a7 mm: add strictlimit knob)
$ git merge --no-ff akpm/master
Removing mm/fremap.c
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-class-bdi | 8 +
Documentation/vm/remap_file_pages.txt | 7 +-
drivers/gpio/gpio-zevio.c | 4 +
drivers/w1/w1_int.c | 3 +-
fs/notify/dnotify/dnotify.c | 4 +-
fs/notify/fdinfo.c | 6 +-
fs/notify/fsnotify.c | 4 +-
fs/notify/fsnotify.h | 12 ++
fs/notify/inode_mark.c | 113 ++----------
fs/notify/inotify/inotify_fsnotify.c | 2 +-
fs/notify/inotify/inotify_user.c | 10 +-
fs/notify/mark.c | 97 +++++++++-
fs/notify/vfsmount_mark.c | 109 ++----------
fs/open.c | 11 ++
fs/proc/meminfo.c | 15 +-
include/linux/cma.h | 1 +
include/linux/fs.h | 8 +-
include/linux/fsnotify_backend.h | 31 +---
kernel/audit_tree.c | 16 +-
lib/show_mem.c | 6 +
mm/Makefile | 2 +-
mm/backing-dev.c | 35 ++++
mm/cma.c | 7 +
mm/fremap.c | 283 ------------------------------
mm/mmap.c | 69 ++++++++
mm/nommu.c | 8 -
mm/page_alloc.c | 6 +-
mm/slab.c | 2 +-
mm/slub.c | 3 +-
tools/testing/selftests/Makefile | 15 +-
30 files changed, 348 insertions(+), 549 deletions(-)
delete mode 100644 mm/fremap.c