--- /dev/null
+$ date
+Friday 30 May 09:19:11 EST 2014
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at f2159d1e9961 Merge tag 'sound-3.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
+Merging origin/master (a991639c26c7 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux)
+$ git merge origin/master
+Updating f2159d1e9961..a991639c26c7
+Fast-forward
+ arch/arm64/include/asm/pgtable.h | 2 +-
+ drivers/acpi/thermal.c | 2 +-
+ drivers/clk/clk-divider.c | 2 +-
+ drivers/clk/st/clkgen-pll.c | 4 ++-
+ drivers/clk/tegra/clk-pll.c | 64 +++++++++++++++++++++++++-------------
+ drivers/cpufreq/cpufreq-cpu0.c | 16 +++++++---
+ drivers/cpufreq/cpufreq_governor.c | 6 ++++
+ 7 files changed, 66 insertions(+), 30 deletions(-)
+Merging fixes/master (4b660a7f5c80 Linux 3.15-rc6)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/rc-fixes (38dbfb59d117 Linus 3.14-rc1)
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging arc-current/for-curr (a798c10faf62 Linux 3.15-rc2)
+$ git merge arc-current/for-curr
+Already up-to-date.
+Merging arm-current/fixes (483a6c9d447f ARM: 8064/1: fix v7-M signal return)
+$ git merge arm-current/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/uaccess.h | 3 ++-
+ arch/arm/kernel/entry-header.S | 4 ++++
+ arch/arm/kernel/unwind.c | 2 +-
+ arch/arm/mm/proc-v7m.S | 8 +++++---
+ include/linux/amba/bus.h | 1 +
+ 5 files changed, 13 insertions(+), 5 deletions(-)
+Merging m68k-current/for-linus (50be9eba831d m68k: Update defconfigs for v3.14-rc1)
+$ 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 powerpc-merge/merge (011e4b02f1da powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode)
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc/master (8ecc1bad4c9b sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c)
+$ git merge sparc/master
+Already up-to-date.
+Merging net/master (8646224cdb94 Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 3 +--
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 1 +
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
+ net/bluetooth/l2cap_core.c | 4 ++--
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+Merging ipsec/master (6d004d6cc739 vti: Use the tunnel mark for lookup in the error handlers.)
+$ git merge ipsec/master
+Already up-to-date.
+Merging sound-current/for-linus (77f07800cb45 ALSA: hda - Fix onboard audio on Intel H97/Z97 chipsets)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (d0b4cc4e3270 PCI: Wrong register used to check pending traffic)
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless/master (2c316e699fa4 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
+$ git merge wireless/master
+Already up-to-date.
+Merging driver-core.current/driver-core-linus (4b660a7f5c80 Linux 3.15-rc6)
+$ git merge driver-core.current/driver-core-linus
+Already up-to-date.
+Merging tty.current/tty-linus (d6d211db37e7 Linux 3.15-rc5)
+$ git merge tty.current/tty-linus
+Already up-to-date.
+Merging usb.current/usb-linus (5dc2808c4729 xhci: delete endpoints from bandwidth list before freeing whole device)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/core/driver.c | 9 ++++++---
+ drivers/usb/core/hub.c | 15 +++++++++++++--
+ drivers/usb/host/pci-quirks.c | 7 +++++++
+ drivers/usb/host/xhci-mem.c | 20 ++++++++++----------
+ drivers/usb/serial/ftdi_sio.c | 2 ++
+ drivers/usb/serial/ftdi_sio_ids.h | 5 +++++
+ drivers/usb/serial/io_ti.c | 2 +-
+ drivers/usb/serial/io_usbvend.h | 2 +-
+ drivers/usb/serial/option.c | 2 ++
+ include/uapi/linux/usb/Kbuild | 1 +
+ include/uapi/linux/usb/cdc-wdm.h | 2 ++
+ 11 files changed, 50 insertions(+), 17 deletions(-)
+Merging usb-gadget-fixes/fixes (886c7c426d46 usb: gadget: at91-udc: fix irq and iomem resource retrieval)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging staging.current/staging-linus (9326c5ca0982 staging: r8192e_pci: fix htons error)
+$ git merge staging.current/staging-linus
+Merge made by the 'recursive' strategy.
+ drivers/staging/comedi/drivers/ni_daq_700.c | 2 ++
+ drivers/staging/rtl8192e/rtllib_tx.c | 2 +-
+ drivers/staging/speakup/main.c | 1 +
+ drivers/staging/speakup/selection.c | 52 ++++++++++++++++++++++++-----
+ drivers/staging/speakup/speakup.h | 1 +
+ drivers/staging/speakup/speakup_acntsa.c | 8 ++---
+ drivers/tty/tty_buffer.c | 2 ++
+ 7 files changed, 54 insertions(+), 14 deletions(-)
+Merging char-misc.current/char-misc-linus (d1db0eea8524 Linux 3.15-rc3)
+$ git merge char-misc.current/char-misc-linus
+Already up-to-date.
+Merging input-current/for-linus (0f68f39c393b Input: synaptics - change min/max quirk table to pnp-id matching)
+$ git merge input-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/Kconfig | 2 +-
+ drivers/input/keyboard/pxa27x_keypad.c | 7 +-
+ drivers/input/mouse/Kconfig | 2 +-
+ drivers/input/mouse/synaptics.c | 166 ++++++++++-----------------------
+ drivers/input/serio/ambakmi.c | 3 +-
+ drivers/input/touchscreen/Kconfig | 2 +-
+ 6 files changed, 61 insertions(+), 121 deletions(-)
+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 (3901c1124ec5 crypto: s390 - fix aes,des ctr mode concurrency finding.)
+$ git merge crypto-current/master
+Already up-to-date.
+Merging ide/master (5b40dd30bbfa ide: Fix SC1200 dependencies)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/Kconfig | 5 ++++-
+ drivers/ide/ide-probe.c | 8 +++++---
+ 2 files changed, 9 insertions(+), 4 deletions(-)
+Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff)
+$ git merge dwmw2/master
+Already up-to-date.
+Merging devicetree-current/devicetree/merge (4b660a7f5c80 Linux 3.15-rc6)
+$ git merge devicetree-current/devicetree/merge
+Already up-to-date.
+Merging rr-fixes/fixes (79465d2fd48e module: remove warning about waiting module removal.)
+$ git merge rr-fixes/fixes
+Already up-to-date.
+Merging mfd-fixes/master (73beb63d290f mfd: rtsx_pcr: Disable interrupts before cancelling delayed works)
+$ git merge mfd-fixes/master
+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 drm-intel-fixes/for-linux-next-fixes (c1240bd2842f drm/i915: Prevent negative relocation deltas from wrapping)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_dma.c | 1 -
+ drivers/gpu/drm/i915/i915_drv.h | 30 +--
+ drivers/gpu/drm/i915/i915_gem.c | 365 +++++++++++++----------------
+ drivers/gpu/drm/i915/i915_gem_evict.c | 9 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 130 ++++++----
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 4 +-
+ drivers/gpu/drm/i915/intel_display.c | 11 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 12 +-
+ 8 files changed, 271 insertions(+), 291 deletions(-)
+Merging asm-generic/master (fb9de7ebc3a2 xtensa: Use generic asm/mmu.h for nommu)
+$ git merge asm-generic/master
+Already up-to-date.
+Merging arc/for-next (35b960a30019 ARC: remove duplicate header exports)
+$ git merge arc/for-next
+Merge made by the 'recursive' strategy.
+ arch/arc/include/asm/irq.h | 8 +++++---
+ arch/arc/include/asm/processor.h | 29 ++++-------------------------
+ arch/arc/include/uapi/asm/Kbuild | 7 -------
+ arch/arc/kernel/entry.S | 12 ++++++------
+ arch/arc/kernel/irq.c | 34 +++++++++++++++++++++-------------
+ arch/arc/kernel/process.c | 23 +++++++++++++++++++++++
+ arch/arc/kernel/smp.c | 10 +++++++---
+ arch/arc/kernel/time.c | 28 ++++++++--------------------
+ arch/arc/mm/cache_arc700.c | 4 ++++
+ arch/arc/plat-arcfpga/Makefile | 2 +-
+ arch/arc/plat-arcfpga/platform.c | 4 ++--
+ arch/arc/plat-arcfpga/smp.c | 18 ++++++++++++++++++
+ 12 files changed, 99 insertions(+), 80 deletions(-)
+Merging arm/for-next (38206255d7c8 Merge branch 'devel-stable' into for-next)
+$ git merge arm/for-next
+Removing arch/arm/mach-prima2/l2x0.c
+Merge made by the 'recursive' strategy.
+ Documentation/arm/memory.txt | 9 +-
+ Documentation/devicetree/bindings/arm/pmu.txt | 1 +
+ arch/arm/Kconfig | 56 +-
+ arch/arm/boot/dts/marco.dtsi | 2 +-
+ arch/arm/boot/dts/prima2.dtsi | 2 +-
+ arch/arm/common/mcpm_entry.c | 6 +-
+ arch/arm/common/mcpm_platsmp.c | 2 +-
+ arch/arm/include/asm/assembler.h | 2 +-
+ arch/arm/include/asm/cacheflush.h | 4 +-
+ arch/arm/include/asm/cp15.h | 25 +-
+ arch/arm/include/asm/cputype.h | 1 +
+ arch/arm/include/asm/dma-mapping.h | 25 +-
+ arch/arm/include/asm/fixmap.h | 21 +-
+ arch/arm/include/asm/hardware/cache-l2x0.h | 104 +-
+ arch/arm/include/asm/highmem.h | 1 +
+ arch/arm/include/asm/mach/arch.h | 3 +
+ arch/arm/include/asm/mcpm.h | 8 +-
+ arch/arm/include/asm/memory.h | 2 -
+ arch/arm/include/asm/outercache.h | 67 +-
+ arch/arm/kernel/Makefile | 1 +
+ arch/arm/kernel/entry-armv.S | 16 +-
+ arch/arm/kernel/entry-common.S | 8 +-
+ arch/arm/kernel/entry-header.S | 4 +-
+ arch/arm/kernel/ftrace.c | 13 +
+ arch/arm/kernel/head-common.S | 3 +-
+ arch/arm/kernel/head.S | 2 +-
+ arch/arm/kernel/hibernate.c | 107 ++
+ arch/arm/kernel/irq.c | 12 +
+ arch/arm/kernel/iwmmxt.S | 16 +-
+ arch/arm/kernel/perf_event_cpu.c | 1 +
+ arch/arm/kernel/perf_event_v7.c | 12 +
+ arch/arm/kernel/setup.c | 2 +-
+ arch/arm/kernel/sleep.S | 5 +-
+ arch/arm/kernel/stacktrace.c | 41 +-
+ arch/arm/kernel/topology.c | 8 +-
+ arch/arm/kernel/uprobes.c | 20 +
+ arch/arm/mach-bcm/bcm_5301x.c | 9 +-
+ arch/arm/mach-berlin/berlin.c | 17 +-
+ arch/arm/mach-cns3xxx/core.c | 10 +-
+ arch/arm/mach-ep93xx/crunch-bits.S | 14 +-
+ arch/arm/mach-exynos/common.h | 1 -
+ arch/arm/mach-exynos/exynos.c | 21 +-
+ arch/arm/mach-exynos/sleep.S | 30 +-
+ arch/arm/mach-highbank/highbank.c | 21 +-
+ arch/arm/mach-imx/mach-vf610.c | 9 +-
+ arch/arm/mach-imx/suspend-imx6.S | 24 +-
+ arch/arm/mach-imx/system.c | 8 +-
+ arch/arm/mach-mvebu/board-v7.c | 9 +-
+ arch/arm/mach-nomadik/cpu-8815.c | 13 +-
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/common.h | 1 +
+ arch/arm/mach-omap2/io.c | 2 +
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 16 +-
+ arch/arm/mach-omap2/omap4-common.c | 86 +-
+ arch/arm/mach-prima2/Makefile | 1 -
+ arch/arm/mach-prima2/common.c | 6 +
+ arch/arm/mach-prima2/l2x0.c | 49 -
+ arch/arm/mach-prima2/pm.c | 1 -
+ arch/arm/mach-realview/realview_eb.c | 9 +-
+ arch/arm/mach-realview/realview_pb1176.c | 8 +-
+ arch/arm/mach-realview/realview_pb11mp.c | 9 +-
+ arch/arm/mach-realview/realview_pbx.c | 4 +-
+ arch/arm/mach-rockchip/rockchip.c | 9 +-
+ .../board-armadillo800eva-reference.c | 4 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 4 +-
+ arch/arm/mach-shmobile/board-kzm9g-reference.c | 4 +-
+ arch/arm/mach-shmobile/board-kzm9g.c | 4 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c | 4 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 4 +-
+ arch/arm/mach-socfpga/socfpga.c | 9 +-
+ arch/arm/mach-spear/platsmp.c | 19 +-
+ arch/arm/mach-spear/spear13xx.c | 8 +-
+ arch/arm/mach-sti/board-dt.c | 27 +-
+ arch/arm/mach-tegra/pm.h | 2 -
+ arch/arm/mach-tegra/reset-handler.S | 11 +-
+ arch/arm/mach-tegra/sleep.h | 31 -
+ arch/arm/mach-tegra/tegra.c | 32 +-
+ arch/arm/mach-ux500/cache-l2x0.c | 32 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c | 28 +-
+ arch/arm/mach-vexpress/tc2_pm.c | 4 +-
+ arch/arm/mach-vexpress/v2m.c | 3 +-
+ arch/arm/mach-zynq/common.c | 8 +-
+ arch/arm/mm/Kconfig | 51 +
+ arch/arm/mm/Makefile | 3 +-
+ arch/arm/mm/alignment.c | 19 +-
+ arch/arm/mm/cache-feroceon-l2.c | 1 -
+ arch/arm/mm/cache-l2x0.c | 1504 +++++++++++++-------
+ arch/arm/mm/cache-v7.S | 12 +-
+ arch/arm/mm/dma-mapping.c | 11 +-
+ arch/arm/mm/flush.c | 33 +-
+ arch/arm/mm/highmem.c | 33 +-
+ arch/arm/mm/l2c-common.c | 20 +
+ arch/arm/mm/l2c-l2x0-resume.S | 58 +
+ arch/arm/mm/mm.h | 4 +
+ arch/arm/mm/mmu.c | 47 +-
+ arch/arm/mm/proc-v7-3level.S | 18 +-
+ arch/arm/mm/proc-v7.S | 39 +-
+ arch/arm/plat-samsung/s5p-sleep.S | 1 -
+ arch/arm/vfp/entry.S | 3 +-
+ drivers/of/address.c | 110 ++
+ drivers/of/platform.c | 65 +-
+ include/linux/device.h | 2 +
+ include/linux/dma-mapping.h | 7 +
+ include/linux/of_address.h | 14 +
+ include/linux/suspend.h | 2 +
+ include/linux/uprobes.h | 3 +
+ kernel/events/uprobes.c | 25 +-
+ 107 files changed, 2128 insertions(+), 1195 deletions(-)
+ create mode 100644 arch/arm/kernel/hibernate.c
+ delete mode 100644 arch/arm/mach-prima2/l2x0.c
+ create mode 100644 arch/arm/mm/l2c-common.c
+ create mode 100644 arch/arm/mm/l2c-l2x0-resume.S
+$ git am -3 ../patches/0001-ARM-outer-cache-no-need-for-bug.h-in-outercache.h.patch
+Applying: ARM: outer cache: no need for bug.h in outercache.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/include/asm/outercache.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 6f5008478c84] Merge remote-tracking branch 'arm/for-next'
+Merging arm-perf/for-next/perf (d18135c126e8 ARM: perf: add support for the Cortex-A17 PMU)
+$ git merge arm-perf/for-next/perf
+Merge made by the 'recursive' strategy.
+Merging arm-soc/for-next (936663c3549a arm-soc: document new merges)
+$ git merge arm-soc/for-next
+Resolved 'arch/arm/mach-exynos/exynos.c' using previous resolution.
+Resolved 'arch/arm/mach-mvebu/board-v7.c' using previous resolution.
+Resolved 'arch/arm/mach-omap2/omap-mpuss-lowpower.c' using previous resolution.
+Resolved 'arch/arm/mach-rockchip/rockchip.c' using previous resolution.
+Resolved 'arch/arm/mach-vexpress/v2m.c' using previous resolution.
+Resolved 'arch/arm/mach-zynq/common.c' using previous resolution.
+Removing drivers/mfd/vexpress-config.c
+Auto-merging drivers/leds/leds-versatile.c
+Removing drivers/input/touchscreen/atmel_tsadcc.c
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/clocksource/timer-marco.c
+Auto-merging arch/arm/mach-zynq/common.c
+CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c
+Auto-merging arch/arm/mach-vexpress/v2m.c
+CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/v2m.c
+Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c
+Removing arch/arm/mach-sunxi/common.h
+Auto-merging arch/arm/mach-sti/board-dt.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7779.c
+Auto-merging arch/arm/mach-shmobile/setup-r8a7778.c
+Removing arch/arm/mach-shmobile/include/mach/emev2.h
+Removing arch/arm/mach-shmobile/clock-emev2.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+Removing arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+Removing arch/arm/mach-s3c24xx/common-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c244x.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2443.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2440.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2416.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2412.c
+Removing arch/arm/mach-s3c24xx/clock-s3c2410.c
+Removing arch/arm/mach-s3c24xx/clock-dclk.c
+Auto-merging arch/arm/mach-rockchip/rockchip.c
+CONFLICT (content): Merge conflict in arch/arm/mach-rockchip/rockchip.c
+Auto-merging arch/arm/mach-realview/realview_pbx.c
+Auto-merging arch/arm/mach-realview/realview_pb11mp.c
+Auto-merging arch/arm/mach-realview/realview_pb1176.c
+Auto-merging arch/arm/mach-realview/realview_eb.c
+Removing arch/arm/mach-orion5x/mss2-setup.c
+Removing arch/arm/mach-orion5x/edmini_v2-setup.c
+Removing arch/arm/mach-orion5x/d2net-setup.c
+Auto-merging arch/arm/mach-omap2/omap4-common.c
+Auto-merging arch/arm/mach-omap2/omap-mpuss-lowpower.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap-mpuss-lowpower.c
+Auto-merging arch/arm/mach-omap2/io.c
+Auto-merging arch/arm/mach-mvebu/board-v7.c
+CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/board-v7.c
+Removing arch/arm/mach-mvebu/board-t5325.c
+Removing arch/arm/mach-imx/mach-mx51_babbage.c
+Removing arch/arm/mach-imx/mach-cpuimx51sd.c
+Removing arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
+Auto-merging arch/arm/mach-exynos/exynos.c
+CONFLICT (content): Merge conflict in arch/arm/mach-exynos/exynos.c
+Removing arch/arm/mach-exynos/cpuidle.c
+Auto-merging arch/arm/mach-exynos/common.h
+Auto-merging arch/arm/mach-bcm/kona_l2_cache.h
+Auto-merging arch/arm/mach-bcm/kona_l2_cache.c
+Removing arch/arm/mach-bcm/bcm_kona_smc_asm.S
+Removing arch/arm/mach-at91/include/mach/at91_adc.h
+Auto-merging arch/arm/mach-at91/gpio.h
+Removing arch/arm/boot/dts/r7s72100-genmai-reference.dts
+Auto-merging arch/arm/boot/dts/prima2.dtsi
+Removing arch/arm/boot/dts/omap4-var-som.dts
+Auto-merging arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi
+Auto-merging arch/arm/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/reset/socfpga-reset.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eb9feae5d579] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../ABI/testing/sysfs-platform-brcmstb-gisb-arb | 8 +
+ Documentation/arm/Marvell/README | 5 +
+ Documentation/arm/sti/stih407-overview.txt | 18 +
+ .../devicetree/bindings/arm/armada-370-xp-pmsu.txt | 19 +-
+ .../devicetree/bindings/arm/armada-cpu-reset.txt | 14 +
+ Documentation/devicetree/bindings/arm/axxia.txt | 12 +
+ .../devicetree/bindings/arm/coherency-fabric.txt | 32 +-
+ Documentation/devicetree/bindings/arm/cpus.txt | 8 +-
+ .../devicetree/bindings/arm/exynos/smp-sysram.txt | 38 +
+ .../devicetree/bindings/arm/marvell,berlin.txt | 102 +
+ .../devicetree/bindings/arm/omap/l3-noc.txt | 2 +
+ .../devicetree/bindings/arm/omap/omap.txt | 18 +-
+ Documentation/devicetree/bindings/arm/rockchip.txt | 10 +
+ .../devicetree/bindings/arm/samsung/pmu.txt | 3 +
+ .../devicetree/bindings/arm/samsung/sysreg.txt | 11 +-
+ Documentation/devicetree/bindings/arm/sti.txt | 15 +
+ .../devicetree/bindings/arm/vexpress-sysreg.txt | 79 +-
+ Documentation/devicetree/bindings/arm/vexpress.txt | 15 +-
+ .../devicetree/bindings/bus/brcm,gisb-arb.txt | 30 +
+ .../devicetree/bindings/clock/altr_socfpga.txt | 4 +-
+ .../devicetree/bindings/clock/at91-clock.txt | 128 +-
+ .../devicetree/bindings/clock/exynos3250-clock.txt | 41 +
+ .../devicetree/bindings/clock/exynos5260-clock.txt | 190 ++
+ .../devicetree/bindings/clock/exynos5420-clock.txt | 3 +-
+ .../devicetree/bindings/clock/imx25-clock.txt | 3 +
+ .../devicetree/bindings/clock/imx27-clock.txt | 7 +-
+ .../devicetree/bindings/clock/imx6q-clock.txt | 1 +
+ .../devicetree/bindings/clock/imx6sx-clock.txt | 13 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 +
+ .../bindings/clock/samsung,s3c2410-clock.txt | 50 +
+ .../bindings/clock/samsung,s3c2412-clock.txt | 50 +
+ .../bindings/clock/samsung,s3c2443-clock.txt | 56 +
+ .../bindings/clock/ti-keystone-pllctrl.txt | 20 +
+ Documentation/devicetree/bindings/dma/ti-edma.txt | 13 +-
+ .../bindings/memory-controllers/mvebu-devbus.txt | 32 +-
+ .../bindings/power/reset/keystone-reset.txt | 67 +
+ .../bindings/power_supply/axxia-reset.txt | 20 +
+ .../bindings/reset/allwinner,sunxi-clock-reset.txt | 21 +
+ .../{arm/altera => reset}/socfpga-reset.txt | 2 +
+ .../devicetree/bindings/soc/qcom/qcom,gsbi.txt | 78 +
+ Documentation/devicetree/bindings/usb/omap-usb.txt | 4 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 4 +
+ MAINTAINERS | 6 -
+ arch/arm/Kconfig | 9 +-
+ arch/arm/Kconfig.debug | 153 +-
+ arch/arm/Makefile | 2 +
+ arch/arm/arm-soc-for-next-contents.txt | 297 +++
+ arch/arm/boot/compressed/head.S | 5 -
+ arch/arm/boot/dts/Makefile | 119 +-
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 41 +-
+ arch/arm/boot/dts/am335x-boneblack.dts | 1 -
+ arch/arm/boot/dts/am335x-evm.dts | 96 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 51 +-
+ arch/arm/boot/dts/am335x-igep0033.dtsi | 46 +-
+ arch/arm/boot/dts/am335x-nano.dts | 5 +
+ arch/arm/boot/dts/am33xx-clocks.dtsi | 30 +-
+ arch/arm/boot/dts/am33xx.dtsi | 5 +-
+ arch/arm/boot/dts/am4372.dtsi | 130 +-
+ arch/arm/boot/dts/am437x-gp-evm.dts | 229 +++
+ arch/arm/boot/dts/am43x-epos-evm.dts | 107 +-
+ arch/arm/boot/dts/am43xx-clocks.dtsi | 107 +-
+ arch/arm/boot/dts/armada-370-db.dts | 1 -
+ arch/arm/boot/dts/armada-370-mirabox.dts | 1 -
+ arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 -
+ arch/arm/boot/dts/armada-370-netgear-rn104.dts | 1 -
+ arch/arm/boot/dts/armada-370-rd.dts | 1 -
+ arch/arm/boot/dts/armada-370-xp.dtsi | 7 +
+ arch/arm/boot/dts/armada-370.dtsi | 5 +
+ arch/arm/boot/dts/armada-375-db.dts | 9 +-
+ arch/arm/boot/dts/armada-375.dtsi | 55 +
+ arch/arm/boot/dts/armada-380.dtsi | 2 +
+ arch/arm/boot/dts/armada-385-db.dts | 29 +-
+ arch/arm/boot/dts/armada-385-rd.dts | 5 +-
+ arch/arm/boot/dts/armada-385.dtsi | 2 +
+ arch/arm/boot/dts/armada-38x.dtsi | 84 +
+ arch/arm/boot/dts/armada-xp-axpwifiap.dts | 2 -
+ arch/arm/boot/dts/armada-xp-db.dts | 4 -
+ arch/arm/boot/dts/armada-xp-gp.dts | 4 -
+ arch/arm/boot/dts/armada-xp-matrix.dts | 4 -
+ arch/arm/boot/dts/armada-xp-mv78230.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78260.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-mv78460.dtsi | 1 +
+ arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 -
+ arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 2 -
+ arch/arm/boot/dts/armada-xp.dtsi | 8 +-
+ arch/arm/boot/dts/at91-cosino_mega2560.dts | 5 -
+ arch/arm/boot/dts/at91-sama5d3_xplained.dts | 70 +
+ arch/arm/boot/dts/at91sam9261.dtsi | 137 +-
+ arch/arm/boot/dts/at91sam9261ek.dts | 4 +
+ arch/arm/boot/dts/at91sam9g45.dtsi | 33 +-
+ arch/arm/boot/dts/at91sam9m10g45ek.dts | 20 +-
+ arch/arm/boot/dts/at91sam9n12.dtsi | 348 +++-
+ arch/arm/boot/dts/at91sam9n12ek.dts | 8 +
+ arch/arm/boot/dts/at91sam9rl.dtsi | 318 +++-
+ arch/arm/boot/dts/at91sam9rlek.dts | 99 +-
+ arch/arm/boot/dts/at91sam9x5.dtsi | 355 +++-
+ arch/arm/boot/dts/at91sam9x5_can.dtsi | 31 +
+ arch/arm/boot/dts/at91sam9x5_isi.dtsi | 26 +
+ arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 26 +
+ arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 11 +
+ arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 11 +
+ arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 11 +
+ arch/arm/boot/dts/at91sam9x5cm.dtsi | 8 +
+ arch/arm/boot/dts/atlas6.dtsi | 32 +-
+ arch/arm/boot/dts/axm5516-amarillo.dts | 51 +
+ arch/arm/boot/dts/axm5516-cpus.dtsi | 204 ++
+ arch/arm/boot/dts/axm55xx.dtsi | 204 ++
+ arch/arm/boot/dts/bcm11351.dtsi | 8 +
+ arch/arm/boot/dts/bcm28155-ap.dts | 4 +
+ arch/arm/boot/dts/bcm59056.dtsi | 21 +
+ arch/arm/boot/dts/berlin2.dtsi | 191 +-
+ arch/arm/boot/dts/berlin2cd.dtsi | 167 +-
+ arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 39 +
+ arch/arm/boot/dts/berlin2q.dtsi | 363 ++++
+ arch/arm/boot/dts/dra7-evm.dts | 228 ++-
+ arch/arm/boot/dts/dra7.dtsi | 255 ++-
+ arch/arm/boot/dts/dra72-evm.dts | 24 +
+ arch/arm/boot/dts/dra72x.dtsi | 25 +
+ arch/arm/boot/dts/dra74x.dtsi | 41 +
+ arch/arm/boot/dts/dra7xx-clocks.dtsi | 12 +-
+ arch/arm/boot/dts/exynos4.dtsi | 84 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 10 +
+ arch/arm/boot/dts/exynos4210-universal_c210.dts | 74 +
+ arch/arm/boot/dts/exynos4210.dtsi | 18 +
+ arch/arm/boot/dts/exynos4412-trats2.dts | 133 +-
+ arch/arm/boot/dts/exynos4412.dtsi | 4 +
+ arch/arm/boot/dts/exynos4x12.dtsi | 27 +
+ arch/arm/boot/dts/exynos5250-cros-common.dtsi | 6 +-
+ arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 28 +
+ arch/arm/boot/dts/exynos5250-snow.dts | 224 +++
+ arch/arm/boot/dts/exynos5250.dtsi | 70 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 5 +
+ arch/arm/boot/dts/exynos5420-peach-pit.dts | 287 +++
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 28 +
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 51 +
+ arch/arm/boot/dts/exynos5420.dtsi | 195 +-
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 13 +
+ arch/arm/boot/dts/imx25-karo-tx25.dts | 77 +
+ arch/arm/boot/dts/imx25-pdk.dts | 217 ++-
+ arch/arm/boot/dts/imx25.dtsi | 46 +-
+ arch/arm/boot/dts/imx27-pdk.dts | 170 +-
+ arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 4 +
+ arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 116 +-
+ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 53 +-
+ arch/arm/boot/dts/imx27.dtsi | 30 +-
+ arch/arm/boot/dts/imx28-duckbill.dts | 12 +-
+ arch/arm/boot/dts/imx28.dtsi | 1 +
+ arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 15 +
+ .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts | 22 +
+ arch/arm/boot/dts/imx35-pdk.dts | 68 +
+ arch/arm/boot/dts/imx35.dtsi | 25 +-
+ arch/arm/boot/dts/imx50.dtsi | 1 +
+ arch/arm/boot/dts/imx51-babbage.dts | 374 ++--
+ arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts | 108 ++
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 377 ++++
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 11 +
+ .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 120 ++
+ arch/arm/boot/dts/imx51.dtsi | 3 +
+ arch/arm/boot/dts/imx53-mba53.dts | 4 +
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 21 +
+ arch/arm/boot/dts/imx53.dtsi | 3 +-
+ arch/arm/boot/dts/imx6dl-hummingboard.dts | 31 +
+ arch/arm/boot/dts/imx6dl-phytec-pbab01.dts | 19 +
+ arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 22 +
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 539 ++++++
+ arch/arm/boot/dts/imx6dl.dtsi | 3 +-
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 40 +-
+ arch/arm/boot/dts/imx6q-gk802.dts | 7 +-
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 5 +
+ arch/arm/boot/dts/imx6q-phytec-pbab01.dts | 33 +-
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 307 +--
+ arch/arm/boot/dts/imx6q-udoo.dts | 23 +
+ arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 27 +
+ arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +-
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 45 +
+ arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 24 +
+ arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 24 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 4 +
+ arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 102 +
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 356 ++++
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 4 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 65 +
+ arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 19 +
+ arch/arm/boot/dts/imx6qdl.dtsi | 8 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 1 +
+ arch/arm/boot/dts/k2e-evm.dts | 81 +
+ arch/arm/boot/dts/k2hk-evm.dts | 29 +
+ arch/arm/boot/dts/k2l-evm.dts | 81 +
+ arch/arm/boot/dts/keystone.dtsi | 34 +-
+ arch/arm/boot/dts/kirkwood-6192.dtsi | 35 +-
+ arch/arm/boot/dts/kirkwood-6281.dtsi | 35 +-
+ arch/arm/boot/dts/kirkwood-6282.dtsi | 48 +-
+ arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 68 +-
+ arch/arm/boot/dts/kirkwood-b3.dts | 7 +-
+ arch/arm/boot/dts/kirkwood-cloudbox.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-db.dtsi | 10 +-
+ arch/arm/boot/dts/kirkwood-dns320.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-dns325.dts | 1 +
+ arch/arm/boot/dts/kirkwood-dnskw.dtsi | 4 +-
+ arch/arm/boot/dts/kirkwood-dockstar.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-dreamplug.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-ds109.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds110jv10.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds111.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds112.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds209.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds210.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds212.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds212j.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds409.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds409slim.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411j.dts | 1 +
+ arch/arm/boot/dts/kirkwood-ds411slim.dts | 1 +
+ arch/arm/boot/dts/kirkwood-goflexnet.dts | 3 +-
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 14 +-
+ arch/arm/boot/dts/kirkwood-ib62x0.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-iconnect.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 3 +-
+ arch/arm/boot/dts/kirkwood-km_common.dtsi | 48 +
+ arch/arm/boot/dts/kirkwood-km_fixedeth.dts | 23 +
+ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 39 +-
+ arch/arm/boot/dts/kirkwood-laplug.dts | 8 +-
+ arch/arm/boot/dts/kirkwood-lsxl.dtsi | 3 +-
+ arch/arm/boot/dts/kirkwood-mplcec4.dts | 19 +-
+ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 10 +-
+ .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 5 +-
+ .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 9 +-
+ arch/arm/boot/dts/kirkwood-nsa310.dts | 53 +-
+ arch/arm/boot/dts/kirkwood-nsa310a.dts | 57 +-
+ arch/arm/boot/dts/kirkwood-nsa320.dts | 215 +++
+ ...310-common.dtsi => kirkwood-nsa3x0-common.dtsi} | 60 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 15 +-
+ arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 24 +-
+ arch/arm/boot/dts/kirkwood-openrd-base.dts | 42 +
+ arch/arm/boot/dts/kirkwood-openrd-client.dts | 73 +
+ arch/arm/boot/dts/kirkwood-openrd-ultimate.dts | 58 +
+ arch/arm/boot/dts/kirkwood-openrd.dtsi | 90 +
+ arch/arm/boot/dts/kirkwood-rd88f6192.dts | 5 +-
+ arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 3 +-
+ arch/arm/boot/dts/kirkwood-rs212.dts | 1 +
+ arch/arm/boot/dts/kirkwood-rs409.dts | 1 +
+ arch/arm/boot/dts/kirkwood-rs411.dts | 1 +
+ arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi | 7 +-
+ arch/arm/boot/dts/kirkwood-synology.dtsi | 10 +-
+ arch/arm/boot/dts/kirkwood-t5325.dts | 42 +-
+ arch/arm/boot/dts/kirkwood-topkick.dts | 13 +-
+ arch/arm/boot/dts/kirkwood-ts219-6281.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ts219-6282.dts | 2 +-
+ arch/arm/boot/dts/kirkwood-ts219.dtsi | 11 +-
+ arch/arm/boot/dts/kirkwood-ts419.dtsi | 2 +-
+ arch/arm/boot/dts/kirkwood.dtsi | 75 +-
+ arch/arm/boot/dts/omap2420-clocks.dtsi | 270 +++
+ arch/arm/boot/dts/omap2420.dtsi | 26 +
+ arch/arm/boot/dts/omap2430-clocks.dtsi | 344 ++++
+ arch/arm/boot/dts/omap2430.dtsi | 26 +
+ arch/arm/boot/dts/omap24xx-clocks.dtsi | 1244 ++++++++++++
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 9 +
+ arch/arm/boot/dts/omap3-ldp.dts | 4 +
+ arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 7 +-
+ arch/arm/boot/dts/omap3-n900.dts | 243 ++-
+ arch/arm/boot/dts/omap3-n950-n9.dtsi | 14 +
+ arch/arm/boot/dts/omap3.dtsi | 51 +-
+ arch/arm/boot/dts/omap34xx.dtsi | 11 +
+ arch/arm/boot/dts/omap36xx-clocks.dtsi | 2 +-
+ arch/arm/boot/dts/omap36xx.dtsi | 11 +
+ arch/arm/boot/dts/omap3xxx-clocks.dtsi | 7 +-
+ arch/arm/boot/dts/omap4-duovero-parlor.dts | 18 +-
+ arch/arm/boot/dts/omap4-duovero.dtsi | 98 +-
+ arch/arm/boot/dts/omap4-panda-common.dtsi | 15 +
+ arch/arm/boot/dts/omap4-sdp.dts | 6 +
+ arch/arm/boot/dts/omap4-var-dvk-om44.dts | 71 +
+ arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 235 +++
+ arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi | 68 +
+ arch/arm/boot/dts/omap4-var-som-om44.dtsi | 343 ++++
+ arch/arm/boot/dts/omap4-var-som.dts | 96 -
+ arch/arm/boot/dts/omap4-var-stk-om44.dts | 17 +
+ arch/arm/boot/dts/omap4.dtsi | 9 +-
+ arch/arm/boot/dts/omap5-cm-t54.dts | 413 ++++
+ arch/arm/boot/dts/omap5-sbc-t54.dts | 51 +
+ arch/arm/boot/dts/omap5.dtsi | 48 +
+ arch/arm/boot/dts/omap54xx-clocks.dtsi | 58 +-
+ arch/arm/boot/dts/orion5x-lacie-d2-network.dts | 236 +++
+ .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 141 +-
+ .../boot/dts/orion5x-maxtor-shared-storage-2.dts | 178 ++
+ arch/arm/boot/dts/orion5x-mv88f5182.dtsi | 45 +
+ arch/arm/boot/dts/orion5x-rd88f5182-nas.dts | 177 ++
+ arch/arm/boot/dts/orion5x.dtsi | 289 +--
+ arch/arm/boot/dts/prima2.dtsi | 11 +-
+ arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 13 +
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 51 +
+ arch/arm/boot/dts/r7s72100-genmai-reference.dts | 42 -
+ arch/arm/boot/dts/r7s72100-genmai.dts | 30 +-
+ arch/arm/boot/dts/r7s72100.dtsi | 215 ++-
+ arch/arm/boot/dts/r8a73a4.dtsi | 18 -
+ .../boot/dts/r8a7740-armadillo800eva-reference.dts | 44 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 33 +-
+ arch/arm/boot/dts/r8a7778-bockw-reference.dts | 14 +
+ arch/arm/boot/dts/r8a7778.dtsi | 30 +-
+ arch/arm/boot/dts/r8a7779-marzen-reference.dts | 1 +
+ arch/arm/boot/dts/r8a7779.dtsi | 33 +-
+ arch/arm/boot/dts/r8a7790-lager.dts | 83 +-
+ arch/arm/boot/dts/r8a7790.dtsi | 133 +-
+ arch/arm/boot/dts/r8a7791-henninger.dts | 219 +++
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 99 +-
+ arch/arm/boot/dts/r8a7791.dtsi | 127 +-
+ arch/arm/boot/dts/rk3066a-bqcurie2.dts | 1 +
+ arch/arm/boot/dts/rk3066a.dtsi | 3 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 1 +
+ arch/arm/boot/dts/rk3188.dtsi | 10 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 9 +-
+ arch/arm/boot/dts/s3c2416-smdk2416.dts | 13 +
+ arch/arm/boot/dts/s3c2416.dtsi | 42 +
+ arch/arm/boot/dts/sama5d3.dtsi | 145 +-
+ arch/arm/boot/dts/sama5d3xcm.dtsi | 8 +
+ arch/arm/boot/dts/sama5d3xmb.dtsi | 9 +-
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 15 +-
+ arch/arm/boot/dts/socfpga.dtsi | 194 +-
+ arch/arm/boot/dts/socfpga_arria5.dtsi | 26 +-
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 21 +-
+ arch/arm/boot/dts/socfpga_cyclone5.dtsi | 26 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 21 +-
+ arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 6 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 50 +
+ arch/arm/boot/dts/socfpga_vt.dts | 2 +-
+ arch/arm/boot/dts/stih407-b2120.dts | 78 +
+ arch/arm/boot/dts/stih407-clock.dtsi | 39 +
+ arch/arm/boot/dts/stih407-pinctrl.dtsi | 615 ++++++
+ arch/arm/boot/dts/stih407.dtsi | 263 +++
+ arch/arm/boot/dts/stih415-b2000.dts | 2 +-
+ arch/arm/boot/dts/stih415-b2020.dts | 2 +-
+ arch/arm/boot/dts/stih415-clock.dtsi | 519 ++++-
+ arch/arm/boot/dts/stih415-pinctrl.dtsi | 16 +
+ arch/arm/boot/dts/stih415.dtsi | 30 +-
+ arch/arm/boot/dts/stih416-b2000.dts | 3 +-
+ arch/arm/boot/dts/stih416-b2020-revE.dts | 35 +
+ arch/arm/boot/dts/stih416-b2020.dts | 3 +-
+ arch/arm/boot/dts/stih416-clock.dtsi | 735 +++++++-
+ arch/arm/boot/dts/stih416-pinctrl.dtsi | 16 +
+ arch/arm/boot/dts/stih416.dtsi | 30 +-
+ arch/arm/boot/dts/stih41x-b2000.dtsi | 25 +-
+ arch/arm/boot/dts/stih41x-b2020.dtsi | 2 +-
+ arch/arm/boot/dts/stih41x.dtsi | 7 +
+ arch/arm/boot/dts/sun4i-a10-a1000.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-hackberry.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 10 +
+ arch/arm/boot/dts/sun4i-a10.dtsi | 78 +
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 34 +
+ arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 100 +
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 41 +
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 17 +
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 17 +
+ arch/arm/boot/dts/sun5i-a13.dtsi | 31 +
+ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 57 +
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 47 +
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 50 +
+ arch/arm/boot/dts/sun6i-a31.dtsi | 279 ++-
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 10 +
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 48 +
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 176 ++
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 27 +
+ arch/arm/boot/dts/sun7i-a20.dtsi | 95 +
+ arch/arm/boot/dts/sunxi-common-regulators.dtsi | 14 +
+ arch/arm/boot/dts/tegra114-dalmore.dts | 21 +-
+ arch/arm/boot/dts/tegra114-roth.dts | 1113 +++++++++++
+ arch/arm/boot/dts/tegra114-tn7.dts | 348 ++++
+ arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1827 ++++++++++++++++++
+ arch/arm/boot/dts/tegra124-venice2.dts | 42 +-
+ arch/arm/boot/dts/tegra124.dtsi | 12 +
+ arch/arm/boot/dts/tegra20-harmony.dts | 12 +
+ arch/arm/boot/dts/tegra30-beaver.dts | 12 +
+ arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 205 ++
+ arch/arm/boot/dts/tegra30-colibri.dtsi | 377 ++++
+ arch/arm/boot/dts/twl4030.dtsi | 6 +
+ arch/arm/boot/dts/twl4030_omap3.dtsi | 19 +-
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 76 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 76 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 5 +-
+ arch/arm/boot/dts/vf610-colibri.dts | 123 ++
+ arch/arm/boot/dts/vf610-twr.dts | 36 +
+ arch/arm/boot/dts/vf610.dtsi | 24 +
+ arch/arm/boot/dts/zynq-7000.dtsi | 45 +-
+ arch/arm/common/edma.c | 197 +-
+ arch/arm/configs/at91sam9g45_defconfig | 3 +-
+ arch/arm/configs/at91sam9rl_defconfig | 3 +-
+ arch/arm/configs/axm55xx_defconfig | 248 +++
+ arch/arm/configs/bcm_defconfig | 3 +
+ arch/arm/configs/davinci_all_defconfig | 1 -
+ arch/arm/configs/dove_defconfig | 2 +-
+ arch/arm/configs/imx_v4_v5_defconfig | 8 +-
+ arch/arm/configs/imx_v6_v7_defconfig | 12 +-
+ arch/arm/configs/integrator_defconfig | 1 -
+ arch/arm/configs/keystone_defconfig | 5 +-
+ arch/arm/configs/kirkwood_defconfig | 1 +
+ arch/arm/configs/msm_defconfig | 25 +-
+ arch/arm/configs/multi_v5_defconfig | 3 +-
+ arch/arm/configs/multi_v7_defconfig | 36 +-
+ arch/arm/configs/mvebu_v5_defconfig | 5 +-
+ arch/arm/configs/mvebu_v7_defconfig | 11 +
+ arch/arm/configs/mxs_defconfig | 7 +-
+ arch/arm/configs/omap2plus_defconfig | 8 +
+ arch/arm/configs/qcom_defconfig | 164 ++
+ arch/arm/configs/realview-smp_defconfig | 2 +
+ arch/arm/configs/realview_defconfig | 2 +
+ arch/arm/configs/sama5_defconfig | 3 +-
+ arch/arm/configs/shmobile_defconfig | 14 +
+ arch/arm/configs/sunxi_defconfig | 44 +-
+ arch/arm/configs/tegra_defconfig | 10 +
+ arch/arm/configs/versatile_defconfig | 3 +
+ arch/arm/configs/vt8500_v6_v7_defconfig | 1 -
+ arch/arm/include/debug/imx-uart.h | 11 +
+ arch/arm/include/debug/msm.S | 46 +-
+ arch/arm/include/debug/s3c24xx.S | 46 +
+ arch/arm/include/debug/vf.S | 15 +-
+ arch/arm/include/debug/zynq.S | 10 +-
+ arch/arm/mach-at91/Kconfig | 2 -
+ arch/arm/mach-at91/at91rm9200_devices.c | 1 +
+ arch/arm/mach-at91/at91sam9260_devices.c | 12 +-
+ arch/arm/mach-at91/at91sam9261_devices.c | 2 +-
+ arch/arm/mach-at91/at91sam9263_devices.c | 1 +
+ arch/arm/mach-at91/at91sam9g45.c | 2 +-
+ arch/arm/mach-at91/at91sam9g45_devices.c | 64 +-
+ arch/arm/mach-at91/at91sam9n12.c | 6 +-
+ arch/arm/mach-at91/at91sam9rl.c | 7 +
+ arch/arm/mach-at91/at91sam9rl_devices.c | 84 +-
+ arch/arm/mach-at91/at91sam9x5.c | 6 +-
+ arch/arm/mach-at91/board-1arm.c | 2 +-
+ arch/arm/mach-at91/board-afeb-9260v1.c | 1 +
+ arch/arm/mach-at91/board-cam60.c | 1 +
+ arch/arm/mach-at91/board-carmeva.c | 1 +
+ arch/arm/mach-at91/board-cpu9krea.c | 1 +
+ arch/arm/mach-at91/board-cpuat91.c | 2 +
+ arch/arm/mach-at91/board-csb337.c | 2 +-
+ arch/arm/mach-at91/board-csb637.c | 1 +
+ arch/arm/mach-at91/board-eb9200.c | 1 +
+ arch/arm/mach-at91/board-ecbat91.c | 1 +
+ arch/arm/mach-at91/board-eco920.c | 2 +
+ arch/arm/mach-at91/board-flexibity.c | 1 +
+ arch/arm/mach-at91/board-foxg20.c | 1 +
+ arch/arm/mach-at91/board-gsia18s.c | 1 +
+ arch/arm/mach-at91/board-kafa.c | 1 +
+ arch/arm/mach-at91/board-kb9202.c | 1 +
+ arch/arm/mach-at91/board-pcontrol-g20.c | 1 +
+ arch/arm/mach-at91/board-picotux200.c | 1 +
+ arch/arm/mach-at91/board-rm9200ek.c | 1 +
+ arch/arm/mach-at91/board-rsi-ews.c | 1 +
+ arch/arm/mach-at91/board-sam9-l9260.c | 1 +
+ arch/arm/mach-at91/board-sam9260ek.c | 1 +
+ arch/arm/mach-at91/board-sam9261ek.c | 1 +
+ arch/arm/mach-at91/board-sam9263ek.c | 1 +
+ arch/arm/mach-at91/board-sam9g20ek.c | 1 +
+ arch/arm/mach-at91/board-sam9m10g45ek.c | 17 +-
+ arch/arm/mach-at91/board-sam9rlek.c | 17 +-
+ arch/arm/mach-at91/board-snapper9260.c | 1 +
+ arch/arm/mach-at91/board-stamp9g20.c | 1 +
+ arch/arm/mach-at91/board-yl-9200.c | 1 +
+ arch/arm/mach-at91/board.h | 3 -
+ arch/arm/mach-at91/gpio.c | 1 +
+ arch/arm/mach-at91/{include/mach => }/gpio.h | 8 -
+ arch/arm/mach-at91/include/mach/at91_adc.h | 107 --
+ arch/arm/mach-at91/include/mach/hardware.h | 15 +
+ arch/arm/mach-at91/leds.c | 1 +
+ arch/arm/mach-at91/pm.c | 1 +
+ arch/arm/mach-axxia/Kconfig | 16 +
+ arch/arm/mach-axxia/Makefile | 2 +
+ arch/arm/mach-axxia/axxia.c | 28 +
+ arch/arm/mach-axxia/platsmp.c | 89 +
+ arch/arm/mach-bcm/Kconfig | 61 +-
+ arch/arm/mach-bcm/Makefile | 21 +-
+ arch/arm/mach-bcm/bcm_kona_smc.c | 136 +-
+ arch/arm/mach-bcm/bcm_kona_smc.h | 52 +-
+ arch/arm/mach-bcm/bcm_kona_smc_asm.S | 41 -
+ arch/arm/mach-bcm/board_bcm21664.c | 5 +-
+ arch/arm/mach-bcm/board_bcm281xx.c | 2 +-
+ arch/arm/mach-bcm/{kona.c => kona_l2_cache.c} | 16 +-
+ arch/arm/mach-bcm/{kona.h => kona_l2_cache.h} | 6 +-
+ arch/arm/mach-berlin/Kconfig | 10 +
+ arch/arm/mach-cns3xxx/Kconfig | 1 -
+ arch/arm/mach-davinci/board-dm355-evm.c | 4 -
+ arch/arm/mach-davinci/board-dm355-leopard.c | 4 -
+ arch/arm/mach-davinci/devices-da8xx.c | 31 -
+ arch/arm/mach-davinci/dm355.c | 14 -
+ arch/arm/mach-davinci/dm365.c | 16 -
+ arch/arm/mach-davinci/dm644x.c | 14 -
+ arch/arm/mach-davinci/dm646x.c | 16 -
+ arch/arm/mach-dove/irq.c | 36 +
+ arch/arm/mach-exynos/Kconfig | 8 +
+ arch/arm/mach-exynos/Makefile | 10 +-
+ arch/arm/mach-exynos/common.h | 81 +
+ arch/arm/mach-exynos/cpuidle.c | 256 ---
+ arch/arm/mach-exynos/exynos.c | 85 +-
+ arch/arm/mach-exynos/firmware.c | 10 +-
+ arch/arm/mach-exynos/hotplug.c | 67 +-
+ arch/arm/mach-exynos/include/mach/map.h | 7 -
+ arch/arm/mach-exynos/mcpm-exynos.c | 351 ++++
+ arch/arm/mach-exynos/platsmp.c | 67 +-
+ arch/arm/mach-exynos/pm.c | 219 ++-
+ arch/arm/mach-exynos/pmu.c | 2 -
+ arch/arm/mach-exynos/regs-pmu.h | 18 +-
+ arch/arm/mach-imx/Kconfig | 70 +-
+ arch/arm/mach-imx/Makefile | 6 +-
+ arch/arm/mach-imx/avic.c | 4 +-
+ arch/arm/mach-imx/clk-gate2.c | 47 +-
+ arch/arm/mach-imx/clk-imx1.c | 41 +-
+ arch/arm/mach-imx/clk-imx25.c | 24 +-
+ arch/arm/mach-imx/clk-imx27.c | 27 +-
+ arch/arm/mach-imx/clk-imx31.c | 2 -
+ arch/arm/mach-imx/clk-imx51-imx53.c | 20 +-
+ arch/arm/mach-imx/clk-imx6q.c | 21 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 6 +-
+ arch/arm/mach-imx/clk-imx6sx.c | 524 ++++++
+ arch/arm/mach-imx/clk.h | 13 +-
+ arch/arm/mach-imx/common.h | 15 +-
+ arch/arm/mach-imx/cpu.c | 3 +
+ arch/arm/mach-imx/devices/platform-mx2-emma.c | 2 +-
+ arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c | 231 ---
+ arch/arm/mach-imx/imx25-dt.c | 1 -
+ arch/arm/mach-imx/imx27-dt.c | 1 -
+ arch/arm/mach-imx/imx31-dt.c | 1 -
+ arch/arm/mach-imx/imx35-dt.c | 1 -
+ arch/arm/mach-imx/imx51-dt.c | 1 -
+ arch/arm/mach-imx/mach-apf9328.c | 1 -
+ arch/arm/mach-imx/mach-armadillo5x0.c | 1 -
+ arch/arm/mach-imx/mach-bug.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx27.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx35.c | 1 -
+ arch/arm/mach-imx/mach-cpuimx51sd.c | 364 ----
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 -
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 -
+ arch/arm/mach-imx/mach-imx27ipcam.c | 1 -
+ arch/arm/mach-imx/mach-imx27lite.c | 1 -
+ arch/arm/mach-imx/mach-imx50.c | 1 -
+ arch/arm/mach-imx/mach-imx53.c | 1 -
+ arch/arm/mach-imx/mach-imx6sx.c | 51 +
+ arch/arm/mach-imx/mach-kzm_arm11_01.c | 1 -
+ arch/arm/mach-imx/mach-mx1ads.c | 2 -
+ arch/arm/mach-imx/mach-mx21ads.c | 174 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx27_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx27ads.c | 1 -
+ arch/arm/mach-imx/mach-mx31_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx31ads.c | 1 -
+ arch/arm/mach-imx/mach-mx31lilly.c | 1 -
+ arch/arm/mach-imx/mach-mx31lite.c | 1 -
+ arch/arm/mach-imx/mach-mx31moboard.c | 1 -
+ arch/arm/mach-imx/mach-mx35_3ds.c | 1 -
+ arch/arm/mach-imx/mach-mx51_babbage.c | 428 -----
+ arch/arm/mach-imx/mach-mxt_td60.c | 1 -
+ arch/arm/mach-imx/mach-pca100.c | 4 +-
+ arch/arm/mach-imx/mach-pcm037.c | 1 -
+ arch/arm/mach-imx/mach-pcm038.c | 1 -
+ arch/arm/mach-imx/mach-pcm043.c | 1 -
+ arch/arm/mach-imx/mach-qong.c | 1 -
+ arch/arm/mach-imx/mach-scb9328.c | 1 -
+ arch/arm/mach-imx/mach-vpr200.c | 1 -
+ arch/arm/mach-imx/mxc.h | 6 +
+ arch/arm/mach-imx/time.c | 15 +
+ arch/arm/mach-imx/tzic.c | 4 +-
+ arch/arm/mach-keystone/keystone.c | 100 +-
+ arch/arm/mach-keystone/memory.h | 24 +
+ arch/arm/mach-keystone/platsmp.c | 18 +-
+ arch/arm/mach-kirkwood/board-dt.c | 2 +-
+ arch/arm/mach-kirkwood/irq.c | 37 +
+ arch/arm/mach-msm/Kconfig | 3 -
+ arch/arm/mach-msm/board-trout-gpio.c | 2 +-
+ arch/arm/mach-msm/board-trout.c | 2 +-
+ arch/arm/mach-msm/board-trout.h | 2 +-
+ arch/arm/mach-mvebu/Kconfig | 21 +-
+ arch/arm/mach-mvebu/Makefile | 13 +-
+ arch/arm/mach-mvebu/armada-370-xp.h | 2 -
+ arch/arm/mach-mvebu/board-t5325.c | 41 -
+ arch/arm/mach-mvebu/board-v7.c | 80 +-
+ arch/arm/mach-mvebu/board.h | 6 -
+ arch/arm/mach-mvebu/coherency.c | 340 +++-
+ arch/arm/mach-mvebu/coherency.h | 3 +-
+ arch/arm/mach-mvebu/coherency_ll.S | 143 +-
+ arch/arm/mach-mvebu/common.h | 3 +
+ arch/arm/mach-mvebu/cpu-reset.c | 103 +
+ arch/arm/mach-mvebu/dove.c | 2 +-
+ arch/arm/mach-mvebu/headsmp-a9.S | 34 +
+ arch/arm/mach-mvebu/headsmp.S | 15 +-
+ arch/arm/mach-mvebu/kirkwood.c | 5 +-
+ arch/arm/mach-mvebu/mvebu-soc-id.c | 32 +-
+ arch/arm/mach-mvebu/mvebu-soc-id.h | 4 +
+ arch/arm/mach-mvebu/platsmp-a9.c | 102 +
+ arch/arm/mach-mvebu/platsmp.c | 23 +-
+ arch/arm/mach-mvebu/pmsu.c | 273 ++-
+ arch/arm/mach-mvebu/system-controller.c | 15 +-
+ arch/arm/mach-omap1/board-h2.c | 2 +-
+ arch/arm/mach-omap1/board-h3.c | 2 +-
+ arch/arm/mach-omap1/board-innovator.c | 2 +-
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap1/board-sx1.c | 26 -
+ arch/arm/mach-omap1/pm.c | 13 +-
+ arch/arm/mach-omap2/board-am3517evm.c | 5 -
+ arch/arm/mach-omap2/board-flash.c | 4 +-
+ arch/arm/mach-omap2/board-generic.c | 45 +-
+ arch/arm/mach-omap2/board-omap3stalker.c | 4 -
+ arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 2 +-
+ arch/arm/mach-omap2/clkt2xxx_osc.c | 8 +-
+ arch/arm/mach-omap2/clkt2xxx_sys.c | 2 +-
+ arch/arm/mach-omap2/clockdomain.h | 3 +-
+ arch/arm/mach-omap2/cm2xxx.c | 15 +-
+ arch/arm/mach-omap2/cm2xxx_3xxx.h | 4 +-
+ arch/arm/mach-omap2/cm33xx.c | 4 +-
+ arch/arm/mach-omap2/cm33xx.h | 3 -
+ arch/arm/mach-omap2/cm3xxx.c | 25 +-
+ arch/arm/mach-omap2/cm3xxx.h | 5 +-
+ arch/arm/mach-omap2/cm44xx.c | 11 +-
+ arch/arm/mach-omap2/cm_common.c | 2 +-
+ arch/arm/mach-omap2/cminst44xx.c | 14 +-
+ arch/arm/mach-omap2/control.c | 20 +-
+ arch/arm/mach-omap2/dma.c | 4 +-
+ arch/arm/mach-omap2/gpmc-nand.c | 2 +-
+ arch/arm/mach-omap2/gpmc.c | 8 +-
+ arch/arm/mach-omap2/hdq1w.c | 2 +
+ arch/arm/mach-omap2/id.c | 39 +-
+ arch/arm/mach-omap2/io.c | 1 +
+ arch/arm/mach-omap2/irq.c | 4 +-
+ arch/arm/mach-omap2/mux.c | 8 +-
+ arch/arm/mach-omap2/omap-headsmp.S | 6 +-
+ arch/arm/mach-omap2/omap-hotplug.c | 4 +-
+ arch/arm/mach-omap2/omap-mpuss-lowpower.c | 18 +-
+ arch/arm/mach-omap2/omap-smp.c | 6 +-
+ arch/arm/mach-omap2/omap-wakeupgen.c | 42 +-
+ arch/arm/mach-omap2/omap4-common.c | 18 +-
+ arch/arm/mach-omap2/omap_hwmod.c | 10 +-
+ .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1 +
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 9 +-
+ arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 99 +-
+ arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 283 +++
+ arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 10 -
+ arch/arm/mach-omap2/omap_phy_internal.c | 6 +-
+ arch/arm/mach-omap2/omap_twl.c | 60 -
+ arch/arm/mach-omap2/pdata-quirks.c | 19 +
+ arch/arm/mach-omap2/pm.c | 45 +-
+ arch/arm/mach-omap2/pm.h | 8 +-
+ arch/arm/mach-omap2/pm24xx.c | 4 +-
+ arch/arm/mach-omap2/pm34xx.c | 11 +-
+ arch/arm/mach-omap2/pm44xx.c | 6 +-
+ arch/arm/mach-omap2/powerdomain-common.c | 1 -
+ arch/arm/mach-omap2/powerdomain.c | 1 +
+ arch/arm/mach-omap2/powerdomain.h | 3 +-
+ arch/arm/mach-omap2/prcm-common.h | 24 +
+ arch/arm/mach-omap2/prcm_mpu44xx.c | 4 +-
+ arch/arm/mach-omap2/prcm_mpu44xx.h | 1 -
+ arch/arm/mach-omap2/prm-regbits-34xx.h | 11 +-
+ arch/arm/mach-omap2/prm.h | 10 +
+ arch/arm/mach-omap2/prm2xxx.c | 13 +-
+ arch/arm/mach-omap2/prm2xxx.h | 2 +-
+ arch/arm/mach-omap2/prm2xxx_3xxx.c | 1 -
+ arch/arm/mach-omap2/prm2xxx_3xxx.h | 4 +-
+ arch/arm/mach-omap2/prm33xx.c | 5 +-
+ arch/arm/mach-omap2/prm3xxx.c | 22 +-
+ arch/arm/mach-omap2/prm3xxx.h | 2 +-
+ arch/arm/mach-omap2/prm44xx.c | 24 +-
+ arch/arm/mach-omap2/prm_common.c | 17 +-
+ arch/arm/mach-omap2/prminst44xx.c | 4 +-
+ arch/arm/mach-omap2/sdrc.h | 8 +-
+ arch/arm/mach-omap2/sdrc2xxx.c | 4 +-
+ arch/arm/mach-omap2/soc.h | 5 +
+ arch/arm/mach-omap2/sr_device.c | 2 +-
+ arch/arm/mach-omap2/sram.c | 16 +-
+ arch/arm/mach-omap2/timer.c | 10 +-
+ arch/arm/mach-omap2/vc.c | 236 ++-
+ arch/arm/mach-omap2/vc.h | 3 +
+ arch/arm/mach-omap2/wd_timer.c | 8 +-
+ arch/arm/mach-orion5x/Kconfig | 37 +-
+ arch/arm/mach-orion5x/Makefile | 7 +-
+ arch/arm/mach-orion5x/board-d2net.c | 109 ++
+ arch/arm/mach-orion5x/board-dt.c | 18 +-
+ arch/arm/mach-orion5x/board-mss2.c | 90 +
+ arch/arm/mach-orion5x/board-rd88f5182.c | 116 ++
+ arch/arm/mach-orion5x/common.h | 13 +-
+ arch/arm/mach-orion5x/d2net-setup.c | 365 ----
+ arch/arm/mach-orion5x/edmini_v2-setup.c | 169 --
+ arch/arm/mach-orion5x/irq.c | 28 +
+ arch/arm/mach-orion5x/mss2-setup.c | 274 ---
+ arch/arm/mach-prima2/rstc.c | 34 +-
+ arch/arm/mach-qcom/Kconfig | 4 +-
+ arch/arm/mach-realview/core.c | 15 +
+ arch/arm/mach-realview/core.h | 1 +
+ arch/arm/mach-realview/realview_eb.c | 1 +
+ arch/arm/mach-realview/realview_pb1176.c | 1 +
+ arch/arm/mach-realview/realview_pb11mp.c | 1 +
+ arch/arm/mach-realview/realview_pba8.c | 1 +
+ arch/arm/mach-realview/realview_pbx.c | 1 +
+ arch/arm/mach-rockchip/core.h | 2 -
+ arch/arm/mach-rockchip/platsmp.c | 3 +-
+ arch/arm/mach-rockchip/rockchip.c | 1 -
+ arch/arm/mach-s3c24xx/Kconfig | 70 +-
+ arch/arm/mach-s3c24xx/Makefile | 13 +-
+ arch/arm/mach-s3c24xx/clock-dclk.c | 195 --
+ arch/arm/mach-s3c24xx/clock-s3c2410.c | 284 ---
+ arch/arm/mach-s3c24xx/clock-s3c2412.c | 760 --------
+ arch/arm/mach-s3c24xx/clock-s3c2416.c | 171 --
+ arch/arm/mach-s3c24xx/clock-s3c2440.c | 217 ---
+ arch/arm/mach-s3c24xx/clock-s3c2443.c | 212 ---
+ arch/arm/mach-s3c24xx/clock-s3c244x.c | 141 --
+ arch/arm/mach-s3c24xx/common-s3c2443.c | 675 -------
+ arch/arm/mach-s3c24xx/common.c | 85 +-
+ arch/arm/mach-s3c24xx/common.h | 21 +-
+ arch/arm/mach-s3c24xx/cpufreq-utils.c | 4 +-
+ arch/arm/mach-s3c24xx/include/mach/debug-macro.S | 101 -
+ arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 18 -
+ arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 3 -
+ arch/arm/mach-s3c24xx/mach-amlm5900.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-anubis.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-at2440evb.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-bast.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-gta02.c | 8 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-jive.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 12 +-
+ arch/arm/mach-s3c24xx/mach-nexcoder.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-osiris.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-otom.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-qt2410.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 21 +-
+ arch/arm/mach-s3c24xx/mach-rx3715.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 38 +-
+ arch/arm/mach-s3c24xx/mach-smdk2410.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2413.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2416.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-smdk2440.c | 10 +-
+ arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-tct_hammer.c | 9 +-
+ arch/arm/mach-s3c24xx/mach-vr1000.c | 34 +-
+ arch/arm/mach-s3c24xx/mach-vstms.c | 9 +-
+ arch/arm/mach-s3c24xx/pm.c | 17 -
+ arch/arm/mach-s3c24xx/s3c2410.c | 56 -
+ arch/arm/mach-s3c24xx/s3c2412.c | 43 -
+ arch/arm/mach-s3c24xx/s3c2442.c | 111 --
+ arch/arm/mach-s3c24xx/s3c244x.c | 59 +-
+ arch/arm/mach-shmobile/Kconfig | 29 +-
+ arch/arm/mach-shmobile/Makefile | 4 +-
+ arch/arm/mach-shmobile/Makefile.boot | 1 -
+ .../board-armadillo800eva-reference.c | 2 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 7 +-
+ arch/arm/mach-shmobile/board-bockw.c | 63 +-
+ arch/arm/mach-shmobile/board-genmai-reference.c | 18 +-
+ arch/arm/mach-shmobile/board-genmai.c | 44 +
+ arch/arm/mach-shmobile/board-koelsch-reference.c | 73 +-
+ arch/arm/mach-shmobile/board-koelsch.c | 4 +-
+ arch/arm/mach-shmobile/board-lager-reference.c | 69 +-
+ arch/arm/mach-shmobile/board-lager.c | 29 +-
+ arch/arm/mach-shmobile/clock-emev2.c | 231 ---
+ arch/arm/mach-shmobile/clock-r7s72100.c | 11 +-
+ arch/arm/mach-shmobile/clock-r8a73a4.c | 2 +-
+ arch/arm/mach-shmobile/clock-r8a7740.c | 12 +-
+ arch/arm/mach-shmobile/clock-r8a7778.c | 26 +-
+ arch/arm/mach-shmobile/clock-r8a7779.c | 4 +-
+ arch/arm/mach-shmobile/clock-r8a7790.c | 34 +-
+ arch/arm/mach-shmobile/clock-r8a7791.c | 25 +-
+ arch/arm/mach-shmobile/clock-sh7372.c | 9 +-
+ arch/arm/mach-shmobile/clock-sh73a0.c | 5 +-
+ arch/arm/mach-shmobile/clock.c | 28 +
+ arch/arm/mach-shmobile/include/mach/clock.h | 17 +
+ arch/arm/mach-shmobile/include/mach/common.h | 1 +
+ arch/arm/mach-shmobile/include/mach/emev2.h | 9 -
+ arch/arm/mach-shmobile/include/mach/r8a7740.h | 1 -
+ arch/arm/mach-shmobile/include/mach/r8a7791.h | 1 -
+ arch/arm/mach-shmobile/pm-rmobile.c | 38 +-
+ arch/arm/mach-shmobile/setup-emev2.c | 11 +-
+ arch/arm/mach-shmobile/setup-r7s72100.c | 69 +-
+ arch/arm/mach-shmobile/setup-r8a73a4.c | 17 +-
+ arch/arm/mach-shmobile/setup-r8a7740.c | 154 +-
+ arch/arm/mach-shmobile/setup-r8a7778.c | 28 +-
+ arch/arm/mach-shmobile/setup-r8a7779.c | 66 +-
+ arch/arm/mach-shmobile/setup-r8a7790.c | 37 +-
+ arch/arm/mach-shmobile/setup-r8a7791.c | 34 +-
+ arch/arm/mach-shmobile/setup-rcar-gen2.c | 16 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 95 +-
+ arch/arm/mach-shmobile/setup-sh73a0.c | 92 +-
+ arch/arm/mach-shmobile/smp-emev2.c | 1 -
+ arch/arm/mach-shmobile/smp-r8a7791.c | 15 +-
+ arch/arm/mach-shmobile/timer.c | 45 +
+ arch/arm/mach-sti/board-dt.c | 1 +
+ arch/arm/mach-sunxi/Kconfig | 38 +-
+ arch/arm/mach-sunxi/common.h | 19 -
+ arch/arm/mach-sunxi/platsmp.c | 3 +-
+ arch/arm/mach-sunxi/sunxi.c | 113 +-
+ arch/arm/mach-tegra/Kconfig | 1 -
+ arch/arm/mach-tegra/pmc.c | 24 +
+ arch/arm/mach-versatile/core.c | 16 +
+ arch/arm/mach-vexpress/Kconfig | 2 +
+ arch/arm/mach-vexpress/core.h | 3 +-
+ arch/arm/mach-vexpress/ct-ca9x4.c | 10 +-
+ arch/arm/mach-vexpress/platsmp.c | 187 +-
+ arch/arm/mach-vexpress/v2m.c | 82 +-
+ arch/arm/mach-zynq/Kconfig | 10 +-
+ arch/arm/mach-zynq/common.c | 73 +-
+ arch/arm/mach-zynq/common.h | 1 +
+ arch/arm/mach-zynq/headsmp.S | 5 +-
+ arch/arm/mach-zynq/slcr.c | 19 +
+ arch/arm/plat-omap/counter_32k.c | 6 +-
+ arch/arm/plat-omap/debug-leds.c | 14 +-
+ arch/arm/plat-omap/dmtimer.c | 8 +-
+ arch/arm/plat-omap/include/plat/dmtimer.h | 16 +-
+ arch/arm/plat-orion/gpio.c | 48 -
+ arch/arm/plat-orion/include/plat/irq.h | 1 -
+ arch/arm/plat-orion/include/plat/orion-gpio.h | 1 -
+ arch/arm/plat-orion/irq.c | 77 -
+ arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 1 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 61 -
+ arch/arm/plat-versatile/Kconfig | 6 -
+ arch/arm/plat-versatile/Makefile | 1 -
+ arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi | 2 +-
+ arch/sh/kernel/cpu/clock-cpg.c | 10 +-
+ arch/sh/kernel/cpu/sh2/setup-sh7619.c | 66 +-
+ arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 4 +-
+ arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 4 +-
+ arch/sh/kernel/cpu/sh2a/setup-mxg.c | 98 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 98 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 133 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 164 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7264.c | 140 +-
+ arch/sh/kernel/cpu/sh2a/setup-sh7269.c | 133 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh770x.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7710.c | 78 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 228 +--
+ arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 78 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7750.c | 138 +-
+ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 78 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 6 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 10 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 10 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 16 +-
+ arch/sh/kernel/cpu/sh4a/clock-shx3.c | 8 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 96 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 96 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 96 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 172 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 173 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 235 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 48 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 154 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 230 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 154 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 154 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 299 +--
+ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 150 +-
+ arch/sh/kernel/cpu/sh5/setup-sh5.c | 79 +-
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 3 +
+ drivers/bus/Kconfig | 18 +
+ drivers/bus/Makefile | 3 +
+ drivers/bus/brcmstb_gisb.c | 289 +++
+ drivers/bus/mvebu-mbus.c | 11 +-
+ drivers/bus/omap_l3_noc.c | 406 ++--
+ drivers/bus/omap_l3_noc.h | 545 ++++--
+ drivers/bus/vexpress-config.c | 202 ++
+ drivers/clk/Kconfig | 11 +-
+ drivers/clk/Makefile | 2 +-
+ drivers/clk/at91/Makefile | 4 +-
+ drivers/clk/at91/clk-main.c | 577 +++++-
+ drivers/clk/at91/clk-slow.c | 467 +++++
+ drivers/clk/at91/pmc.c | 17 +
+ drivers/clk/at91/pmc.h | 9 +
+ drivers/clk/at91/sckc.c | 57 +
+ drivers/clk/at91/sckc.h | 22 +
+ drivers/clk/samsung/Kconfig | 26 +
+ drivers/clk/samsung/Makefile | 6 +
+ drivers/clk/samsung/clk-exynos3250.c | 780 ++++++++
+ drivers/clk/samsung/clk-exynos4.c | 51 +-
+ drivers/clk/samsung/clk-exynos5250.c | 118 +-
+ drivers/clk/samsung/clk-exynos5260.c | 1980 ++++++++++++++++++++
+ drivers/clk/samsung/clk-exynos5260.h | 459 +++++
+ drivers/clk/samsung/clk-exynos5420.c | 1127 +++++++----
+ drivers/clk/samsung/clk-exynos5440.c | 18 +-
+ drivers/clk/samsung/clk-pll.c | 489 ++++-
+ drivers/clk/samsung/clk-pll.h | 8 +
+ drivers/clk/samsung/clk-s3c2410-dclk.c | 440 +++++
+ drivers/clk/samsung/clk-s3c2410.c | 482 +++++
+ drivers/clk/samsung/clk-s3c2412.c | 274 +++
+ drivers/clk/samsung/clk-s3c2443.c | 466 +++++
+ drivers/clk/samsung/clk-s3c64xx.c | 44 +-
+ drivers/clk/samsung/clk.c | 123 +-
+ drivers/clk/samsung/clk.h | 72 +-
+ drivers/clk/ti/clk-43xx.c | 6 +
+ drivers/clk/versatile/Kconfig | 26 +
+ drivers/clk/versatile/Makefile | 5 +-
+ drivers/clk/versatile/clk-vexpress-osc.c | 96 +-
+ drivers/clocksource/Kconfig | 11 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/cadence_ttc_timer.c | 54 +-
+ drivers/clocksource/exynos_mct.c | 8 +
+ drivers/clocksource/sh_cmt.c | 956 ++++++----
+ drivers/clocksource/sh_mtu2.c | 488 +++--
+ drivers/clocksource/sh_tmu.c | 541 ++++--
+ drivers/clocksource/timer-marco.c | 8 +-
+ drivers/clocksource/timer-prima2.c | 47 +-
+ drivers/clocksource/versatile.c | 40 +
+ drivers/cpufreq/exynos-cpufreq.c | 19 +-
+ drivers/cpufreq/exynos-cpufreq.h | 8 +
+ drivers/cpufreq/exynos4x12-cpufreq.c | 11 +-
+ drivers/cpufreq/s3c24xx-cpufreq.c | 1 +
+ drivers/cpuidle/Kconfig.arm | 11 +
+ drivers/cpuidle/Makefile | 2 +
+ drivers/cpuidle/cpuidle-armada-370-xp.c | 93 +
+ drivers/cpuidle/cpuidle-exynos.c | 99 +
+ drivers/dma/edma.c | 335 +++-
+ drivers/hwmon/vexpress.c | 17 +-
+ drivers/iio/adc/at91_adc.c | 340 +++-
+ drivers/input/touchscreen/Kconfig | 12 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/atmel_tsadcc.c | 358 ----
+ drivers/irqchip/irq-armada-370-xp.c | 24 +-
+ drivers/irqchip/irq-orion.c | 4 +-
+ drivers/irqchip/irq-sirfsoc.c | 3 +-
+ drivers/leds/Kconfig | 8 +
+ drivers/leds/Makefile | 1 +
+ .../leds.c => drivers/leds/leds-versatile.c | 51 +-
+ drivers/memory/mvebu-devbus.c | 229 ++-
+ drivers/mfd/Kconfig | 15 +-
+ drivers/mfd/Makefile | 2 +-
+ drivers/mfd/syscon.c | 4 +
+ drivers/mfd/twl-core.c | 15 +
+ drivers/mfd/vexpress-config.c | 287 ---
+ drivers/mfd/vexpress-sysreg.c | 554 ++----
+ drivers/misc/Kconfig | 9 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/vexpress-syscfg.c | 324 ++++
+ drivers/of/platform.c | 74 +-
+ drivers/power/reset/Kconfig | 23 +
+ drivers/power/reset/Makefile | 3 +
+ drivers/power/reset/axxia-reset.c | 88 +
+ drivers/power/reset/keystone-reset.c | 166 ++
+ drivers/power/reset/sun6i-reboot.c | 85 +
+ drivers/power/reset/vexpress-poweroff.c | 16 +-
+ drivers/regulator/vexpress.c | 50 +-
+ drivers/reset/Makefile | 1 +
+ drivers/reset/reset-socfpga.c | 146 ++
+ drivers/reset/reset-sunxi.c | 21 +-
+ drivers/reset/sti/reset-stih415.c | 1 +
+ drivers/reset/sti/reset-stih416.c | 1 +
+ drivers/soc/Kconfig | 5 +
+ drivers/soc/Makefile | 5 +
+ drivers/soc/qcom/Kconfig | 11 +
+ drivers/soc/qcom/Makefile | 1 +
+ drivers/soc/qcom/qcom_gsbi.c | 85 +
+ drivers/usb/phy/phy-isp1301-omap.c | 2 +-
+ include/dt-bindings/clock/berlin2.h | 45 +
+ include/dt-bindings/clock/berlin2q.h | 31 +
+ include/dt-bindings/clock/exynos3250.h | 258 +++
+ include/dt-bindings/clock/exynos4.h | 2 +-
+ include/dt-bindings/clock/exynos5250.h | 21 +-
+ include/dt-bindings/clock/exynos5260-clk.h | 469 +++++
+ include/dt-bindings/clock/exynos5420.h | 43 +-
+ include/dt-bindings/clock/imx6sx-clock.h | 256 +++
+ include/dt-bindings/clock/lsi,axm5516-clks.h | 36 +
+ include/dt-bindings/clock/r7s72100-clock.h | 41 +
+ include/dt-bindings/clock/r8a7790-clock.h | 7 +-
+ include/dt-bindings/clock/r8a7791-clock.h | 8 +-
+ include/dt-bindings/clock/s3c2410.h | 62 +
+ include/dt-bindings/clock/s3c2412.h | 73 +
+ include/dt-bindings/clock/s3c2443.h | 92 +
+ include/dt-bindings/clock/stih415-clks.h | 15 +
+ include/dt-bindings/clock/stih416-clks.h | 15 +
+ include/dt-bindings/pinctrl/omap.h | 25 +-
+ .../dt-bindings/reset-controller/stih415-resets.h | 1 +
+ .../dt-bindings/reset-controller/stih416-resets.h | 1 +
+ include/dt-bindings/reset/altr,rst-mgr.h | 90 +
+ include/dt-bindings/soc/qcom,gsbi.h | 26 +
+ include/linux/clk/at91_pmc.h | 1 +
+ include/linux/mbus.h | 2 +-
+ include/linux/of.h | 7 +
+ include/linux/of_platform.h | 5 +
+ include/linux/platform_data/at91_adc.h | 27 +-
+ include/linux/platform_data/atmel.h | 7 -
+ include/linux/platform_data/edma.h | 28 +-
+ include/linux/platform_data/syscon.h | 8 +
+ include/linux/reset.h | 10 +
+ include/linux/sh_timer.h | 1 +
+ include/linux/vexpress.h | 94 +-
+ sound/soc/atmel/sam9g20_wm8731.c | 1 -
+ 989 files changed, 45922 insertions(+), 17937 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-brcmstb-gisb-arb
+ create mode 100644 Documentation/arm/sti/stih407-overview.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/armada-cpu-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/axxia.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/exynos/smp-sysram.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/rockchip.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/sti.txt
+ create mode 100644 Documentation/devicetree/bindings/bus/brcm,gisb-arb.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos3250-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5260-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx6sx-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/power/reset/keystone-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/power_supply/axxia-reset.txt
+ create mode 100644 Documentation/devicetree/bindings/reset/allwinner,sunxi-clock-reset.txt
+ rename Documentation/devicetree/bindings/{arm/altera => reset}/socfpga-reset.txt (85%)
+ create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_can.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_isi.dtsi
+ create mode 100644 arch/arm/boot/dts/at91sam9x5_lcd.dtsi
+ create mode 100644 arch/arm/boot/dts/axm5516-amarillo.dts
+ create mode 100644 arch/arm/boot/dts/axm5516-cpus.dtsi
+ create mode 100644 arch/arm/boot/dts/axm55xx.dtsi
+ create mode 100644 arch/arm/boot/dts/berlin2q-marvell-dmp.dts
+ create mode 100644 arch/arm/boot/dts/berlin2q.dtsi
+ create mode 100644 arch/arm/boot/dts/dra72-evm.dts
+ create mode 100644 arch/arm/boot/dts/dra72x.dtsi
+ create mode 100644 arch/arm/boot/dts/dra74x.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5420-peach-pit.dts
+ create mode 100644 arch/arm/boot/dts/imx35-pdk.dts
+ create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-jsk.dts
+ create mode 100644 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-phytec-pbab01.dts
+ create mode 100644 arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6dl-riotboard.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-km_common.dtsi
+ create mode 100644 arch/arm/boot/dts/kirkwood-km_fixedeth.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-nsa320.dts
+ rename arch/arm/boot/dts/{kirkwood-nsa310-common.dtsi => kirkwood-nsa3x0-common.dtsi} (58%)
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-base.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-client.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd-ultimate.dts
+ create mode 100644 arch/arm/boot/dts/kirkwood-openrd.dtsi
+ create mode 100644 arch/arm/boot/dts/omap2420-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/omap2430-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/omap24xx-clocks.dtsi
+ create mode 100644 arch/arm/boot/dts/omap4-var-dvk-om44.dts
+ create mode 100644 arch/arm/boot/dts/omap4-var-om44customboard.dtsi
+ create mode 100644 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi
+ create mode 100644 arch/arm/boot/dts/omap4-var-som-om44.dtsi
+ delete mode 100644 arch/arm/boot/dts/omap4-var-som.dts
+ create mode 100644 arch/arm/boot/dts/omap4-var-stk-om44.dts
+ create mode 100644 arch/arm/boot/dts/omap5-cm-t54.dts
+ create mode 100644 arch/arm/boot/dts/omap5-sbc-t54.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-lacie-d2-network.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-maxtor-shared-storage-2.dts
+ create mode 100644 arch/arm/boot/dts/orion5x-mv88f5182.dtsi
+ create mode 100644 arch/arm/boot/dts/orion5x-rd88f5182-nas.dts
+ delete mode 100644 arch/arm/boot/dts/r7s72100-genmai-reference.dts
+ create mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts
+ create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_socrates.dts
+ create mode 100644 arch/arm/boot/dts/stih407-b2120.dts
+ create mode 100644 arch/arm/boot/dts/stih407-clock.dtsi
+ create mode 100644 arch/arm/boot/dts/stih407-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/stih407.dtsi
+ create mode 100644 arch/arm/boot/dts/stih416-b2020-revE.dts
+ create mode 100644 arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+ create mode 100644 arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+ create mode 100644 arch/arm/boot/dts/sun6i-a31-m9.dts
+ create mode 100644 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+ create mode 100644 arch/arm/boot/dts/tegra114-roth.dts
+ create mode 100644 arch/arm/boot/dts/tegra114-tn7.dts
+ create mode 100644 arch/arm/boot/dts/tegra124-jetson-tk1.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
+ create mode 100644 arch/arm/boot/dts/tegra30-colibri.dtsi
+ create mode 100644 arch/arm/boot/dts/vf610-colibri.dts
+ create mode 100644 arch/arm/configs/axm55xx_defconfig
+ create mode 100644 arch/arm/configs/qcom_defconfig
+ create mode 100644 arch/arm/include/debug/s3c24xx.S
+ rename arch/arm/mach-at91/{include/mach => }/gpio.h (96%)
+ delete mode 100644 arch/arm/mach-at91/include/mach/at91_adc.h
+ create mode 100644 arch/arm/mach-axxia/Kconfig
+ create mode 100644 arch/arm/mach-axxia/Makefile
+ create mode 100644 arch/arm/mach-axxia/axxia.c
+ create mode 100644 arch/arm/mach-axxia/platsmp.c
+ delete mode 100644 arch/arm/mach-bcm/bcm_kona_smc_asm.S
+ rename arch/arm/mach-bcm/{kona.c => kona_l2_cache.c} (80%)
+ rename arch/arm/mach-bcm/{kona.h => kona_l2_cache.h} (80%)
+ delete mode 100644 arch/arm/mach-exynos/cpuidle.c
+ create mode 100644 arch/arm/mach-exynos/mcpm-exynos.c
+ create mode 100644 arch/arm/mach-imx/clk-imx6sx.c
+ delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
+ delete mode 100644 arch/arm/mach-imx/mach-cpuimx51sd.c
+ create mode 100644 arch/arm/mach-imx/mach-imx6sx.c
+ delete mode 100644 arch/arm/mach-imx/mach-mx51_babbage.c
+ create mode 100644 arch/arm/mach-keystone/memory.h
+ delete mode 100644 arch/arm/mach-mvebu/board-t5325.c
+ create mode 100644 arch/arm/mach-mvebu/cpu-reset.c
+ create mode 100644 arch/arm/mach-mvebu/headsmp-a9.S
+ create mode 100644 arch/arm/mach-mvebu/platsmp-a9.c
+ create mode 100644 arch/arm/mach-orion5x/board-d2net.c
+ create mode 100644 arch/arm/mach-orion5x/board-mss2.c
+ create mode 100644 arch/arm/mach-orion5x/board-rd88f5182.c
+ delete mode 100644 arch/arm/mach-orion5x/d2net-setup.c
+ delete mode 100644 arch/arm/mach-orion5x/edmini_v2-setup.c
+ delete mode 100644 arch/arm/mach-orion5x/mss2-setup.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-dclk.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2410.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2412.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2416.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2440.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c2443.c
+ delete mode 100644 arch/arm/mach-s3c24xx/clock-s3c244x.c
+ delete mode 100644 arch/arm/mach-s3c24xx/common-s3c2443.c
+ delete mode 100644 arch/arm/mach-s3c24xx/include/mach/debug-macro.S
+ delete mode 100644 arch/arm/mach-shmobile/clock-emev2.c
+ delete mode 100644 arch/arm/mach-shmobile/include/mach/emev2.h
+ delete mode 100644 arch/arm/mach-sunxi/common.h
+ create mode 100644 drivers/bus/brcmstb_gisb.c
+ create mode 100644 drivers/bus/vexpress-config.c
+ create mode 100644 drivers/clk/at91/clk-slow.c
+ create mode 100644 drivers/clk/at91/sckc.c
+ create mode 100644 drivers/clk/at91/sckc.h
+ create mode 100644 drivers/clk/samsung/Kconfig
+ create mode 100644 drivers/clk/samsung/clk-exynos3250.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5260.c
+ create mode 100644 drivers/clk/samsung/clk-exynos5260.h
+ create mode 100644 drivers/clk/samsung/clk-s3c2410-dclk.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2410.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2412.c
+ create mode 100644 drivers/clk/samsung/clk-s3c2443.c
+ create mode 100644 drivers/clk/versatile/Kconfig
+ create mode 100644 drivers/clocksource/versatile.c
+ create mode 100644 drivers/cpuidle/cpuidle-armada-370-xp.c
+ create mode 100644 drivers/cpuidle/cpuidle-exynos.c
+ delete mode 100644 drivers/input/touchscreen/atmel_tsadcc.c
+ rename arch/arm/plat-versatile/leds.c => drivers/leds/leds-versatile.c (68%)
+ delete mode 100644 drivers/mfd/vexpress-config.c
+ create mode 100644 drivers/misc/vexpress-syscfg.c
+ create mode 100644 drivers/power/reset/axxia-reset.c
+ create mode 100644 drivers/power/reset/keystone-reset.c
+ create mode 100644 drivers/power/reset/sun6i-reboot.c
+ create mode 100644 drivers/reset/reset-socfpga.c
+ create mode 100644 drivers/soc/Kconfig
+ create mode 100644 drivers/soc/Makefile
+ create mode 100644 drivers/soc/qcom/Kconfig
+ create mode 100644 drivers/soc/qcom/Makefile
+ create mode 100644 drivers/soc/qcom/qcom_gsbi.c
+ create mode 100644 include/dt-bindings/clock/berlin2.h
+ create mode 100644 include/dt-bindings/clock/berlin2q.h
+ create mode 100644 include/dt-bindings/clock/exynos3250.h
+ create mode 100644 include/dt-bindings/clock/exynos5260-clk.h
+ create mode 100644 include/dt-bindings/clock/imx6sx-clock.h
+ create mode 100644 include/dt-bindings/clock/lsi,axm5516-clks.h
+ create mode 100644 include/dt-bindings/clock/r7s72100-clock.h
+ create mode 100644 include/dt-bindings/clock/s3c2410.h
+ create mode 100644 include/dt-bindings/clock/s3c2412.h
+ create mode 100644 include/dt-bindings/clock/s3c2443.h
+ create mode 100644 include/dt-bindings/clock/stih415-clks.h
+ create mode 100644 include/dt-bindings/clock/stih416-clks.h
+ create mode 100644 include/dt-bindings/reset/altr,rst-mgr.h
+ create mode 100644 include/dt-bindings/soc/qcom,gsbi.h
+ create mode 100644 include/linux/platform_data/syscon.h
+Merging bcm2835/for-next (fa389e220254 Linux 3.14-rc6)
+$ git merge bcm2835/for-next
+Already up-to-date.
+Merging berlin/berlin/for-next (8a26730ea692 Merge branch 'berlin/soc' 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 (49a96400a142 Merge branch 'imx/dt' into for-next)
+$ git merge imx-mxs/for-next
+Removing include/linux/platform_data/usb-imx_udc.h
+Removing arch/arm/mach-imx/mx53.h
+Removing arch/arm/mach-imx/mx51.h
+Removing arch/arm/mach-imx/mm-imx5.c
+Auto-merging arch/arm/mach-imx/mach-imx51.c
+Removing arch/arm/mach-imx/iomux-mx51.h
+Removing arch/arm/mach-imx/ehci-imx5.c
+Removing arch/arm/mach-imx/devices/platform-imx_udc.c
+Removing arch/arm/mach-imx/devices-imx51.h
+Removing arch/arm/mach-imx/crm-regs-imx5.h
+Auto-merging arch/arm/mach-imx/Kconfig
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/imx1-clock.txt | 26 +
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 296 ++++
+ .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts | 274 ++++
+ arch/arm/boot/dts/imx28-cfa10036.dts | 22 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 1 +
+ arch/arm/boot/dts/imx6sl-evk.dts | 16 +-
+ arch/arm/boot/dts/imx6sl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx-pinfunc.h | 1544 ++++++++++++++++++++
+ arch/arm/boot/dts/imx6sx-sdb.dts | 210 +++
+ arch/arm/boot/dts/imx6sx.dtsi | 1202 +++++++++++++++
+ arch/arm/configs/imx_v6_v7_defconfig | 2 +-
+ arch/arm/configs/multi_v7_defconfig | 2 +-
+ arch/arm/mach-imx/Kconfig | 27 +-
+ arch/arm/mach-imx/Makefile | 10 +-
+ arch/arm/mach-imx/clk-imx1.c | 153 +-
+ arch/arm/mach-imx/clk-imx51-imx53.c | 144 +-
+ arch/arm/mach-imx/clk-imx6sl.c | 1 +
+ arch/arm/mach-imx/common.h | 22 +-
+ arch/arm/mach-imx/cpu-imx5.c | 25 +-
+ arch/arm/mach-imx/crm-regs-imx5.h | 600 --------
+ arch/arm/mach-imx/devices-imx51.h | 66 -
+ arch/arm/mach-imx/devices/Kconfig | 6 +-
+ arch/arm/mach-imx/devices/Makefile | 1 -
+ arch/arm/mach-imx/devices/devices-common.h | 16 -
+ arch/arm/mach-imx/devices/platform-fec.c | 12 -
+ arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 5 -
+ arch/arm/mach-imx/devices/platform-imx-i2c.c | 26 -
+ arch/arm/mach-imx/devices/platform-imx-keypad.c | 10 -
+ arch/arm/mach-imx/devices/platform-imx-ssi.c | 20 -
+ arch/arm/mach-imx/devices/platform-imx-uart.c | 22 -
+ arch/arm/mach-imx/devices/platform-imx2-wdt.c | 18 -
+ arch/arm/mach-imx/devices/platform-imx_udc.c | 75 -
+ arch/arm/mach-imx/devices/platform-mxc-ehci.c | 9 -
+ arch/arm/mach-imx/devices/platform-mxc_nand.c | 5 -
+ arch/arm/mach-imx/devices/platform-pata_imx.c | 10 -
+ .../mach-imx/devices/platform-sdhci-esdhc-imx.c | 24 -
+ arch/arm/mach-imx/devices/platform-spi_imx.c | 27 -
+ arch/arm/mach-imx/ehci-imx25.c | 1 +
+ arch/arm/mach-imx/ehci-imx27.c | 1 +
+ arch/arm/mach-imx/ehci-imx31.c | 1 +
+ arch/arm/mach-imx/ehci-imx35.c | 1 +
+ arch/arm/mach-imx/ehci-imx5.c | 171 ---
+ arch/arm/mach-imx/ehci.h | 43 +
+ arch/arm/mach-imx/hardware.h | 2 -
+ arch/arm/mach-imx/iomux-mx51.h | 827 -----------
+ arch/arm/mach-imx/mach-armadillo5x0.c | 1 +
+ arch/arm/mach-imx/mach-cpuimx27.c | 1 +
+ arch/arm/mach-imx/mach-cpuimx35.c | 1 +
+ arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 1 +
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 1 +
+ arch/arm/mach-imx/mach-imx50.c | 3 +-
+ arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} | 43 +-
+ arch/arm/mach-imx/mach-imx53.c | 15 +-
+ arch/arm/mach-imx/mach-mx25_3ds.c | 1 +
+ arch/arm/mach-imx/mach-mx27_3ds.c | 1 +
+ arch/arm/mach-imx/mach-mx31_3ds.c | 1 +
+ arch/arm/mach-imx/mach-mx31lilly.c | 1 +
+ arch/arm/mach-imx/mach-mx31lite.c | 1 +
+ arch/arm/mach-imx/mach-mx31moboard.c | 1 +
+ arch/arm/mach-imx/mach-mx35_3ds.c | 1 +
+ arch/arm/mach-imx/mach-pca100.c | 1 +
+ arch/arm/mach-imx/mach-pcm037.c | 1 +
+ arch/arm/mach-imx/mach-pcm038.c | 1 +
+ arch/arm/mach-imx/mach-pcm043.c | 1 +
+ arch/arm/mach-imx/mach-vpr200.c | 1 +
+ arch/arm/mach-imx/mm-imx5.c | 155 --
+ arch/arm/mach-imx/mx31moboard-devboard.c | 1 +
+ arch/arm/mach-imx/mx31moboard-marxbot.c | 1 +
+ arch/arm/mach-imx/mx31moboard-smartbot.c | 1 +
+ arch/arm/mach-imx/mx51.h | 346 -----
+ arch/arm/mach-imx/mx53.h | 342 -----
+ arch/arm/mach-imx/pm-imx5.c | 98 +-
+ arch/arm/mach-imx/tzic.c | 9 +-
+ include/dt-bindings/clock/imx1-clock.h | 40 +
+ include/dt-bindings/clock/imx6sl-clock.h | 3 +-
+ include/linux/platform_data/usb-ehci-mxc.h | 46 -
+ include/linux/platform_data/usb-imx_udc.h | 23 -
+ 78 files changed, 4079 insertions(+), 3044 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/imx1-clock.txt
+ create mode 100644 arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi
+ create mode 100644 arch/arm/boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts
+ create mode 100755 arch/arm/boot/dts/imx6sx-pinfunc.h
+ create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts
+ create mode 100644 arch/arm/boot/dts/imx6sx.dtsi
+ delete mode 100644 arch/arm/mach-imx/crm-regs-imx5.h
+ delete mode 100644 arch/arm/mach-imx/devices-imx51.h
+ delete mode 100644 arch/arm/mach-imx/devices/platform-imx_udc.c
+ delete mode 100644 arch/arm/mach-imx/ehci-imx5.c
+ create mode 100644 arch/arm/mach-imx/ehci.h
+ delete mode 100644 arch/arm/mach-imx/iomux-mx51.h
+ rename arch/arm/mach-imx/{imx51-dt.c => mach-imx51.c} (54%)
+ delete mode 100644 arch/arm/mach-imx/mm-imx5.c
+ delete mode 100644 arch/arm/mach-imx/mx51.h
+ delete mode 100644 arch/arm/mach-imx/mx53.h
+ create mode 100644 include/dt-bindings/clock/imx1-clock.h
+ delete mode 100644 include/linux/platform_data/usb-imx_udc.h
+Merging ixp4xx/next (19f949f52599 Linux 3.8)
+$ git merge ixp4xx/next
+Already up-to-date.
+Merging keystone/next (c9eaa447e77e Linux 3.15-rc1)
+$ git merge keystone/next
+Already up-to-date.
+Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix)
+$ git merge msm/for-next
+Already up-to-date.
+Merging mvebu/for-next (0a847a5b6ebe Merge branch 'mvebu/dt' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/mvebu-core-clock.txt | 8 +
+ arch/arm/boot/dts/armada-375-db.dts | 2 +
+ arch/arm/boot/dts/armada-385-db.dts | 2 +
+ drivers/clk/mvebu/Kconfig | 4 +
+ drivers/clk/mvebu/Makefile | 1 +
+ drivers/clk/mvebu/orion.c | 210 +++++++++++++++++++++
+ 6 files changed, 227 insertions(+)
+ create mode 100644 drivers/clk/mvebu/orion.c
+Merging renesas/next (9e5ace6250ce Merge branch 'heads/fixes-for-v3.16' into next)
+$ git merge renesas/next
+Resolved 'arch/arm/boot/dts/Makefile' using previous resolution.
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/boot/dts/Makefile
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3b7f09193314] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +-
+ drivers/sh/intc/Kconfig | 2 +-
+ drivers/sh/pm_runtime.c | 37 +++++++++++++++++++++-----
+ 3 files changed, 33 insertions(+), 8 deletions(-)
+Merging samsung/for-next (ca610da74ea1 Merge branch 'v3.16-next/dt-samsung-3' into for-next)
+$ git merge samsung/for-next
+Auto-merging arch/arm/mach-exynos/firmware.c
+Auto-merging arch/arm/mach-exynos/exynos.c
+Auto-merging arch/arm/mach-exynos/common.h
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/exynos5410-clock.txt | 45 ++
+ arch/arm/Kconfig | 20 -
+ arch/arm/boot/dts/Makefile | 5 +-
+ arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 475 +++++++++++++++++
+ arch/arm/boot/dts/exynos3250.dtsi | 439 ++++++++++++++++
+ arch/arm/boot/dts/exynos4210-origen.dts | 19 +-
+ arch/arm/boot/dts/exynos4412-origen.dts | 21 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 13 +-
+ arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 574 +++++++++++++++++++++
+ arch/arm/boot/dts/exynos5260-xyref5260.dts | 103 ++++
+ arch/arm/boot/dts/exynos5260.dtsi | 304 +++++++++++
+ arch/arm/boot/dts/exynos5410-smdk5410.dts | 82 +++
+ arch/arm/boot/dts/exynos5410.dtsi | 206 ++++++++
+ arch/arm/boot/dts/exynos5440.dtsi | 2 +-
+ arch/arm/boot/dts/exynos5800-peach-pi.dts | 253 +++++++++
+ arch/arm/boot/dts/exynos5800.dtsi | 28 +
+ arch/arm/mach-exynos/Kconfig | 92 ++--
+ arch/arm/mach-exynos/Makefile | 2 +
+ arch/arm/mach-exynos/common.h | 29 +-
+ arch/arm/mach-exynos/exynos.c | 3 +
+ arch/arm/mach-exynos/firmware.c | 9 +-
+ arch/arm/mach-exynos/hotplug.c | 8 +-
+ arch/arm/mach-exynos/mcpm-exynos.c | 4 +-
+ arch/arm/mach-exynos/platsmp.c | 2 +-
+ arch/arm/plat-samsung/Makefile | 3 +
+ drivers/clk/samsung/Makefile | 1 +
+ drivers/clk/samsung/clk-exynos5410.c | 209 ++++++++
+ drivers/cpufreq/Kconfig.arm | 6 +-
+ drivers/cpufreq/exynos-cpufreq.c | 2 -
+ drivers/cpufreq/exynos-cpufreq.h | 30 +-
+ drivers/cpufreq/exynos4210-cpufreq.c | 39 +-
+ drivers/cpufreq/exynos4x12-cpufreq.c | 40 +-
+ drivers/cpufreq/exynos5250-cpufreq.c | 43 +-
+ include/dt-bindings/clock/exynos5410.h | 33 ++
+ 34 files changed, 3011 insertions(+), 133 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/exynos5410-clock.txt
+ create mode 100644 arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos3250.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5260-xyref5260.dts
+ create mode 100644 arch/arm/boot/dts/exynos5260.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5410-smdk5410.dts
+ create mode 100644 arch/arm/boot/dts/exynos5410.dtsi
+ create mode 100644 arch/arm/boot/dts/exynos5800-peach-pi.dts
+ create mode 100644 arch/arm/boot/dts/exynos5800.dtsi
+ create mode 100644 drivers/clk/samsung/clk-exynos5410.c
+ create mode 100644 include/dt-bindings/clock/exynos5410.h
+Merging tegra/for-next (ae3caacb703d Merge branch for-3.16/defconfig into for-next)
+$ git merge tegra/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging arm64/for-next/core (af885f402262 arm64: Fix linker script entry point)
+$ git merge arm64/for-next/core
+Removing arch/arm64/mm/tlb.S
+Removing arch/arm64/include/asm/sigcontext.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Merge made by the 'recursive' strategy.
+ arch/arm64/Kconfig | 6 +
+ arch/arm64/Makefile | 1 +
+ arch/arm64/configs/defconfig | 36 ++-
+ arch/arm64/crypto/Kconfig | 53 +++
+ arch/arm64/crypto/Makefile | 38 +++
+ arch/arm64/crypto/aes-ce-ccm-core.S | 222 +++++++++++++
+ arch/arm64/crypto/aes-ce-ccm-glue.c | 297 +++++++++++++++++
+ arch/arm64/crypto/aes-ce-cipher.c | 155 +++++++++
+ arch/arm64/crypto/aes-ce.S | 133 ++++++++
+ arch/arm64/crypto/aes-glue.c | 446 ++++++++++++++++++++++++++
+ arch/arm64/crypto/aes-modes.S | 532 +++++++++++++++++++++++++++++++
+ arch/arm64/crypto/aes-neon.S | 382 ++++++++++++++++++++++
+ arch/arm64/crypto/ghash-ce-core.S | 95 ++++++
+ arch/arm64/crypto/ghash-ce-glue.c | 155 +++++++++
+ arch/arm64/crypto/sha1-ce-core.S | 153 +++++++++
+ arch/arm64/crypto/sha1-ce-glue.c | 174 ++++++++++
+ arch/arm64/crypto/sha2-ce-core.S | 156 +++++++++
+ arch/arm64/crypto/sha2-ce-glue.c | 255 +++++++++++++++
+ arch/arm64/include/asm/Kbuild | 1 +
+ arch/arm64/include/asm/assembler.h | 23 +-
+ arch/arm64/include/asm/atomic.h | 2 +-
+ arch/arm64/include/asm/barrier.h | 20 +-
+ arch/arm64/include/asm/cache.h | 13 +-
+ arch/arm64/include/asm/cacheflush.h | 4 +-
+ arch/arm64/include/asm/cachetype.h | 11 +
+ arch/arm64/include/asm/cmpxchg.h | 7 +-
+ arch/arm64/include/asm/compat.h | 5 -
+ arch/arm64/include/asm/esr.h | 6 +-
+ arch/arm64/include/asm/fpsimd.h | 23 ++
+ arch/arm64/include/asm/fpsimdmacros.h | 35 ++
+ arch/arm64/include/asm/hardirq.h | 2 +-
+ arch/arm64/include/asm/io.h | 8 -
+ arch/arm64/include/asm/neon.h | 6 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 2 +
+ arch/arm64/include/asm/pgtable.h | 107 ++++---
+ arch/arm64/include/asm/processor.h | 1 +
+ arch/arm64/include/asm/ptrace.h | 5 +
+ arch/arm64/include/asm/sigcontext.h | 31 --
+ arch/arm64/include/asm/string.h | 15 +
+ arch/arm64/include/asm/thread_info.h | 17 +-
+ arch/arm64/include/asm/tlbflush.h | 44 ++-
+ arch/arm64/include/asm/topology.h | 3 -
+ arch/arm64/include/uapi/asm/sigcontext.h | 7 +
+ arch/arm64/kernel/arm64ksyms.c | 5 +
+ arch/arm64/kernel/entry-fpsimd.S | 24 ++
+ arch/arm64/kernel/entry.S | 90 ++----
+ arch/arm64/kernel/fpsimd.c | 186 +++++++++--
+ arch/arm64/kernel/head.S | 8 +-
+ arch/arm64/kernel/hw_breakpoint.c | 2 +-
+ arch/arm64/kernel/process.c | 49 ++-
+ arch/arm64/kernel/ptrace.c | 53 +--
+ arch/arm64/kernel/setup.c | 16 +-
+ arch/arm64/kernel/signal.c | 52 ++-
+ arch/arm64/kernel/signal32.c | 16 +-
+ arch/arm64/kernel/smp.c | 19 ++
+ arch/arm64/kernel/smp_spin_table.c | 39 +--
+ arch/arm64/kernel/topology.c | 212 +++++++++++-
+ arch/arm64/kernel/traps.c | 7 +-
+ arch/arm64/kernel/vmlinux.lds.S | 2 +-
+ arch/arm64/kvm/hyp.S | 12 +-
+ arch/arm64/kvm/sys_regs.c | 4 +-
+ arch/arm64/lib/Makefile | 1 +
+ arch/arm64/lib/memcmp.S | 258 +++++++++++++++
+ arch/arm64/lib/memcpy.S | 192 +++++++++--
+ arch/arm64/lib/memmove.S | 190 +++++++++--
+ arch/arm64/lib/memset.S | 207 ++++++++++--
+ arch/arm64/lib/strcmp.S | 234 ++++++++++++++
+ arch/arm64/lib/strlen.S | 126 ++++++++
+ arch/arm64/lib/strncmp.S | 310 ++++++++++++++++++
+ arch/arm64/lib/strnlen.S | 171 ++++++++++
+ arch/arm64/mm/Makefile | 2 +-
+ arch/arm64/mm/cache.S | 6 +-
+ arch/arm64/mm/dma-mapping.c | 2 +-
+ arch/arm64/mm/fault.c | 8 +-
+ arch/arm64/mm/mmu.c | 64 ++--
+ arch/arm64/mm/proc.S | 2 +-
+ arch/arm64/mm/tlb.S | 71 -----
+ include/asm-generic/unaligned.h | 21 +-
+ 78 files changed, 5810 insertions(+), 538 deletions(-)
+ create mode 100644 arch/arm64/crypto/Kconfig
+ create mode 100644 arch/arm64/crypto/Makefile
+ create mode 100644 arch/arm64/crypto/aes-ce-ccm-core.S
+ create mode 100644 arch/arm64/crypto/aes-ce-ccm-glue.c
+ create mode 100644 arch/arm64/crypto/aes-ce-cipher.c
+ create mode 100644 arch/arm64/crypto/aes-ce.S
+ create mode 100644 arch/arm64/crypto/aes-glue.c
+ create mode 100644 arch/arm64/crypto/aes-modes.S
+ create mode 100644 arch/arm64/crypto/aes-neon.S
+ create mode 100644 arch/arm64/crypto/ghash-ce-core.S
+ create mode 100644 arch/arm64/crypto/ghash-ce-glue.c
+ create mode 100644 arch/arm64/crypto/sha1-ce-core.S
+ create mode 100644 arch/arm64/crypto/sha1-ce-glue.c
+ create mode 100644 arch/arm64/crypto/sha2-ce-core.S
+ create mode 100644 arch/arm64/crypto/sha2-ce-glue.c
+ delete mode 100644 arch/arm64/include/asm/sigcontext.h
+ create mode 100644 arch/arm64/lib/memcmp.S
+ create mode 100644 arch/arm64/lib/strcmp.S
+ create mode 100644 arch/arm64/lib/strlen.S
+ create mode 100644 arch/arm64/lib/strncmp.S
+ create mode 100644 arch/arm64/lib/strnlen.S
+ delete mode 100644 arch/arm64/mm/tlb.S
+Merging blackfin/for-linus (c4a2c58d2095 blackfin: cleanup board files)
+$ git merge blackfin/for-linus
+Already up-to-date.
+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 (cd065a010a97 CRISv10: Readd missing header)
+$ git merge cris/for-next
+Already up-to-date.
+Merging hexagon/linux-next (a9a44fdf3296 Hexagon: update CR year for elf.h)
+$ git merge hexagon/linux-next
+Already up-to-date.
+Merging ia64/next (e32634f5d57f pstore: Fix memory leak when decompress using big_oops_buf)
+$ git merge ia64/next
+Already up-to-date.
+Merging m68k/for-next (e8d6dc5ad26e m68k/hp300: Convert printk to pr_foo())
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 2 +-
+ arch/m68k/Kconfig.debug | 9 +-
+ arch/m68k/amiga/amisound.c | 2 +-
+ arch/m68k/amiga/config.c | 20 ++--
+ arch/m68k/apollo/config.c | 20 ++--
+ arch/m68k/atari/stram.c | 71 +++++++++---
+ arch/m68k/configs/amiga_defconfig | 5 +-
+ arch/m68k/configs/apollo_defconfig | 5 +-
+ arch/m68k/configs/atari_defconfig | 5 +-
+ arch/m68k/configs/bvme6000_defconfig | 5 +-
+ arch/m68k/configs/hp300_defconfig | 5 +-
+ arch/m68k/configs/mac_defconfig | 5 +-
+ arch/m68k/configs/multi_defconfig | 5 +-
+ arch/m68k/configs/mvme147_defconfig | 5 +-
+ arch/m68k/configs/mvme16x_defconfig | 5 +-
+ arch/m68k/configs/q40_defconfig | 5 +-
+ arch/m68k/configs/sun3_defconfig | 5 +-
+ arch/m68k/configs/sun3x_defconfig | 5 +-
+ arch/m68k/hp300/config.c | 11 +-
+ arch/m68k/include/asm/atari_stram.h | 2 +
+ arch/m68k/kernel/Makefile | 2 +
+ arch/m68k/kernel/early_printk.c | 67 ++++++++++++
+ arch/m68k/kernel/head.S | 207 +++++++++++++++--------------------
+ arch/m68k/mac/config.c | 29 -----
+ arch/m68k/mm/motorola.c | 10 +-
+ arch/m68k/mvme16x/config.c | 26 +----
+ drivers/block/ataflop.c | 2 +-
+ drivers/scsi/atari_scsi.c | 2 +-
+ drivers/video/fbdev/atafb.c | 49 +++++----
+ 29 files changed, 329 insertions(+), 262 deletions(-)
+ create mode 100644 arch/m68k/kernel/early_printk.c
+Merging m68knommu/for-next (83c6bdb827c9 m68knommu: Implement gpio support for m54xx.)
+$ git merge m68knommu/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/m525xsim.h | 2 +-
+ arch/m68k/include/asm/m54xxsim.h | 12 +++++++++---
+ arch/m68k/include/asm/mcfgpio.h | 12 ++++++++----
+ arch/m68k/kernel/setup_no.c | 13 ++++++-------
+ arch/m68k/platform/68000/m68EZ328.c | 3 ++-
+ arch/m68k/platform/68000/m68VZ328.c | 1 +
+ arch/m68k/platform/coldfire/gpio.c | 34 +++++++++++++++++++++++-----------
+ arch/m68k/platform/coldfire/m520x.c | 8 ++------
+ arch/m68k/platform/coldfire/m523x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m5249.c | 10 ++++------
+ arch/m68k/platform/coldfire/m525x.c | 2 ++
+ arch/m68k/platform/coldfire/m5272.c | 2 ++
+ arch/m68k/platform/coldfire/m527x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m528x.c | 10 ++++------
+ arch/m68k/platform/coldfire/m53xx.c | 8 ++------
+ 15 files changed, 74 insertions(+), 63 deletions(-)
+Merging metag/for-next (2aca46ce1b5c sched: remove unused SCHED_INIT_NODE)
+$ git merge metag/for-next
+Already up-to-date.
+Merging microblaze/next (14186fea0cb0 Merge tag 'locks-v3.15-4' of git://git.samba.org/jlayton/linux)
+$ git merge microblaze/next
+Already up-to-date.
+Merging mips/mips-for-linux-next (fba4f8a8889e Merge branch '3.15-fixes' into mips-for-linux-next)
+$ git merge mips/mips-for-linux-next
+Auto-merging drivers/cpuidle/Makefile
+Removing arch/mips/pmcs-msp71xx/msp_smtc.c
+Removing arch/mips/mti-malta/malta-smtc.c
+Removing arch/mips/math-emu/sp_scalb.c
+Removing arch/mips/math-emu/sp_modf.c
+Removing arch/mips/math-emu/sp_logb.c
+Removing arch/mips/math-emu/sp_frexp.c
+Removing arch/mips/math-emu/kernel_linkage.c
+Removing arch/mips/math-emu/ieee754xcpt.c
+Removing arch/mips/math-emu/ieee754m.c
+Removing arch/mips/math-emu/dp_scalb.c
+Removing arch/mips/math-emu/dp_modf.c
+Removing arch/mips/math-emu/dp_logb.c
+Removing arch/mips/math-emu/dp_frexp.c
+Removing arch/mips/kernel/smtc.c
+Removing arch/mips/kernel/smtc-proc.c
+Removing arch/mips/kernel/smtc-asm.S
+Removing arch/mips/kernel/cevt-smtc.c
+Removing arch/mips/include/asm/smtc_proc.h
+Removing arch/mips/include/asm/smtc_ipi.h
+Removing arch/mips/include/asm/smtc.h
+Removing arch/mips/configs/maltasmtc_defconfig
+Merge made by the 'recursive' strategy.
+ arch/mips/Kbuild | 1 -
+ arch/mips/Kconfig | 97 +-
+ arch/mips/Kconfig.debug | 9 -
+ arch/mips/Makefile | 3 +-
+ arch/mips/alchemy/common/setup.c | 6 +
+ arch/mips/alchemy/common/usb.c | 26 +-
+ arch/mips/cavium-octeon/setup.c | 17 -
+ arch/mips/cavium-octeon/smp.c | 25 -
+ arch/mips/configs/ath79_defconfig | 3 +-
+ arch/mips/configs/db1xxx_defconfig | 1 +
+ arch/mips/configs/maltasmtc_defconfig | 196 ---
+ arch/mips/configs/maltasmvp_defconfig | 3 +-
+ arch/mips/configs/maltasmvp_eva_defconfig | 3 +-
+ arch/mips/configs/rt305x_defconfig | 2 +-
+ arch/mips/include/asm/asmmacro.h | 22 +-
+ arch/mips/include/asm/branch.h | 30 +
+ arch/mips/include/asm/cacheflush.h | 6 +
+ arch/mips/include/asm/cmp.h | 1 -
+ arch/mips/include/asm/cpu-features.h | 11 +
+ arch/mips/include/asm/cpu-info.h | 17 +-
+ arch/mips/include/asm/cpu-type.h | 3 -
+ arch/mips/include/asm/cpu.h | 2 +-
+ arch/mips/include/asm/fixmap.h | 4 -
+ arch/mips/include/asm/fpu.h | 7 +-
+ arch/mips/include/asm/fpu_emulator.h | 16 +
+ arch/mips/include/asm/gic.h | 1 +
+ arch/mips/include/asm/idle.h | 14 +
+ arch/mips/include/asm/irq.h | 96 --
+ arch/mips/include/asm/irqflags.h | 32 +-
+ .../include/asm/mach-ip22/cpu-feature-overrides.h | 4 +
+ .../include/asm/mach-malta/kernel-entry-init.h | 30 -
+ arch/mips/include/asm/mach-pmcs-msp71xx/msp_usb.h | 4 -
+ arch/mips/include/asm/mach-ralink/war.h | 1 -
+ .../include/asm/mach-sead3/kernel-entry-init.h | 31 -
+ arch/mips/include/asm/mips-cpc.h | 34 +-
+ arch/mips/include/asm/mips_mt.h | 5 +-
+ arch/mips/include/asm/mipsmtregs.h | 2 +
+ arch/mips/include/asm/mipsregs.h | 142 +-
+ arch/mips/include/asm/mmu_context.h | 122 +-
+ arch/mips/include/asm/module.h | 8 +-
+ arch/mips/include/asm/octeon/octeon.h | 1 -
+ arch/mips/include/asm/pgtable.h | 2 +
+ arch/mips/include/asm/pm-cps.h | 51 +
+ arch/mips/include/asm/pm.h | 159 ++
+ arch/mips/include/asm/ptrace.h | 3 -
+ arch/mips/include/asm/r4kcache.h | 5 +-
+ arch/mips/include/asm/smp-cps.h | 19 +-
+ arch/mips/include/asm/smp-ops.h | 1 -
+ arch/mips/include/asm/smp.h | 3 +
+ arch/mips/include/asm/smtc.h | 78 -
+ arch/mips/include/asm/smtc_ipi.h | 129 --
+ arch/mips/include/asm/smtc_proc.h | 23 -
+ arch/mips/include/asm/stackframe.h | 196 +--
+ arch/mips/include/asm/thread_info.h | 11 +-
+ arch/mips/include/asm/time.h | 5 +-
+ arch/mips/include/asm/uasm.h | 9 +
+ arch/mips/include/uapi/asm/Kbuild | 1 +
+ arch/mips/include/uapi/asm/bitfield.h | 29 +
+ arch/mips/include/uapi/asm/inst.h | 46 +-
+ arch/mips/include/uapi/asm/types.h | 5 +-
+ arch/mips/include/uapi/asm/unistd.h | 6 +-
+ arch/mips/kernel/Makefile | 5 +-
+ arch/mips/kernel/asm-offsets.c | 32 +-
+ arch/mips/kernel/branch.c | 204 ++-
+ arch/mips/kernel/cevt-gic.c | 5 +-
+ arch/mips/kernel/cevt-r4k.c | 24 +-
+ arch/mips/kernel/cevt-smtc.c | 324 -----
+ arch/mips/kernel/cps-vec.S | 328 ++++-
+ arch/mips/kernel/cpu-probe.c | 17 +-
+ arch/mips/kernel/entry.S | 38 -
+ arch/mips/kernel/genex.S | 54 -
+ arch/mips/kernel/head.S | 56 -
+ arch/mips/kernel/i8259.c | 4 -
+ arch/mips/kernel/idle.c | 25 +-
+ arch/mips/kernel/irq-gic.c | 15 +
+ arch/mips/kernel/irq-msc01.c | 5 -
+ arch/mips/kernel/irq.c | 17 -
+ arch/mips/kernel/mips-cpc.c | 28 +
+ arch/mips/kernel/mips-mt-fpaff.c | 2 +-
+ arch/mips/kernel/mips-mt.c | 18 +-
+ arch/mips/kernel/pm-cps.c | 716 +++++++++
+ arch/mips/kernel/pm.c | 99 ++
+ arch/mips/kernel/process.c | 7 -
+ arch/mips/kernel/ptrace.c | 14 +-
+ arch/mips/kernel/r4k_switch.S | 33 -
+ arch/mips/kernel/rtlx-mt.c | 1 -
+ arch/mips/kernel/smp-bmips.c | 9 -
+ arch/mips/kernel/smp-cmp.c | 15 +-
+ arch/mips/kernel/smp-cps.c | 431 ++++--
+ arch/mips/kernel/smp-gic.c | 11 +
+ arch/mips/kernel/smp-mt.c | 5 -
+ arch/mips/kernel/smp-up.c | 6 -
+ arch/mips/kernel/smp.c | 61 +-
+ arch/mips/kernel/smtc-asm.S | 133 --
+ arch/mips/kernel/smtc-proc.c | 102 --
+ arch/mips/kernel/smtc.c | 1528 --------------------
+ arch/mips/kernel/sync-r4k.c | 18 -
+ arch/mips/kernel/time.c | 1 -
+ arch/mips/kernel/traps.c | 124 +-
+ arch/mips/kernel/vpe-mt.c | 16 +-
+ arch/mips/lantiq/irq.c | 4 +-
+ arch/mips/lib/mips-atomic.c | 46 +-
+ arch/mips/loongson/Kconfig | 5 +-
+ arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 11 +-
+ arch/mips/loongson/loongson-3/smp.c | 8 -
+ arch/mips/loongson1/Kconfig | 1 +
+ arch/mips/math-emu/Makefile | 16 +-
+ arch/mips/math-emu/cp1emu.c | 892 ++++--------
+ arch/mips/math-emu/dp_add.c | 71 +-
+ arch/mips/math-emu/dp_cmp.c | 24 +-
+ arch/mips/math-emu/dp_div.c | 94 +-
+ arch/mips/math-emu/dp_fint.c | 33 +-
+ arch/mips/math-emu/dp_flong.c | 28 +-
+ arch/mips/math-emu/dp_frexp.c | 52 -
+ arch/mips/math-emu/dp_fsp.c | 32 +-
+ arch/mips/math-emu/dp_logb.c | 53 -
+ arch/mips/math-emu/dp_modf.c | 79 -
+ arch/mips/math-emu/dp_mul.c | 143 +-
+ arch/mips/math-emu/dp_scalb.c | 57 -
+ arch/mips/math-emu/dp_simple.c | 39 +-
+ arch/mips/math-emu/dp_sqrt.c | 46 +-
+ arch/mips/math-emu/dp_sub.c | 55 +-
+ arch/mips/math-emu/dp_tint.c | 69 +-
+ arch/mips/math-emu/dp_tlong.c | 68 +-
+ arch/mips/math-emu/dsemul.c | 35 +-
+ arch/mips/math-emu/ieee754.c | 146 +-
+ arch/mips/math-emu/ieee754.h | 322 ++---
+ arch/mips/math-emu/ieee754d.c | 39 +-
+ arch/mips/math-emu/ieee754dp.c | 122 +-
+ arch/mips/math-emu/ieee754dp.h | 70 +-
+ arch/mips/math-emu/ieee754int.h | 201 ++-
+ arch/mips/math-emu/ieee754m.c | 55 -
+ arch/mips/math-emu/ieee754sp.c | 126 +-
+ arch/mips/math-emu/ieee754sp.h | 79 +-
+ arch/mips/math-emu/ieee754xcpt.c | 47 -
+ arch/mips/math-emu/kernel_linkage.c | 45 -
+ arch/mips/math-emu/me-debugfs.c | 62 +
+ arch/mips/math-emu/sp_add.c | 72 +-
+ arch/mips/math-emu/sp_cmp.c | 24 +-
+ arch/mips/math-emu/sp_div.c | 93 +-
+ arch/mips/math-emu/sp_fdp.c | 56 +-
+ arch/mips/math-emu/sp_fint.c | 30 +-
+ arch/mips/math-emu/sp_flong.c | 30 +-
+ arch/mips/math-emu/sp_frexp.c | 52 -
+ arch/mips/math-emu/sp_logb.c | 53 -
+ arch/mips/math-emu/sp_modf.c | 79 -
+ arch/mips/math-emu/sp_mul.c | 139 +-
+ arch/mips/math-emu/sp_scalb.c | 57 -
+ arch/mips/math-emu/sp_simple.c | 39 +-
+ arch/mips/math-emu/sp_sqrt.c | 35 +-
+ arch/mips/math-emu/sp_sub.c | 57 +-
+ arch/mips/math-emu/sp_tint.c | 67 +-
+ arch/mips/math-emu/sp_tlong.c | 69 +-
+ arch/mips/mm/c-r4k.c | 29 +-
+ arch/mips/mm/init.c | 82 +-
+ arch/mips/mm/page.c | 4 +-
+ arch/mips/mm/tlb-r4k.c | 88 +-
+ arch/mips/mm/uasm-micromips.c | 2 +
+ arch/mips/mm/uasm-mips.c | 4 +
+ arch/mips/mm/uasm.c | 31 +-
+ arch/mips/mti-malta/Makefile | 3 -
+ arch/mips/mti-malta/malta-init.c | 6 -
+ arch/mips/mti-malta/malta-int.c | 19 -
+ arch/mips/mti-malta/malta-memory.c | 4 +-
+ arch/mips/mti-malta/malta-setup.c | 4 -
+ arch/mips/mti-malta/malta-smtc.c | 162 ---
+ arch/mips/mti-sead3/sead3-pic32-i2c-drv.c | 36 +-
+ arch/mips/netlogic/common/smp.c | 5 -
+ arch/mips/pci/msi-octeon.c | 6 +
+ arch/mips/pci/pci-rc32434.c | 1 -
+ arch/mips/pmcs-msp71xx/Makefile | 1 -
+ arch/mips/pmcs-msp71xx/msp_eth.c | 76 -
+ arch/mips/pmcs-msp71xx/msp_irq.c | 16 +-
+ arch/mips/pmcs-msp71xx/msp_irq_cic.c | 7 +-
+ arch/mips/pmcs-msp71xx/msp_irq_per.c | 3 -
+ arch/mips/pmcs-msp71xx/msp_setup.c | 17 +-
+ arch/mips/pmcs-msp71xx/msp_smtc.c | 104 --
+ arch/mips/pmcs-msp71xx/msp_usb.c | 90 --
+ arch/mips/pnx833x/common/platform.c | 73 -
+ arch/mips/sgi-ip27/ip27-smp.c | 5 -
+ arch/mips/sibyte/bcm1480/irq.c | 11 -
+ arch/mips/sibyte/bcm1480/smp.c | 8 -
+ arch/mips/sibyte/sb1250/smp.c | 8 -
+ drivers/cpuidle/Kconfig | 5 +
+ drivers/cpuidle/Kconfig.mips | 17 +
+ drivers/cpuidle/Makefile | 4 +
+ drivers/cpuidle/cpuidle-cps.c | 186 +++
+ drivers/usb/host/ehci-pmcmsp.c | 40 -
+ include/linux/cpuidle.h | 1 +
+ include/uapi/linux/audit.h | 2 +-
+ 190 files changed, 4116 insertions(+), 7621 deletions(-)
+ delete mode 100644 arch/mips/configs/maltasmtc_defconfig
+ create mode 100644 arch/mips/include/asm/pm-cps.h
+ create mode 100644 arch/mips/include/asm/pm.h
+ delete mode 100644 arch/mips/include/asm/smtc.h
+ delete mode 100644 arch/mips/include/asm/smtc_ipi.h
+ delete mode 100644 arch/mips/include/asm/smtc_proc.h
+ create mode 100644 arch/mips/include/uapi/asm/bitfield.h
+ delete mode 100644 arch/mips/kernel/cevt-smtc.c
+ create mode 100644 arch/mips/kernel/pm-cps.c
+ create mode 100644 arch/mips/kernel/pm.c
+ delete mode 100644 arch/mips/kernel/smtc-asm.S
+ delete mode 100644 arch/mips/kernel/smtc-proc.c
+ delete mode 100644 arch/mips/kernel/smtc.c
+ delete mode 100644 arch/mips/math-emu/dp_frexp.c
+ delete mode 100644 arch/mips/math-emu/dp_logb.c
+ delete mode 100644 arch/mips/math-emu/dp_modf.c
+ delete mode 100644 arch/mips/math-emu/dp_scalb.c
+ delete mode 100644 arch/mips/math-emu/ieee754m.c
+ delete mode 100644 arch/mips/math-emu/ieee754xcpt.c
+ delete mode 100644 arch/mips/math-emu/kernel_linkage.c
+ create mode 100644 arch/mips/math-emu/me-debugfs.c
+ delete mode 100644 arch/mips/math-emu/sp_frexp.c
+ delete mode 100644 arch/mips/math-emu/sp_logb.c
+ delete mode 100644 arch/mips/math-emu/sp_modf.c
+ delete mode 100644 arch/mips/math-emu/sp_scalb.c
+ delete mode 100644 arch/mips/mti-malta/malta-smtc.c
+ delete mode 100644 arch/mips/pmcs-msp71xx/msp_smtc.c
+ create mode 100644 drivers/cpuidle/Kconfig.mips
+ create mode 100644 drivers/cpuidle/cpuidle-cps.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 (455c6fdbd219 Linux 3.14)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (26c88f930141 powerpc: Document sysfs DSCR interface)
+$ git merge powerpc/next
+Resolved 'arch/powerpc/include/asm/sections.h' using previous resolution.
+Auto-merging drivers/pci/pci.c
+Auto-merging arch/powerpc/platforms/85xx/p1023_rdb.c
+Auto-merging arch/powerpc/platforms/44x/ppc476.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S
+Auto-merging arch/powerpc/include/asm/sections.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/sections.h
+Removing arch/powerpc/boot/dts/p1023rds.dts
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Auto-merging Documentation/devicetree/bindings/clock/qoriq-clock.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e496d47dc8be] Merge remote-tracking branch 'powerpc/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/stable/sysfs-devices-system-cpu | 25 ++
+ .../clock/{corenet-clock.txt => qoriq-clock.txt} | 10 +-
+ Documentation/devicetree/bindings/mfd/bfticu.txt | 25 ++
+ Documentation/devicetree/bindings/mfd/qriox.txt | 17 +
+ .../devicetree/bindings/powerpc/4xx/akebono.txt | 54 +++
+ .../devicetree/bindings/powerpc/4xx/hsta.txt | 19 +
+ .../devicetree/bindings/powerpc/fsl/board.txt | 17 +
+ .../devicetree/bindings/powerpc/fsl/ccf.txt | 46 +++
+ .../devicetree/bindings/powerpc/fsl/cpus.txt | 11 +
+ .../devicetree/bindings/powerpc/fsl/pamu.txt | 10 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/powerpc/Kconfig | 8 +
+ arch/powerpc/Makefile | 16 +-
+ arch/powerpc/boot/Makefile | 24 +-
+ arch/powerpc/boot/addnote.c | 128 +++---
+ arch/powerpc/boot/crt0.S | 180 ++++++++-
+ arch/powerpc/boot/dcr.h | 4 +
+ arch/powerpc/boot/dts/akebono.dts | 415 ++++++++++++++++++++
+ arch/powerpc/boot/dts/b4860emu.dts | 7 +-
+ arch/powerpc/boot/dts/bsc9132qds.dts | 35 ++
+ arch/powerpc/boot/dts/bsc9132qds.dtsi | 101 +++++
+ arch/powerpc/boot/dts/fsl/b4420si-post.dtsi | 4 -
+ arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi | 2 +
+ arch/powerpc/boot/dts/fsl/b4860si-post.dtsi | 4 -
+ arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi | 4 +
+ arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 185 +++++++++
+ arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi | 66 ++++
+ arch/powerpc/boot/dts/fsl/p2041si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi | 4 +
+ arch/powerpc/boot/dts/fsl/p3041si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi | 4 +
+ arch/powerpc/boot/dts/fsl/p4080si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi | 8 +
+ arch/powerpc/boot/dts/fsl/p5020si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi | 2 +
+ arch/powerpc/boot/dts/fsl/p5040si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi | 4 +
+ arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 430 +++++++++++++++++++++
+ arch/powerpc/boot/dts/fsl/t1042si-post.dtsi | 37 ++
+ arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi | 104 +++++
+ arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 3 +-
+ arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi | 12 +
+ arch/powerpc/boot/dts/kmcoge4.dts | 152 ++++++++
+ arch/powerpc/boot/dts/oca4080.dts | 118 ++++++
+ arch/powerpc/boot/dts/p1023rds.dts | 219 -----------
+ arch/powerpc/boot/dts/t1040qds.dts | 46 +++
+ arch/powerpc/boot/dts/t1042qds.dts | 46 +++
+ arch/powerpc/boot/dts/t104xqds.dtsi | 166 ++++++++
+ arch/powerpc/boot/dts/t4240emu.dts | 15 +-
+ arch/powerpc/boot/elf_util.c | 4 +
+ arch/powerpc/boot/of.c | 4 +-
+ arch/powerpc/boot/of.h | 19 +-
+ arch/powerpc/boot/ofconsole.c | 6 +-
+ arch/powerpc/boot/oflib.c | 92 +++--
+ arch/powerpc/boot/ppc_asm.h | 12 +
+ arch/powerpc/boot/pseries-head.S | 8 +
+ arch/powerpc/boot/stdio.c | 14 +
+ arch/powerpc/boot/swab.h | 29 ++
+ arch/powerpc/boot/treeboot-akebono.c | 163 ++++++++
+ arch/powerpc/boot/util.S | 4 +-
+ arch/powerpc/boot/wrapper | 20 +-
+ arch/powerpc/boot/zImage.lds.S | 25 +-
+ arch/powerpc/configs/44x/akebono_defconfig | 148 +++++++
+ arch/powerpc/configs/85xx/kmp204x_defconfig | 225 +++++++++++
+ arch/powerpc/configs/corenet32_smp_defconfig | 1 +
+ arch/powerpc/configs/mpc85xx_defconfig | 1 -
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 1 -
+ arch/powerpc/include/asm/code-patching.h | 40 +-
+ arch/powerpc/include/asm/context_tracking.h | 4 +-
+ arch/powerpc/include/asm/cputhreads.h | 7 +
+ arch/powerpc/include/asm/debug.h | 3 +-
+ arch/powerpc/include/asm/eeh.h | 46 ++-
+ arch/powerpc/include/asm/elf.h | 2 +
+ arch/powerpc/include/asm/exception-64e.h | 6 +-
+ arch/powerpc/include/asm/exception-64s.h | 2 +-
+ arch/powerpc/include/asm/ftrace.h | 2 +
+ arch/powerpc/include/asm/hw_breakpoint.h | 2 +-
+ arch/powerpc/include/asm/irqflags.h | 8 +-
+ arch/powerpc/include/asm/kprobes.h | 5 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 7 +
+ arch/powerpc/include/asm/linkage.h | 2 +
+ arch/powerpc/include/asm/machdep.h | 5 +
+ arch/powerpc/include/asm/module.h | 4 +
+ arch/powerpc/include/asm/opal.h | 1 +
+ arch/powerpc/include/asm/paca.h | 3 +
+ arch/powerpc/include/asm/ppc-pci.h | 1 +
+ arch/powerpc/include/asm/ppc_asm.h | 72 ++--
+ arch/powerpc/include/asm/processor.h | 2 +-
+ arch/powerpc/include/asm/reg.h | 10 +
+ arch/powerpc/include/asm/sections.h | 2 +
+ arch/powerpc/include/asm/smp.h | 8 -
+ arch/powerpc/include/asm/string.h | 4 -
+ arch/powerpc/include/asm/systbl.h | 6 +-
+ arch/powerpc/include/asm/topology.h | 15 +-
+ arch/powerpc/include/uapi/asm/Kbuild | 1 -
+ arch/powerpc/include/uapi/asm/elf.h | 10 +-
+ arch/powerpc/kernel/asm-offsets.c | 1 +
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 28 +-
+ arch/powerpc/kernel/eeh.c | 212 ++++++----
+ arch/powerpc/kernel/eeh_driver.c | 118 +++++-
+ arch/powerpc/kernel/eeh_pe.c | 47 ++-
+ arch/powerpc/kernel/entry_64.S | 126 +++---
+ arch/powerpc/kernel/epapr_paravirt.c | 19 +-
+ arch/powerpc/kernel/exceptions-64e.S | 140 +++----
+ arch/powerpc/kernel/exceptions-64s.S | 206 +++++-----
+ arch/powerpc/kernel/fadump.c | 13 +-
+ arch/powerpc/kernel/ftrace.c | 137 ++-----
+ arch/powerpc/kernel/head_64.S | 117 +++---
+ arch/powerpc/kernel/hw_breakpoint.c | 8 +-
+ arch/powerpc/kernel/idle_book3e.S | 2 +-
+ arch/powerpc/kernel/idle_power4.S | 2 +-
+ arch/powerpc/kernel/idle_power7.S | 13 +-
+ arch/powerpc/kernel/legacy_serial.c | 21 +-
+ arch/powerpc/kernel/misc_64.S | 46 ++-
+ arch/powerpc/kernel/module_64.c | 279 ++++++++++---
+ arch/powerpc/kernel/pci-common.c | 108 +++---
+ arch/powerpc/kernel/pci_of_scan.c | 9 +
+ arch/powerpc/kernel/ppc_ksyms.c | 2 -
+ arch/powerpc/kernel/process.c | 32 +-
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/powerpc/kernel/rtas_pci.c | 66 +++-
+ arch/powerpc/kernel/setup-common.c | 20 +-
+ arch/powerpc/kernel/setup_64.c | 2 +-
+ arch/powerpc/kernel/signal.c | 2 +-
+ arch/powerpc/kernel/smp.c | 43 +--
+ arch/powerpc/kernel/sysfs.c | 51 ++-
+ arch/powerpc/kernel/systbl.S | 18 +-
+ arch/powerpc/kernel/tm.S | 69 ++--
+ arch/powerpc/kvm/book3s_hv.c | 34 +-
+ arch/powerpc/kvm/book3s_hv_builtin.c | 31 ++
+ arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +-
+ arch/powerpc/kvm/book3s_hv_rmhandlers.S | 37 +-
+ arch/powerpc/kvm/powerpc.c | 2 +-
+ arch/powerpc/lib/Makefile | 2 -
+ arch/powerpc/lib/copypage_64.S | 2 +-
+ arch/powerpc/lib/copypage_power7.S | 12 +-
+ arch/powerpc/lib/copyuser_64.S | 2 +-
+ arch/powerpc/lib/copyuser_power7.S | 32 +-
+ arch/powerpc/lib/hweight_64.S | 8 +-
+ arch/powerpc/lib/mem_64.S | 4 +-
+ arch/powerpc/lib/memcpy_64.S | 26 +-
+ arch/powerpc/lib/memcpy_power7.S | 26 +-
+ arch/powerpc/mm/hash_low_64.S | 44 ++-
+ arch/powerpc/mm/hash_utils_64.c | 61 +--
+ arch/powerpc/mm/slb.c | 12 +-
+ arch/powerpc/mm/slb_low.S | 14 +-
+ arch/powerpc/mm/tlb_nohash.c | 7 +-
+ arch/powerpc/platforms/44x/Kconfig | 42 ++
+ arch/powerpc/platforms/44x/Makefile | 3 +-
+ .../platforms/44x/{currituck.c => ppc476.c} | 120 ++++--
+ arch/powerpc/platforms/44x/ppc476_modules.lds | 15 +
+ arch/powerpc/platforms/85xx/Kconfig | 19 +-
+ arch/powerpc/platforms/85xx/Makefile | 3 +-
+ arch/powerpc/platforms/85xx/bsc913x_qds.c | 74 ++++
+ arch/powerpc/platforms/85xx/corenet_generic.c | 9 +-
+ .../platforms/85xx/{p1023_rds.c => p1023_rdb.c} | 36 +-
+ arch/powerpc/platforms/85xx/smp.c | 3 +-
+ arch/powerpc/platforms/Kconfig.cputype | 5 +
+ arch/powerpc/platforms/cell/smp.c | 5 +-
+ arch/powerpc/platforms/embedded6xx/Kconfig | 1 +
+ arch/powerpc/platforms/pasemi/powersave.S | 2 +-
+ arch/powerpc/platforms/powernv/Makefile | 2 +-
+ arch/powerpc/platforms/powernv/eeh-ioda.c | 264 +++++++------
+ arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +
+ arch/powerpc/platforms/powernv/opal-flash.c | 47 ++-
+ arch/powerpc/platforms/powernv/opal-takeover.S | 2 +
+ arch/powerpc/platforms/powernv/opal-wrappers.S | 4 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 26 +-
+ arch/powerpc/platforms/powernv/pci.c | 202 +++++-----
+ arch/powerpc/platforms/powernv/pci.h | 11 +-
+ arch/powerpc/platforms/powernv/powernv.h | 2 +
+ arch/powerpc/platforms/powernv/setup.c | 46 ++-
+ arch/powerpc/platforms/powernv/smp.c | 25 +-
+ arch/powerpc/platforms/powernv/subcore-asm.S | 95 +++++
+ arch/powerpc/platforms/powernv/subcore.c | 392 +++++++++++++++++++
+ arch/powerpc/platforms/powernv/subcore.h | 18 +
+ arch/powerpc/platforms/pseries/eeh_pseries.c | 43 ++-
+ arch/powerpc/platforms/pseries/hvCall.S | 4 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +
+ arch/powerpc/platforms/pseries/smp.c | 5 +-
+ arch/powerpc/platforms/wsp/scom_smp.c | 3 +-
+ arch/powerpc/sysdev/Kconfig | 6 +
+ arch/powerpc/sysdev/Makefile | 1 +
+ arch/powerpc/sysdev/fsl_pci.c | 3 +-
+ arch/powerpc/sysdev/fsl_rio.c | 10 +-
+ arch/powerpc/sysdev/fsl_rmu.c | 6 +-
+ arch/powerpc/sysdev/mpic.c | 8 +-
+ arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 215 +++++++++++
+ arch/powerpc/sysdev/ppc4xx_pci.c | 21 +-
+ arch/powerpc/xmon/xmon.c | 2 +-
+ drivers/macintosh/windfarm_pm121.c | 16 +-
+ drivers/pci/pci.c | 21 +-
+ .../selftests/powerpc/copyloops/asm/ppc_asm.h | 5 +-
+ 194 files changed, 6315 insertions(+), 1714 deletions(-)
+ create mode 100644 Documentation/ABI/stable/sysfs-devices-system-cpu
+ rename Documentation/devicetree/bindings/clock/{corenet-clock.txt => qoriq-clock.txt} (95%)
+ create mode 100644 Documentation/devicetree/bindings/mfd/bfticu.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/qriox.txt
+ create mode 100644 Documentation/devicetree/bindings/powerpc/4xx/akebono.txt
+ create mode 100644 Documentation/devicetree/bindings/powerpc/4xx/hsta.txt
+ create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/ccf.txt
+ create mode 100644 arch/powerpc/boot/dts/akebono.dts
+ create mode 100644 arch/powerpc/boot/dts/bsc9132qds.dts
+ create mode 100644 arch/powerpc/boot/dts/bsc9132qds.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/t1040si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/t1042si-post.dtsi
+ create mode 100644 arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi
+ create mode 100644 arch/powerpc/boot/dts/kmcoge4.dts
+ create mode 100644 arch/powerpc/boot/dts/oca4080.dts
+ delete mode 100644 arch/powerpc/boot/dts/p1023rds.dts
+ create mode 100644 arch/powerpc/boot/dts/t1040qds.dts
+ create mode 100644 arch/powerpc/boot/dts/t1042qds.dts
+ create mode 100644 arch/powerpc/boot/dts/t104xqds.dtsi
+ create mode 100644 arch/powerpc/boot/pseries-head.S
+ create mode 100644 arch/powerpc/boot/swab.h
+ create mode 100644 arch/powerpc/boot/treeboot-akebono.c
+ create mode 100644 arch/powerpc/configs/44x/akebono_defconfig
+ create mode 100644 arch/powerpc/configs/85xx/kmp204x_defconfig
+ rename arch/powerpc/platforms/44x/{currituck.c => ppc476.c} (72%)
+ create mode 100644 arch/powerpc/platforms/44x/ppc476_modules.lds
+ create mode 100644 arch/powerpc/platforms/85xx/bsc913x_qds.c
+ rename arch/powerpc/platforms/85xx/{p1023_rds.c => p1023_rdb.c} (75%)
+ create mode 100644 arch/powerpc/platforms/powernv/subcore-asm.S
+ create mode 100644 arch/powerpc/platforms/powernv/subcore.c
+ create mode 100644 arch/powerpc/platforms/powernv/subcore.h
+ create mode 100644 arch/powerpc/sysdev/ppc4xx_hsta_msi.c
+Merging fsl/next (e83eb028bb98 powerpc/fsl: Add fsl,portid-mapping to corenet1-cf chips)
+$ git merge fsl/next
+Already up-to-date.
+Merging mpc5xxx/next (bc7505942233 powerpc/512x: dts: add MPC5125 clock specs)
+$ git merge mpc5xxx/next
+Already up-to-date.
+Merging s390/features (63aef00b55d3 s390/lowcore: replace lowcore irb array with a per-cpu variable)
+$ git merge s390/features
+Auto-merging arch/s390/kvm/kvm-s390.c
+Merge made by the 'recursive' strategy.
+ Documentation/s390/zfcpdump.txt | 73 ++----
+ arch/s390/Kconfig | 14 +-
+ arch/s390/appldata/appldata_mem.c | 1 +
+ arch/s390/boot/compressed/Makefile | 2 +-
+ arch/s390/include/asm/ccwdev.h | 2 +-
+ arch/s390/include/asm/ccwgroup.h | 2 +
+ arch/s390/include/asm/chpid.h | 11 +
+ arch/s390/include/asm/futex.h | 4 +-
+ arch/s390/include/asm/lowcore.h | 25 +-
+ arch/s390/include/asm/mmu_context.h | 43 ++-
+ arch/s390/include/asm/pci.h | 12 +-
+ arch/s390/include/asm/pci_clp.h | 10 +-
+ arch/s390/include/asm/processor.h | 22 ++
+ arch/s390/include/asm/ptrace.h | 22 ++
+ arch/s390/include/asm/setup.h | 16 +-
+ arch/s390/include/asm/smp.h | 5 +-
+ arch/s390/include/asm/spinlock.h | 129 +++++----
+ arch/s390/include/asm/spinlock_types.h | 6 +-
+ arch/s390/include/asm/switch_to.h | 1 -
+ arch/s390/include/asm/syscall.h | 2 +-
+ arch/s390/include/asm/thread_info.h | 34 +--
+ arch/s390/include/asm/uaccess.h | 30 +++
+ arch/s390/kernel/asm-offsets.c | 3 +-
+ arch/s390/kernel/compat_signal.c | 2 +-
+ arch/s390/kernel/crash_dump.c | 83 +++---
+ arch/s390/kernel/early.c | 6 +
+ arch/s390/kernel/entry.S | 87 ++++---
+ arch/s390/kernel/entry64.S | 82 +++---
+ arch/s390/kernel/head.S | 8 +-
+ arch/s390/kernel/head31.S | 1 -
+ arch/s390/kernel/nmi.c | 8 +-
+ arch/s390/kernel/process.c | 6 +-
+ arch/s390/kernel/ptrace.c | 4 +-
+ arch/s390/kernel/setup.c | 459 ++++++++++++---------------------
+ arch/s390/kernel/signal.c | 12 +-
+ arch/s390/kernel/smp.c | 20 +-
+ arch/s390/kernel/time.c | 2 +-
+ arch/s390/kernel/topology.c | 4 +-
+ arch/s390/kvm/kvm-s390.c | 2 +-
+ arch/s390/lib/spinlock.c | 157 ++++++-----
+ arch/s390/lib/uaccess.c | 10 +-
+ arch/s390/mm/fault.c | 2 +-
+ arch/s390/mm/mem_detect.c | 130 +++-------
+ arch/s390/mm/page-states.c | 10 -
+ arch/s390/mm/pgtable.c | 10 +-
+ arch/s390/mm/vmem.c | 30 +--
+ arch/s390/oprofile/hwsampler.c | 14 +-
+ arch/s390/pci/pci.c | 6 +-
+ arch/s390/pci/pci_clp.c | 10 +
+ arch/s390/pci/pci_event.c | 5 +-
+ arch/s390/pci/pci_sysfs.c | 135 +++++-----
+ drivers/s390/char/Makefile | 2 +-
+ drivers/s390/char/zcore.c | 44 +---
+ drivers/s390/cio/ccwreq.c | 4 +-
+ drivers/s390/cio/chp.c | 2 +-
+ drivers/s390/cio/chp.h | 2 +-
+ drivers/s390/cio/chsc.h | 11 -
+ drivers/s390/cio/chsc_sch.c | 2 +-
+ drivers/s390/cio/cio.c | 9 +-
+ drivers/s390/cio/cio.h | 2 +
+ drivers/s390/cio/device_fsm.c | 4 +-
+ drivers/s390/cio/device_ops.c | 13 +-
+ drivers/s390/cio/eadm_sch.c | 2 +-
+ drivers/s390/net/qeth_core_main.c | 12 +-
+ include/linux/memblock.h | 79 +++++-
+ mm/Kconfig | 3 +
+ mm/memblock.c | 205 ++++++++++-----
+ 67 files changed, 1061 insertions(+), 1109 deletions(-)
+Merging sparc-next/master (311b8935ad4e Merge branch 'sparc_sparse_fixes')
+$ git merge sparc-next/master
+Resolved 'arch/sparc/include/asm/pgtable_64.h' using previous resolution.
+Auto-merging arch/sparc/mm/tsb.c
+Removing arch/sparc/mm/srmmu.h
+Auto-merging arch/sparc/mm/init_64.c
+Auto-merging arch/sparc/mm/fault_64.c
+Auto-merging arch/sparc/kernel/unaligned_64.c
+Removing arch/sparc/kernel/tadpole.c
+Auto-merging arch/sparc/kernel/smp_64.c
+Auto-merging arch/sparc/include/asm/pgtable_64.h
+CONFLICT (content): Merge conflict in arch/sparc/include/asm/pgtable_64.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 68f6180cfbd5] Merge remote-tracking branch 'sparc-next/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/sparc/crypto/aes_glue.c | 6 +-
+ arch/sparc/include/asm/atomic_32.h | 8 +-
+ arch/sparc/include/asm/atomic_64.h | 18 +-
+ arch/sparc/include/asm/auxio.h | 7 +
+ arch/sparc/include/asm/auxio_32.h | 6 +-
+ arch/sparc/include/asm/auxio_64.h | 6 +-
+ arch/sparc/include/asm/bitext.h | 6 +-
+ arch/sparc/include/asm/bitops_32.h | 6 +-
+ arch/sparc/include/asm/bitops_64.h | 24 +--
+ arch/sparc/include/asm/btext.h | 2 +-
+ arch/sparc/include/asm/bug.h | 4 +-
+ arch/sparc/include/asm/cacheflush_32.h | 8 +-
+ arch/sparc/include/asm/cacheflush_64.h | 24 +--
+ arch/sparc/include/asm/checksum_32.h | 4 +-
+ arch/sparc/include/asm/checksum_64.h | 32 ++--
+ arch/sparc/include/asm/cmpxchg_32.h | 6 +-
+ arch/sparc/include/asm/cmpxchg_64.h | 4 +-
+ arch/sparc/include/asm/cpudata.h | 10 +
+ arch/sparc/include/asm/cpudata_64.h | 5 -
+ arch/sparc/include/asm/delay_32.h | 4 +-
+ arch/sparc/include/asm/delay_64.h | 4 +-
+ arch/sparc/include/asm/device.h | 2 +-
+ arch/sparc/include/asm/dma-mapping.h | 2 +-
+ arch/sparc/include/asm/ebus_dma.h | 16 +-
+ arch/sparc/include/asm/floppy_32.h | 14 +-
+ arch/sparc/include/asm/floppy_64.h | 2 +-
+ arch/sparc/include/asm/ftrace.h | 6 +-
+ arch/sparc/include/asm/highmem.h | 10 +-
+ arch/sparc/include/asm/hvtramp.h | 2 +-
+ arch/sparc/include/asm/hypervisor.h | 325 ++++++++++++++++----------------
+ arch/sparc/include/asm/idprom.h | 2 +-
+ arch/sparc/include/asm/io-unit.h | 2 +-
+ arch/sparc/include/asm/io_32.h | 299 ++++++-----------------------
+ arch/sparc/include/asm/io_64.h | 21 +--
+ arch/sparc/include/asm/iommu_32.h | 10 +-
+ arch/sparc/include/asm/iommu_64.h | 6 +-
+ arch/sparc/include/asm/irq_32.h | 3 +-
+ arch/sparc/include/asm/irq_64.h | 44 ++---
+ arch/sparc/include/asm/irqflags_32.h | 6 +-
+ arch/sparc/include/asm/kdebug_64.h | 2 +-
+ arch/sparc/include/asm/kgdb.h | 5 +-
+ arch/sparc/include/asm/kprobes.h | 8 +-
+ arch/sparc/include/asm/ldc.h | 66 +++----
+ arch/sparc/include/asm/leon.h | 54 +++---
+ arch/sparc/include/asm/leon_pci.h | 4 +-
+ arch/sparc/include/asm/mc146818rtc.h | 5 +
+ arch/sparc/include/asm/mdesc.h | 32 ++--
+ arch/sparc/include/asm/mmu_64.h | 6 +-
+ arch/sparc/include/asm/mmu_context_64.h | 24 +--
+ arch/sparc/include/asm/nmi.h | 10 +-
+ arch/sparc/include/asm/oplib_32.h | 68 +++----
+ arch/sparc/include/asm/oplib_64.h | 112 +++++------
+ arch/sparc/include/asm/page.h | 3 +
+ arch/sparc/include/asm/page_64.h | 8 +-
+ arch/sparc/include/asm/pci_64.h | 14 +-
+ arch/sparc/include/asm/pcic.h | 8 +-
+ arch/sparc/include/asm/pcr.h | 6 +-
+ arch/sparc/include/asm/pgalloc_32.h | 2 +
+ arch/sparc/include/asm/pgalloc_64.h | 16 +-
+ arch/sparc/include/asm/pgtable_32.h | 11 +-
+ arch/sparc/include/asm/pgtable_64.h | 58 +++---
+ arch/sparc/include/asm/processor_32.h | 5 +-
+ arch/sparc/include/asm/processor_64.h | 6 +-
+ arch/sparc/include/asm/prom.h | 24 +--
+ arch/sparc/include/asm/ptrace.h | 2 +-
+ arch/sparc/include/asm/setup.h | 39 +++-
+ arch/sparc/include/asm/sfp-machine_32.h | 28 +--
+ arch/sparc/include/asm/smp_32.h | 6 +-
+ arch/sparc/include/asm/smp_64.h | 24 ++-
+ arch/sparc/include/asm/spitfire.h | 2 +-
+ arch/sparc/include/asm/stacktrace.h | 2 +-
+ arch/sparc/include/asm/starfire.h | 8 +-
+ arch/sparc/include/asm/string_32.h | 12 +-
+ arch/sparc/include/asm/string_64.h | 12 +-
+ arch/sparc/include/asm/switch_to_32.h | 6 +-
+ arch/sparc/include/asm/switch_to_64.h | 4 +-
+ arch/sparc/include/asm/syscalls.h | 8 +-
+ arch/sparc/include/asm/timer_32.h | 6 +-
+ arch/sparc/include/asm/timer_64.h | 6 +-
+ arch/sparc/include/asm/tlb_64.h | 8 +-
+ arch/sparc/include/asm/tlbflush_64.h | 22 +--
+ arch/sparc/include/asm/topology_64.h | 2 +-
+ arch/sparc/include/asm/trap_block.h | 6 +-
+ arch/sparc/include/asm/uaccess.h | 2 +-
+ arch/sparc/include/asm/uaccess_32.h | 14 +-
+ arch/sparc/include/asm/uaccess_64.h | 50 ++---
+ arch/sparc/include/asm/vio.h | 36 ++--
+ arch/sparc/include/asm/visasm.h | 3 +-
+ arch/sparc/include/asm/xor_64.h | 28 +--
+ arch/sparc/kernel/Makefile | 1 -
+ arch/sparc/kernel/audit.c | 8 +-
+ arch/sparc/kernel/auxio_32.c | 9 +-
+ arch/sparc/kernel/btext.c | 2 +-
+ arch/sparc/kernel/compat_audit.c | 1 +
+ arch/sparc/kernel/cpu.c | 1 +
+ arch/sparc/kernel/cpumap.h | 4 +-
+ arch/sparc/kernel/devices.c | 12 +-
+ arch/sparc/kernel/entry.h | 259 +++++++++++++------------
+ arch/sparc/kernel/iommu.c | 3 +-
+ arch/sparc/kernel/iommu_common.h | 14 +-
+ arch/sparc/kernel/ioport.c | 6 +-
+ arch/sparc/kernel/irq.h | 11 +-
+ arch/sparc/kernel/irq_32.c | 1 +
+ arch/sparc/kernel/kernel.h | 124 ++++++++++--
+ arch/sparc/kernel/kgdb_64.c | 2 +
+ arch/sparc/kernel/kprobes.c | 5 +-
+ arch/sparc/kernel/leon_kernel.c | 10 +-
+ arch/sparc/kernel/leon_pci.c | 79 --------
+ arch/sparc/kernel/leon_pci_grpci1.c | 16 +-
+ arch/sparc/kernel/leon_pci_grpci2.c | 22 +--
+ arch/sparc/kernel/leon_pmc.c | 8 +-
+ arch/sparc/kernel/leon_smp.c | 13 +-
+ arch/sparc/kernel/of_device_common.c | 4 +-
+ arch/sparc/kernel/pci.c | 1 +
+ arch/sparc/kernel/pci_impl.h | 30 +--
+ arch/sparc/kernel/pci_sun4v.h | 156 +++++++--------
+ arch/sparc/kernel/pcic.c | 116 +-----------
+ arch/sparc/kernel/perf_event.c | 23 ++-
+ arch/sparc/kernel/process_32.c | 12 +-
+ arch/sparc/kernel/process_64.c | 2 +-
+ arch/sparc/kernel/prom.h | 2 +-
+ arch/sparc/kernel/prom_64.c | 5 +-
+ arch/sparc/kernel/psycho_common.h | 22 +--
+ arch/sparc/kernel/ptrace_32.c | 2 +
+ arch/sparc/kernel/setup_32.c | 4 +-
+ arch/sparc/kernel/signal32.c | 56 ++----
+ arch/sparc/kernel/signal_32.c | 11 +-
+ arch/sparc/kernel/signal_64.c | 6 +-
+ arch/sparc/kernel/smp_32.c | 13 +-
+ arch/sparc/kernel/smp_64.c | 16 +-
+ arch/sparc/kernel/sun4d_irq.c | 17 +-
+ arch/sparc/kernel/sys_sparc32.c | 2 +
+ arch/sparc/kernel/sys_sparc_32.c | 10 +-
+ arch/sparc/kernel/sys_sparc_64.c | 1 +
+ arch/sparc/kernel/systbls.h | 124 +++++++++---
+ arch/sparc/kernel/tadpole.c | 126 -------------
+ arch/sparc/kernel/time_32.c | 8 +-
+ arch/sparc/kernel/traps_32.c | 4 +-
+ arch/sparc/kernel/traps_64.c | 11 +-
+ arch/sparc/kernel/unaligned_32.c | 4 +
+ arch/sparc/kernel/unaligned_64.c | 2 +
+ arch/sparc/kernel/windows.c | 3 +
+ arch/sparc/lib/Makefile | 2 +-
+ arch/sparc/math-emu/sfp-util_32.h | 20 +-
+ arch/sparc/math-emu/sfp-util_64.h | 12 +-
+ arch/sparc/mm/fault_32.c | 9 +-
+ arch/sparc/mm/fault_64.c | 4 +-
+ arch/sparc/mm/init_32.c | 7 +-
+ arch/sparc/mm/init_64.c | 9 +-
+ arch/sparc/mm/init_64.h | 4 +-
+ arch/sparc/mm/io-unit.c | 21 ++-
+ arch/sparc/mm/iommu.c | 25 ++-
+ arch/sparc/mm/leon_mm.c | 4 +-
+ arch/sparc/mm/mm_32.h | 24 +++
+ arch/sparc/mm/srmmu.c | 13 +-
+ arch/sparc/mm/srmmu.h | 4 -
+ arch/sparc/mm/tsb.c | 1 +
+ arch/sparc/prom/misc_64.c | 5 -
+ include/linux/profile.h | 1 +
+ kernel/sysctl.c | 4 -
+ 160 files changed, 1579 insertions(+), 1853 deletions(-)
+ delete mode 100644 arch/sparc/kernel/tadpole.c
+ create mode 100644 arch/sparc/mm/mm_32.h
+ delete mode 100644 arch/sparc/mm/srmmu.h
+Merging tile/master (b2dfa048bae3 replace strict_strto* call with kstrto*)
+$ git merge tile/master
+Merge made by the 'recursive' strategy.
+ arch/tile/include/asm/thread_info.h | 2 +-
+ arch/tile/kernel/setup.c | 12 +++++-------
+ arch/tile/kernel/signal.c | 7 +++----
+ arch/tile/kernel/traps.c | 5 ++---
+ arch/tile/mm/init.c | 8 ++++----
+ 5 files changed, 15 insertions(+), 19 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
+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 f0b5bd28e02e] 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 (d7b452a61ee7 UniCore32: Change git tree location information in MAINTAINERS)
+$ git merge unicore32/unicore32
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 +--
+ arch/unicore32/include/asm/io.h | 27 +++++++++++++++++
+ arch/unicore32/include/asm/pgtable.h | 10 +++----
+ arch/unicore32/include/asm/ptrace.h | 1 +
+ arch/unicore32/kernel/clock.c | 8 ++---
+ arch/unicore32/kernel/ksyms.c | 41 ++-----------------------
+ arch/unicore32/kernel/ksyms.h | 2 --
+ arch/unicore32/kernel/module.c | 11 ++-----
+ arch/unicore32/kernel/process.c | 1 +
+ arch/unicore32/kernel/setup.c | 4 +++
+ arch/unicore32/mm/alignment.c | 1 +
+ arch/unicore32/mm/proc-syms.c | 2 ++
+ drivers/rtc/rtc-puv3.c | 4 +--
+ drivers/scsi/mvsas/mv_94xx.c | 10 +++----
+ drivers/scsi/mvsas/mv_94xx.h | 58 ++++++++++++++++++------------------
+ drivers/video/fbdev/fb-puv3.c | 2 ++
+ 16 files changed, 90 insertions(+), 96 deletions(-)
+Merging xtensa/for_next (55b441be5cd6 xtensa: ISS: don't depend on CONFIG_TTY)
+$ git merge xtensa/for_next
+Already up-to-date.
+Merging btrfs/next (00fdf13a2e9f Btrfs: fix a crash of clone with inline extents's split)
+$ git merge btrfs/next
+Already up-to-date.
+Merging ceph/master (a30be7cb2ccb ceph: skip invalid dentry during dcache readdir)
+$ git merge ceph/master
+Already up-to-date.
+Merging cifs/for-next (663a96215159 CIFS: Fix memory leaks in SMB2_open)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsfs.c | 94 ++++++++++++++++++++++++------------------------------
+ fs/cifs/cifsfs.h | 22 +++++++++----
+ fs/cifs/cifsglob.h | 8 +++--
+ fs/cifs/connect.c | 5 ++-
+ fs/cifs/file.c | 16 +++++-----
+ fs/cifs/inode.c | 71 +++++++++++++++++++++++++++++++----------
+ fs/cifs/ioctl.c | 2 +-
+ fs/cifs/netmisc.c | 9 +++---
+ fs/cifs/smb2ops.c | 2 ++
+ fs/cifs/smb2pdu.c | 19 +++++++++--
+ fs/cifs/smb2pdu.h | 8 +++--
+ 11 files changed, 158 insertions(+), 98 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 (9e78d14a9f64 Use %pd in eCryptFS)
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/inode.c
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/file.c | 4 ++--
+ fs/ecryptfs/inode.c | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+Merging ext3/for_next (01d8885785a6 reiserfs: fix race in readdir)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (4e1ca652f912 ext4: fix wrong assert in ext4_mb_normalize_request())
+$ git merge ext4/dev
+Auto-merging mm/page-writeback.c
+Merge made by the 'recursive' strategy.
+ fs/ext4/balloc.c | 66 +++++++-----
+ fs/ext4/dir.c | 3 +-
+ fs/ext4/ext4.h | 65 ++++-------
+ fs/ext4/ext4_extents.h | 22 ++--
+ fs/ext4/ext4_jbd2.c | 7 +-
+ fs/ext4/ext4_jbd2.h | 4 -
+ fs/ext4/extents.c | 257 +++++++++++++++++++++++---------------------
+ fs/ext4/extents_status.c | 10 +-
+ fs/ext4/file.c | 156 ++++++++++++++-------------
+ fs/ext4/inline.c | 15 ++-
+ fs/ext4/inode.c | 94 +++++++++-------
+ fs/ext4/mballoc.c | 8 +-
+ fs/ext4/migrate.c | 2 +-
+ fs/ext4/mmp.c | 4 +-
+ fs/ext4/move_extent.c | 39 +++----
+ fs/ext4/namei.c | 131 ++++++++++++----------
+ fs/ext4/page-io.c | 32 +++---
+ fs/ext4/resize.c | 13 +++
+ fs/ext4/super.c | 23 ++--
+ fs/ext4/xattr.c | 9 +-
+ include/linux/page-flags.h | 12 ++-
+ include/trace/events/ext4.h | 9 +-
+ mm/page-writeback.c | 11 +-
+ 23 files changed, 542 insertions(+), 450 deletions(-)
+Merging f2fs/dev (70ff5dfeb691 f2fs: use inode_init_owner() to simplify codes)
+$ git merge f2fs/dev
+Merge made by the 'recursive' strategy.
+ fs/f2fs/acl.c | 2 +-
+ fs/f2fs/checkpoint.c | 73 ++++++++--------------
+ fs/f2fs/data.c | 54 +++++++++++-----
+ fs/f2fs/dir.c | 8 +++
+ fs/f2fs/f2fs.h | 34 ++++++++---
+ fs/f2fs/file.c | 137 +++++++++++++++++++++++++++++++++++++++--
+ fs/f2fs/inline.c | 40 +++++++++---
+ fs/f2fs/inode.c | 18 +++---
+ fs/f2fs/namei.c | 11 +---
+ fs/f2fs/node.c | 90 ++++++++++++++-------------
+ fs/f2fs/node.h | 19 ++++--
+ fs/f2fs/recovery.c | 26 ++++----
+ fs/f2fs/segment.c | 134 ++++++++++++++++++++++++----------------
+ fs/f2fs/super.c | 32 ++++++++--
+ fs/f2fs/xattr.c | 108 ++++++++++++++++++--------------
+ fs/f2fs/xattr.h | 8 +--
+ include/linux/f2fs_fs.h | 3 +
+ include/trace/events/f2fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++-
+ 18 files changed, 676 insertions(+), 267 deletions(-)
+Merging fscache/fscache (fe02fb3ec109 FS-Cache: Handle removal of unadded object to the fscache_object_list rb tree)
+$ git merge fscache/fscache
+Merge made by the 'recursive' strategy.
+Merging fuse/for-next (1560c974dcd4 fuse: add renameat2 support)
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master (9dd868e1c009 GFS2: fs/gfs2/file.c: kernel-doc warning fixes)
+$ git merge gfs2/master
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 2 +-
+ fs/gfs2/bmap.c | 8 ++--
+ fs/gfs2/file.c | 12 +++---
+ fs/gfs2/glops.c | 51 ++++++++++++++--------
+ fs/gfs2/glops.h | 2 +-
+ fs/gfs2/incore.h | 12 ++++--
+ fs/gfs2/inode.c | 40 ++++++++++++-----
+ fs/gfs2/log.c | 93 +++++++++++++++++++++++++++-------------
+ fs/gfs2/log.h | 11 ++++-
+ fs/gfs2/lops.c | 2 +-
+ fs/gfs2/ops_fstype.c | 22 +++++++---
+ fs/gfs2/quota.c | 3 +-
+ fs/gfs2/recovery.c | 22 +++++-----
+ fs/gfs2/rgrp.c | 2 +-
+ fs/gfs2/super.c | 69 ++++++++++++++++++-----------
+ fs/gfs2/sys.c | 4 +-
+ fs/gfs2/trans.c | 44 +++----------------
+ include/uapi/linux/gfs2_ondisk.h | 2 +-
+ 18 files changed, 238 insertions(+), 163 deletions(-)
+Merging jfs/jfs-next (e31da3f98d3b JFS: Check for NULL before calling posix_acl_equiv_mode())
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/acl.c | 16 +++++++++-------
+ fs/jfs/jfs_inode.c | 16 ++++++++--------
+ 2 files changed, 17 insertions(+), 15 deletions(-)
+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 (a27d2ba9829d Push the file layout driver into a subdirectory)
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/filelayout/filelayoutdev.c
+Auto-merging fs/nfs/filelayout/filelayout.h
+Auto-merging fs/nfs/filelayout/filelayout.c
+Merge made by the 'recursive' strategy.
+ fs/nfs/Makefile | 4 +-
+ fs/nfs/blocklayout/blocklayout.c | 38 +-
+ fs/nfs/direct.c | 117 +++-
+ fs/nfs/filelayout/Makefile | 5 +
+ .../{nfs4filelayout.c => filelayout/filelayout.c} | 194 ++++---
+ .../{nfs4filelayout.h => filelayout/filelayout.h} | 2 +-
+ .../filelayoutdev.c} | 6 +-
+ fs/nfs/getroot.c | 3 +-
+ fs/nfs/inode.c | 26 +-
+ fs/nfs/internal.h | 33 +-
+ fs/nfs/nfs2xdr.c | 14 +-
+ fs/nfs/nfs3proc.c | 21 +-
+ fs/nfs/nfs3xdr.c | 16 +-
+ fs/nfs/nfs4_fs.h | 4 +-
+ fs/nfs/nfs4file.c | 3 +-
+ fs/nfs/nfs4proc.c | 56 +-
+ fs/nfs/nfs4trace.h | 8 +-
+ fs/nfs/nfs4xdr.c | 19 +-
+ fs/nfs/objlayout/objio_osd.c | 24 +-
+ fs/nfs/objlayout/objlayout.c | 16 +-
+ fs/nfs/objlayout/objlayout.h | 8 +-
+ fs/nfs/pagelist.c | 633 +++++++++++++++++++--
+ fs/nfs/pnfs.c | 146 ++---
+ fs/nfs/pnfs.h | 30 +-
+ fs/nfs/proc.c | 21 +-
+ fs/nfs/read.c | 414 +++-----------
+ fs/nfs/super.c | 26 +-
+ fs/nfs/write.c | 588 ++++++-------------
+ include/linux/nfs.h | 5 +-
+ include/linux/nfs_fs.h | 2 -
+ include/linux/nfs_page.h | 46 +-
+ include/linux/nfs_xdr.h | 106 ++--
+ net/sunrpc/auth_gss/gss_mech_switch.c | 4 +-
+ net/sunrpc/sched.c | 5 +-
+ 34 files changed, 1370 insertions(+), 1273 deletions(-)
+ create mode 100644 fs/nfs/filelayout/Makefile
+ rename fs/nfs/{nfs4filelayout.c => filelayout/filelayout.c} (91%)
+ rename fs/nfs/{nfs4filelayout.h => filelayout/filelayout.h} (99%)
+ rename fs/nfs/{nfs4filelayoutdev.c => filelayout/filelayoutdev.c} (99%)
+Merging nfsd/nfsd-next (9fb1b4db6e8f NFSD: Error out when getting more than one fsloc/secinfo/uuid)
+$ git merge nfsd/nfsd-next
+Removing include/linux/nfsd/nfsfh.h
+Removing include/linux/nfsd/debug.h
+Auto-merging fs/nfsd/stats.h
+Auto-merging fs/nfsd/export.h
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/nfs/nfs41-server.txt | 2 -
+ fs/lockd/clnt4xdr.c | 2 +
+ fs/lockd/clntxdr.c | 2 +
+ fs/lockd/svc.c | 2 +-
+ fs/lockd/svcsubs.c | 3 +-
+ fs/lockd/xdr.c | 2 +
+ fs/nfsd/acl.h | 2 +-
+ fs/nfsd/auth.c | 5 +-
+ fs/nfsd/export.c | 88 +-
+ {include/linux => fs}/nfsd/export.h | 14 +-
+ fs/nfsd/fault_inject.c | 15 +-
+ fs/nfsd/idmap.h | 4 +-
+ fs/nfsd/nfs2acl.c | 12 +-
+ fs/nfsd/nfs3acl.c | 6 +-
+ fs/nfsd/nfs3xdr.c | 27 +-
+ fs/nfsd/nfs4acl.c | 12 +-
+ fs/nfsd/nfs4idmap.c | 42 +-
+ fs/nfsd/nfs4proc.c | 174 ++-
+ fs/nfsd/nfs4state.c | 172 +--
+ fs/nfsd/nfs4xdr.c | 1643 ++++++++++++++----------
+ fs/nfsd/nfsctl.c | 1 -
+ fs/nfsd/nfsd.h | 17 +-
+ fs/nfsd/nfsfh.c | 20 +-
+ fs/nfsd/nfsfh.h | 59 +-
+ fs/nfsd/nfssvc.c | 6 -
+ fs/nfsd/nfsxdr.c | 15 +-
+ fs/nfsd/state.h | 5 +-
+ fs/nfsd/stats.c | 1 -
+ {include/linux => fs}/nfsd/stats.h | 8 +-
+ fs/nfsd/vfs.c | 145 ++-
+ fs/nfsd/vfs.h | 8 +
+ fs/nfsd/xdr4.h | 23 +-
+ include/linux/lockd/lockd.h | 2 +-
+ include/linux/nfsd/debug.h | 19 -
+ include/linux/nfsd/nfsfh.h | 63 -
+ include/linux/sunrpc/svc.h | 13 +-
+ include/linux/sunrpc/svc_xprt.h | 2 +
+ include/linux/sunrpc/xdr.h | 3 +
+ include/uapi/linux/nfsd/nfsfh.h | 32 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 2 +
+ net/sunrpc/cache.c | 2 +-
+ net/sunrpc/sunrpc.h | 13 +
+ net/sunrpc/svc_xprt.c | 5 +-
+ net/sunrpc/svcauth.c | 2 +
+ net/sunrpc/svcsock.c | 14 +
+ net/sunrpc/xdr.c | 174 ++-
+ net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 +
+ 47 files changed, 1730 insertions(+), 1160 deletions(-)
+ rename {include/linux => fs}/nfsd/export.h (93%)
+ rename {include/linux => fs}/nfsd/stats.h (91%)
+ delete mode 100644 include/linux/nfsd/debug.h
+ delete mode 100644 include/linux/nfsd/nfsfh.h
+Merging omfs/for-next (976d167615b6 Linux 3.1-rc9)
+$ git merge omfs/for-next
+Already up-to-date.
+Merging squashfs/master (6d565409503f Squashfs: fix failure to unlock pages on decompress error)
+$ git merge squashfs/master
+Already up-to-date.
+Merging v9fs/for-next (c9eaa447e77e Linux 3.15-rc1)
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next (604b592e6fd3 UBI: fix rb_tree node comparison in add_map)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/mtd/ubi/cdev.c | 2 +-
+ drivers/mtd/ubi/fastmap.c | 4 ++--
+ fs/ubifs/budget.c | 1 -
+ fs/ubifs/file.c | 3 +--
+ 4 files changed, 4 insertions(+), 6 deletions(-)
+Merging xfs/for-next (b70f14e1ffbb Merge branch 'xfs-feature-bit-cleanup' into for-next)
+$ git merge xfs/for-next
+Merge made by the 'recursive' strategy.
+ fs/quota/quota.c | 14 +-
+ fs/xfs/xfs_ag.h | 36 ++-
+ fs/xfs/xfs_alloc_btree.c | 1 -
+ fs/xfs/xfs_aops.c | 49 ++-
+ fs/xfs/xfs_attr.c | 328 ++++++++-------------
+ fs/xfs/xfs_attr_remote.c | 3 +-
+ fs/xfs/xfs_bmap.c | 208 +++++++------
+ fs/xfs/xfs_bmap.h | 4 +-
+ fs/xfs/xfs_bmap_btree.c | 9 +-
+ fs/xfs/xfs_bmap_btree.h | 2 +-
+ fs/xfs/xfs_bmap_util.c | 2 -
+ fs/xfs/xfs_btree.c | 44 ++-
+ fs/xfs/xfs_btree.h | 5 +-
+ fs/xfs/xfs_buf.c | 17 +-
+ fs/xfs/xfs_buf.h | 4 +-
+ fs/xfs/xfs_buf_item.c | 3 +-
+ fs/xfs/xfs_da_btree.c | 49 +--
+ fs/xfs/xfs_da_btree.h | 6 +-
+ fs/xfs/xfs_da_format.h | 10 +-
+ fs/xfs/xfs_dir2.c | 28 +-
+ fs/xfs/xfs_dir2.h | 4 +-
+ fs/xfs/xfs_dir2_block.c | 9 +-
+ fs/xfs/xfs_dir2_data.c | 3 +-
+ fs/xfs/xfs_dir2_leaf.c | 2 +-
+ fs/xfs/xfs_dir2_node.c | 2 +-
+ fs/xfs/xfs_dir2_priv.h | 4 +-
+ fs/xfs/xfs_dir2_readdir.c | 17 +-
+ fs/xfs/xfs_dir2_sf.c | 21 +-
+ fs/xfs/xfs_dquot.c | 53 +---
+ fs/xfs/xfs_dquot.h | 2 -
+ fs/xfs/xfs_dquot_buf.c | 5 +-
+ fs/xfs/xfs_file.c | 2 +-
+ fs/xfs/xfs_filestream.c | 684 +++++++++---------------------------------
+ fs/xfs/xfs_filestream.h | 34 +--
+ fs/xfs/xfs_format.h | 14 +-
+ fs/xfs/xfs_fs.h | 1 +
+ fs/xfs/xfs_fsops.c | 45 ++-
+ fs/xfs/xfs_ialloc.c | 703 +++++++++++++++++++++++++++++++++++++-------
+ fs/xfs/xfs_ialloc.h | 2 +-
+ fs/xfs/xfs_ialloc_btree.c | 69 ++++-
+ fs/xfs/xfs_ialloc_btree.h | 3 +-
+ fs/xfs/xfs_icache.c | 12 +-
+ fs/xfs/xfs_icache.h | 6 +-
+ fs/xfs/xfs_inode.c | 178 +++--------
+ fs/xfs/xfs_inode.h | 5 +-
+ fs/xfs/xfs_inode_buf.c | 17 +-
+ fs/xfs/xfs_inode_fork.c | 3 +-
+ fs/xfs/xfs_inode_fork.h | 3 +-
+ fs/xfs/xfs_inode_item.c | 32 +-
+ fs/xfs/xfs_ioctl.c | 14 +-
+ fs/xfs/xfs_ioctl32.c | 5 +-
+ fs/xfs/xfs_iomap.c | 2 +-
+ fs/xfs/xfs_iops.c | 20 +-
+ fs/xfs/xfs_itable.c | 6 +-
+ fs/xfs/xfs_log.c | 9 +-
+ fs/xfs/xfs_log.h | 19 +-
+ fs/xfs/xfs_log_cil.c | 57 +++-
+ fs/xfs/xfs_log_recover.c | 11 +-
+ fs/xfs/xfs_mount.c | 6 +
+ fs/xfs/xfs_mru_cache.c | 151 ++++------
+ fs/xfs/xfs_mru_cache.h | 31 +-
+ fs/xfs/xfs_qm.c | 217 ++------------
+ fs/xfs/xfs_qm_syscalls.c | 6 +-
+ fs/xfs/xfs_quota_defs.h | 2 +-
+ fs/xfs/xfs_quotaops.c | 29 +-
+ fs/xfs/xfs_sb.c | 12 +-
+ fs/xfs/xfs_sb.h | 235 +++++----------
+ fs/xfs/xfs_shared.h | 2 +-
+ fs/xfs/xfs_stats.c | 1 +
+ fs/xfs/xfs_stats.h | 18 +-
+ fs/xfs/xfs_super.c | 22 +-
+ fs/xfs/xfs_symlink.c | 2 +-
+ fs/xfs/xfs_symlink_remote.c | 1 -
+ fs/xfs/xfs_trace.c | 1 +
+ fs/xfs/xfs_trace.h | 58 ++++
+ fs/xfs/xfs_trans.c | 2 +-
+ fs/xfs/xfs_trans_ail.c | 5 +-
+ fs/xfs/xfs_trans_priv.h | 3 +-
+ fs/xfs/xfs_trans_resv.c | 53 +++-
+ fs/xfs/xfs_trans_space.h | 7 +-
+ fs/xfs/xfs_types.h | 2 +-
+ include/linux/quota.h | 1 +
+ 82 files changed, 1791 insertions(+), 1976 deletions(-)
+Merging file-private-locks/linux-next (9f234be73db8 locks: add some tracepoints in the lease handling code)
+$ git merge file-private-locks/linux-next
+Auto-merging fs/locks.c
+Merge made by the 'recursive' strategy.
+ drivers/staging/lustre/lustre/llite/file.c | 17 ++----
+ fs/9p/vfs_file.c | 3 -
+ fs/afs/flock.c | 4 --
+ fs/ceph/locks.c | 10 +---
+ fs/fuse/file.c | 1 -
+ fs/locks.c | 37 ++++++++----
+ fs/nfs/file.c | 4 --
+ include/trace/events/filelock.h | 96 ++++++++++++++++++++++++++++++
+ 8 files changed, 129 insertions(+), 43 deletions(-)
+ create mode 100644 include/trace/events/filelock.h
+Merging vfs/for-next (9bd0bc947d95 kill generic_file_splice_write())
+$ git merge vfs/for-next
+Resolved 'fs/ext4/file.c' using previous resolution.
+Resolved 'fs/f2fs/file.c' using previous resolution.
+Resolved 'fs/nfs/direct.c' using previous resolution.
+Resolved 'fs/splice.c' using previous resolution.
+Auto-merging mm/filemap.c
+Auto-merging include/linux/nfs_fs.h
+Auto-merging fs/xfs/xfs_trace.h
+Auto-merging fs/xfs/xfs_file.c
+Auto-merging fs/xfs/xfs_aops.c
+Auto-merging fs/ubifs/file.c
+Auto-merging fs/splice.c
+CONFLICT (content): Merge conflict in fs/splice.c
+Auto-merging fs/nfs/nfs4file.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/file.c
+Auto-merging fs/nfs/direct.c
+CONFLICT (content): Merge conflict in fs/nfs/direct.c
+Auto-merging fs/gfs2/file.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/f2fs/file.c
+CONFLICT (content): Merge conflict in fs/f2fs/file.c
+Auto-merging fs/f2fs/data.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/file.c
+CONFLICT (content): Merge conflict in fs/ext4/file.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ecryptfs/file.c
+Auto-merging fs/cifs/file.c
+Auto-merging fs/cifs/cifsfs.h
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/afs/internal.h
+Auto-merging fs/9p/vfs_file.c
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d3a1c5342a40] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 5 +-
+ Documentation/filesystems/vfs.txt | 13 +-
+ drivers/char/raw.c | 8 +-
+ drivers/mtd/nand/nandsim.c | 4 +-
+ drivers/staging/lustre/lustre/include/lclient.h | 11 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 48 +-
+ drivers/staging/lustre/lustre/llite/file.c | 112 +---
+ .../staging/lustre/lustre/llite/llite_internal.h | 3 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 3 +-
+ drivers/staging/lustre/lustre/llite/rw26.c | 102 ++--
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 29 +-
+ drivers/usb/gadget/storage_common.c | 4 +-
+ fs/9p/vfs_addr.c | 5 +-
+ fs/9p/vfs_file.c | 14 +-
+ fs/adfs/file.c | 8 +-
+ fs/affs/file.c | 8 +-
+ fs/afs/file.c | 8 +-
+ fs/afs/internal.h | 3 +-
+ fs/afs/write.c | 11 +-
+ fs/aio.c | 14 +-
+ fs/bfs/file.c | 8 +-
+ fs/block_dev.c | 40 +-
+ fs/btrfs/file.c | 51 +-
+ fs/btrfs/inode.c | 47 +-
+ fs/ceph/addr.c | 4 +-
+ fs/ceph/file.c | 185 +++----
+ fs/cifs/cifsfs.c | 55 +-
+ fs/cifs/cifsfs.h | 12 +-
+ fs/cifs/file.c | 81 ++-
+ fs/direct-io.c | 164 ++----
+ fs/ecryptfs/file.c | 13 +-
+ fs/exofs/file.c | 10 +-
+ fs/exofs/inode.c | 2 +-
+ fs/ext2/file.c | 10 +-
+ fs/ext2/inode.c | 10 +-
+ fs/ext3/file.c | 10 +-
+ fs/ext3/inode.c | 15 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/file.c | 35 +-
+ fs/ext4/indirect.c | 14 +-
+ fs/ext4/inode.c | 24 +-
+ fs/f2fs/data.c | 17 +-
+ fs/f2fs/file.c | 10 +-
+ fs/fat/file.c | 8 +-
+ fs/fat/inode.c | 12 +-
+ fs/file.c | 11 +-
+ fs/file_table.c | 6 +
+ fs/fuse/cuse.c | 8 +-
+ fs/fuse/file.c | 154 +++---
+ fs/fuse/fuse_i.h | 5 +-
+ fs/gfs2/aops.c | 11 +-
+ fs/gfs2/file.c | 30 +-
+ fs/hfs/inode.c | 16 +-
+ fs/hfsplus/inode.c | 15 +-
+ fs/hostfs/hostfs_kern.c | 8 +-
+ fs/hpfs/file.c | 8 +-
+ fs/jffs2/file.c | 8 +-
+ fs/jfs/file.c | 10 +-
+ fs/jfs/inode.c | 8 +-
+ fs/logfs/file.c | 8 +-
+ fs/minix/file.c | 8 +-
+ fs/nfs/direct.c | 326 ++++-------
+ fs/nfs/file.c | 65 +--
+ fs/nfs/internal.h | 6 +-
+ fs/nfs/nfs4file.c | 10 +-
+ fs/nilfs2/file.c | 8 +-
+ fs/nilfs2/inode.c | 9 +-
+ fs/ntfs/file.c | 9 +-
+ fs/ocfs2/aops.c | 7 +-
+ fs/ocfs2/file.c | 138 +----
+ fs/omfs/file.c | 8 +-
+ fs/open.c | 6 +
+ fs/pipe.c | 145 +----
+ fs/ramfs/file-mmu.c | 10 +-
+ fs/ramfs/file-nommu.c | 10 +-
+ fs/read_write.c | 108 +++-
+ fs/reiserfs/file.c | 10 +-
+ fs/reiserfs/inode.c | 10 +-
+ fs/romfs/mmap-nommu.c | 4 +-
+ fs/splice.c | 194 +++----
+ fs/sysv/file.c | 8 +-
+ fs/ubifs/file.c | 25 +-
+ fs/udf/file.c | 19 +-
+ fs/udf/inode.c | 10 +-
+ fs/ufs/file.c | 8 +-
+ fs/xfs/xfs_aops.c | 17 +-
+ fs/xfs/xfs_file.c | 119 +----
+ fs/xfs/xfs_trace.h | 1 -
+ include/linux/blk_types.h | 4 +-
+ include/linux/ceph/libceph.h | 2 -
+ include/linux/fs.h | 41 +-
+ include/linux/nfs_fs.h | 7 +-
+ include/linux/splice.h | 10 -
+ include/linux/uio.h | 51 +-
+ mm/filemap.c | 158 ++----
+ mm/iov_iter.c | 595 +++++++++++++++++++--
+ mm/page_io.c | 21 +-
+ mm/process_vm_access.c | 10 +-
+ mm/shmem.c | 26 +-
+ mm/vmscan.c | 2 +-
+ net/ceph/pagevec.c | 35 +-
+ 101 files changed, 1792 insertions(+), 2027 deletions(-)
+Merging pci/next (fdaf36bd360f Merge branch 'pci/misc' into next)
+$ git merge pci/next
+Resolved 'arch/s390/pci/pci_sysfs.c' using previous resolution.
+Auto-merging include/linux/dma-mapping.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/host/pci-rcar-gen2.c
+Auto-merging drivers/misc/genwqe/card_utils.c
+Auto-merging arch/sparc/kernel/pci.c
+Auto-merging arch/sparc/include/asm/pci_64.h
+Auto-merging arch/s390/pci/pci_sysfs.c
+CONFLICT (content): Merge conflict in arch/s390/pci/pci_sysfs.c
+Auto-merging arch/powerpc/kernel/pci_of_scan.c
+Auto-merging arch/powerpc/kernel/pci-common.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/ABI/testing/sysfs-bus-pci
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b8678db9c5a7] Merge remote-tracking branch 'pci/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-pci | 21 +
+ Documentation/DMA-API-HOWTO.txt | 210 ++--
+ Documentation/DMA-API.txt | 150 +--
+ Documentation/DMA-ISA-LPC.txt | 4 +-
+ .../devicetree/bindings/pci/pci-rcar-gen2.txt | 66 ++
+ Documentation/devicetree/bindings/pci/rcar-pci.txt | 47 +
+ MAINTAINERS | 1 +
+ arch/alpha/include/asm/pci.h | 5 -
+ arch/arm/include/asm/pci.h | 5 -
+ arch/blackfin/include/asm/pci.h | 5 -
+ arch/cris/include/asm/pci.h | 1 -
+ arch/frv/include/asm/pci.h | 2 -
+ arch/frv/mb93090-mb00/pci-irq.c | 4 -
+ arch/ia64/include/asm/pci.h | 6 -
+ arch/ia64/pci/fixup.c | 4 +-
+ arch/microblaze/include/asm/pci.h | 5 -
+ arch/microblaze/pci/pci-common.c | 20 -
+ arch/mips/include/asm/pci.h | 5 -
+ arch/mn10300/include/asm/pci.h | 1 -
+ arch/mn10300/unit-asb2305/pci-irq.c | 4 -
+ arch/parisc/include/asm/pci.h | 5 -
+ arch/powerpc/include/asm/pci.h | 5 -
+ arch/powerpc/kernel/pci-common.c | 20 -
+ arch/powerpc/kernel/pci-hotplug.c | 3 +-
+ arch/powerpc/kernel/pci_of_scan.c | 3 +-
+ arch/sh/drivers/pci/fixups-dreamcast.c | 18 +-
+ arch/sh/include/asm/pci.h | 5 -
+ arch/sparc/include/asm/pci_32.h | 5 -
+ arch/sparc/include/asm/pci_64.h | 5 -
+ arch/sparc/kernel/pci.c | 3 +-
+ arch/unicore32/include/asm/pci.h | 5 -
+ arch/x86/include/asm/pci.h | 1 -
+ arch/x86/kernel/aperture_64.c | 59 +-
+ arch/x86/pci/acpi.c | 6 +-
+ arch/x86/pci/amd_bus.c | 83 +-
+ arch/x86/pci/broadcom_bus.c | 4 +-
+ arch/x86/pci/fixup.c | 18 +-
+ arch/x86/pci/i386.c | 27 +-
+ arch/xtensa/include/asm/pci.h | 5 -
+ drivers/base/dma-coherent.c | 10 +-
+ drivers/base/dma-mapping.c | 6 +-
+ drivers/block/nvme-core.c | 11 +
+ drivers/iommu/exynos-iommu.c | 14 +-
+ drivers/misc/genwqe/card_utils.c | 2 +-
+ drivers/pci/access.c | 12 +-
+ drivers/pci/bus.c | 1 -
+ drivers/pci/host-bridge.c | 1 -
+ drivers/pci/host/Kconfig | 6 +
+ drivers/pci/host/Makefile | 1 +
+ drivers/pci/host/pci-exynos.c | 4 +-
+ drivers/pci/host/pci-rcar-gen2.c | 31 +-
+ drivers/pci/host/pcie-rcar.c | 1008 ++++++++++++++++++++
+ drivers/pci/hotplug-pci.c | 2 +-
+ drivers/pci/hotplug/acpiphp_glue.c | 6 +-
+ drivers/pci/hotplug/cpci_hotplug_pci.c | 5 +-
+ drivers/pci/hotplug/cpqphp_ctrl.c | 3 +-
+ drivers/pci/hotplug/cpqphp_nvram.c | 1 -
+ drivers/pci/hotplug/pciehp.h | 2 +-
+ drivers/pci/hotplug/pciehp_hpc.c | 2 +
+ drivers/pci/hotplug/pciehp_pci.c | 3 +-
+ drivers/pci/hotplug/pcihp_slot.c | 3 +-
+ drivers/pci/hotplug/rpadlpar_core.c | 3 +-
+ drivers/pci/hotplug/rpaphp_core.c | 15 +-
+ drivers/pci/hotplug/s390_pci_hpc.c | 1 -
+ drivers/pci/hotplug/shpchp_pci.c | 5 +-
+ drivers/pci/msi.c | 96 +-
+ drivers/pci/pci-acpi.c | 8 +-
+ drivers/pci/pci-driver.c | 58 +-
+ drivers/pci/pci-sysfs.c | 68 +-
+ drivers/pci/pci.c | 34 +-
+ drivers/pci/pci.h | 10 +-
+ drivers/pci/pcie/portdrv_core.c | 9 +-
+ drivers/pci/probe.c | 101 +-
+ drivers/pci/quirks.c | 11 +
+ drivers/pci/search.c | 1 -
+ drivers/pci/setup-bus.c | 251 +++--
+ drivers/pci/setup-irq.c | 1 -
+ drivers/pci/setup-res.c | 42 +-
+ drivers/pcmcia/cardbus.c | 3 +-
+ include/asm-generic/dma-coherent.h | 13 +-
+ include/linux/dma-mapping.h | 13 +-
+ include/linux/pci.h | 38 +-
+ include/linux/pci_ids.h | 3 -
+ include/linux/types.h | 1 +
+ kernel/resource.c | 7 +-
+ 85 files changed, 2107 insertions(+), 665 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt
+ create mode 100644 Documentation/devicetree/bindings/pci/rcar-pci.txt
+ create mode 100644 drivers/pci/host/pcie-rcar.c
+Merging hid/for-next (5044df95c5c2 Merge branch 'for-3.16/upstream' into for-next)
+$ git merge hid/for-next
+Auto-merging drivers/leds/Kconfig
+Removing Documentation/ABI/testing/sysfs-driver-hid-thingm
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-driver-hid-thingm | 23 -
+ drivers/hid/Kconfig | 13 +-
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-core.c | 12 +
+ drivers/hid/hid-debug.c | 89 +++
+ drivers/hid/hid-ids.h | 5 +
+ drivers/hid/hid-input.c | 14 +
+ drivers/hid/hid-rmi.c | 920 ++++++++++++++++++++++
+ drivers/hid/hid-saitek.c | 154 +++-
+ drivers/hid/hid-sensor-hub.c | 9 +
+ drivers/hid/hid-sony.c | 434 +++++++---
+ drivers/hid/hid-thingm.c | 361 +++++----
+ drivers/hid/i2c-hid/i2c-hid.c | 45 +-
+ drivers/hid/uhid.c | 5 +-
+ drivers/leds/Kconfig | 2 +
+ include/linux/hid.h | 10 +
+ include/uapi/linux/input.h | 17 +-
+ 17 files changed, 1793 insertions(+), 321 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-thingm
+ create mode 100644 drivers/hid/hid-rmi.c
+Merging i2c/i2c/for-next (d275545e0e22 ARM: sunxi: dt: Convert to the new i2c compatibles)
+$ git merge i2c/i2c/for-next
+Auto-merging arch/arm/boot/dts/sun7i-a20.dtsi
+Auto-merging arch/arm/boot/dts/sun5i-a13.dtsi
+Auto-merging arch/arm/boot/dts/sun5i-a10s.dtsi
+Auto-merging arch/arm/boot/dts/sun4i-a10.dtsi
+Merge made by the 'recursive' strategy.
+ .../bindings/i2c/i2c-arb-gpio-challenge.txt | 6 +
+ .../devicetree/bindings/i2c/i2c-exynos5.txt | 11 +-
+ .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 2 +-
+ .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 26 +++
+ arch/arm/boot/dts/sun4i-a10.dtsi | 6 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 6 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 6 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 10 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-ali1563.c | 82 ++++----
+ drivers/i2c/busses/i2c-exynos5.c | 67 +++++--
+ drivers/i2c/busses/i2c-gpio.c | 25 +--
+ drivers/i2c/busses/i2c-imx.c | 31 ++-
+ drivers/i2c/busses/i2c-mv64xxx.c | 2 +-
+ drivers/i2c/busses/i2c-nomadik.c | 14 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 222 ++++++++++-----------
+ 16 files changed, 304 insertions(+), 214 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-sh_mobile.txt
+Merging jdelvare-hwmon/master (5d0b6b341687 hwmon: (ntc_thermistor) Fix OF device ID mapping)
+$ git merge jdelvare-hwmon/master
+Merge made by the 'recursive' strategy.
+Merging hwmon-staging/hwmon-next (e8cba3cda44e hwmon: (ultra45_env) Introduce managed version of kzalloc)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/hwmon/emc1403 | 59 ++
+ Documentation/hwmon/hwmon-kernel-api.txt | 107 +++
+ Documentation/hwmon/jc42 | 16 +-
+ Documentation/hwmon/lm77 | 20 +-
+ Documentation/hwmon/nct6683 | 57 ++
+ MAINTAINERS | 2 +-
+ drivers/hwmon/Kconfig | 10 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/adm1029.c | 4 +-
+ drivers/hwmon/emc1403.c | 267 ++++--
+ drivers/hwmon/f71805f.c | 4 +-
+ drivers/hwmon/g762.c | 2 +-
+ drivers/hwmon/gpio-fan.c | 2 +-
+ drivers/hwmon/ibmpex.c | 4 +-
+ drivers/hwmon/iio_hwmon.c | 2 +-
+ drivers/hwmon/jc42.c | 315 +++----
+ drivers/hwmon/lm70.c | 62 +-
+ drivers/hwmon/lm75.c | 51 +-
+ drivers/hwmon/lm77.c | 374 +++-----
+ drivers/hwmon/lm80.c | 640 +++++++------
+ drivers/hwmon/lm83.c | 168 ++--
+ drivers/hwmon/lm92.c | 224 ++---
+ drivers/hwmon/lm93.c | 4 +-
+ drivers/hwmon/ltc2945.c | 2 +-
+ drivers/hwmon/max1111.c | 4 +-
+ drivers/hwmon/max1619.c | 304 +++----
+ drivers/hwmon/max197.c | 4 +-
+ drivers/hwmon/nct6683.c | 1455 ++++++++++++++++++++++++++++++
+ drivers/hwmon/pc87427.c | 4 +-
+ drivers/hwmon/s3c-hwmon.c | 4 +-
+ drivers/hwmon/tmp102.c | 62 +-
+ drivers/hwmon/tmp421.c | 47 +-
+ drivers/hwmon/ultra45_env.c | 7 +-
+ drivers/hwmon/vt1211.c | 4 +-
+ 34 files changed, 2878 insertions(+), 1414 deletions(-)
+ create mode 100644 Documentation/hwmon/emc1403
+ create mode 100644 Documentation/hwmon/hwmon-kernel-api.txt
+ create mode 100644 Documentation/hwmon/nct6683
+ create mode 100644 drivers/hwmon/nct6683.c
+Merging v4l-dvb/master (656111f4b9cb Merge branch 'topic/omap3isp' into to_next)
+$ git merge v4l-dvb/master
+Auto-merging include/media/exynos-fimc.h
+Removing include/linux/platform_data/mipi-csis.h
+Removing drivers/media/platform/omap3isp/ispqueue.h
+Removing drivers/media/platform/omap3isp/ispqueue.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/DocBook/media/v4l/io.xml | 15 +-
+ .../DocBook/media/v4l/media-ioc-enum-links.xml | 8 +-
+ Documentation/DocBook/media/v4l/pixfmt.xml | 4 +-
+ Documentation/DocBook/media/v4l/subdev-formats.xml | 760 ++++++++++
+ Documentation/DocBook/media/v4l/vidioc-dqevent.xml | 33 +
+ .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 27 +-
+ .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 30 +-
+ .../DocBook/media/v4l/vidioc-subscribe-event.xml | 20 +
+ .../devicetree/bindings/media/i2c/adv7604.txt | 70 +
+ .../devicetree/bindings/media/renesas,vsp1.txt | 43 +
+ .../devicetree/bindings/media/s5p-mfc.txt | 3 +-
+ Documentation/video4linux/CARDLIST.bttv | 1 +
+ Documentation/video4linux/CARDLIST.em28xx | 1 +
+ Documentation/video4linux/fimc.txt | 30 -
+ Documentation/video4linux/v4l2-pci-skeleton.c | 42 +-
+ MAINTAINERS | 21 +-
+ arch/arm/mach-s5pv210/mach-goni.c | 51 -
+ drivers/iommu/omap-iommu.c | 31 +-
+ drivers/iommu/omap-iopgtable.h | 3 -
+ drivers/media/dvb-core/dvb-usb-ids.h | 3 +
+ drivers/media/dvb-frontends/Kconfig | 7 +
+ drivers/media/dvb-frontends/Makefile | 1 +
+ drivers/media/dvb-frontends/si2168.c | 760 ++++++++++
+ drivers/media/dvb-frontends/si2168.h | 39 +
+ drivers/media/dvb-frontends/si2168_priv.h | 46 +
+ drivers/media/i2c/ad9389b.c | 64 +-
+ drivers/media/i2c/adv7180.c | 2 +-
+ drivers/media/i2c/adv7183.c | 4 +-
+ drivers/media/i2c/adv7511.c | 66 +-
+ drivers/media/i2c/adv7604.c | 1468 ++++++++++++++------
+ drivers/media/i2c/adv7842.c | 28 +-
+ drivers/media/i2c/bt819.c | 2 +-
+ drivers/media/i2c/cx25840/cx25840-core.c | 4 +-
+ drivers/media/i2c/ks0127.c | 6 +-
+ drivers/media/i2c/m5mols/m5mols_capture.c | 2 +-
+ drivers/media/i2c/ml86v7667.c | 2 +-
+ drivers/media/i2c/msp3400-driver.c | 2 +-
+ drivers/media/i2c/mt9p031.c | 53 +-
+ drivers/media/i2c/saa6752hs.c | 2 +-
+ drivers/media/i2c/saa7110.c | 2 +-
+ drivers/media/i2c/saa7115.c | 2 +-
+ drivers/media/i2c/saa717x.c | 2 +-
+ drivers/media/i2c/saa7191.c | 2 +-
+ drivers/media/i2c/smiapp-pll.h | 2 +-
+ drivers/media/i2c/smiapp/smiapp-core.c | 57 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.c | 55 +-
+ drivers/media/i2c/smiapp/smiapp-quirk.h | 24 +-
+ drivers/media/i2c/smiapp/smiapp-reg-defs.h | 8 +-
+ drivers/media/i2c/smiapp/smiapp-regs.c | 89 +-
+ drivers/media/i2c/smiapp/smiapp-regs.h | 19 +-
+ drivers/media/i2c/soc_camera/tw9910.c | 11 +-
+ drivers/media/i2c/sony-btf-mpx.c | 10 +-
+ drivers/media/i2c/ths8200.c | 10 +
+ drivers/media/i2c/tvaudio.c | 6 +-
+ drivers/media/i2c/tvp514x.c | 2 +-
+ drivers/media/i2c/tvp5150.c | 6 +-
+ drivers/media/i2c/tvp7002.c | 5 +-
+ drivers/media/i2c/tw2804.c | 2 +-
+ drivers/media/i2c/tw9903.c | 2 +-
+ drivers/media/i2c/tw9906.c | 2 +-
+ drivers/media/i2c/vp27smpx.c | 6 +-
+ drivers/media/i2c/vpx3220.c | 2 +-
+ drivers/media/media-device.c | 7 +-
+ drivers/media/media-devnode.c | 5 +-
+ drivers/media/parport/bw-qcam.c | 2 +-
+ drivers/media/pci/bt8xx/bttv-cards.c | 110 ++
+ drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
+ drivers/media/pci/bt8xx/bttv.h | 1 +
+ drivers/media/pci/bt8xx/dst.c | 20 +-
+ drivers/media/pci/cx18/cx18-av-core.c | 2 +-
+ drivers/media/pci/cx18/cx18-fileops.c | 2 +-
+ drivers/media/pci/cx18/cx18-gpio.c | 6 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 2 +-
+ drivers/media/pci/cx23885/cx23885-video.c | 4 +-
+ drivers/media/pci/cx88/cx88-core.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 6 +
+ drivers/media/pci/ivtv/ivtv-fileops.c | 2 +-
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +-
+ drivers/media/pci/saa7134/Kconfig | 4 +-
+ drivers/media/pci/saa7134/saa7134-alsa.c | 107 +-
+ drivers/media/pci/saa7134/saa7134-core.c | 130 +-
+ drivers/media/pci/saa7134/saa7134-dvb.c | 50 +-
+ drivers/media/pci/saa7134/saa7134-empress.c | 187 +--
+ drivers/media/pci/saa7134/saa7134-i2c.c | 7 -
+ drivers/media/pci/saa7134/saa7134-reg.h | 12 +-
+ drivers/media/pci/saa7134/saa7134-ts.c | 191 +--
+ drivers/media/pci/saa7134/saa7134-tvaudio.c | 7 -
+ drivers/media/pci/saa7134/saa7134-vbi.c | 175 ++-
+ drivers/media/pci/saa7134/saa7134-video.c | 697 ++++------
+ drivers/media/pci/saa7134/saa7134.h | 108 +-
+ drivers/media/pci/saa7146/mxb.c | 14 +-
+ drivers/media/pci/sta2x11/sta2x11_vip.c | 7 +-
+ drivers/media/pci/ttpci/av7110_av.c | 6 +-
+ drivers/media/pci/zoran/zoran_device.c | 2 +-
+ drivers/media/pci/zoran/zoran_driver.c | 2 +-
+ drivers/media/platform/Kconfig | 4 +-
+ drivers/media/platform/blackfin/bfin_capture.c | 14 +-
+ drivers/media/platform/coda.c | 6 +-
+ drivers/media/platform/davinci/vpbe_display.c | 55 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 15 +-
+ drivers/media/platform/davinci/vpif_capture.c | 1119 ++++-----------
+ drivers/media/platform/davinci/vpif_capture.h | 28 -
+ drivers/media/platform/davinci/vpif_display.c | 1206 +++++-----------
+ drivers/media/platform/davinci/vpif_display.h | 44 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +-
+ drivers/media/platform/exynos4-is/Kconfig | 3 +-
+ drivers/media/platform/exynos4-is/common.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-capture.c | 6 +-
+ drivers/media/platform/exynos4-is/fimc-core.c | 6 +-
+ drivers/media/platform/exynos4-is/fimc-core.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-is.c | 3 +
+ drivers/media/platform/exynos4-is/fimc-isp-video.c | 7 +-
+ drivers/media/platform/exynos4-is/fimc-isp.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +-
+ drivers/media/platform/exynos4-is/fimc-lite.c | 8 +-
+ drivers/media/platform/exynos4-is/fimc-lite.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 9 +-
+ drivers/media/platform/exynos4-is/fimc-reg.c | 2 +-
+ drivers/media/platform/exynos4-is/media-dev.c | 329 +----
+ drivers/media/platform/exynos4-is/media-dev.h | 2 +-
+ drivers/media/platform/exynos4-is/mipi-csis.c | 43 +-
+ drivers/media/platform/fsl-viu.c | 2 +-
+ drivers/media/platform/marvell-ccic/mcam-core.c | 7 +-
+ drivers/media/platform/mem2mem_testdev.c | 5 +-
+ drivers/media/platform/mx2_emmaprp.c | 37 +-
+ drivers/media/platform/omap3isp/Makefile | 2 +-
+ drivers/media/platform/omap3isp/isp.c | 108 +-
+ drivers/media/platform/omap3isp/isp.h | 8 +-
+ drivers/media/platform/omap3isp/ispccdc.c | 107 +-
+ drivers/media/platform/omap3isp/ispccdc.h | 16 +-
+ drivers/media/platform/omap3isp/ispccp2.c | 4 +-
+ drivers/media/platform/omap3isp/ispcsi2.c | 4 +-
+ drivers/media/platform/omap3isp/isph3a_aewb.c | 2 +-
+ drivers/media/platform/omap3isp/isph3a_af.c | 2 +-
+ drivers/media/platform/omap3isp/isppreview.c | 8 +-
+ drivers/media/platform/omap3isp/ispqueue.c | 1161 ----------------
+ drivers/media/platform/omap3isp/ispqueue.h | 188 ---
+ drivers/media/platform/omap3isp/ispresizer.c | 8 +-
+ drivers/media/platform/omap3isp/ispstat.c | 197 ++-
+ drivers/media/platform/omap3isp/ispstat.h | 3 +-
+ drivers/media/platform/omap3isp/ispvideo.c | 325 ++---
+ drivers/media/platform/omap3isp/ispvideo.h | 29 +-
+ drivers/media/platform/s3c-camif/camif-capture.c | 4 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.c | 122 +-
+ drivers/media/platform/s5p-jpeg/jpeg-core.h | 6 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v6.h | 4 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v7.h | 5 +-
+ drivers/media/platform/s5p-mfc/regs-mfc-v8.h | 124 ++
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 79 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 15 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 62 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.h | 3 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 290 ++--
+ drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 96 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.c | 6 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 254 ++++
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 842 +++++++----
+ drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.h | 7 +-
+ drivers/media/platform/s5p-tv/hdmi_drv.c | 14 +-
+ drivers/media/platform/s5p-tv/hdmiphy_drv.c | 9 +-
+ drivers/media/platform/s5p-tv/mixer_video.c | 11 +-
+ drivers/media/platform/soc_camera/atmel-isi.c | 6 +-
+ drivers/media/platform/soc_camera/mx2_camera.c | 4 +-
+ drivers/media/platform/soc_camera/mx3_camera.c | 4 +-
+ drivers/media/platform/soc_camera/rcar_vin.c | 4 +-
+ .../platform/soc_camera/sh_mobile_ceu_camera.c | 4 +-
+ drivers/media/platform/soc_camera/soc_camera.c | 12 +-
+ drivers/media/platform/ti-vpe/csc.c | 6 +-
+ drivers/media/platform/ti-vpe/sc.c | 4 +-
+ drivers/media/platform/ti-vpe/vpdma.c | 68 +-
+ drivers/media/platform/ti-vpe/vpdma.h | 17 +-
+ drivers/media/platform/ti-vpe/vpe.c | 227 ++-
+ drivers/media/platform/timblogiw.c | 10 +-
+ drivers/media/platform/vino.c | 6 +-
+ drivers/media/platform/vivi.c | 3 +-
+ drivers/media/platform/vsp1/Makefile | 2 +-
+ drivers/media/platform/vsp1/vsp1.h | 3 +-
+ drivers/media/platform/vsp1/vsp1_bru.c | 395 ++++++
+ drivers/media/platform/vsp1/vsp1_bru.h | 39 +
+ drivers/media/platform/vsp1/vsp1_drv.c | 101 +-
+ drivers/media/platform/vsp1/vsp1_entity.c | 57 +-
+ drivers/media/platform/vsp1/vsp1_entity.h | 24 +-
+ drivers/media/platform/vsp1/vsp1_hsit.c | 7 +-
+ drivers/media/platform/vsp1/vsp1_lif.c | 1 -
+ drivers/media/platform/vsp1/vsp1_lut.c | 1 -
+ drivers/media/platform/vsp1/vsp1_regs.h | 98 ++
+ drivers/media/platform/vsp1/vsp1_rpf.c | 7 +-
+ drivers/media/platform/vsp1/vsp1_rwpf.h | 4 +
+ drivers/media/platform/vsp1/vsp1_sru.c | 1 -
+ drivers/media/platform/vsp1/vsp1_uds.c | 4 +-
+ drivers/media/platform/vsp1/vsp1_video.c | 30 +-
+ drivers/media/platform/vsp1/vsp1_video.h | 1 +
+ drivers/media/platform/vsp1/vsp1_wpf.c | 13 +-
+ drivers/media/rc/mceusb.c | 65 +-
+ drivers/media/tuners/Kconfig | 7 +
+ drivers/media/tuners/Makefile | 1 +
+ drivers/media/tuners/si2157.c | 260 ++++
+ drivers/media/tuners/si2157.h | 34 +
+ drivers/media/tuners/si2157_priv.h | 37 +
+ drivers/media/tuners/xc5000.c | 302 ++--
+ drivers/media/usb/au0828/au0828-dvb.c | 57 +-
+ drivers/media/usb/au0828/au0828-video.c | 4 +-
+ drivers/media/usb/au0828/au0828.h | 2 +
+ drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 6 +
+ drivers/media/usb/dvb-usb/az6027.c | 7 +-
+ drivers/media/usb/dvb-usb/dib0700.h | 2 +-
+ drivers/media/usb/dvb-usb/dib0700_core.c | 43 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +-
+ drivers/media/usb/dvb-usb/technisat-usb2.c | 28 +-
+ drivers/media/usb/em28xx/Kconfig | 2 +
+ drivers/media/usb/em28xx/em28xx-audio.c | 39 +-
+ drivers/media/usb/em28xx/em28xx-camera.c | 51 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 47 +-
+ drivers/media/usb/em28xx/em28xx-dvb.c | 89 ++
+ drivers/media/usb/em28xx/em28xx-i2c.c | 1 -
+ drivers/media/usb/em28xx/em28xx-v4l.h | 2 +-
+ drivers/media/usb/em28xx/em28xx-vbi.c | 10 +-
+ drivers/media/usb/em28xx/em28xx-video.c | 622 +++++----
+ drivers/media/usb/em28xx/em28xx.h | 153 +-
+ drivers/media/usb/gspca/Kconfig | 10 +
+ drivers/media/usb/gspca/Makefile | 2 +
+ drivers/media/usb/gspca/dtcs033.c | 441 ++++++
+ drivers/media/usb/gspca/gl860/gl860-mi2020.c | 464 ++++---
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
+ drivers/media/usb/pwc/pwc-if.c | 7 +-
+ drivers/media/usb/s2255/s2255drv.c | 11 +-
+ drivers/media/usb/stk1160/stk1160-core.c | 10 +-
+ drivers/media/usb/stk1160/stk1160-v4l.c | 8 +-
+ drivers/media/usb/stk1160/stk1160.h | 1 -
+ drivers/media/usb/tm6000/tm6000-cards.c | 2 +-
+ drivers/media/usb/tm6000/tm6000-video.c | 2 +-
+ drivers/media/usb/usbtv/usbtv-video.c | 9 +-
+ drivers/media/usb/usbvision/usbvision-video.c | 2 +-
+ drivers/media/usb/uvc/uvc_video.c | 36 +-
+ drivers/media/v4l2-core/Kconfig | 4 +
+ drivers/media/v4l2-core/Makefile | 1 +
+ drivers/media/v4l2-core/tuner-core.c | 6 +-
+ drivers/media/v4l2-core/v4l2-device.c | 18 +-
+ drivers/media/v4l2-core/v4l2-dv-timings.c | 11 +
+ drivers/media/v4l2-core/v4l2-event.c | 36 +
+ drivers/media/v4l2-core/v4l2-ioctl.c | 12 +-
+ drivers/media/v4l2-core/v4l2-subdev.c | 67 +-
+ drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-core.c | 730 +++++++---
+ drivers/media/v4l2-core/videobuf2-dma-sg.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-dvb.c | 336 +++++
+ drivers/staging/media/as102/as102_usb_drv.c | 7 +-
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +-
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 2 -
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 27 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.h | 2 -
+ drivers/staging/media/dt3155v4l/dt3155v4l.c | 7 +-
+ drivers/staging/media/go7007/go7007-v4l2.c | 5 +-
+ drivers/staging/media/go7007/s2250-board.c | 2 +-
+ drivers/staging/media/go7007/saa7134-go7007.c | 4 +
+ drivers/staging/media/lirc/lirc_bt829.c | 6 +-
+ drivers/staging/media/lirc/lirc_parallel.c | 26 +-
+ drivers/staging/media/lirc/lirc_serial.c | 11 +-
+ drivers/staging/media/lirc/lirc_sir.c | 33 +-
+ drivers/staging/media/lirc/lirc_zilog.c | 23 +-
+ drivers/staging/media/msi3101/sdr-msi3101.c | 24 +-
+ drivers/staging/media/omap24xx/tcm825x.c | 12 +-
+ drivers/staging/media/omap24xx/tcm825x.h | 4 +-
+ drivers/staging/media/omap4iss/Kconfig | 6 -
+ drivers/staging/media/omap4iss/iss.c | 52 +-
+ drivers/staging/media/omap4iss/iss.h | 14 +
+ drivers/staging/media/omap4iss/iss_csi2.c | 39 +-
+ drivers/staging/media/omap4iss/iss_video.c | 2 +-
+ drivers/staging/media/omap4iss/iss_video.h | 2 +-
+ drivers/staging/media/rtl2832u_sdr/rtl2832_sdr.c | 7 +-
+ drivers/staging/media/sn9c102/sn9c102.h | 30 +-
+ drivers/staging/media/sn9c102/sn9c102_core.c | 342 ++---
+ drivers/staging/media/sn9c102/sn9c102_devtable.h | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_hv7131d.c | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_hv7131r.c | 23 +-
+ drivers/staging/media/sn9c102/sn9c102_mi0343.c | 30 +-
+ drivers/staging/media/sn9c102/sn9c102_mi0360.c | 30 +-
+ drivers/staging/media/sn9c102/sn9c102_ov7630.c | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_ov7660.c | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_pas106b.c | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_pas202bcb.c | 22 +-
+ drivers/staging/media/sn9c102/sn9c102_sensor.h | 34 +-
+ drivers/staging/media/sn9c102/sn9c102_tas5110c1b.c | 18 +-
+ drivers/staging/media/sn9c102/sn9c102_tas5110d.c | 14 +-
+ drivers/staging/media/sn9c102/sn9c102_tas5130d1b.c | 18 +-
+ drivers/staging/media/solo6x10/Kconfig | 12 +-
+ drivers/staging/media/solo6x10/solo6x10-enc.c | 31 +-
+ drivers/staging/media/solo6x10/solo6x10-offsets.h | 2 +
+ drivers/staging/media/solo6x10/solo6x10-v4l2-enc.c | 3 +-
+ drivers/staging/media/solo6x10/solo6x10-v4l2.c | 3 +-
+ include/linux/platform_data/mipi-csis.h | 28 -
+ include/media/adv7604.h | 124 +-
+ include/media/davinci/vpbe_display.h | 6 +-
+ include/media/davinci/vpfe_capture.h | 6 +-
+ include/media/{s5p_fimc.h => exynos-fimc.h} | 21 -
+ include/media/media-device.h | 4 +-
+ include/media/media-devnode.h | 3 +-
+ include/media/v4l2-device.h | 8 +
+ include/media/v4l2-event.h | 4 +
+ include/media/v4l2-subdev.h | 37 +-
+ include/media/videobuf2-core.h | 52 +-
+ include/media/videobuf2-dvb.h | 58 +
+ include/uapi/linux/v4l2-common.h | 2 +-
+ include/uapi/linux/v4l2-dv-timings.h | 70 +
+ include/uapi/linux/v4l2-mediabus.h | 14 +-
+ include/uapi/linux/v4l2-subdev.h | 40 +-
+ include/uapi/linux/videodev2.h | 19 +-
+ 309 files changed, 11672 insertions(+), 8201 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7604.txt
+ create mode 100644 Documentation/devicetree/bindings/media/renesas,vsp1.txt
+ create mode 100644 drivers/media/dvb-frontends/si2168.c
+ create mode 100644 drivers/media/dvb-frontends/si2168.h
+ create mode 100644 drivers/media/dvb-frontends/si2168_priv.h
+ delete mode 100644 drivers/media/platform/omap3isp/ispqueue.c
+ delete mode 100644 drivers/media/platform/omap3isp/ispqueue.h
+ create mode 100644 drivers/media/platform/s5p-mfc/regs-mfc-v8.h
+ create mode 100644 drivers/media/platform/vsp1/vsp1_bru.c
+ create mode 100644 drivers/media/platform/vsp1/vsp1_bru.h
+ create mode 100644 drivers/media/tuners/si2157.c
+ create mode 100644 drivers/media/tuners/si2157.h
+ create mode 100644 drivers/media/tuners/si2157_priv.h
+ mode change 100644 => 100755 drivers/media/usb/au0828/au0828-dvb.c
+ create mode 100644 drivers/media/usb/gspca/dtcs033.c
+ create mode 100644 drivers/media/v4l2-core/videobuf2-dvb.c
+ delete mode 100644 include/linux/platform_data/mipi-csis.h
+ rename include/media/{s5p_fimc.h => exynos-fimc.h} (87%)
+ create mode 100644 include/media/videobuf2-dvb.h
+Merging kbuild/for-next (5366c855e0d8 Merge branches 'kbuild/misc' and 'kbuild/kbuild' into kbuild/for-next)
+$ git merge kbuild/for-next
+Auto-merging lib/Kconfig.debug
+Auto-merging init/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ .gitignore | 4 +-
+ Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++
+ Makefile | 96 ++++++++++++-------
+ arch/x86/Kconfig | 2 +-
+ firmware/Makefile | 34 ++-----
+ init/Kconfig | 73 +++++++++++++++
+ kernel/gcov/Kconfig | 2 +-
+ lib/Kconfig.debug | 2 +-
+ scripts/Makefile.build | 65 +------------
+ scripts/Makefile.extrawarn | 67 ++++++++++++++
+ scripts/Makefile.fwinst | 26 +++---
+ scripts/Makefile.host | 2 +-
+ scripts/Makefile.lib | 10 +-
+ scripts/Makefile.lto | 84 +++++++++++++++++
+ scripts/Makefile.modpost | 7 +-
+ scripts/conmakehash.c | 12 +--
+ scripts/kconfig/streamline_config.pl | 2 +-
+ scripts/link-vmlinux.sh | 2 +-
+ scripts/mkcompile_h | 4 +-
+ scripts/mkmakefile | 15 +--
+ scripts/package/builddeb | 10 +-
+ scripts/patch-kernel | 4 +-
+ scripts/tags.sh | 17 +++-
+ 23 files changed, 534 insertions(+), 179 deletions(-)
+ create mode 100644 Documentation/lto-build
+ create mode 100644 scripts/Makefile.extrawarn
+ 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 (fc6db7a44659 Merge branch 'for-3.16' into for-next)
+$ git merge libata/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ata/ahci-platform.txt | 14 ++-
+ drivers/ata/Kconfig | 9 ++
+ drivers/ata/Makefile | 1 +
+ drivers/ata/acard-ahci.c | 6 +-
+ drivers/ata/ahci.c | 2 +
+ drivers/ata/ahci.h | 1 +
+ drivers/ata/ahci_da850.c | 3 +-
+ drivers/ata/ahci_imx.c | 3 +-
+ drivers/ata/ahci_mvebu.c | 128 +++++++++++++++++++++
+ drivers/ata/ahci_platform.c | 9 +-
+ drivers/ata/ahci_st.c | 2 +-
+ drivers/ata/ahci_sunxi.c | 9 +-
+ drivers/ata/ahci_xgene.c | 7 +-
+ drivers/ata/ata_generic.c | 2 +-
+ drivers/ata/ata_piix.c | 4 +-
+ drivers/ata/libahci.c | 5 +
+ drivers/ata/libahci_platform.c | 5 +-
+ drivers/ata/libata-scsi.c | 6 +-
+ drivers/ata/libata-sff.c | 9 --
+ drivers/ata/pata_acpi.c | 2 +-
+ drivers/ata/pata_ali.c | 4 +-
+ drivers/ata/pata_amd.c | 4 +-
+ drivers/ata/pata_artop.c | 4 +-
+ drivers/ata/pata_atiixp.c | 2 +-
+ drivers/ata/pata_atp867x.c | 4 +-
+ drivers/ata/pata_bf54x.c | 2 +-
+ drivers/ata/pata_cmd640.c | 4 +-
+ drivers/ata/pata_cmd64x.c | 4 +-
+ drivers/ata/pata_cs5520.c | 6 +-
+ drivers/ata/pata_cs5530.c | 6 +-
+ drivers/ata/pata_cs5535.c | 2 +-
+ drivers/ata/pata_cs5536.c | 2 +-
+ drivers/ata/pata_cypress.c | 2 +-
+ drivers/ata/pata_efar.c | 2 +-
+ drivers/ata/pata_ep93xx.c | 4 +-
+ drivers/ata/pata_hpt366.c | 4 +-
+ drivers/ata/pata_hpt3x3.c | 4 +-
+ drivers/ata/pata_imx.c | 4 +-
+ drivers/ata/pata_it8213.c | 2 +-
+ drivers/ata/pata_it821x.c | 4 +-
+ drivers/ata/pata_jmicron.c | 2 +-
+ drivers/ata/pata_macio.c | 22 ++--
+ drivers/ata/pata_marvell.c | 2 +-
+ drivers/ata/pata_mpc52xx.c | 8 +-
+ drivers/ata/pata_mpiix.c | 2 +-
+ drivers/ata/pata_netcell.c | 2 +-
+ drivers/ata/pata_ninja32.c | 5 +-
+ drivers/ata/pata_ns87410.c | 2 +-
+ drivers/ata/pata_ns87415.c | 4 +-
+ drivers/ata/pata_octeon_cf.c | 50 +++-----
+ drivers/ata/pata_oldpiix.c | 2 +-
+ drivers/ata/pata_opti.c | 2 +-
+ drivers/ata/pata_optidma.c | 2 +-
+ drivers/ata/pata_pdc2027x.c | 6 +-
+ drivers/ata/pata_pdc202xx_old.c | 2 +-
+ drivers/ata/pata_piccolo.c | 2 +-
+ drivers/ata/pata_radisys.c | 2 +-
+ drivers/ata/pata_rdc.c | 2 +-
+ drivers/ata/pata_rz1000.c | 4 +-
+ drivers/ata/pata_samsung_cf.c | 4 +-
+ drivers/ata/pata_sc1200.c | 2 +-
+ drivers/ata/pata_scc.c | 2 +-
+ drivers/ata/pata_sch.c | 2 +-
+ drivers/ata/pata_serverworks.c | 4 +-
+ drivers/ata/pata_sil680.c | 4 +-
+ drivers/ata/pata_sis.c | 4 +-
+ drivers/ata/pata_sl82c105.c | 4 +-
+ drivers/ata/pata_triflex.c | 4 +-
+ drivers/ata/pata_via.c | 4 +-
+ drivers/ata/sata_fsl.c | 18 +--
+ drivers/ata/sata_inic162x.c | 4 +-
+ drivers/ata/sata_mv.c | 8 +-
+ drivers/ata/sata_nv.c | 6 +-
+ drivers/ata/sata_rcar.c | 4 +-
+ drivers/ata/sata_sil.c | 6 +-
+ drivers/ata/sata_sil24.c | 10 +-
+ drivers/ata/sata_sis.c | 2 +-
+ drivers/ata/sata_via.c | 2 +-
+ include/linux/ahci_platform.h | 1 +
+ 79 files changed, 322 insertions(+), 193 deletions(-)
+ create mode 100644 drivers/ata/ahci_mvebu.c
+Merging pm/linux-next (0c932c3ecbba Merge branch 'pm-cpufreq-next' into linux-next)
+$ git merge pm/linux-next
+Resolved 'drivers/cpufreq/exynos-cpufreq.c' using previous resolution.
+Resolved 'drivers/cpufreq/exynos-cpufreq.h' using previous resolution.
+Removing tools/power/acpi/tools/acpidump/acpidump.c
+Auto-merging include/linux/suspend.h
+Auto-merging include/linux/cpuidle.h
+Auto-merging drivers/cpuidle/Makefile
+Auto-merging drivers/cpuidle/Kconfig.arm
+Auto-merging drivers/cpufreq/exynos-cpufreq.h
+CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.h
+Auto-merging drivers/cpufreq/exynos-cpufreq.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/exynos-cpufreq.c
+Auto-merging drivers/cpufreq/Kconfig.arm
+Auto-merging drivers/clk/Makefile
+Auto-merging MAINTAINERS
+Auto-merging Documentation/kernel-parameters.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dabf25875906] Merge remote-tracking branch 'pm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 4 +-
+ Documentation/ABI/testing/sysfs-power | 29 +-
+ Documentation/cpu-freq/core.txt | 29 +
+ Documentation/cpu-freq/cpu-drivers.txt | 19 +
+ Documentation/cpu-freq/index.txt | 4 +-
+ Documentation/kernel-parameters.txt | 19 +-
+ Documentation/power/devices.txt | 34 +-
+ Documentation/power/opp.txt | 40 +-
+ Documentation/power/runtime_pm.txt | 37 +-
+ Documentation/power/states.txt | 87 +-
+ Documentation/power/swsusp.txt | 5 +-
+ MAINTAINERS | 3 -
+ arch/arm/mach-davinci/da850.c | 9 +-
+ arch/ia64/include/asm/acenv.h | 56 +
+ arch/ia64/include/asm/acpi.h | 52 +-
+ arch/ia64/kernel/acpi.c | 3 +
+ arch/mips/loongson/lemote-2f/clock.c | 17 +-
+ arch/x86/include/asm/acenv.h | 49 +
+ arch/x86/include/asm/acpi.h | 45 -
+ drivers/acpi/acpi_extlog.c | 16 +-
+ drivers/acpi/acpi_lpss.c | 249 +++-
+ drivers/acpi/acpi_pad.c | 16 +-
+ drivers/acpi/acpi_platform.c | 29 +-
+ drivers/acpi/acpi_processor.c | 2 +-
+ drivers/acpi/acpica/Makefile | 1 +
+ drivers/acpi/acpica/acapps.h | 170 +++
+ drivers/acpi/acpica/acevents.h | 5 +-
+ drivers/acpi/acpica/acglobal.h | 142 +--
+ drivers/acpi/acpica/aclocal.h | 17 +-
+ drivers/acpi/acpica/acpredef.h | 4 +
+ drivers/acpi/acpica/actables.h | 60 +-
+ drivers/acpi/acpica/acutils.h | 10 +-
+ drivers/acpi/acpica/evgpe.c | 13 +-
+ drivers/acpi/acpica/evgpeblk.c | 34 +-
+ drivers/acpi/acpica/evgpeinit.c | 12 +-
+ drivers/acpi/acpica/evmisc.c | 3 +-
+ drivers/acpi/acpica/evsci.c | 2 +-
+ drivers/acpi/acpica/evxface.c | 61 +-
+ drivers/acpi/acpica/evxfgpe.c | 7 +-
+ drivers/acpi/acpica/exconfig.c | 82 +-
+ drivers/acpi/acpica/exdump.c | 4 +-
+ drivers/acpi/acpica/hwpci.c | 15 +-
+ drivers/acpi/acpica/rscreate.c | 13 +-
+ drivers/acpi/acpica/tbdata.c | 723 +++++++++++
+ drivers/acpi/acpica/tbfadt.c | 61 +-
+ drivers/acpi/acpica/tbfind.c | 4 +-
+ drivers/acpi/acpica/tbinstal.c | 837 +++++--------
+ drivers/acpi/acpica/tbutils.c | 283 +----
+ drivers/acpi/acpica/tbxface.c | 18 +-
+ drivers/acpi/acpica/tbxfload.c | 87 +-
+ drivers/acpi/acpica/utdecode.c | 74 +-
+ drivers/acpi/acpica/utglobal.c | 26 +-
+ drivers/acpi/acpica/utstring.c | 2 +-
+ drivers/acpi/acpica/utxferror.c | 2 +
+ drivers/acpi/apei/einj.c | 14 +-
+ drivers/acpi/battery.c | 36 +-
+ drivers/acpi/bus.c | 53 +-
+ drivers/acpi/device_pm.c | 46 +-
+ drivers/acpi/internal.h | 3 +-
+ drivers/acpi/nvs.c | 4 +-
+ drivers/acpi/osl.c | 32 +-
+ drivers/acpi/processor_driver.c | 7 +
+ drivers/acpi/scan.c | 20 +-
+ drivers/acpi/sleep.c | 19 +
+ drivers/acpi/thermal.c | 11 +-
+ drivers/acpi/utils.c | 64 +-
+ drivers/acpi/video.c | 252 +++-
+ drivers/base/power/main.c | 66 +-
+ drivers/base/power/opp.c | 122 +-
+ drivers/char/tpm/tpm_acpi.c | 4 +-
+ drivers/clk/Makefile | 1 +
+ drivers/clk/clk-fractional-divider.c | 135 ++
+ drivers/cpufreq/Kconfig.arm | 7 +-
+ drivers/cpufreq/Kconfig.x86 | 4 +-
+ drivers/cpufreq/Makefile | 2 +
+ drivers/cpufreq/acpi-cpufreq.c | 9 +-
+ drivers/cpufreq/arm_big_little.c | 16 +-
+ drivers/cpufreq/cpufreq-nforce2.c | 2 +-
+ drivers/cpufreq/cpufreq.c | 14 +
+ drivers/cpufreq/cpufreq_opp.c | 110 ++
+ drivers/cpufreq/cpufreq_stats.c | 24 +-
+ drivers/cpufreq/dbx500-cpufreq.c | 8 +-
+ drivers/cpufreq/elanfreq.c | 9 +-
+ drivers/cpufreq/exynos-cpufreq.c | 32 +-
+ drivers/cpufreq/exynos-cpufreq.h | 1 +
+ drivers/cpufreq/exynos5440-cpufreq.c | 30 +-
+ drivers/cpufreq/freq_table.c | 64 +-
+ drivers/cpufreq/imx6q-cpufreq.c | 54 +-
+ drivers/cpufreq/intel_pstate.c | 18 +-
+ drivers/cpufreq/longhaul.c | 11 +-
+ drivers/cpufreq/pasemi-cpufreq.c | 10 +-
+ drivers/cpufreq/powernow-k6.c | 14 +-
+ drivers/cpufreq/powernow-k8.c | 180 ++-
+ drivers/cpufreq/powernow-k8.h | 2 +-
+ drivers/cpufreq/powernv-cpufreq.c | 2 +-
+ drivers/cpufreq/ppc_cbe_cpufreq.c | 9 +-
+ drivers/cpufreq/s3c2416-cpufreq.c | 40 +-
+ drivers/cpufreq/s3c64xx-cpufreq.c | 15 +-
+ drivers/cpufreq/s5pv210-cpufreq.c | 6 +-
+ drivers/cpufreq/speedstep-centrino.c | 2 +-
+ drivers/cpufreq/tegra-cpufreq.c | 9 +-
+ drivers/cpuidle/Kconfig.arm | 6 +
+ drivers/cpuidle/Makefile | 1 +
+ drivers/cpuidle/cpuidle-clps711x.c | 64 +
+ drivers/cpuidle/cpuidle.c | 55 +-
+ drivers/cpuidle/governors/menu.c | 17 +-
+ drivers/gpu/drm/nouveau/nouveau_backlight.c | 9 -
+ drivers/mfd/db8500-prcmu.c | 19 +-
+ drivers/net/irda/sh_sir.c | 14 +-
+ drivers/platform/x86/acer-wmi.c | 10 +-
+ drivers/pnp/resource.c | 4 +-
+ drivers/powercap/intel_rapl.c | 33 +-
+ drivers/sh/clk/core.c | 20 +-
+ drivers/thermal/cpu_cooling.c | 33 +-
+ drivers/video/backlight/backlight.c | 40 +
+ include/acpi/acnames.h | 1 +
+ include/acpi/acpi.h | 4 +-
+ include/acpi/acpi_bus.h | 5 +-
+ include/acpi/acpi_drivers.h | 5 +
+ include/acpi/acpi_io.h | 3 +
+ include/acpi/acpixf.h | 831 ++++++++----
+ include/acpi/actbl.h | 11 +-
+ include/acpi/actbl1.h | 4 +-
+ include/acpi/actbl2.h | 71 +-
+ include/acpi/actypes.h | 21 +
+ include/acpi/platform/acenvex.h | 63 +
+ include/acpi/platform/acgcc.h | 11 +
+ include/acpi/platform/aclinux.h | 209 +--
+ include/acpi/platform/aclinuxex.h | 112 ++
+ include/acpi/video.h | 2 +
+ include/linux/acpi.h | 28 +-
+ include/linux/backlight.h | 7 +
+ include/linux/clk-provider.h | 31 +
+ include/linux/cpufreq.h | 50 +
+ include/linux/cpuidle.h | 7 +-
+ include/linux/pm.h | 36 +-
+ include/linux/pm_opp.h | 20 -
+ include/linux/pm_runtime.h | 6 +
+ include/linux/suspend.h | 7 +
+ kernel/power/Kconfig | 3 +-
+ kernel/power/hibernate.c | 27 +-
+ kernel/power/main.c | 33 +-
+ kernel/power/power.h | 9 +-
+ kernel/power/suspend.c | 111 +-
+ kernel/power/suspend_test.c | 24 +-
+ kernel/sched/idle.c | 20 +-
+ tools/power/acpi/Makefile | 28 +-
+ tools/power/acpi/common/cmfsize.c | 101 ++
+ tools/power/acpi/common/getopt.c | 239 ++++
+ tools/power/acpi/man/acpidump.8 | 85 +-
+ .../acpi/os_specific/service_layers/oslinuxtbl.c | 1325 ++++++++++++++++++++
+ .../acpi/os_specific/service_layers/osunixdir.c | 204 +++
+ .../acpi/os_specific/service_layers/osunixmap.c | 151 +++
+ tools/power/acpi/tools/acpidump/acpidump.c | 559 ---------
+ tools/power/acpi/tools/acpidump/acpidump.h | 130 ++
+ tools/power/acpi/tools/acpidump/apdump.c | 451 +++++++
+ tools/power/acpi/tools/acpidump/apfiles.c | 228 ++++
+ tools/power/acpi/tools/acpidump/apmain.c | 351 ++++++
+ tools/power/acpi/tools/ec/Makefile | 22 +
+ tools/power/acpi/tools/ec/ec_access.c | 238 ++++
+ tools/power/cpupower/Makefile | 12 +-
+ tools/power/cpupower/README | 24 +-
+ tools/power/cpupower/ToDo | 1 -
+ .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 2 +-
+ tools/power/cpupower/man/cpupower-frequency-info.1 | 3 +
+ tools/power/cpupower/man/cpupower-idle-set.1 | 10 +-
+ tools/power/cpupower/man/cpupower-info.1 | 2 +-
+ tools/power/cpupower/man/cpupower-set.1 | 31 +-
+ tools/power/cpupower/utils/cpufreq-info.c | 110 +-
+ tools/power/cpupower/utils/cpuidle-set.c | 75 +-
+ tools/power/cpupower/utils/cpupower-info.c | 42 +-
+ tools/power/cpupower/utils/cpupower-set.c | 43 +-
+ tools/power/cpupower/utils/cpupower.c | 14 +
+ tools/power/x86/turbostat/turbostat.c | 4 +-
+ 174 files changed, 8415 insertions(+), 3385 deletions(-)
+ create mode 100644 arch/ia64/include/asm/acenv.h
+ create mode 100644 arch/x86/include/asm/acenv.h
+ create mode 100644 drivers/acpi/acpica/acapps.h
+ create mode 100644 drivers/acpi/acpica/tbdata.c
+ create mode 100644 drivers/clk/clk-fractional-divider.c
+ create mode 100644 drivers/cpufreq/cpufreq_opp.c
+ create mode 100644 drivers/cpuidle/cpuidle-clps711x.c
+ create mode 100644 include/acpi/platform/acenvex.h
+ create mode 100644 include/acpi/platform/aclinuxex.h
+ create mode 100644 tools/power/acpi/common/cmfsize.c
+ create mode 100644 tools/power/acpi/common/getopt.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/osunixdir.c
+ create mode 100644 tools/power/acpi/os_specific/service_layers/osunixmap.c
+ delete mode 100644 tools/power/acpi/tools/acpidump/acpidump.c
+ create mode 100644 tools/power/acpi/tools/acpidump/acpidump.h
+ create mode 100644 tools/power/acpi/tools/acpidump/apdump.c
+ create mode 100644 tools/power/acpi/tools/acpidump/apfiles.c
+ create mode 100644 tools/power/acpi/tools/acpidump/apmain.c
+ create mode 100644 tools/power/acpi/tools/ec/Makefile
+ create mode 100644 tools/power/acpi/tools/ec/ec_access.c
+Merging idle/next (23a299cd9378 Merge branches 'turbostat' and 'intel_idle' into release)
+$ git merge idle/next
+Already up-to-date.
+Merging apm/for-next (158204397034 apm-emulation: add hibernation APM events to support suspend2disk)
+$ 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 (63745aa72ed1 Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel-soc-dts-thermal' and 'thermal-soc-fixes' of .git into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/thermal/armada-thermal.txt | 12 +-
+ .../devicetree/bindings/thermal/exynos-thermal.txt | 50 ++-
+ drivers/thermal/Kconfig | 14 +-
+ drivers/thermal/Makefile | 1 +
+ drivers/thermal/armada_thermal.c | 158 ++++++-
+ drivers/thermal/int3403_thermal.c | 8 +-
+ drivers/thermal/intel_powerclamp.c | 2 +
+ drivers/thermal/intel_soc_dts_thermal.c | 479 +++++++++++++++++++++
+ drivers/thermal/rcar_thermal.c | 9 +-
+ drivers/thermal/samsung/exynos_tmu.c | 86 +++-
+ drivers/thermal/samsung/exynos_tmu.h | 23 +-
+ drivers/thermal/samsung/exynos_tmu_data.c | 211 ++++++++-
+ drivers/thermal/samsung/exynos_tmu_data.h | 31 +-
+ drivers/thermal/spear_thermal.c | 4 +-
+ drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +-
+ 15 files changed, 1015 insertions(+), 75 deletions(-)
+ create mode 100644 drivers/thermal/intel_soc_dts_thermal.c
+Merging ieee1394/for-next (165d560bb267 Merge branch 'master' into for-next)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/debugging-via-ohci1394.txt | 13 ++++++++-----
+ drivers/firewire/Kconfig | 2 +-
+ drivers/firewire/core.h | 4 ++--
+ drivers/firewire/net.c | 4 ++--
+ drivers/firewire/ohci.c | 9 ++++++++-
+ 5 files changed, 21 insertions(+), 11 deletions(-)
+Merging dlm/next (075f01775f53 dlm: use INFO for recovery messages)
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/linux-next (0cb637bff80d swiotlb: Don't DoS us with 'swiotlb buffer is full' (v2))
+$ git merge swiotlb/linux-next
+Already up-to-date.
+Merging slave-dma/next (9fe2419a0ab5 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Auto-merging include/linux/dmaengine.h
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/mmp-dma.txt | 11 +-
+ .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 75 ++
+ arch/powerpc/boot/dts/mpc8308_p1m.dts | 2 +-
+ arch/powerpc/boot/dts/mpc8308rdb.dts | 2 +-
+ drivers/dma/Kconfig | 16 +-
+ drivers/dma/Makefile | 1 +
+ drivers/dma/dw/core.c | 49 +-
+ drivers/dma/dw/pci.c | 12 +-
+ drivers/dma/dw/platform.c | 18 +-
+ drivers/dma/fsldma.c | 306 ++---
+ drivers/dma/mmp_pdma.c | 95 +-
+ drivers/dma/mpc512x_dma.c | 342 ++++-
+ drivers/dma/pch_dma.c | 3 +-
+ drivers/dma/sh/shdma-base.c | 90 +-
+ drivers/dma/ste_dma40.c | 182 ++-
+ drivers/dma/xilinx/Makefile | 1 +
+ drivers/dma/xilinx/xilinx_vdma.c | 1379 ++++++++++++++++++++
+ include/linux/amba/xilinx_dma.h | 47 +
+ include/linux/dmaengine.h | 2 +-
+ include/linux/shdma-base.h | 1 +
+ 20 files changed, 2269 insertions(+), 365 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/xilinx/xilinx_vdma.txt
+ create mode 100644 drivers/dma/xilinx/Makefile
+ create mode 100644 drivers/dma/xilinx/xilinx_vdma.c
+ create mode 100644 include/linux/amba/xilinx_dma.h
+Merging dmaengine/next (fbeec99ad5c0 dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup())
+$ git merge dmaengine/next
+Auto-merging drivers/dma/mv_xor.c
+Merge made by the 'recursive' strategy.
+ drivers/dma/ioat/dca.c | 13 ++++----
+ drivers/dma/ioat/dma.c | 2 +-
+ drivers/dma/ioat/dma_v3.c | 6 ++--
+ drivers/dma/mv_xor.c | 80 +++++++++++++++++++++++++++++++++++++----------
+ 4 files changed, 74 insertions(+), 27 deletions(-)
+Merging net-next/master (6623b4194459 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next)
+$ git merge net-next/master
+Resolved 'drivers/net/wireless/iwlwifi/mvm/mac80211.c' using previous resolution.
+Removing net/tipc/handler.c
+Removing net/bridge/br_notify.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/sysctl.c
+Auto-merging include/uapi/linux/audit.h
+Auto-merging drivers/s390/net/qeth_core_main.c
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/can/spi/mcp251x.c
+Auto-merging drivers/clk/ti/clk-43xx.c
+Auto-merging arch/sparc/include/asm/checksum_64.h
+Auto-merging arch/sparc/include/asm/checksum_32.h
+Auto-merging arch/arm/boot/dts/armada-xp-matrix.dts
+Auto-merging arch/arm/boot/dts/am4372.dtsi
+Auto-merging arch/arm/boot/dts/am33xx.dtsi
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master af49dc02ea1b] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-class-net | 8 +
+ Documentation/ABI/testing/sysfs-class-net-queues | 79 +
+ .../ABI/testing/sysfs-class-net-statistics | 201 +++
+ Documentation/DocBook/80211.tmpl | 1 +
+ .../devicetree/bindings/net/broadcom-bcmgenet.txt | 2 +-
+ .../bindings/net/broadcom-systemport.txt | 29 +
+ .../devicetree/bindings/net/cpsw-phy-sel.txt | 4 +-
+ .../devicetree/bindings/net/fixed-link.txt | 42 +
+ .../devicetree/bindings/net/fsl-tsec-phy.txt | 5 +-
+ .../bindings/net/ieee802154/at86rf230.txt | 23 +
+ .../devicetree/bindings/net/micrel-ks8851.txt | 15 +-
+ .../devicetree/bindings/net/micrel-ksz9021.txt | 49 -
+ .../devicetree/bindings/net/micrel-ksz90x1.txt | 83 +
+ .../devicetree/bindings/net/via-rhine.txt | 17 +
+ Documentation/driver-model/devres.txt | 5 +
+ Documentation/networking/bonding.txt | 44 +-
+ Documentation/networking/can.txt | 35 +
+ Documentation/networking/cdc_mbim.txt | 339 ++++
+ Documentation/networking/filter.txt | 185 ++-
+ MAINTAINERS | 9 +-
+ arch/arm/boot/dts/am33xx.dtsi | 2 +
+ arch/arm/boot/dts/am4372.dtsi | 2 +
+ arch/arm/boot/dts/armada-xp-matrix.dts | 4 +
+ arch/arm/boot/dts/vt8500.dtsi | 6 +
+ arch/arm/boot/dts/wm8650.dtsi | 6 +
+ arch/arm/boot/dts/wm8850.dtsi | 6 +
+ arch/powerpc/sysdev/fsl_soc.c | 32 -
+ arch/sparc/include/asm/checksum_32.h | 12 +
+ arch/sparc/include/asm/checksum_64.h | 12 +
+ arch/x86/include/asm/checksum_64.h | 9 +-
+ arch/x86/net/bpf_jit.S | 77 +-
+ arch/x86/net/bpf_jit_comp.c | 1399 +++++++++-------
+ drivers/atm/idt77252.c | 8 +-
+ drivers/bluetooth/btmrvl_drv.h | 4 +-
+ drivers/bluetooth/btmrvl_main.c | 19 +-
+ drivers/bluetooth/btmrvl_sdio.c | 103 +-
+ drivers/bluetooth/btmrvl_sdio.h | 3 +
+ drivers/bluetooth/hci_h4.c | 7 -
+ drivers/clk/ti/clk-43xx.c | 16 +
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 111 +-
+ drivers/isdn/i4l/isdn_ppp.c | 4 +-
+ drivers/isdn/mISDN/l1oip_core.c | 14 +-
+ drivers/net/bonding/bond_3ad.c | 62 +-
+ drivers/net/bonding/bond_alb.c | 132 +-
+ drivers/net/bonding/bond_alb.h | 1 +
+ drivers/net/bonding/bond_debugfs.c | 2 +-
+ drivers/net/bonding/bond_main.c | 210 ++-
+ drivers/net/bonding/bond_netlink.c | 8 +-
+ drivers/net/bonding/bond_options.c | 66 +-
+ drivers/net/bonding/bond_options.h | 2 +
+ drivers/net/bonding/bond_procfs.c | 16 +-
+ drivers/net/bonding/bond_sysfs.c | 567 ++-----
+ drivers/net/bonding/bond_sysfs_slave.c | 4 +-
+ drivers/net/bonding/bonding.h | 119 +-
+ drivers/net/can/Kconfig | 22 +-
+ drivers/net/can/Makefile | 3 +-
+ drivers/net/can/c_can/c_can.c | 15 +-
+ drivers/net/can/c_can/c_can.h | 8 +-
+ drivers/net/can/c_can/c_can_pci.c | 78 +-
+ drivers/net/can/c_can/c_can_platform.c | 84 +-
+ drivers/net/can/mscan/Kconfig | 2 +-
+ drivers/net/can/rcar_can.c | 876 ++++++++++
+ drivers/net/can/softing/softing_main.c | 20 +-
+ drivers/net/can/spi/Kconfig | 10 +
+ drivers/net/can/spi/Makefile | 8 +
+ drivers/net/can/{ => spi}/mcp251x.c | 95 +-
+ drivers/net/can/usb/Kconfig | 12 +-
+ drivers/net/can/usb/Makefile | 1 +
+ drivers/net/can/usb/gs_usb.c | 971 +++++++++++
+ drivers/net/can/usb/kvaser_usb.c | 53 +-
+ drivers/net/dsa/mv88e6123_61_65.c | 2 +-
+ drivers/net/dsa/mv88e6131.c | 4 +-
+ drivers/net/dsa/mv88e6xxx.c | 12 +-
+ drivers/net/ethernet/3com/3c509.c | 2 +-
+ drivers/net/ethernet/3com/3c589_cs.c | 2 +-
+ drivers/net/ethernet/3com/typhoon.c | 2 +-
+ drivers/net/ethernet/8390/ax88796.c | 4 +-
+ drivers/net/ethernet/adaptec/starfire.c | 2 +-
+ drivers/net/ethernet/alteon/acenic.c | 2 +-
+ drivers/net/ethernet/altera/altera_sgdma.c | 1 -
+ drivers/net/ethernet/altera/altera_tse_ethtool.c | 2 +-
+ drivers/net/ethernet/amd/amd8111e.c | 2 +-
+ drivers/net/ethernet/amd/ariadne.c | 3 -
+ drivers/net/ethernet/amd/au1000_eth.c | 2 +-
+ drivers/net/ethernet/amd/nmclan_cs.c | 2 +-
+ drivers/net/ethernet/arc/emac_main.c | 49 +
+ drivers/net/ethernet/atheros/alx/main.c | 2 +-
+ drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 2 +-
+ drivers/net/ethernet/atheros/atlx/atl2.c | 2 +-
+ drivers/net/ethernet/broadcom/Kconfig | 11 +
+ drivers/net/ethernet/broadcom/Makefile | 1 +
+ drivers/net/ethernet/broadcom/b44.c | 2 +-
+ drivers/net/ethernet/broadcom/bcm63xx_enet.c | 7 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 1649 +++++++++++++++++++
+ drivers/net/ethernet/broadcom/bcmsysport.h | 678 ++++++++
+ drivers/net/ethernet/broadcom/bgmac.c | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 3 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 21 +-
+ drivers/net/ethernet/broadcom/tg3.c | 96 +-
+ drivers/net/ethernet/broadcom/tg3.h | 2 +-
+ drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 2 +-
+ drivers/net/ethernet/calxeda/xgmac.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 19 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 6 +-
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +-
+ drivers/net/ethernet/cisco/enic/enic.h | 30 +
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 63 +-
+ drivers/net/ethernet/cisco/enic/enic_main.c | 150 ++
+ drivers/net/ethernet/cisco/enic/vnic_cq.h | 9 +
+ drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +-
+ drivers/net/ethernet/dlink/dl2k.c | 2 +-
+ drivers/net/ethernet/dlink/sundance.c | 2 +-
+ drivers/net/ethernet/ec_bhf.c | 20 +-
+ drivers/net/ethernet/emulex/benet/be.h | 14 +-
+ drivers/net/ethernet/emulex/benet/be_cmds.c | 370 +++--
+ drivers/net/ethernet/emulex/benet/be_cmds.h | 4 +-
+ drivers/net/ethernet/emulex/benet/be_ethtool.c | 193 ++-
+ drivers/net/ethernet/emulex/benet/be_main.c | 270 +--
+ drivers/net/ethernet/ethoc.c | 6 -
+ drivers/net/ethernet/faraday/ftgmac100.c | 2 +-
+ drivers/net/ethernet/faraday/ftmac100.c | 2 +-
+ drivers/net/ethernet/freescale/fec_main.c | 122 +-
+ .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 17 +-
+ drivers/net/ethernet/freescale/gianfar.c | 14 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 14 +-
+ drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 2 +-
+ drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_ethtool.c | 2 +-
+ drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 4 +-
+ drivers/net/ethernet/ibm/emac/core.c | 2 +-
+ drivers/net/ethernet/icplus/ipg.c | 2 +-
+ drivers/net/ethernet/intel/e100.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/e1000/e1000_hw.c | 4 +-
+ drivers/net/ethernet/intel/e1000e/80003es2lan.c | 1 +
+ drivers/net/ethernet/intel/e1000e/82571.c | 1 +
+ drivers/net/ethernet/intel/e1000e/e1000.h | 41 +-
+ drivers/net/ethernet/intel/e1000e/ethtool.c | 13 +-
+ drivers/net/ethernet/intel/e1000e/hw.h | 3 +-
+ drivers/net/ethernet/intel/e1000e/ich8lan.c | 62 +-
+ drivers/net/ethernet/intel/e1000e/mac.c | 9 +-
+ drivers/net/ethernet/intel/e1000e/mac.h | 3 +-
+ drivers/net/ethernet/intel/e1000e/netdev.c | 88 +-
+ drivers/net/ethernet/intel/e1000e/nvm.c | 1 +
+ drivers/net/ethernet/intel/e1000e/param.c | 4 +
+ drivers/net/ethernet/intel/e1000e/phy.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e.h | 6 -
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 23 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 41 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 50 +-
+ drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 6 -
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 79 +-
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 292 ++--
+ drivers/net/ethernet/intel/i40e/i40e_prototype.h | 7 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 37 -
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 4 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 132 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +-
+ drivers/net/ethernet/intel/i40evf/Makefile | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 27 +-
+ drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 6 +-
+ .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 68 +-
+ drivers/net/ethernet/intel/i40evf/i40e_alloc.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_common.c | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 6 +-
+ drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_register.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_status.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 3 +
+ drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40e_type.h | 16 +-
+ drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 5 +-
+ drivers/net/ethernet/intel/i40evf/i40evf.h | 3 +
+ drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 400 ++++-
+ drivers/net/ethernet/intel/i40evf/i40evf_main.c | 61 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 3 +
+ drivers/net/ethernet/intel/igb/e1000_82575.c | 93 +-
+ drivers/net/ethernet/intel/igb/e1000_82575.h | 72 +-
+ drivers/net/ethernet/intel/igb/e1000_defines.h | 96 +-
+ drivers/net/ethernet/intel/igb/e1000_hw.h | 96 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.c | 48 +-
+ drivers/net/ethernet/intel/igb/e1000_i210.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.c | 56 +-
+ drivers/net/ethernet/intel/igb/e1000_mac.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.c | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_mbx.h | 47 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.c | 48 +-
+ drivers/net/ethernet/intel/igb/e1000_nvm.h | 49 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.c | 66 +-
+ drivers/net/ethernet/intel/igb/e1000_phy.h | 48 +-
+ drivers/net/ethernet/intel/igb/e1000_regs.h | 54 +-
+ drivers/net/ethernet/intel/igb/igb.h | 49 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 114 +-
+ drivers/net/ethernet/intel/igb/igb_hwmon.c | 47 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 182 ++-
+ drivers/net/ethernet/intel/igbvf/ethtool.c | 3 +-
+ drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe.h | 21 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 89 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 85 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 80 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 31 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 24 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 28 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 85 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 2 -
+ drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 354 ++--
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 10 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 6 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 68 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 32 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 163 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 66 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 62 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 15 +-
+ drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 320 +++-
+ drivers/net/ethernet/marvell/mvmdio.c | 18 +-
+ drivers/net/ethernet/marvell/mvneta.c | 284 +++-
+ drivers/net/ethernet/marvell/pxa168_eth.c | 2 +-
+ drivers/net/ethernet/marvell/sky2.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 112 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 11 +-
+ drivers/net/ethernet/mellanox/mlx4/en_main.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 22 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 +-
+ drivers/net/ethernet/mellanox/mlx4/en_tx.c | 14 +-
+ drivers/net/ethernet/mellanox/mlx4/eq.c | 147 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 24 +-
+ drivers/net/ethernet/mellanox/mlx4/main.c | 276 ++--
+ drivers/net/ethernet/mellanox/mlx4/mcg.c | 18 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 17 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 40 +-
+ drivers/net/ethernet/mellanox/mlx4/mr.c | 16 +-
+ drivers/net/ethernet/mellanox/mlx4/port.c | 12 +-
+ drivers/net/ethernet/mellanox/mlx4/profile.c | 13 +-
+ drivers/net/ethernet/mellanox/mlx4/qp.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/reset.c | 24 +-
+ .../net/ethernet/mellanox/mlx4/resource_tracker.c | 83 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +-
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 30 +-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 8 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 4 +-
+ drivers/net/ethernet/micrel/ks8695net.c | 6 +-
+ drivers/net/ethernet/micrel/ks8851.c | 73 +-
+ drivers/net/ethernet/micrel/ksz884x.c | 5 +-
+ drivers/net/ethernet/microchip/enc28j60.c | 2 +-
+ drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +-
+ drivers/net/ethernet/natsemi/natsemi.c | 2 +-
+ drivers/net/ethernet/natsemi/ns83820.c | 2 +-
+ drivers/net/ethernet/neterion/s2io.c | 11 +-
+ drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +-
+ drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +-
+ drivers/net/ethernet/nvidia/forcedeth.c | 2 +-
+ drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 2 +-
+ .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c | 2 +-
+ drivers/net/ethernet/packetengines/hamachi.c | 6 +-
+ drivers/net/ethernet/packetengines/yellowfin.c | 2 +-
+ drivers/net/ethernet/qlogic/Kconfig | 11 +
+ .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +-
+ drivers/net/ethernet/qlogic/qla3xxx.c | 2 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 34 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 44 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 4 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 14 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 13 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 42 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 31 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 68 +-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 37 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov.h | 6 +-
+ .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 189 ++-
+ .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 171 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 68 +
+ drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +-
+ drivers/net/ethernet/realtek/r8169.c | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c | 6 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c | 2 +-
+ drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 50 +-
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sfc/siena_sriov.c | 3 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 8 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 -
+ drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 7 +-
+ drivers/net/ethernet/tehuti/tehuti.c | 2 +-
+ drivers/net/ethernet/ti/cpmac.c | 14 -
+ drivers/net/ethernet/ti/cpsw-phy-sel.c | 62 +-
+ drivers/net/ethernet/ti/cpsw.c | 114 +-
+ drivers/net/ethernet/ti/cpts.c | 11 +-
+ drivers/net/ethernet/ti/davinci_cpdma.c | 35 +-
+ drivers/net/ethernet/ti/davinci_emac.c | 8 +-
+ drivers/net/ethernet/ti/davinci_mdio.c | 50 +-
+ drivers/net/ethernet/via/Kconfig | 2 +-
+ drivers/net/ethernet/via/via-rhine.c | 506 +++---
+ drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 +-
+ drivers/net/ethernet/xilinx/xilinx_emaclite.c | 2 +-
+ drivers/net/hyperv/hyperv_net.h | 163 +-
+ drivers/net/hyperv/netvsc.c | 529 +++---
+ drivers/net/hyperv/netvsc_drv.c | 129 +-
+ drivers/net/hyperv/rndis_filter.c | 193 ++-
+ drivers/net/ieee802154/at86rf230.c | 133 +-
+ drivers/net/ieee802154/fakelb.c | 6 +-
+ drivers/net/irda/Kconfig | 3 +-
+ drivers/net/irda/w83977af_ir.c | 33 +-
+ drivers/net/macvlan.c | 138 +-
+ drivers/net/ntb_netdev.c | 2 +-
+ drivers/net/phy/at803x.c | 39 +-
+ drivers/net/phy/fixed.c | 81 +-
+ drivers/net/phy/mdio_bus.c | 67 +
+ drivers/net/phy/micrel.c | 106 +-
+ drivers/net/phy/phy_device.c | 50 +-
+ drivers/net/phy/smsc.c | 3 +-
+ drivers/net/phy/vitesse.c | 3 +-
+ drivers/net/ppp/ppp_generic.c | 4 +-
+ drivers/net/rionet.c | 2 +-
+ drivers/net/team/team.c | 2 +-
+ drivers/net/team/team_mode_loadbalance.c | 12 +-
+ drivers/net/tun.c | 54 +-
+ drivers/net/usb/catc.c | 2 +-
+ drivers/net/usb/cdc_mbim.c | 129 +-
+ drivers/net/usb/cdc_ncm.c | 618 +++++--
+ drivers/net/usb/hso.c | 2 +-
+ drivers/net/usb/huawei_cdc_ncm.c | 13 -
+ drivers/net/usb/ipheth.c | 2 +-
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/pegasus.c | 2 +-
+ drivers/net/usb/r8152.c | 2 +-
+ drivers/net/usb/rtl8150.c | 2 +-
+ drivers/net/virtio_net.c | 9 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +-
+ drivers/net/vxlan.c | 65 +-
+ drivers/net/wan/sdla.c | 4 -
+ drivers/net/wimax/i2400m/driver.c | 7 +-
+ drivers/net/wireless/ath/ar5523/ar5523.c | 3 +-
+ drivers/net/wireless/ath/ath10k/bmi.c | 13 +-
+ drivers/net/wireless/ath/ath10k/bmi.h | 2 +-
+ drivers/net/wireless/ath/ath10k/ce.c | 356 ++--
+ drivers/net/wireless/ath/ath10k/ce.h | 15 +-
+ drivers/net/wireless/ath/ath10k/core.c | 85 +-
+ drivers/net/wireless/ath/ath10k/core.h | 18 +-
+ drivers/net/wireless/ath/ath10k/debug.c | 109 +-
+ drivers/net/wireless/ath/ath10k/htc.c | 12 +-
+ drivers/net/wireless/ath/ath10k/htt.h | 21 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 513 ++++--
+ drivers/net/wireless/ath/ath10k/hw.h | 1 +
+ drivers/net/wireless/ath/ath10k/mac.c | 766 +++++----
+ drivers/net/wireless/ath/ath10k/pci.c | 219 ++-
+ drivers/net/wireless/ath/ath10k/pci.h | 3 -
+ drivers/net/wireless/ath/ath10k/txrx.c | 183 ---
+ drivers/net/wireless/ath/ath10k/txrx.h | 1 -
+ drivers/net/wireless/ath/ath10k/wmi.c | 62 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 98 +-
+ drivers/net/wireless/ath/ath5k/phy.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/Kconfig | 30 +-
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 9 +-
+ drivers/net/wireless/ath/ath6kl/core.c | 6 +-
+ drivers/net/wireless/ath/ath6kl/debug.c | 4 -
+ drivers/net/wireless/ath/ath6kl/debug.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/hif.c | 3 -
+ drivers/net/wireless/ath/ath6kl/hif.h | 4 +-
+ drivers/net/wireless/ath/ath6kl/htc_mbox.c | 23 +-
+ drivers/net/wireless/ath/ath6kl/htc_pipe.c | 10 +-
+ drivers/net/wireless/ath/ath6kl/init.c | 1 -
+ drivers/net/wireless/ath/ath6kl/main.c | 10 +-
+ drivers/net/wireless/ath/ath6kl/sdio.c | 17 +-
+ drivers/net/wireless/ath/ath6kl/target.h | 2 +-
+ drivers/net/wireless/ath/ath6kl/txrx.c | 31 +-
+ drivers/net/wireless/ath/ath6kl/usb.c | 2 -
+ drivers/net/wireless/ath/ath6kl/wmi.c | 19 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 1 -
+ .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 2 +-
+ .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 2 +-
+ .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 8 +-
+ drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 6 +-
+ .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 2 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 12 +
+ drivers/net/wireless/ath/ath9k/init.c | 10 +-
+ drivers/net/wireless/ath/ath9k/main.c | 109 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 3 +
+ drivers/net/wireless/ath/carl9170/main.c | 4 +-
+ drivers/net/wireless/ath/wil6210/interrupt.c | 2 +-
+ drivers/net/wireless/ath/wil6210/main.c | 4 +-
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 -
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 17 +
+ drivers/net/wireless/ath/wil6210/wil6210.h | 3 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 11 +-
+ drivers/net/wireless/ath/wil6210/wmi.h | 50 +-
+ drivers/net/wireless/b43/b43.h | 4 -
+ drivers/net/wireless/b43/main.c | 97 +-
+ drivers/net/wireless/b43/phy_common.c | 6 +-
+ drivers/net/wireless/b43/phy_g.c | 6 +-
+ drivers/net/wireless/b43/phy_n.c | 304 +++-
+ drivers/net/wireless/b43/radio_2056.c | 418 ++++-
+ drivers/net/wireless/b43/tables_nphy.c | 72 +-
+ drivers/net/wireless/b43/tables_nphy.h | 3 +-
+ drivers/net/wireless/b43/wa.c | 2 +-
+ .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 3 +-
+ drivers/net/wireless/cw1200/sta.c | 3 +-
+ drivers/net/wireless/cw1200/sta.h | 3 +-
+ drivers/net/wireless/hostap/hostap_main.c | 2 +-
+ drivers/net/wireless/iwlegacy/3945.c | 2 +-
+ drivers/net/wireless/iwlegacy/4965-mac.c | 2 +-
+ drivers/net/wireless/iwlegacy/common.c | 3 +-
+ drivers/net/wireless/iwlegacy/common.h | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/mac80211.c | 5 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 12 +
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-2000.c | 2 +
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 3 +
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 5 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 27 +-
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 25 +-
+ drivers/net/wireless/iwlwifi/iwl-op-mode.h | 25 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 8 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 34 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 94 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 15 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 38 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 17 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 26 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 46 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 54 +-
+ drivers/net/wireless/iwlwifi/mvm/fw-error-dump.h | 6 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 12 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 5 +-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 49 +-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 26 +-
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 56 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 272 ++--
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 330 +++-
+ drivers/net/wireless/iwlwifi/mvm/rs.h | 24 +
+ drivers/net/wireless/iwlwifi/mvm/rx.c | 45 +-
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 20 +-
+ drivers/net/wireless/iwlwifi/mvm/sf.c | 3 -
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 177 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 3 +
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 71 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 10 +-
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 46 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 9 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 84 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 47 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 62 +-
+ drivers/net/wireless/mac80211_hwsim.c | 5 +-
+ drivers/net/wireless/mwifiex/11ac.c | 3 +-
+ drivers/net/wireless/mwifiex/11n.c | 3 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 21 +-
+ drivers/net/wireless/mwifiex/README | 7 +
+ drivers/net/wireless/mwifiex/cmdevt.c | 2 -
+ drivers/net/wireless/mwifiex/debugfs.c | 25 +
+ drivers/net/wireless/mwifiex/decl.h | 8 +-
+ drivers/net/wireless/mwifiex/ioctl.h | 2 +-
+ drivers/net/wireless/mwifiex/main.c | 2 -
+ drivers/net/wireless/mwifiex/main.h | 2 +-
+ drivers/net/wireless/mwifiex/pcie.c | 3 -
+ drivers/net/wireless/mwifiex/scan.c | 37 +-
+ drivers/net/wireless/mwifiex/sdio.c | 9 +-
+ drivers/net/wireless/mwifiex/sdio.h | 18 +-
+ drivers/net/wireless/mwifiex/uap_cmd.c | 8 +-
+ drivers/net/wireless/mwifiex/usb.c | 55 +-
+ drivers/net/wireless/mwifiex/wmm.c | 9 -
+ drivers/net/wireless/p54/main.c | 3 +-
+ drivers/net/wireless/ray_cs.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_mgmt.c | 4 +-
+ drivers/net/wireless/rsi/rsi_mgmt.h | 1 +
+ drivers/net/wireless/rt2x00/rt2800lib.c | 15 +-
+ drivers/net/wireless/rt2x00/rt2x00.h | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 3 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 10 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 10 +-
+ drivers/net/wireless/rtl818x/rtl8180/Makefile | 4 +-
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 10 +-
+ drivers/net/wireless/rtl818x/rtl818x.h | 6 +-
+ drivers/net/wireless/rtlwifi/core.c | 3 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 2 +-
+ drivers/net/wireless/ti/wlcore/main.c | 3 +-
+ drivers/net/wireless/ti/wlcore/sdio.c | 28 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 23 +-
+ drivers/net/xen-netback/interface.c | 2 +-
+ drivers/net/xen-netfront.c | 2 +-
+ drivers/of/of_mdio.c | 132 +-
+ drivers/ptp/ptp_clock.c | 5 +-
+ drivers/s390/net/claw.c | 2 +-
+ drivers/s390/net/ctcm_main.c | 2 +-
+ drivers/s390/net/lcs.c | 2 +-
+ drivers/s390/net/qeth_core.h | 6 +-
+ drivers/s390/net/qeth_core_main.c | 77 +-
+ drivers/s390/net/qeth_core_sys.c | 22 +-
+ drivers/s390/net/qeth_l2_main.c | 18 +-
+ drivers/s390/net/qeth_l3_main.c | 19 +-
+ drivers/scsi/iscsi_tcp.c | 2 +-
+ drivers/staging/et131x/et131x.c | 2 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 2 +-
+ drivers/staging/netlogic/xlr_net.c | 2 +-
+ drivers/staging/octeon/ethernet.c | 2 +-
+ drivers/staging/rtl8821ae/core.c | 14 +-
+ drivers/usb/gadget/u_ether.c | 4 +-
+ include/linux/can/core.h | 6 +-
+ include/linux/can/dev.h | 6 +-
+ include/linux/can/led.h | 6 +-
+ include/linux/can/platform/cc770.h | 6 +-
+ include/linux/can/platform/mcp251x.h | 6 +-
+ include/linux/can/platform/rcar_can.h | 17 +
+ include/linux/can/platform/sja1000.h | 6 +-
+ include/linux/can/platform/ti_hecc.h | 6 +-
+ include/linux/can/skb.h | 6 +-
+ include/linux/ethtool.h | 13 +
+ include/linux/filter.h | 107 +-
+ include/linux/if_link.h | 3 +-
+ include/linux/if_vlan.h | 4 +-
+ include/linux/mlx4/device.h | 4 +-
+ include/linux/netdevice.h | 26 +-
+ include/linux/netlink.h | 3 +-
+ include/linux/nl802154.h | 31 +
+ include/linux/of_mdio.h | 23 +-
+ include/linux/phy.h | 8 +
+ include/linux/phy_fixed.h | 11 +
+ include/linux/skbuff.h | 97 +-
+ include/linux/spi/at86rf230.h | 14 -
+ include/linux/tcp.h | 10 +-
+ include/linux/udp.h | 24 +-
+ include/linux/usb/cdc_ncm.h | 35 +-
+ include/net/6lowpan.h | 1 +
+ include/net/addrconf.h | 5 -
+ include/net/af_ieee802154.h | 10 +-
+ include/net/bluetooth/hci.h | 1 +
+ include/net/bluetooth/hci_core.h | 13 +-
+ include/net/cfg80211.h | 86 +-
+ include/net/checksum.h | 2 +
+ include/net/dsa.h | 5 +
+ include/net/ieee802154.h | 9 +
+ include/net/ieee802154_netdev.h | 187 ++-
+ include/net/inet_ecn.h | 2 +-
+ include/net/inet_hashtables.h | 8 +-
+ include/net/inet_sock.h | 10 +
+ include/net/ip.h | 47 +-
+ include/net/ip6_checksum.h | 7 +
+ include/net/ip6_route.h | 2 +-
+ include/net/ipv6.h | 22 +
+ include/net/mac80211.h | 31 +-
+ include/net/net_namespace.h | 8 +
+ include/net/netfilter/nf_tables.h | 130 +-
+ include/net/netfilter/nft_meta.h | 36 +
+ include/net/netns/ipv4.h | 7 +
+ include/net/netns/ipv6.h | 1 +
+ include/net/pkt_cls.h | 2 +-
+ include/net/protocol.h | 1 -
+ include/net/regulatory.h | 6 +
+ include/net/sch_generic.h | 2 +-
+ include/net/snmp.h | 32 +-
+ include/net/sock.h | 6 +-
+ include/net/tcp.h | 45 +-
+ include/net/tso.h | 20 +
+ include/net/udp.h | 9 -
+ include/net/vxlan.h | 2 +-
+ include/net/xfrm.h | 57 +-
+ include/uapi/linux/audit.h | 8 +
+ include/uapi/linux/can.h | 6 +-
+ include/uapi/linux/can/bcm.h | 6 +-
+ include/uapi/linux/can/error.h | 6 +-
+ include/uapi/linux/can/gw.h | 6 +-
+ include/uapi/linux/can/netlink.h | 6 +-
+ include/uapi/linux/can/raw.h | 6 +-
+ include/uapi/linux/capability.h | 7 +-
+ include/uapi/linux/ethtool.h | 32 +
+ include/uapi/linux/filter.h | 3 +-
+ include/uapi/linux/if_fddi.h | 90 +-
+ include/uapi/linux/if_link.h | 9 +-
+ include/uapi/linux/l2tp.h | 2 +
+ include/uapi/linux/netfilter/nf_tables.h | 37 +
+ include/uapi/linux/nl80211.h | 42 +
+ include/uapi/linux/openvswitch.h | 4 +-
+ include/uapi/linux/tipc.h | 23 +
+ include/uapi/linux/tipc_config.h | 10 +-
+ include/uapi/linux/udp.h | 2 +
+ kernel/audit.c | 64 +-
+ kernel/seccomp.c | 27 +-
+ kernel/sysctl.c | 4 +-
+ lib/Kconfig.debug | 13 +
+ lib/Makefile | 1 +
+ lib/test_bpf.c | 1718 ++++++++++++++++++++
+ net/8021q/vlan_core.c | 6 +-
+ net/8021q/vlan_dev.c | 62 +-
+ net/appletalk/ddp.c | 2 +-
+ net/batman-adv/debugfs.c | 13 +-
+ net/batman-adv/distributed-arp-table.c | 1 +
+ net/batman-adv/main.h | 2 +-
+ net/batman-adv/network-coding.c | 1 +
+ net/batman-adv/soft-interface.c | 2 +-
+ net/batman-adv/sysfs.c | 14 +-
+ net/bluetooth/hci_conn.c | 81 +-
+ net/bluetooth/hci_core.c | 20 +-
+ net/bluetooth/hci_event.c | 246 ++-
+ net/bluetooth/hci_sock.c | 11 +-
+ net/bluetooth/lib.c | 1 +
+ net/bluetooth/mgmt.c | 36 +-
+ net/bridge/Makefile | 4 +-
+ net/bridge/br.c | 98 ++
+ net/bridge/br_device.c | 9 +-
+ net/bridge/br_fdb.c | 131 +-
+ net/bridge/br_if.c | 123 +-
+ net/bridge/br_netfilter.c | 2 +-
+ net/bridge/br_netlink.c | 3 +
+ net/bridge/br_notify.c | 118 --
+ net/bridge/br_private.h | 21 +-
+ net/bridge/br_sysfs_if.c | 30 +-
+ net/bridge/br_vlan.c | 1 +
+ net/bridge/netfilter/Kconfig | 17 +-
+ net/bridge/netfilter/Makefile | 1 +
+ net/bridge/netfilter/nft_meta_bridge.c | 139 ++
+ net/can/af_can.c | 31 +-
+ net/can/af_can.h | 9 +-
+ net/can/proc.c | 76 +-
+ net/core/Makefile | 2 +-
+ net/core/dev.c | 50 +-
+ net/core/ethtool.c | 223 ++-
+ net/core/filter.c | 683 ++++----
+ net/core/net_namespace.c | 2 +-
+ net/core/pktgen.c | 50 +-
+ net/core/ptp_classifier.c | 4 +-
+ net/core/rtnetlink.c | 38 +-
+ net/core/skbuff.c | 4 +-
+ net/core/sock.c | 4 +-
+ net/core/tso.c | 72 +
+ net/dccp/ipv4.c | 1 -
+ net/dccp/proto.c | 9 +-
+ net/dccp/sysctl.c | 3 +-
+ net/dccp/timer.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/dsa/slave.c | 2 +-
+ net/ieee802154/6lowpan_rtnl.c | 207 +--
+ net/ieee802154/dgram.c | 104 +-
+ net/ieee802154/header_ops.c | 52 +-
+ net/ieee802154/ieee802154.h | 19 +
+ net/ieee802154/netlink.c | 20 +
+ net/ieee802154/nl-mac.c | 809 +++++++++
+ net/ieee802154/nl_policy.c | 16 +
+ net/ieee802154/reassembly.c | 48 +-
+ net/ipv4/af_inet.c | 108 +-
+ net/ipv4/devinet.c | 9 +-
+ net/ipv4/gre_demux.c | 24 +-
+ net/ipv4/icmp.c | 23 +-
+ net/ipv4/igmp.c | 12 +-
+ net/ipv4/inet_connection_sock.c | 11 +-
+ net/ipv4/inet_hashtables.c | 6 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/ip_forward.c | 2 +-
+ net/ipv4/ip_gre.c | 6 +-
+ net/ipv4/ip_options.c | 6 +-
+ net/ipv4/ip_output.c | 15 +-
+ net/ipv4/ip_tunnel.c | 9 +-
+ net/ipv4/ipip.c | 1 +
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +-
+ net/ipv4/proc.c | 24 +-
+ net/ipv4/route.c | 7 +
+ net/ipv4/syncookies.c | 3 +-
+ net/ipv4/sysctl_net_ipv4.c | 45 +-
+ net/ipv4/tcp.c | 8 +
+ net/ipv4/tcp_bic.c | 5 +-
+ net/ipv4/tcp_cong.c | 24 +-
+ net/ipv4/tcp_cubic.c | 5 +-
+ net/ipv4/tcp_fastopen.c | 219 ++-
+ net/ipv4/tcp_highspeed.c | 4 +-
+ net/ipv4/tcp_htcp.c | 4 +-
+ net/ipv4/tcp_hybla.c | 7 +-
+ net/ipv4/tcp_illinois.c | 5 +-
+ net/ipv4/tcp_input.c | 31 +-
+ net/ipv4/tcp_ipv4.c | 303 +---
+ net/ipv4/tcp_lp.c | 5 +-
+ net/ipv4/tcp_minisocks.c | 31 +
+ net/ipv4/tcp_output.c | 107 +-
+ net/ipv4/tcp_scalable.c | 5 +-
+ net/ipv4/tcp_vegas.c | 7 +-
+ net/ipv4/tcp_veno.c | 9 +-
+ net/ipv4/tcp_yeah.c | 5 +-
+ net/ipv4/udp.c | 49 +-
+ net/ipv4/udplite.c | 1 -
+ net/ipv4/xfrm4_output.c | 2 +-
+ net/ipv6/addrconf.c | 49 +-
+ net/ipv6/addrconf_core.c | 2 +-
+ net/ipv6/af_inet6.c | 45 +-
+ net/ipv6/icmp.c | 41 +-
+ net/ipv6/inet6_connection_sock.c | 2 +-
+ net/ipv6/ip6_checksum.c | 27 +-
+ net/ipv6/ip6_fib.c | 12 +-
+ net/ipv6/ip6_flowlabel.c | 1 -
+ net/ipv6/ip6_gre.c | 64 +-
+ net/ipv6/ip6_output.c | 12 +-
+ net/ipv6/ip6_tunnel.c | 1 +
+ net/ipv6/ip6_vti.c | 3 -
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +-
+ net/ipv6/ping.c | 8 +-
+ net/ipv6/proc.c | 14 +-
+ net/ipv6/raw.c | 11 +-
+ net/ipv6/route.c | 4 +-
+ net/ipv6/sit.c | 1 +
+ net/ipv6/syncookies.c | 4 +-
+ net/ipv6/sysctl_net_ipv6.c | 7 +
+ net/ipv6/tcp_ipv6.c | 86 +-
+ net/ipv6/udp.c | 49 +-
+ net/ipv6/udplite.c | 1 -
+ net/ipv6/xfrm6_output.c | 6 +-
+ net/ipx/af_ipx.c | 2 +-
+ net/ipx/ipx_route.c | 3 +-
+ net/key/af_key.c | 32 +-
+ net/l2tp/l2tp_core.c | 72 +-
+ net/l2tp/l2tp_core.h | 4 +-
+ net/l2tp/l2tp_ip.c | 1 -
+ net/l2tp/l2tp_ip6.c | 11 +-
+ net/l2tp/l2tp_netlink.c | 10 +-
+ net/mac80211/aes_ccm.c | 37 +-
+ net/mac80211/cfg.c | 53 +-
+ net/mac80211/chan.c | 614 +++++--
+ net/mac80211/debugfs.c | 2 +-
+ net/mac80211/debugfs.h | 2 +
+ net/mac80211/debugfs_netdev.h | 2 +
+ net/mac80211/driver-ops.h | 8 +-
+ net/mac80211/ht.c | 22 +-
+ net/mac80211/ibss.c | 75 +-
+ net/mac80211/ieee80211_i.h | 33 +-
+ net/mac80211/iface.c | 36 +-
+ net/mac80211/main.c | 8 +-
+ net/mac80211/mesh.c | 36 +-
+ net/mac80211/mesh_hwmp.c | 5 +-
+ net/mac80211/michael.h | 1 +
+ net/mac80211/mlme.c | 4 +-
+ net/mac80211/rx.c | 19 +-
+ net/mac80211/scan.c | 10 +-
+ net/mac80211/sta_info.c | 3 +-
+ net/mac80211/util.c | 145 +-
+ net/mac80211/wpa.c | 5 +-
+ net/mac802154/Kconfig | 4 +
+ net/mac802154/Makefile | 3 +-
+ net/mac802154/llsec.c | 1069 ++++++++++++
+ net/mac802154/llsec.h | 108 ++
+ net/mac802154/mac802154.h | 44 +
+ net/mac802154/mac_cmd.c | 42 +-
+ net/mac802154/mib.c | 187 +++
+ net/mac802154/rx.c | 2 -
+ net/mac802154/wpan.c | 164 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 20 +-
+ net/netfilter/nf_tables_api.c | 1236 ++++++++++----
+ net/netfilter/nfnetlink.c | 10 +-
+ net/netfilter/nft_ct.c | 96 +-
+ net/netfilter/nft_hash.c | 54 +-
+ net/netfilter/nft_lookup.c | 10 +-
+ net/netfilter/nft_meta.c | 103 +-
+ net/netfilter/nft_rbtree.c | 21 +
+ net/netfilter/xt_bpf.c | 5 +-
+ net/netlink/af_netlink.c | 70 +-
+ net/netlink/af_netlink.h | 6 +-
+ net/openvswitch/actions.c | 4 +-
+ net/openvswitch/datapath.c | 778 +++++----
+ net/openvswitch/datapath.h | 8 +-
+ net/openvswitch/flow.c | 188 ++-
+ net/openvswitch/flow.h | 53 +-
+ net/openvswitch/flow_netlink.c | 186 +--
+ net/openvswitch/flow_netlink.h | 1 -
+ net/openvswitch/flow_table.c | 121 +-
+ net/openvswitch/flow_table.h | 4 +-
+ net/openvswitch/vport-gre.c | 4 +-
+ net/openvswitch/vport-internal_dev.c | 2 +-
+ net/openvswitch/vport-vxlan.c | 5 +-
+ net/openvswitch/vport.h | 6 +-
+ net/rds/ib_send.c | 4 +-
+ net/rds/iw_send.c | 4 +-
+ net/rds/iw_sysctl.c | 3 +-
+ net/rds/sysctl.c | 3 +-
+ net/sched/cls_api.c | 26 +-
+ net/sched/cls_basic.c | 10 +-
+ net/sched/cls_bpf.c | 14 +-
+ net/sched/cls_cgroup.c | 4 +-
+ net/sched/cls_flow.c | 4 +-
+ net/sched/cls_fw.c | 10 +-
+ net/sched/cls_route.c | 11 +-
+ net/sched/cls_rsvp.h | 4 +-
+ net/sched/cls_tcindex.c | 8 +-
+ net/sched/cls_u32.c | 10 +-
+ net/sched/sch_api.c | 8 +-
+ net/sched/sch_hhf.c | 2 +-
+ net/sctp/ipv6.c | 4 +-
+ net/sctp/output.c | 2 +-
+ net/sctp/proc.c | 2 +-
+ net/sctp/protocol.c | 11 +-
+ net/sctp/socket.c | 13 +-
+ net/sctp/sysctl.c | 21 +-
+ net/sctp/ulpqueue.c | 4 +
+ net/sunrpc/xprtsock.c | 3 -
+ net/tipc/Makefile | 2 +-
+ net/tipc/bcast.c | 192 ++-
+ net/tipc/bcast.h | 9 +-
+ net/tipc/bearer.c | 153 +-
+ net/tipc/bearer.h | 47 +-
+ net/tipc/config.c | 12 +-
+ net/tipc/core.c | 14 +-
+ net/tipc/core.h | 10 +-
+ net/tipc/discover.c | 281 ++--
+ net/tipc/discover.h | 1 +
+ net/tipc/eth_media.c | 51 +-
+ net/tipc/handler.c | 134 --
+ net/tipc/ib_media.c | 34 +-
+ net/tipc/link.c | 216 +--
+ net/tipc/link.h | 21 +-
+ net/tipc/msg.c | 55 +-
+ net/tipc/msg.h | 5 +-
+ net/tipc/name_distr.c | 78 +-
+ net/tipc/name_distr.h | 35 +-
+ net/tipc/name_table.c | 14 +-
+ net/tipc/net.c | 71 +-
+ net/tipc/net.h | 4 +-
+ net/tipc/node.c | 110 +-
+ net/tipc/node.h | 88 +-
+ net/tipc/node_subscr.c | 9 +-
+ net/tipc/node_subscr.h | 2 +-
+ net/tipc/port.c | 39 +-
+ net/tipc/port.h | 10 +-
+ net/tipc/socket.c | 122 +-
+ net/tipc/socket.h | 4 +-
+ net/unix/af_unix.c | 8 +-
+ net/wireless/Kconfig | 37 +
+ net/wireless/chan.c | 176 +-
+ net/wireless/core.c | 75 +-
+ net/wireless/core.h | 46 +-
+ net/wireless/ethtool.c | 10 +-
+ net/wireless/ibss.c | 41 +-
+ net/wireless/mesh.c | 28 +-
+ net/wireless/mlme.c | 38 +-
+ net/wireless/nl80211.c | 499 +++---
+ net/wireless/rdev-ops.h | 13 +
+ net/wireless/reg.c | 153 +-
+ net/wireless/reg.h | 18 +
+ net/wireless/scan.c | 154 +-
+ net/wireless/sme.c | 40 +-
+ net/wireless/trace.h | 29 +-
+ net/wireless/util.c | 171 +-
+ net/wireless/wext-compat.c | 40 +-
+ net/wireless/wext-compat.h | 2 +-
+ net/wireless/wext-sme.c | 12 +-
+ net/xfrm/xfrm_output.c | 5 +-
+ net/xfrm/xfrm_policy.c | 56 +-
+ net/xfrm/xfrm_proc.c | 3 +-
+ net/xfrm/xfrm_state.c | 37 +-
+ net/xfrm/xfrm_user.c | 53 +-
+ security/selinux/include/classmap.h | 2 +-
+ tools/net/bpf_exp.l | 1 +
+ tools/net/bpf_exp.y | 11 +-
+ tools/net/bpf_jit_disasm.c | 20 +-
+ tools/testing/selftests/net/Makefile | 8 +-
+ 888 files changed, 31304 insertions(+), 14000 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-net-queues
+ create mode 100644 Documentation/ABI/testing/sysfs-class-net-statistics
+ create mode 100644 Documentation/devicetree/bindings/net/broadcom-systemport.txt
+ create mode 100644 Documentation/devicetree/bindings/net/fixed-link.txt
+ create mode 100644 Documentation/devicetree/bindings/net/ieee802154/at86rf230.txt
+ delete mode 100644 Documentation/devicetree/bindings/net/micrel-ksz9021.txt
+ create mode 100644 Documentation/devicetree/bindings/net/micrel-ksz90x1.txt
+ create mode 100644 Documentation/devicetree/bindings/net/via-rhine.txt
+ create mode 100644 Documentation/networking/cdc_mbim.txt
+ create mode 100644 drivers/net/can/rcar_can.c
+ create mode 100644 drivers/net/can/spi/Kconfig
+ create mode 100644 drivers/net/can/spi/Makefile
+ rename drivers/net/can/{ => spi}/mcp251x.c (96%)
+ create mode 100644 drivers/net/can/usb/gs_usb.c
+ create mode 100644 drivers/net/ethernet/broadcom/bcmsysport.c
+ create mode 100644 drivers/net/ethernet/broadcom/bcmsysport.h
+ create mode 100644 include/linux/can/platform/rcar_can.h
+ create mode 100644 include/net/netfilter/nft_meta.h
+ create mode 100644 include/net/tso.h
+ create mode 100644 lib/test_bpf.c
+ delete mode 100644 net/bridge/br_notify.c
+ create mode 100644 net/bridge/netfilter/nft_meta_bridge.c
+ create mode 100644 net/core/tso.c
+ create mode 100644 net/mac802154/llsec.c
+ create mode 100644 net/mac802154/llsec.h
+ delete mode 100644 net/tipc/handler.c
+Merging ipsec-next/master (fc68086ce888 net/xfrm/xfrm_output.c: move EXPORT_SYMBOL)
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging wireless-next/master (a3b9d55350d6 rtlwifi: rtl8192cu: remove check for CONFIG_AUTOSUSPEND)
+$ git merge wireless-next/master
+Resolved 'drivers/net/wireless/iwlwifi/mvm/mac80211.c' using previous resolution.
+Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/mac80211.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h
+Removing drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+Auto-merging drivers/net/wireless/brcm80211/brcmfmac/firmware.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 62a45ceea2a2] Merge remote-tracking branch 'wireless-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/net/nfc/pn544.txt | 35 +
+ .../devicetree/bindings/net/nfc/st21nfca.txt | 33 +
+ .../devicetree/bindings/net/nfc/trf7970a.txt | 2 +
+ arch/arm/mach-tegra/board-paz00.c | 4 +-
+ arch/mips/bcm47xx/sprom.c | 1 +
+ drivers/bluetooth/btusb.c | 155 +++-
+ drivers/mmc/host/mmc_spi.c | 18 +-
+ drivers/net/wireless/at76c50x-usb.c | 127 ++-
+ drivers/net/wireless/at76c50x-usb.h | 25 +-
+ drivers/net/wireless/ath/ath10k/core.c | 6 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 16 +
+ drivers/net/wireless/ath/ath10k/pci.c | 18 +-
+ drivers/net/wireless/ath/ath10k/wmi.c | 2 +
+ drivers/net/wireless/ath/ath6kl/cfg80211.c | 7 +-
+ drivers/net/wireless/ath/ath6kl/wmi.c | 2 +-
+ drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
+ drivers/net/wireless/ath/ath9k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 4 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 5 +-
+ drivers/net/wireless/ath/ath9k/common-debug.c | 253 ++++++
+ drivers/net/wireless/ath/ath9k/common-debug.h | 72 ++
+ drivers/net/wireless/ath/ath9k/common.h | 1 +
+ drivers/net/wireless/ath/ath9k/debug.c | 214 +----
+ drivers/net/wireless/ath/ath9k/debug.h | 44 -
+ drivers/net/wireless/ath/ath9k/dfs.c | 6 +-
+ drivers/net/wireless/ath/ath9k/htc.h | 19 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 555 +------------
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 3 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 3 +-
+ drivers/net/wireless/ath/ath9k/init.c | 30 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 22 +
+ drivers/net/wireless/ath/ath9k/mac.h | 1 +
+ drivers/net/wireless/ath/ath9k/main.c | 65 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 3 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 28 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 3 -
+ drivers/net/wireless/ath/carl9170/usb.c | 8 +-
+ drivers/net/wireless/ath/dfs_pattern_detector.c | 45 +-
+ drivers/net/wireless/ath/wcn36xx/smd.c | 3 +-
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 4 +-
+ drivers/net/wireless/ath/wil6210/main.c | 39 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 14 +
+ drivers/net/wireless/ath/wil6210/pcie_bus.c | 2 +-
+ drivers/net/wireless/ath/wil6210/rx_reorder.c | 9 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 28 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 8 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 1 +
+ drivers/net/wireless/b43/Kconfig | 42 +-
+ drivers/net/wireless/b43/bus.h | 10 +
+ drivers/net/wireless/b43/main.c | 417 +++++-----
+ drivers/net/wireless/b43/phy_common.c | 90 ++
+ drivers/net/wireless/b43/phy_common.h | 8 +-
+ drivers/net/wireless/b43/phy_n.c | 17 +-
+ drivers/net/wireless/b43/phy_n.h | 1 -
+ drivers/net/wireless/b43/radio_2056.c | 918 +++++++++++++++++++++
+ drivers/net/wireless/b43/tables_nphy.c | 80 +-
+ drivers/net/wireless/b43/xmit.c | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/Makefile | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 2 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 7 +-
+ .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 18 +
+ .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 39 +-
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 283 +++----
+ drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 332 ++++++++
+ .../brcm80211/brcmfmac/{nvram.h => firmware.h} | 24 +-
+ .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 24 +
+ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 80 +-
+ drivers/net/wireless/brcm80211/brcmfmac/nvram.c | 94 ---
+ drivers/net/wireless/brcm80211/brcmfmac/usb.c | 270 ++----
+ .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 213 +++--
+ drivers/net/wireless/brcm80211/brcmsmac/main.c | 13 +-
+ drivers/net/wireless/brcm80211/brcmutil/d11.c | 93 ++-
+ drivers/net/wireless/brcm80211/include/brcmu_d11.h | 14 +-
+ .../net/wireless/brcm80211/include/brcmu_wifi.h | 1 +
+ drivers/net/wireless/iwlwifi/Kconfig | 13 +-
+ drivers/net/wireless/iwlwifi/dvm/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/calib.c | 1 -
+ drivers/net/wireless/iwlwifi/dvm/debugfs.c | 7 +-
+ drivers/net/wireless/iwlwifi/dvm/dev.h | 2 +
+ drivers/net/wireless/iwlwifi/dvm/devices.c | 2 -
+ drivers/net/wireless/iwlwifi/dvm/led.h | 12 +
+ drivers/net/wireless/iwlwifi/dvm/lib.c | 17 +-
+ drivers/net/wireless/iwlwifi/dvm/main.c | 27 +-
+ drivers/net/wireless/iwlwifi/dvm/power.c | 4 +-
+ drivers/net/wireless/iwlwifi/dvm/rs.c | 10 +-
+ drivers/net/wireless/iwlwifi/dvm/rx.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/rxon.c | 18 +-
+ drivers/net/wireless/iwlwifi/dvm/scan.c | 3 +-
+ drivers/net/wireless/iwlwifi/dvm/sta.c | 29 +-
+ drivers/net/wireless/iwlwifi/dvm/tt.c | 2 +-
+ drivers/net/wireless/iwlwifi/dvm/tx.c | 24 +-
+ drivers/net/wireless/iwlwifi/dvm/ucode.c | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-8000.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-config.h | 7 +
+ drivers/net/wireless/iwlwifi/iwl-debug.c | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 41 +-
+ drivers/net/wireless/iwlwifi/iwl-drv.c | 5 +
+ .../{mvm/fw-error-dump.h => iwl-fw-error-dump.h} | 26 +
+ drivers/net/wireless/iwlwifi/iwl-fw.h | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-io.c | 18 +
+ drivers/net/wireless/iwlwifi/iwl-io.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-modparams.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 50 +-
+ drivers/net/wireless/iwlwifi/iwl-phy-db.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
+ drivers/net/wireless/iwlwifi/iwl-trans.h | 50 +-
+ drivers/net/wireless/iwlwifi/mvm/Makefile | 3 +-
+ drivers/net/wireless/iwlwifi/mvm/coex.c | 80 +-
+ drivers/net/wireless/iwlwifi/mvm/d3.c | 35 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 48 +-
+ drivers/net/wireless/iwlwifi/mvm/debugfs.c | 11 +-
+ drivers/net/wireless/iwlwifi/mvm/fw.c | 19 +-
+ drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 114 ++-
+ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 175 +++-
+ drivers/net/wireless/iwlwifi/mvm/mvm.h | 34 +-
+ drivers/net/wireless/iwlwifi/mvm/nvm.c | 102 +--
+ drivers/net/wireless/iwlwifi/mvm/ops.c | 43 +-
+ drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 23 +-
+ drivers/net/wireless/iwlwifi/mvm/power.c | 208 ++---
+ drivers/net/wireless/iwlwifi/mvm/quota.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/rs.c | 179 ++--
+ drivers/net/wireless/iwlwifi/mvm/scan.c | 13 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.c | 18 +-
+ drivers/net/wireless/iwlwifi/mvm/sta.h | 3 -
+ drivers/net/wireless/iwlwifi/mvm/time-event.c | 4 +-
+ drivers/net/wireless/iwlwifi/mvm/tt.c | 1 -
+ drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +-
+ drivers/net/wireless/iwlwifi/mvm/utils.c | 41 +-
+ drivers/net/wireless/iwlwifi/pcie/drv.c | 14 +-
+ drivers/net/wireless/iwlwifi/pcie/internal.h | 24 +-
+ drivers/net/wireless/iwlwifi/pcie/rx.c | 2 +-
+ drivers/net/wireless/iwlwifi/pcie/trans.c | 90 +-
+ drivers/net/wireless/iwlwifi/pcie/tx.c | 139 ++--
+ drivers/net/wireless/libertas/cfg.c | 7 +-
+ drivers/net/wireless/libertas/defs.h | 3 +-
+ drivers/net/wireless/libertas/rx.c | 8 +-
+ drivers/net/wireless/mwifiex/11n.c | 42 +
+ drivers/net/wireless/mwifiex/11n.h | 3 +-
+ drivers/net/wireless/mwifiex/11n_aggr.c | 7 +
+ drivers/net/wireless/mwifiex/cfg80211.c | 19 +-
+ drivers/net/wireless/mwifiex/fw.h | 25 +-
+ drivers/net/wireless/mwifiex/main.h | 24 +-
+ drivers/net/wireless/mwifiex/pcie.c | 1 +
+ drivers/net/wireless/mwifiex/scan.c | 29 +-
+ drivers/net/wireless/mwifiex/sdio.c | 6 +-
+ drivers/net/wireless/mwifiex/sta_cmd.c | 7 +
+ drivers/net/wireless/mwifiex/sta_cmdresp.c | 18 +-
+ drivers/net/wireless/mwifiex/sta_event.c | 44 +
+ drivers/net/wireless/mwifiex/sta_rx.c | 16 +-
+ drivers/net/wireless/mwifiex/sta_tx.c | 4 +-
+ drivers/net/wireless/mwifiex/tdls.c | 97 ++-
+ drivers/net/wireless/mwifiex/util.c | 6 +-
+ drivers/net/wireless/mwifiex/wmm.c | 13 +-
+ drivers/net/wireless/mwifiex/wmm.h | 5 +-
+ drivers/net/wireless/orinoco/hw.c | 4 +-
+ drivers/net/wireless/orinoco/hw.h | 4 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 2 +-
+ drivers/net/wireless/orinoco/wext.c | 4 +-
+ drivers/net/wireless/rndis_wlan.c | 4 +-
+ drivers/net/wireless/rsi/rsi_91x_mac80211.c | 1 +
+ drivers/net/wireless/rsi/rsi_common.h | 2 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +
+ drivers/net/wireless/rtl818x/rtl8180/dev.c | 17 +-
+ drivers/net/wireless/rtl818x/rtl8187/dev.c | 11 +-
+ drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 20 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/hw.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8188ee/sw.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 21 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
+ drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 3 -
+ drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 20 -
+ drivers/net/wireless/rtlwifi/rtl8192se/hw.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 1 -
+ .../wireless/rtlwifi/rtl8723ae/hal_bt_coexist.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 21 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/hw.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8723ae/sw.c | 1 -
+ drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 20 -
+ drivers/net/wireless/rtlwifi/rtl8723be/hw.h | 2 -
+ drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 5 +-
+ drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 1 -
+ drivers/net/wireless/rtlwifi/wifi.h | 6 +-
+ drivers/net/wireless/ti/wl1251/acx.c | 1 -
+ drivers/net/wireless/ti/wl1251/cmd.c | 1 -
+ drivers/net/wireless/ti/wl1251/event.c | 5 +-
+ drivers/net/wireless/ti/wl1251/main.c | 68 +-
+ drivers/net/wireless/ti/wl1251/spi.c | 44 +-
+ drivers/net/wireless/ti/wlcore/debugfs.h | 4 +-
+ drivers/net/wireless/ti/wlcore/main.c | 2 +-
+ drivers/net/wireless/ti/wlcore/spi.c | 46 +-
+ drivers/net/wireless/ti/wlcore/wlcore_i.h | 4 +-
+ drivers/nfc/Kconfig | 1 +
+ drivers/nfc/Makefile | 1 +
+ drivers/nfc/pn544/i2c.c | 154 +++-
+ drivers/nfc/st21nfca/Kconfig | 23 +
+ drivers/nfc/st21nfca/Makefile | 8 +
+ drivers/nfc/st21nfca/i2c.c | 724 ++++++++++++++++
+ drivers/nfc/st21nfca/st21nfca.c | 698 ++++++++++++++++
+ drivers/nfc/st21nfca/st21nfca.h | 87 ++
+ drivers/nfc/trf7970a.c | 252 ++++--
+ drivers/staging/wlan-ng/cfg80211.c | 4 +-
+ include/linux/ath9k_platform.h | 2 +
+ include/linux/crc7.h | 8 +-
+ include/linux/ieee80211.h | 1 +
+ include/linux/platform_data/st21nfca.h | 32 +
+ include/linux/rfkill-gpio.h | 10 -
+ include/linux/ssb/ssb.h | 1 +
+ include/net/bluetooth/hci.h | 21 +
+ include/net/bluetooth/hci_core.h | 11 +
+ include/net/bluetooth/mgmt.h | 15 +
+ include/net/bluetooth/rfcomm.h | 6 +-
+ include/net/cfg80211.h | 191 +++--
+ include/net/mac80211.h | 124 ++-
+ include/net/nfc/digital.h | 4 +
+ include/net/nfc/hci.h | 1 +
+ include/net/nfc/nfc.h | 3 +
+ include/uapi/linux/nfc.h | 16 +-
+ include/uapi/linux/nl80211.h | 25 +-
+ lib/crc7.c | 84 +-
+ net/bluetooth/hci_conn.c | 3 +
+ net/bluetooth/hci_core.c | 64 ++
+ net/bluetooth/hci_event.c | 61 ++
+ net/bluetooth/mgmt.c | 236 +++++-
+ net/bluetooth/rfcomm/core.c | 2 +-
+ net/bluetooth/rfcomm/tty.c | 20 +-
+ net/bluetooth/smp.c | 153 ++--
+ net/bluetooth/smp.h | 30 +-
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/cfg.c | 538 ++++--------
+ net/mac80211/chan.c | 4 +-
+ net/mac80211/debugfs_netdev.c | 6 +-
+ net/mac80211/driver-ops.h | 174 +++-
+ net/mac80211/ibss.c | 3 +-
+ net/mac80211/ieee80211_i.h | 17 +-
+ net/mac80211/iface.c | 9 +
+ net/mac80211/key.c | 7 +-
+ net/mac80211/main.c | 2 +
+ net/mac80211/mesh.c | 2 +-
+ net/mac80211/mesh_pathtbl.c | 6 +-
+ net/mac80211/mesh_sync.c | 2 +-
+ net/mac80211/mlme.c | 46 +-
+ net/mac80211/rc80211_minstrel.c | 12 +
+ net/mac80211/rc80211_minstrel_ht.c | 22 +-
+ net/mac80211/scan.c | 15 +-
+ net/mac80211/sta_info.c | 1 +
+ net/mac80211/status.c | 25 +-
+ net/mac80211/tdls.c | 325 ++++++++
+ net/mac80211/trace.h | 117 +++
+ net/mac80211/tx.c | 189 +++--
+ net/mac80211/util.c | 46 +-
+ net/nfc/digital.h | 1 +
+ net/nfc/digital_core.c | 20 +-
+ net/nfc/digital_technology.c | 230 +++++-
+ net/nfc/hci/command.c | 6 +-
+ net/nfc/hci/core.c | 47 +-
+ net/nfc/llcp_commands.c | 2 +-
+ net/nfc/llcp_core.c | 11 +-
+ net/nfc/nci/core.c | 9 +
+ net/nfc/nci/ntf.c | 7 +-
+ net/nfc/nfc.h | 6 +
+ net/nfc/rawsock.c | 94 ++-
+ net/rfkill/rfkill-gpio.c | 59 +-
+ net/wireless/ap.c | 4 +-
+ net/wireless/chan.c | 5 +-
+ net/wireless/core.c | 72 +-
+ net/wireless/core.h | 7 +
+ net/wireless/genregdb.awk | 14 +-
+ net/wireless/ibss.c | 2 +-
+ net/wireless/mesh.c | 4 +-
+ net/wireless/nl80211.c | 161 +++-
+ net/wireless/nl80211.h | 3 +-
+ net/wireless/rdev-ops.h | 2 +-
+ net/wireless/reg.c | 3 +-
+ net/wireless/scan.c | 12 +-
+ net/wireless/sme.c | 8 +-
+ net/wireless/trace.h | 37 +-
+ net/wireless/util.c | 38 +-
+ 282 files changed, 9265 insertions(+), 3892 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/nfc/pn544.txt
+ create mode 100644 Documentation/devicetree/bindings/net/nfc/st21nfca.txt
+ create mode 100644 drivers/net/wireless/ath/ath9k/common-debug.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/common-debug.h
+ create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/firmware.c
+ rename drivers/net/wireless/brcm80211/brcmfmac/{nvram.h => firmware.h} (52%)
+ delete mode 100644 drivers/net/wireless/brcm80211/brcmfmac/nvram.c
+ rename drivers/net/wireless/iwlwifi/{mvm/fw-error-dump.h => iwl-fw-error-dump.h} (84%)
+ create mode 100644 drivers/nfc/st21nfca/Kconfig
+ create mode 100644 drivers/nfc/st21nfca/Makefile
+ create mode 100644 drivers/nfc/st21nfca/i2c.c
+ create mode 100644 drivers/nfc/st21nfca/st21nfca.c
+ create mode 100644 drivers/nfc/st21nfca/st21nfca.h
+ create mode 100644 include/linux/platform_data/st21nfca.h
+ create mode 100644 net/mac80211/tdls.c
+Merging bluetooth/master (3abb56de8750 Bluetooth: ath3k: no need to set same pipe multiple times)
+$ git merge bluetooth/master
+Auto-merging drivers/bluetooth/ath3k.c
+Merge made by the 'recursive' strategy.
+ drivers/bluetooth/ath3k.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging infiniband/for-next (29dc83b9c953 Merge branches 'cxgb4', 'iser', 'mlx5', 'ocrdma', 'qib' and 'srp' into for-next)
+$ git merge infiniband/for-next
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mr.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/cxgb4/cm.c | 17 +-
+ drivers/infiniband/hw/cxgb4/device.c | 2 +
+ drivers/infiniband/hw/ipath/ipath_diag.c | 4 +
+ drivers/infiniband/hw/mlx5/cq.c | 13 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 13 +-
+ drivers/infiniband/hw/mlx5/mr.c | 76 +--
+ drivers/infiniband/hw/mlx5/qp.c | 42 +-
+ drivers/infiniband/hw/mlx5/srq.c | 14 +-
+ drivers/infiniband/hw/mlx5/user.h | 2 +
+ drivers/infiniband/hw/ocrdma/ocrdma_stats.c | 9 +-
+ drivers/infiniband/hw/qib/qib_mad.c | 2 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 105 +++--
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 10 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 89 ++--
+ drivers/infiniband/ulp/srp/ib_srp.c | 670 ++++++++++++++++++++-------
+ drivers/infiniband/ulp/srp/ib_srp.h | 94 +++-
+ drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 +
+ include/linux/mlx5/driver.h | 1 -
+ 18 files changed, 822 insertions(+), 345 deletions(-)
+Merging mtd/master (28c015a9daab mtd: davinci-nand: disable subpage write for keystone-nand)
+$ git merge mtd/master
+Already up-to-date.
+Merging l2-mtd/master (91f5498ebfb2 mtd: gpmi: add gpmi support for imx6sx)
+$ git merge l2-mtd/master
+Auto-merging arch/arm/mach-omap2/gpmc.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/fsl-quadspi.txt | 35 +
+ .../devicetree/bindings/mtd/gpmc-nand.txt | 45 +
+ Documentation/devicetree/bindings/mtd/m25p80.txt | 4 +-
+ .../devicetree/bindings/mtd/pxa3xx-nand.txt | 8 +
+ Documentation/mtd/spi-nor.txt | 62 +
+ arch/arm/mach-omap2/gpmc.c | 15 +
+ drivers/mtd/Kconfig | 2 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/chips/Kconfig | 16 +-
+ drivers/mtd/chips/cfi_cmdset_0020.c | 4 +-
+ drivers/mtd/chips/cfi_util.c | 2 +-
+ drivers/mtd/devices/Kconfig | 4 +-
+ drivers/mtd/devices/elm.c | 38 +
+ drivers/mtd/devices/m25p80.c | 1305 ++------------------
+ drivers/mtd/devices/serial_flash_cmds.h | 44 +-
+ drivers/mtd/devices/slram.c | 4 +-
+ drivers/mtd/devices/st_spi_fsm.c | 340 +++--
+ drivers/mtd/lpddr/Kconfig | 13 +-
+ drivers/mtd/lpddr/Makefile | 1 +
+ drivers/mtd/lpddr/lpddr2_nvm.c | 507 ++++++++
+ drivers/mtd/maps/Kconfig | 4 +-
+ drivers/mtd/maps/sc520cdp.c | 6 +-
+ drivers/mtd/maps/solutionengine.c | 25 +-
+ drivers/mtd/mtd_blkdevs.c | 6 +
+ drivers/mtd/mtdchar.c | 20 +-
+ drivers/mtd/nand/bf5xx_nand.c | 13 +-
+ drivers/mtd/nand/denali.c | 7 +-
+ drivers/mtd/nand/docg4.c | 6 +-
+ drivers/mtd/nand/fsl_elbc_nand.c | 14 +
+ drivers/mtd/nand/fsl_ifc_nand.c | 21 +-
+ drivers/mtd/nand/gpmi-nand/bch-regs.h | 12 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 11 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 72 +-
+ drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 32 +-
+ drivers/mtd/nand/nand_base.c | 104 +-
+ drivers/mtd/nand/nand_bbt.c | 13 +-
+ drivers/mtd/nand/nand_ecc.c | 2 +-
+ drivers/mtd/nand/omap2.c | 108 +-
+ drivers/mtd/nand/orion_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 44 +-
+ drivers/mtd/nand/r852.c | 6 +-
+ drivers/mtd/onenand/samsung.c | 8 +-
+ drivers/mtd/spi-nor/Kconfig | 17 +
+ drivers/mtd/spi-nor/Makefile | 2 +
+ drivers/mtd/spi-nor/fsl-quadspi.c | 1009 +++++++++++++++
+ drivers/mtd/spi-nor/spi-nor.c | 1107 +++++++++++++++++
+ drivers/mtd/tests/oobtest.c | 17 +-
+ include/linux/mtd/nand.h | 10 +-
+ include/linux/mtd/pfow.h | 3 -
+ include/linux/mtd/spi-nor.h | 214 ++++
+ include/linux/platform_data/elm.h | 3 +-
+ include/linux/platform_data/mtd-nand-omap2.h | 5 +
+ include/linux/platform_data/mtd-nand-pxa3xx.h | 3 +
+ include/uapi/mtd/mtd-abi.h | 1 +
+ 54 files changed, 3759 insertions(+), 1618 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/fsl-quadspi.txt
+ create mode 100644 Documentation/mtd/spi-nor.txt
+ create mode 100644 drivers/mtd/lpddr/lpddr2_nvm.c
+ create mode 100644 drivers/mtd/spi-nor/Kconfig
+ create mode 100644 drivers/mtd/spi-nor/Makefile
+ create mode 100644 drivers/mtd/spi-nor/fsl-quadspi.c
+ create mode 100644 drivers/mtd/spi-nor/spi-nor.c
+ create mode 100644 include/linux/mtd/spi-nor.h
+Merging crypto/master (5208ed2ca165 crypto: testmgr - add aead cbc des, des3_ede tests)
+$ git merge crypto/master
+Resolved 'crypto/crypto_user.c' using previous resolution.
+Resolved 'drivers/char/hw_random/Kconfig' using previous resolution.
+Resolved 'drivers/crypto/caam/error.c' using previous resolution.
+Auto-merging drivers/crypto/caam/error.c
+CONFLICT (content): Merge conflict in drivers/crypto/caam/error.c
+CONFLICT (rename/delete): drivers/crypto/bfin_crc.h deleted in HEAD and renamed in crypto/master. Version crypto/master of drivers/crypto/bfin_crc.h left in tree.
+Removing drivers/char/hw_random/picoxcell-rng.c
+Auto-merging drivers/char/hw_random/Kconfig
+CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
+Auto-merging crypto/crypto_user.c
+CONFLICT (content): Merge conflict in crypto/crypto_user.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 419a9111c11b] Merge remote-tracking branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/crypto/samsung-sss.txt | 34 +
+ arch/x86/crypto/ghash-clmulni-intel_asm.S | 4 +-
+ arch/x86/crypto/ghash-clmulni-intel_glue.c | 12 +-
+ crypto/ahash.c | 41 +-
+ crypto/crypto_user.c | 12 +-
+ crypto/tcrypt.c | 52 +-
+ crypto/testmgr.c | 181 ++-
+ crypto/testmgr.h | 1441 +++++++++++++++++++-
+ drivers/char/hw_random/Kconfig | 103 +-
+ drivers/char/hw_random/Makefile | 1 -
+ drivers/char/hw_random/n2-drv.c | 24 +-
+ drivers/char/hw_random/omap-rng.c | 4 +-
+ drivers/char/hw_random/picoxcell-rng.c | 181 ---
+ drivers/char/hw_random/timeriomem-rng.c | 4 +-
+ drivers/crypto/Kconfig | 6 +-
+ drivers/crypto/atmel-aes.c | 8 +-
+ drivers/crypto/bfin_crc.c | 103 +-
+ drivers/crypto/bfin_crc.h | 125 ++
+ drivers/crypto/caam/caamalg.c | 31 +-
+ drivers/crypto/caam/caamhash.c | 32 +-
+ drivers/crypto/caam/caamrng.c | 7 +-
+ drivers/crypto/caam/error.c | 393 +++---
+ drivers/crypto/caam/error.h | 2 +-
+ drivers/crypto/caam/key_gen.c | 7 +-
+ drivers/crypto/ccp/ccp-crypto-aes-xts.c | 4 +-
+ drivers/crypto/ccp/ccp-pci.c | 7 +-
+ drivers/crypto/geode-aes.c | 28 +-
+ drivers/crypto/geode-aes.h | 6 +-
+ drivers/crypto/mv_cesa.c | 6 +-
+ drivers/crypto/mxs-dcp.c | 52 +-
+ drivers/crypto/n2_core.c | 4 +-
+ drivers/crypto/nx/nx-842.c | 4 +-
+ drivers/crypto/omap-des.c | 33 +-
+ drivers/crypto/padlock-sha.c | 2 +-
+ drivers/crypto/s5p-sss.c | 148 +-
+ drivers/crypto/sahara.c | 2 +-
+ include/crypto/internal/hash.h | 13 +
+ 37 files changed, 2370 insertions(+), 747 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/crypto/samsung-sss.txt
+ delete mode 100644 drivers/char/hw_random/picoxcell-rng.c
+ create mode 100644 drivers/crypto/bfin_crc.h
+Merging drm/drm-next (712188772816 drm: store encoder name in encoder struct)
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_gem_execbuffer.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution.
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging include/drm/i915_pciids.h
+Auto-merging drivers/staging/imx-drm/imx-tve.c
+Auto-merging drivers/staging/imx-drm/imx-drm-core.c
+Auto-merging drivers/gpu/drm/radeon/radeon_device.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging 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/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/DocBook/drm.tmpl
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 02201f36a5e6] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 870 +++++++++++++++++++-
+ Documentation/EDID/1024x768.S | 2 +-
+ Documentation/EDID/1280x1024.S | 2 +-
+ Documentation/EDID/1600x1200.S | 2 +-
+ Documentation/EDID/1680x1050.S | 2 +-
+ Documentation/EDID/1920x1080.S | 2 +-
+ Documentation/EDID/800x600.S | 41 +
+ Documentation/EDID/HOWTO.txt | 2 +-
+ Documentation/EDID/edid.S | 17 +-
+ MAINTAINERS | 1 +
+ drivers/gpu/drm/armada/armada_drv.c | 2 +-
+ drivers/gpu/drm/armada/armada_gem.c | 4 +-
+ drivers/gpu/drm/ast/Makefile | 4 +-
+ drivers/gpu/drm/ast/ast_dp501.c | 410 ++++++++++
+ drivers/gpu/drm/ast/ast_drv.c | 1 -
+ drivers/gpu/drm/ast/ast_drv.h | 24 +
+ drivers/gpu/drm/ast/ast_main.c | 97 ++-
+ drivers/gpu/drm/ast/ast_mode.c | 100 ++-
+ drivers/gpu/drm/ast/ast_post.c | 898 +++++++++------------
+ drivers/gpu/drm/ast/ast_tables.h | 67 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 6 +-
+ drivers/gpu/drm/bridge/ptn3460.c | 7 -
+ drivers/gpu/drm/cirrus/cirrus_main.c | 6 +-
+ drivers/gpu/drm/cirrus/cirrus_mode.c | 8 -
+ drivers/gpu/drm/drm_bufs.c | 34 +-
+ drivers/gpu/drm/drm_cache.c | 4 +-
+ drivers/gpu/drm/drm_crtc.c | 100 ++-
+ drivers/gpu/drm/drm_crtc_helper.c | 15 +-
+ drivers/gpu/drm/drm_dp_helper.c | 2 +-
+ drivers/gpu/drm/drm_edid.c | 164 ++--
+ drivers/gpu/drm/drm_edid_load.c | 21 +-
+ drivers/gpu/drm/drm_fb_helper.c | 17 +-
+ drivers/gpu/drm/drm_fops.c | 9 +-
+ drivers/gpu/drm/drm_gem.c | 19 +-
+ drivers/gpu/drm/drm_info.c | 6 +-
+ drivers/gpu/drm/drm_ioctl.c | 13 +-
+ drivers/gpu/drm/drm_irq.c | 105 +--
+ drivers/gpu/drm/drm_modes.c | 9 +-
+ drivers/gpu/drm/drm_pci.c | 93 +--
+ drivers/gpu/drm/drm_plane_helper.c | 13 +-
+ drivers/gpu/drm/drm_platform.c | 25 -
+ drivers/gpu/drm/drm_probe_helper.c | 66 +-
+ drivers/gpu/drm/drm_stub.c | 13 +-
+ drivers/gpu/drm/drm_usb.c | 14 -
+ drivers/gpu/drm/exynos/exynos_dp_core.c | 7 -
+ drivers/gpu/drm/exynos/exynos_drm_dpi.c | 7 -
+ drivers/gpu/drm/exynos/exynos_drm_vidi.c | 7 -
+ drivers/gpu/drm/gma500/psb_drv.c | 2 +-
+ drivers/gpu/drm/i2c/tda998x_drv.c | 6 +-
+ drivers/gpu/drm/i915/Kconfig | 2 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 2 +-
+ drivers/gpu/drm/i915/dvo_ns2501.c | 24 +-
+ drivers/gpu/drm/i915/dvo_sil164.c | 2 +-
+ drivers/gpu/drm/i915/dvo_tfp410.c | 2 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 620 ++++++++++++--
+ drivers/gpu/drm/i915/i915_debugfs.c | 91 +--
+ drivers/gpu/drm/i915/i915_dma.c | 28 +-
+ drivers/gpu/drm/i915/i915_drv.c | 146 +++-
+ drivers/gpu/drm/i915/i915_drv.h | 284 ++-----
+ drivers/gpu/drm/i915/i915_gem.c | 192 +++--
+ drivers/gpu/drm/i915/i915_gem_context.c | 18 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 6 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 105 ++-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 91 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 283 +++++++
+ drivers/gpu/drm/i915/i915_gpu_error.c | 41 +-
+ drivers/gpu/drm/i915/i915_irq.c | 673 ++++++++-------
+ drivers/gpu/drm/i915/i915_params.c | 8 +-
+ drivers/gpu/drm/i915/i915_reg.h | 130 ++-
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +
+ drivers/gpu/drm/i915/i915_trace.h | 75 ++
+ drivers/gpu/drm/i915/intel_bios.c | 318 +++++++-
+ drivers/gpu/drm/i915/intel_bios.h | 60 ++
+ drivers/gpu/drm/i915/intel_crt.c | 76 +-
+ drivers/gpu/drm/i915/intel_display.c | 326 ++++----
+ drivers/gpu/drm/i915/intel_dp.c | 206 ++++-
+ drivers/gpu/drm/i915/intel_drv.h | 40 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 125 ++-
+ drivers/gpu/drm/i915/intel_dsi.h | 4 +-
+ drivers/gpu/drm/i915/intel_dsi_cmd.c | 4 +-
+ drivers/gpu/drm/i915/intel_dsi_cmd.h | 5 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 38 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 7 -
+ drivers/gpu/drm/i915/intel_panel.c | 8 +-
+ drivers/gpu/drm/i915/intel_pm.c | 507 ++++++++----
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 486 ++++++-----
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 36 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 8 +
+ drivers/gpu/drm/i915/intel_sprite.c | 231 +++++-
+ drivers/gpu/drm/i915/intel_tv.c | 214 +++--
+ drivers/gpu/drm/i915/intel_uncore.c | 26 +-
+ drivers/gpu/drm/mga/mga_state.c | 2 +-
+ drivers/gpu/drm/mgag200/mgag200_main.c | 6 +-
+ drivers/gpu/drm/msm/msm_drv.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_vga.c | 11 +-
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_drv.c | 1 -
+ drivers/gpu/drm/qxl/qxl_irq.c | 2 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 6 -
+ drivers/gpu/drm/r128/r128_state.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 11 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 1 -
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_state.c | 2 +-
+ drivers/gpu/drm/rcar-du/Kconfig | 2 +
+ drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 7 -
+ drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 7 -
+ drivers/gpu/drm/shmobile/Kconfig | 3 +-
+ drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 7 -
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 +-
+ drivers/gpu/drm/tegra/bus.c | 11 -
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +-
+ drivers/gpu/drm/udl/udl_main.c | 1 +
+ drivers/gpu/drm/via/via_mm.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
+ drivers/staging/imx-drm/imx-drm-core.c | 7 -
+ drivers/staging/imx-drm/imx-drm.h | 2 -
+ drivers/staging/imx-drm/imx-hdmi.c | 1 -
+ drivers/staging/imx-drm/imx-ldb.c | 1 -
+ drivers/staging/imx-drm/imx-tve.c | 4 -
+ drivers/staging/imx-drm/parallel-display.c | 1 -
+ include/drm/drmP.h | 35 +-
+ include/drm/drm_crtc.h | 6 +
+ include/drm/drm_crtc_helper.h | 6 +-
+ include/drm/drm_dp_helper.h | 79 ++
+ include/drm/drm_flip_work.h | 1 +
+ include/drm/drm_modes.h | 2 +-
+ include/drm/i915_pciids.h | 22 +-
+ include/drm/ttm/ttm_bo_api.h | 5 +-
+ include/uapi/drm/i915_drm.h | 1 +
+ lib/Kconfig | 14 +
+ lib/Kconfig.debug | 1 +
+ lib/Makefile | 3 +-
+ lib/interval_tree.c | 6 +
+ ...erval_tree_test_main.c => interval_tree_test.c} | 0
+ 139 files changed, 6307 insertions(+), 2896 deletions(-)
+ create mode 100644 Documentation/EDID/800x600.S
+ create mode 100644 drivers/gpu/drm/ast/ast_dp501.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.h
+ rename lib/{interval_tree_test_main.c => interval_tree_test.c} (100%)
+Merging drm-panel/drm/panel/for-next (02dfc65dc905 drm/panel: add support for EDT ET057090DHU panel)
+$ git merge drm-panel/drm/panel/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/panel/edt,et057090dhu.txt | 7 +++
+ .../devicetree/bindings/panel/edt,et070080dh6.txt | 10 ++++
+ .../devicetree/bindings/panel/edt,etm0700g0dh6.txt | 10 ++++
+ drivers/gpu/drm/panel/panel-ld9040.c | 3 ++
+ drivers/gpu/drm/panel/panel-s6e8aa0.c | 1 +
+ drivers/gpu/drm/panel/panel-simple.c | 55 ++++++++++++++++++++++
+ 6 files changed, 86 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,et057090dhu.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,et070080dh6.txt
+ create mode 100644 Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt
+Merging drm-intel/for-linux-next (192155025197 drm/i915: Drop locking around fbdev-fb in debugfs)
+$ git merge drm-intel/for-linux-next
+Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution.
+Auto-merging include/drm/i915_pciids.h
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_panel.c
+Auto-merging drivers/gpu/drm/i915/intel_overlay.c
+Auto-merging drivers/gpu/drm/i915/intel_fbdev.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/intel_bios.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.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
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging arch/x86/kernel/early-quirks.c
+Auto-merging Documentation/DocBook/drm.tmpl
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9b62e2a1d16b] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/drm.tmpl | 107 +-
+ arch/x86/kernel/early-quirks.c | 46 +-
+ drivers/gpu/drm/drm_irq.c | 356 +++++--
+ drivers/gpu/drm/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Makefile | 8 +
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 170 ++-
+ drivers/gpu/drm/i915/i915_debugfs.c | 174 +--
+ drivers/gpu/drm/i915/i915_dma.c | 46 +-
+ drivers/gpu/drm/i915/i915_drv.c | 511 ++++++++-
+ drivers/gpu/drm/i915/i915_drv.h | 206 +++-
+ drivers/gpu/drm/i915/i915_gem.c | 371 +++++--
+ drivers/gpu/drm/i915/i915_gem_context.c | 79 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 8 +
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 37 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 113 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +-
+ drivers/gpu/drm/i915/i915_gem_render_state.c | 198 ++++
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 711 +++++++++++++
+ drivers/gpu/drm/i915/i915_gpu_error.c | 14 +-
+ drivers/gpu/drm/i915/i915_irq.c | 537 ++++++++--
+ drivers/gpu/drm/i915/i915_reg.h | 723 ++++++++++---
+ drivers/gpu/drm/i915/i915_suspend.c | 2 -
+ drivers/gpu/drm/i915/i915_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/i915_trace.h | 26 +-
+ drivers/gpu/drm/i915/intel_bios.c | 13 +
+ drivers/gpu/drm/i915/intel_bios.h | 4 +
+ drivers/gpu/drm/i915/intel_ddi.c | 97 +-
+ drivers/gpu/drm/i915/intel_display.c | 1404 ++++++++++++++++---------
+ drivers/gpu/drm/i915/intel_dp.c | 419 +++++++-
+ drivers/gpu/drm/i915/intel_drv.h | 50 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 79 +-
+ drivers/gpu/drm/i915/intel_dsi.h | 15 +-
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 591 +++++++++++
+ drivers/gpu/drm/i915/intel_fbdev.c | 30 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 293 +++++-
+ drivers/gpu/drm/i915/intel_lvds.c | 14 -
+ drivers/gpu/drm/i915/intel_overlay.c | 12 +-
+ drivers/gpu/drm/i915/intel_panel.c | 150 +--
+ drivers/gpu/drm/i915/intel_pm.c | 461 ++++++--
+ drivers/gpu/drm/i915/intel_renderstate.h | 48 +
+ drivers/gpu/drm/i915/intel_renderstate_gen6.c | 289 +++++
+ drivers/gpu/drm/i915/intel_renderstate_gen7.c | 253 +++++
+ drivers/gpu/drm/i915/intel_renderstate_gen8.c | 479 +++++++++
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 378 ++++---
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 138 +--
+ drivers/gpu/drm/i915/intel_sdvo.c | 33 +-
+ drivers/gpu/drm/i915/intel_sideband.c | 51 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 8 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 228 +++-
+ include/drm/drmP.h | 10 +-
+ include/drm/i915_pciids.h | 6 +
+ include/uapi/drm/i915_drm.h | 16 +
+ 52 files changed, 8075 insertions(+), 1945 deletions(-)
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_render_state.c
+ create mode 100644 drivers/gpu/drm/i915/i915_gem_userptr.c
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate.h
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen6.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen7.c
+ create mode 100644 drivers/gpu/drm/i915/intel_renderstate_gen8.c
+Merging drm-tegra/drm/tegra/for-next (f00e104dc165 drm/tegra: gem - Make tegra_bo_import() static)
+$ git merge drm-tegra/drm/tegra/for-next
+Auto-merging drivers/gpu/drm/tegra/dc.c
+Merge made by the 'recursive' strategy.
+ .../bindings/gpu/nvidia,tegra20-host1x.txt | 2 +
+ drivers/gpu/drm/tegra/dc.c | 536 +++++++++++----------
+ drivers/gpu/drm/tegra/dc.h | 3 +-
+ drivers/gpu/drm/tegra/drm.c | 1 +
+ drivers/gpu/drm/tegra/drm.h | 54 +--
+ drivers/gpu/drm/tegra/dsi.c | 244 ++++++----
+ drivers/gpu/drm/tegra/dsi.h | 10 +
+ drivers/gpu/drm/tegra/gem.c | 3 +-
+ drivers/gpu/drm/tegra/hdmi.c | 196 ++++++--
+ drivers/gpu/drm/tegra/hdmi.h | 5 +
+ drivers/gpu/drm/tegra/rgb.c | 31 +-
+ drivers/gpu/drm/tegra/sor.c | 192 +++++++-
+ drivers/gpu/drm/tegra/sor.h | 4 +
+ 13 files changed, 809 insertions(+), 472 deletions(-)
+Merging sound/for-next (82285f254ca8 ALSA: au1x00: Use resource_size instead of computation)
+$ git merge sound/for-next
+Removing sound/soc/sirf/sirf-audio-port.h
+Auto-merging sound/soc/intel/sst-mfld-platform-pcm.c
+Auto-merging sound/pci/hda/hda_intel.c
+Auto-merging drivers/firewire/core.h
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/mc13xxx.txt | 3 +
+ Documentation/devicetree/bindings/sound/ak4104.txt | 3 +
+ .../devicetree/bindings/sound/alc5623.txt | 25 +
+ .../devicetree/bindings/sound/cs42l56.txt | 63 +
+ .../devicetree/bindings/sound/fsl-sai.txt | 11 +-
+ .../devicetree/bindings/sound/max98095.txt | 16 +
+ .../devicetree/bindings/sound/nokia,rx51.txt | 27 +
+ .../bindings/sound/nvidia,tegra30-hda.txt | 28 +
+ Documentation/devicetree/bindings/sound/rt5640.txt | 13 +-
+ .../devicetree/bindings/sound/simple-card.txt | 88 +-
+ Documentation/devicetree/bindings/sound/snow.txt | 17 +
+ .../devicetree/bindings/sound/st,sta350.txt | 131 ++
+ MAINTAINERS | 1 +
+ arch/mips/include/asm/mach-jz4740/dma.h | 2 -
+ arch/mips/jz4740/board-qi_lb60.c | 11 +
+ drivers/firewire/core.h | 1 -
+ drivers/mfd/mc13xxx-core.c | 10 +-
+ include/linux/firewire.h | 3 +
+ include/sound/atmel-ac97c.h | 2 -
+ include/sound/core.h | 7 -
+ include/sound/cs42l56.h | 48 +
+ include/sound/rcar_snd.h | 32 +-
+ include/sound/rt5640.h | 4 +
+ include/sound/rt5645.h | 25 +
+ include/sound/rt5651.h | 21 +
+ include/sound/soc-dai.h | 2 -
+ include/sound/soc-dapm.h | 20 +-
+ include/sound/soc.h | 155 +-
+ include/sound/sta350.h | 57 +
+ include/trace/events/asoc.h | 92 -
+ include/uapi/sound/asound.h | 4 +-
+ include/uapi/sound/firewire.h | 23 +-
+ sound/aoa/codecs/onyx.c | 2 +-
+ sound/arm/pxa2xx-pcm.c | 2 +
+ sound/arm/pxa2xx-pcm.h | 3 +-
+ sound/atmel/ac97c.c | 15 +-
+ sound/core/pcm_lib.c | 2 +-
+ sound/core/seq/seq_midi.c | 4 +-
+ sound/firewire/Kconfig | 59 +
+ sound/firewire/Makefile | 2 +
+ sound/firewire/amdtp.c | 797 +++++--
+ sound/firewire/amdtp.h | 200 +-
+ sound/firewire/bebob/Makefile | 4 +
+ sound/firewire/bebob/bebob.c | 471 ++++
+ sound/firewire/bebob/bebob.h | 257 ++
+ sound/firewire/bebob/bebob_command.c | 282 +++
+ sound/firewire/bebob/bebob_focusrite.c | 279 +++
+ sound/firewire/bebob/bebob_hwdep.c | 199 ++
+ sound/firewire/bebob/bebob_maudio.c | 792 +++++++
+ sound/firewire/bebob/bebob_midi.c | 168 ++
+ sound/firewire/bebob/bebob_pcm.c | 378 +++
+ sound/firewire/bebob/bebob_proc.c | 196 ++
+ sound/firewire/bebob/bebob_stream.c | 1021 ++++++++
+ sound/firewire/bebob/bebob_terratec.c | 68 +
+ sound/firewire/bebob/bebob_yamaha.c | 50 +
+ sound/firewire/cmp.c | 205 +-
+ sound/firewire/cmp.h | 14 +-
+ sound/firewire/dice.c | 88 +-
+ sound/firewire/fcp.c | 189 +-
+ sound/firewire/fcp.h | 21 +
+ sound/firewire/fireworks/Makefile | 4 +
+ sound/firewire/fireworks/fireworks.c | 357 +++
+ sound/firewire/fireworks/fireworks.h | 233 ++
+ sound/firewire/fireworks/fireworks_command.c | 372 +++
+ sound/firewire/fireworks/fireworks_hwdep.c | 298 +++
+ sound/firewire/fireworks/fireworks_midi.c | 168 ++
+ sound/firewire/fireworks/fireworks_pcm.c | 403 ++++
+ sound/firewire/fireworks/fireworks_proc.c | 232 ++
+ sound/firewire/fireworks/fireworks_stream.c | 372 +++
+ sound/firewire/fireworks/fireworks_transaction.c | 326 +++
+ sound/firewire/speakers.c | 100 +-
+ sound/mips/au1x00.c | 6 +-
+ sound/oss/mpu401.c | 4 +-
+ sound/pci/fm801.c | 226 +-
+ sound/pci/hda/Kconfig | 15 +
+ sound/pci/hda/Makefile | 2 +
+ sound/pci/hda/hda_auto_parser.c | 47 +-
+ sound/pci/hda/hda_codec.h | 1 +
+ sound/pci/hda/hda_generic.c | 2 +-
+ sound/pci/hda/hda_intel.c | 2 +-
+ sound/pci/hda/hda_local.h | 14 +
+ sound/pci/hda/hda_tegra.c | 588 +++++
+ sound/pci/hda/patch_hdmi.c | 6 +-
+ sound/pci/hda/patch_realtek.c | 216 +-
+ sound/pci/hda/patch_sigmatel.c | 4 +-
+ sound/pci/lola/lola_proc.c | 2 +-
+ sound/pci/lx6464es/lx_core.c | 46 +-
+ sound/soc/atmel/Kconfig | 2 +-
+ sound/soc/atmel/atmel-pcm-pdc.c | 63 -
+ sound/soc/atmel/snd-soc-afeb9260.c | 12 -
+ sound/soc/codecs/88pm860x-codec.c | 20 +-
+ sound/soc/codecs/Kconfig | 34 +-
+ sound/soc/codecs/Makefile | 10 +
+ sound/soc/codecs/ab8500-codec.c | 12 +-
+ sound/soc/codecs/ad1980.c | 39 +-
+ sound/soc/codecs/adau1373.c | 7 +-
+ sound/soc/codecs/adav80x.c | 12 +-
+ sound/soc/codecs/ak4104.c | 62 +-
+ sound/soc/codecs/ak4641.c | 4 +-
+ sound/soc/codecs/ak4642.c | 75 +-
+ sound/soc/codecs/alc5623.c | 20 +
+ sound/soc/codecs/arizona.h | 4 +-
+ sound/soc/codecs/cq93vc.c | 10 +-
+ sound/soc/codecs/cs4270.c | 2 +-
+ sound/soc/codecs/cs4271.c | 4 +-
+ sound/soc/codecs/cs42l51-i2c.c | 59 +
+ sound/soc/codecs/cs42l51.c | 80 +-
+ sound/soc/codecs/cs42l51.h | 6 +
+ sound/soc/codecs/cs42l52.c | 12 -
+ sound/soc/codecs/cs42l56.c | 1427 +++++++++++
+ sound/soc/codecs/cs42l56.h | 175 ++
+ sound/soc/codecs/cs42xx8.c | 3 +-
+ sound/soc/codecs/da7210.c | 4 +-
+ sound/soc/codecs/da7213.c | 4 +-
+ sound/soc/codecs/da732x.c | 4 +-
+ sound/soc/codecs/da9055.c | 2 +-
+ sound/soc/codecs/hdmi.c | 1 +
+ sound/soc/codecs/lm4857.c | 4 +-
+ sound/soc/codecs/max9768.c | 4 +-
+ sound/soc/codecs/max98088.c | 12 +-
+ sound/soc/codecs/max98090.c | 87 +-
+ sound/soc/codecs/max98090.h | 1 +
+ sound/soc/codecs/max98095.c | 23 +-
+ sound/soc/codecs/mc13783.c | 36 +-
+ sound/soc/codecs/pcm1681.c | 4 +-
+ sound/soc/codecs/pcm512x.c | 4 +-
+ sound/soc/codecs/rt5631.c | 4 +-
+ sound/soc/codecs/rt5640.c | 424 ++--
+ sound/soc/codecs/rt5640.h | 10 +-
+ sound/soc/codecs/rt5645.c | 2475 ++++++++++++++++++++
+ sound/soc/codecs/rt5645.h | 2188 +++++++++++++++++
+ sound/soc/codecs/rt5651.c | 1897 +++++++++++++++
+ sound/soc/codecs/rt5651.h | 2081 ++++++++++++++++
+ sound/soc/codecs/sgtl5000.c | 15 +-
+ sound/soc/codecs/si476x.c | 14 +-
+ sound/soc/codecs/sirf-audio-codec.c | 74 +-
+ sound/soc/codecs/sirf-audio-codec.h | 50 +
+ sound/soc/codecs/sta32x.c | 4 +-
+ sound/soc/codecs/sta350.c | 1311 +++++++++++
+ sound/soc/codecs/sta350.h | 238 ++
+ sound/soc/codecs/tas5086.c | 4 +-
+ sound/soc/codecs/tlv320aic23-i2c.c | 1 +
+ sound/soc/codecs/tlv320aic23.c | 4 +-
+ sound/soc/codecs/tlv320aic31xx.c | 1 +
+ sound/soc/codecs/tlv320dac33.c | 12 +-
+ sound/soc/codecs/tpa6130a2.c | 1 +
+ sound/soc/codecs/twl4030.c | 10 +-
+ sound/soc/codecs/twl6040.c | 8 +-
+ sound/soc/codecs/wl1273.c | 12 +-
+ sound/soc/codecs/wm2000.c | 8 +-
+ sound/soc/codecs/wm2200.c | 4 +-
+ sound/soc/codecs/wm5100.c | 4 +-
+ sound/soc/codecs/wm5102.c | 26 +-
+ sound/soc/codecs/wm5110.c | 35 +-
+ sound/soc/codecs/wm8350.c | 14 +-
+ sound/soc/codecs/wm8400.c | 12 +-
+ sound/soc/codecs/wm8580.c | 2 +-
+ sound/soc/codecs/wm8731.c | 11 +-
+ sound/soc/codecs/wm8753.c | 4 +-
+ sound/soc/codecs/wm8804.c | 11 +-
+ sound/soc/codecs/wm8903.c | 4 +-
+ sound/soc/codecs/wm8904.c | 14 +-
+ sound/soc/codecs/wm8955.c | 13 +-
+ sound/soc/codecs/wm8958-dsp2.c | 32 +-
+ sound/soc/codecs/wm8960.c | 4 +-
+ sound/soc/codecs/wm8962.c | 20 +-
+ sound/soc/codecs/wm8983.c | 4 +-
+ sound/soc/codecs/wm8985.c | 11 +-
+ sound/soc/codecs/wm8988.c | 8 +-
+ sound/soc/codecs/wm8990.c | 2 +-
+ sound/soc/codecs/wm8991.c | 2 +-
+ sound/soc/codecs/wm8994.c | 32 +-
+ sound/soc/codecs/wm8995.c | 10 +-
+ sound/soc/codecs/wm8996.c | 4 +-
+ sound/soc/codecs/wm8997.c | 25 +-
+ sound/soc/codecs/wm9081.c | 4 +-
+ sound/soc/codecs/wm_adsp.c | 6 +-
+ sound/soc/codecs/wm_hubs.c | 2 +-
+ sound/soc/davinci/Kconfig | 10 +-
+ sound/soc/davinci/davinci-i2s.c | 1 -
+ sound/soc/davinci/davinci-mcasp.c | 260 +-
+ sound/soc/davinci/davinci-mcasp.h | 1 +
+ sound/soc/davinci/davinci-pcm.c | 8 +-
+ sound/soc/davinci/davinci-pcm.h | 8 +-
+ sound/soc/davinci/davinci-vcif.c | 1 -
+ sound/soc/fsl/Kconfig | 77 +-
+ sound/soc/fsl/Makefile | 3 +-
+ sound/soc/fsl/fsl_esai.c | 32 +-
+ sound/soc/fsl/fsl_sai.c | 255 +-
+ sound/soc/fsl/fsl_sai.h | 16 +
+ sound/soc/fsl/fsl_spdif.c | 186 +-
+ sound/soc/fsl/fsl_spdif.h | 14 +-
+ sound/soc/fsl/fsl_ssi.c | 996 +++-----
+ sound/soc/fsl/fsl_ssi.h | 62 +-
+ sound/soc/fsl/fsl_ssi_dbg.c | 163 ++
+ sound/soc/fsl/imx-pcm-dma.c | 1 -
+ sound/soc/generic/simple-card.c | 250 +-
+ sound/soc/intel/Makefile | 2 +-
+ sound/soc/intel/byt-rt5640.c | 34 +-
+ sound/soc/intel/haswell.c | 6 -
+ sound/soc/intel/sst-baytrail-dsp.c | 14 +-
+ sound/soc/intel/sst-baytrail-ipc.c | 124 +-
+ sound/soc/intel/sst-baytrail-ipc.h | 7 +-
+ sound/soc/intel/sst-baytrail-pcm.c | 162 +-
+ sound/soc/intel/sst-dsp-priv.h | 2 +
+ sound/soc/intel/sst-firmware.c | 42 +-
+ sound/soc/intel/sst-haswell-pcm.c | 8 +-
+ sound/soc/intel/sst-mfld-dsp.h | 8 -
+ sound/soc/intel/sst-mfld-platform-compress.c | 237 ++
+ ...sst-mfld-platform.c => sst-mfld-platform-pcm.c} | 250 +-
+ sound/soc/intel/sst-mfld-platform.h | 11 +-
+ sound/soc/jz4740/Kconfig | 11 +-
+ sound/soc/jz4740/jz4740-i2s.c | 5 +-
+ sound/soc/jz4740/qi_lb60.c | 84 +-
+ sound/soc/kirkwood/kirkwood-t5325.c | 13 -
+ sound/soc/nuc900/Kconfig | 1 +
+ sound/soc/nuc900/nuc900-ac97.c | 1 +
+ sound/soc/omap/Kconfig | 4 +-
+ sound/soc/omap/am3517evm.c | 2 +-
+ sound/soc/omap/ams-delta.c | 68 +-
+ sound/soc/omap/n810.c | 2 +-
+ sound/soc/omap/omap-abe-twl6040.c | 13 +-
+ sound/soc/omap/omap-dmic.c | 9 +-
+ sound/soc/omap/omap-hdmi-card.c | 2 +-
+ sound/soc/omap/omap-hdmi.c | 6 +-
+ sound/soc/omap/omap-mcbsp.c | 25 +-
+ sound/soc/omap/omap-mcbsp.h | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 16 +-
+ sound/soc/omap/omap-pcm.c | 25 +-
+ sound/soc/omap/omap-pcm.h | 30 +
+ sound/soc/omap/omap-twl4030.c | 15 +-
+ sound/soc/omap/omap3pandora.c | 35 +-
+ sound/soc/omap/osk5912.c | 2 +-
+ sound/soc/omap/rx51.c | 275 ++-
+ sound/soc/pxa/Kconfig | 2 +-
+ sound/soc/pxa/brownstone.c | 7 -
+ sound/soc/pxa/palm27x.c | 8 -
+ sound/soc/pxa/poodle.c | 1 -
+ sound/soc/pxa/pxa-ssp.c | 2 -
+ sound/soc/pxa/pxa2xx-pcm.c | 2 +
+ sound/soc/pxa/ttc-dkb.c | 4 -
+ sound/soc/samsung/Kconfig | 22 +-
+ sound/soc/samsung/Makefile | 2 +
+ sound/soc/samsung/ac97.c | 9 +-
+ sound/soc/samsung/bells.c | 16 +-
+ sound/soc/samsung/dma.c | 8 +-
+ sound/soc/samsung/dma.h | 1 -
+ sound/soc/samsung/dmaengine.c | 13 +-
+ sound/soc/samsung/goni_wm8994.c | 9 +-
+ sound/soc/samsung/h1940_uda1380.c | 5 -
+ sound/soc/samsung/i2s.c | 10 +-
+ sound/soc/samsung/i2s.h | 1 +
+ sound/soc/samsung/idma.c | 11 +-
+ sound/soc/samsung/littlemill.c | 18 +-
+ sound/soc/samsung/lowland.c | 18 +-
+ sound/soc/samsung/neo1973_wm8753.c | 8 +-
+ sound/soc/samsung/pcm.c | 17 +-
+ sound/soc/samsung/rx1950_uda1380.c | 5 -
+ sound/soc/samsung/s3c-i2s-v2.c | 2 +-
+ sound/soc/samsung/s3c2412-i2s.c | 15 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 19 +-
+ sound/soc/samsung/s3c24xx_simtec_hermes.c | 8 -
+ sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 8 -
+ sound/soc/samsung/smartq_wm8987.c | 2 -
+ sound/soc/samsung/smdk_wm8580pcm.c | 15 +-
+ sound/soc/samsung/smdk_wm8994.c | 12 -
+ sound/soc/samsung/smdk_wm8994pcm.c | 15 +-
+ sound/soc/samsung/snow.c | 123 +
+ sound/soc/samsung/spdif.c | 11 +-
+ sound/soc/samsung/speyside.c | 18 +-
+ sound/soc/samsung/tobermory.c | 18 +-
+ sound/soc/sh/Kconfig | 2 +-
+ sound/soc/sh/rcar/Makefile | 2 +-
+ sound/soc/sh/rcar/adg.c | 57 +-
+ sound/soc/sh/rcar/core.c | 163 +-
+ sound/soc/sh/rcar/dvc.c | 273 +++
+ sound/soc/sh/rcar/gen.c | 25 +-
+ sound/soc/sh/rcar/rsnd.h | 68 +-
+ sound/soc/sh/rcar/src.c | 190 +-
+ sound/soc/sh/rcar/ssi.c | 85 +-
+ sound/soc/sirf/sirf-audio-port.c | 107 -
+ sound/soc/sirf/sirf-audio-port.h | 62 -
+ sound/soc/soc-cache.c | 2 -
+ sound/soc/soc-compress.c | 6 +-
+ sound/soc/soc-core.c | 991 ++++----
+ sound/soc/soc-dapm.c | 259 +-
+ sound/soc/soc-devres.c | 35 +
+ sound/soc/soc-io.c | 296 ++-
+ sound/soc/soc-pcm.c | 27 +-
+ sound/soc/tegra/tegra_wm9712.c | 4 +-
+ sound/soc/ux500/mop500_ab8500.c | 2 +-
+ sound/usb/Kconfig | 13 +
+ sound/usb/Makefile | 2 +-
+ sound/usb/bcd2000/Makefile | 3 +
+ sound/usb/bcd2000/bcd2000.c | 461 ++++
+ sound/usb/mixer.c | 411 ++--
+ 296 files changed, 27293 insertions(+), 4884 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/alc5623.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/cs42l56.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/max98095.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nokia,rx51.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/snow.txt
+ create mode 100644 Documentation/devicetree/bindings/sound/st,sta350.txt
+ create mode 100644 include/sound/cs42l56.h
+ create mode 100644 include/sound/rt5645.h
+ create mode 100644 include/sound/rt5651.h
+ create mode 100644 include/sound/sta350.h
+ create mode 100644 sound/firewire/bebob/Makefile
+ create mode 100644 sound/firewire/bebob/bebob.c
+ create mode 100644 sound/firewire/bebob/bebob.h
+ create mode 100644 sound/firewire/bebob/bebob_command.c
+ create mode 100644 sound/firewire/bebob/bebob_focusrite.c
+ create mode 100644 sound/firewire/bebob/bebob_hwdep.c
+ create mode 100644 sound/firewire/bebob/bebob_maudio.c
+ create mode 100644 sound/firewire/bebob/bebob_midi.c
+ create mode 100644 sound/firewire/bebob/bebob_pcm.c
+ create mode 100644 sound/firewire/bebob/bebob_proc.c
+ create mode 100644 sound/firewire/bebob/bebob_stream.c
+ create mode 100644 sound/firewire/bebob/bebob_terratec.c
+ create mode 100644 sound/firewire/bebob/bebob_yamaha.c
+ create mode 100644 sound/firewire/fireworks/Makefile
+ create mode 100644 sound/firewire/fireworks/fireworks.c
+ create mode 100644 sound/firewire/fireworks/fireworks.h
+ create mode 100644 sound/firewire/fireworks/fireworks_command.c
+ create mode 100644 sound/firewire/fireworks/fireworks_hwdep.c
+ create mode 100644 sound/firewire/fireworks/fireworks_midi.c
+ create mode 100644 sound/firewire/fireworks/fireworks_pcm.c
+ create mode 100644 sound/firewire/fireworks/fireworks_proc.c
+ create mode 100644 sound/firewire/fireworks/fireworks_stream.c
+ create mode 100644 sound/firewire/fireworks/fireworks_transaction.c
+ create mode 100644 sound/pci/hda/hda_tegra.c
+ create mode 100644 sound/soc/codecs/cs42l51-i2c.c
+ create mode 100644 sound/soc/codecs/cs42l56.c
+ create mode 100644 sound/soc/codecs/cs42l56.h
+ create mode 100644 sound/soc/codecs/rt5645.c
+ create mode 100644 sound/soc/codecs/rt5645.h
+ create mode 100644 sound/soc/codecs/rt5651.c
+ create mode 100644 sound/soc/codecs/rt5651.h
+ create mode 100644 sound/soc/codecs/sta350.c
+ create mode 100644 sound/soc/codecs/sta350.h
+ create mode 100644 sound/soc/fsl/fsl_ssi_dbg.c
+ create mode 100644 sound/soc/intel/sst-mfld-platform-compress.c
+ rename sound/soc/intel/{sst-mfld-platform.c => sst-mfld-platform-pcm.c} (67%)
+ create mode 100644 sound/soc/omap/omap-pcm.h
+ create mode 100644 sound/soc/samsung/snow.c
+ create mode 100644 sound/soc/sh/rcar/dvc.c
+ delete mode 100644 sound/soc/sirf/sirf-audio-port.h
+ create mode 100644 sound/usb/bcd2000/Makefile
+ create mode 100644 sound/usb/bcd2000/bcd2000.c
+Merging sound-asoc/for-next (28f3a3adb64d Merge remote-tracking branches 'asoc/topic/sta350', 'asoc/topic/tegra', 'asoc/topic/tlv320dac33', 'asoc/topic/ux500', 'asoc/topic/wm8731', 'asoc/topic/wm8804', 'asoc/topic/wm8955' and 'asoc/topic/wm8985' into asoc-next)
+$ git merge sound-asoc/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/sound/max98090.txt | 6 +
+ .../devicetree/bindings/sound/max98095.txt | 6 +
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 1 +
+ .../devicetree/bindings/sound/simple-card.txt | 3 +
+ include/linux/platform_data/adau17x1.h | 109 +++
+ {sound/soc/omap => include/sound}/omap-pcm.h | 0
+ include/sound/soc.h | 22 +-
+ sound/soc/blackfin/Kconfig | 26 +
+ sound/soc/blackfin/Makefile | 4 +
+ sound/soc/blackfin/bfin-eval-adau1x61.c | 142 ++++
+ sound/soc/blackfin/bfin-eval-adau1x81.c | 130 ++++
+ sound/soc/codecs/Kconfig | 39 +-
+ sound/soc/codecs/Makefile | 18 +-
+ sound/soc/codecs/adau1761-i2c.c | 60 ++
+ sound/soc/codecs/adau1761-spi.c | 77 ++
+ sound/soc/codecs/adau1761.c | 803 +++++++++++++++++++
+ sound/soc/codecs/adau1761.h | 23 +
+ sound/soc/codecs/adau1781-i2c.c | 58 ++
+ sound/soc/codecs/adau1781-spi.c | 75 ++
+ sound/soc/codecs/adau1781.c | 511 ++++++++++++
+ sound/soc/codecs/adau1781.h | 23 +
+ sound/soc/codecs/adau17x1.c | 866 +++++++++++++++++++++
+ sound/soc/codecs/adau17x1.h | 124 +++
+ sound/soc/codecs/max98090.c | 31 +-
+ sound/soc/codecs/max98090.h | 1 +
+ sound/soc/codecs/max98095.c | 24 +
+ sound/soc/codecs/sgtl5000.c | 75 +-
+ sound/soc/codecs/sirf-audio-codec.c | 8 +-
+ sound/soc/codecs/wm_adsp.c | 37 +-
+ sound/soc/davinci/davinci-evm.c | 9 +-
+ sound/soc/davinci/davinci-mcasp.c | 2 +-
+ sound/soc/fsl/fsl_ssi.c | 2 +
+ sound/soc/generic/simple-card.c | 39 +-
+ sound/soc/intel/sst-baytrail-ipc.c | 2 +-
+ sound/soc/intel/sst-haswell-ipc.c | 2 +-
+ sound/soc/omap/omap-dmic.c | 2 +-
+ sound/soc/omap/omap-hdmi.c | 2 +-
+ sound/soc/omap/omap-mcbsp.c | 2 +-
+ sound/soc/omap/omap-mcpdm.c | 2 +-
+ sound/soc/pxa/pxa-ssp.c | 1 +
+ sound/soc/samsung/i2s.c | 14 +-
+ sound/soc/samsung/pcm.c | 4 +-
+ sound/soc/samsung/s3c-i2s-v2.c | 8 +-
+ sound/soc/samsung/s3c2412-i2s.c | 6 +-
+ sound/soc/samsung/s3c24xx-i2s.c | 6 +-
+ sound/soc/samsung/smdk_wm8580.c | 8 +-
+ sound/soc/samsung/smdk_wm8994.c | 2 +-
+ sound/soc/samsung/spdif.c | 4 +-
+ sound/soc/sh/rcar/core.c | 87 ++-
+ sound/soc/sh/rcar/dvc.c | 20 +-
+ sound/soc/sh/rcar/gen.c | 95 +++
+ sound/soc/sh/rcar/rsnd.h | 10 +-
+ sound/soc/sh/rcar/src.c | 50 +-
+ sound/soc/sh/rcar/ssi.c | 28 +-
+ sound/soc/soc-jack.c | 88 ++-
+ sound/soc/tegra/tegra_alc5632.c | 16 +-
+ sound/soc/tegra/tegra_max98090.c | 16 +-
+ sound/soc/tegra/tegra_rt5640.c | 16 +-
+ sound/soc/tegra/tegra_wm8903.c | 11 +-
+ 59 files changed, 3654 insertions(+), 202 deletions(-)
+ create mode 100644 include/linux/platform_data/adau17x1.h
+ rename {sound/soc/omap => include/sound}/omap-pcm.h (100%)
+ create mode 100644 sound/soc/blackfin/bfin-eval-adau1x61.c
+ create mode 100644 sound/soc/blackfin/bfin-eval-adau1x81.c
+ create mode 100644 sound/soc/codecs/adau1761-i2c.c
+ create mode 100644 sound/soc/codecs/adau1761-spi.c
+ create mode 100644 sound/soc/codecs/adau1761.c
+ create mode 100644 sound/soc/codecs/adau1761.h
+ create mode 100644 sound/soc/codecs/adau1781-i2c.c
+ create mode 100644 sound/soc/codecs/adau1781-spi.c
+ create mode 100644 sound/soc/codecs/adau1781.c
+ create mode 100644 sound/soc/codecs/adau1781.h
+ create mode 100644 sound/soc/codecs/adau17x1.c
+ create mode 100644 sound/soc/codecs/adau17x1.h
+Merging modules/modules-next (4982223e51e8 module: set nx before marking module MODULE_STATE_COMING.)
+$ git merge modules/modules-next
+Auto-merging kernel/module.c
+Auto-merging init/main.c
+Auto-merging drivers/staging/speakup/speakup_acntsa.c
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by the 'recursive' strategy.
+ Documentation/kernel-parameters.txt | 40 +++++++++++++--------
+ drivers/hid/hid-lg4ff.c | 2 +-
+ drivers/hid/hid-picolcd_fb.c | 2 +-
+ drivers/mtd/devices/docg3.c | 4 +--
+ drivers/regulator/virtual.c | 10 +++---
+ drivers/scsi/pm8001/pm8001_ctl.c | 2 +-
+ drivers/staging/speakup/kobjects.c | 62 ++++++++++++++++----------------
+ drivers/staging/speakup/speakup_acntpc.c | 14 ++++----
+ drivers/staging/speakup/speakup_acntsa.c | 14 ++++----
+ drivers/staging/speakup/speakup_apollo.c | 16 ++++-----
+ drivers/staging/speakup/speakup_audptr.c | 16 ++++-----
+ drivers/staging/speakup/speakup_bns.c | 14 ++++----
+ drivers/staging/speakup/speakup_decext.c | 16 ++++-----
+ drivers/staging/speakup/speakup_decpc.c | 16 ++++-----
+ drivers/staging/speakup/speakup_dectlk.c | 16 ++++-----
+ drivers/staging/speakup/speakup_dtlk.c | 20 +++++------
+ drivers/staging/speakup/speakup_dummy.c | 14 ++++----
+ drivers/staging/speakup/speakup_keypc.c | 10 +++---
+ drivers/staging/speakup/speakup_ltlk.c | 20 +++++------
+ drivers/staging/speakup/speakup_soft.c | 22 ++++++------
+ drivers/staging/speakup/speakup_spkout.c | 16 ++++-----
+ drivers/staging/speakup/speakup_txprt.c | 14 ++++----
+ drivers/video/fbdev/sm501fb.c | 2 +-
+ include/linux/cpumask.h | 2 +-
+ include/linux/moduleparam.h | 2 +-
+ init/main.c | 33 ++++++++++++++---
+ kernel/module.c | 44 +++++++++++++----------
+ kernel/params.c | 25 +++++++------
+ samples/kobject/kobject-example.c | 7 ++--
+ samples/kobject/kset-example.c | 7 ++--
+ scripts/mod/modpost.c | 2 ++
+ 31 files changed, 267 insertions(+), 217 deletions(-)
+Merging virtio/virtio-next (a17597d3b418 virtio-rng: fixes for device registration/unregistration)
+$ git merge virtio/virtio-next
+Merge made by the 'recursive' strategy.
+ drivers/char/hw_random/virtio-rng.c | 105 +++++++++++++++++++++++-------------
+ drivers/s390/kvm/virtio_ccw.c | 49 ++++++++++++-----
+ drivers/virtio/virtio_ring.c | 15 ++++++
+ include/linux/virtio.h | 2 +
+ 4 files changed, 121 insertions(+), 50 deletions(-)
+Merging input/next (61721c88b8d8 Input: omap-keypad - remove platform data support)
+$ git merge input/next
+Removing include/linux/platform_data/omap4-keypad.h
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/mouse/Kconfig
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging arch/arm/mach-s5pv210/mach-goni.c
+Removing arch/arm/mach-omap2/omap4-keypad.h
+Auto-merging arch/arm/boot/dts/omap3-n900.dts
+Merge made by the 'recursive' strategy.
+ .../{gpio/gpio_keys.txt => input/gpio-keys.txt} | 0
+ .../devicetree/bindings/input/st-keyscan.txt | 60 ++
+ .../bindings/input/touchscreen/sun4i.txt | 20 +
+ .../bindings/input/touchscreen/touchscreen.txt | 27 +
+ .../bindings/input/touchscreen/tsc2005.txt | 42 +
+ arch/arm/boot/dts/omap3-n900.dts | 17 +-
+ arch/arm/mach-omap2/devices.c | 33 -
+ arch/arm/mach-omap2/omap4-keypad.h | 8 -
+ arch/arm/mach-s5pv210/mach-goni.c | 8 -
+ drivers/input/evdev.c | 18 -
+ drivers/input/input-polldev.c | 131 +++-
+ drivers/input/keyboard/Kconfig | 13 +-
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/adp5520-keys.c | 32 +-
+ drivers/input/keyboard/clps711x-keypad.c | 2 +-
+ drivers/input/keyboard/gpio_keys.c | 145 ++--
+ drivers/input/keyboard/gpio_keys_polled.c | 100 +--
+ drivers/input/keyboard/imx_keypad.c | 2 +-
+ drivers/input/keyboard/jornada680_kbd.c | 36 +-
+ drivers/input/keyboard/mcs_touchkey.c | 2 +-
+ drivers/input/keyboard/omap4-keypad.c | 32 +-
+ drivers/input/keyboard/st-keyscan.c | 274 +++++++
+ drivers/input/keyboard/tc3589x-keypad.c | 66 +-
+ drivers/input/misc/88pm860x_onkey.c | 40 +-
+ drivers/input/misc/Kconfig | 2 +-
+ drivers/input/misc/ab8500-ponkey.c | 54 +-
+ drivers/input/misc/gpio-beeper.c | 29 +-
+ drivers/input/misc/ims-pcu.c | 1 +
+ drivers/input/misc/max8925_onkey.c | 55 +-
+ drivers/input/misc/pmic8xxx-pwrkey.c | 8 +-
+ drivers/input/misc/rotary_encoder.c | 2 +-
+ drivers/input/misc/soc_button_array.c | 1 -
+ drivers/input/misc/twl6040-vibra.c | 83 +-
+ drivers/input/mouse/Kconfig | 2 +-
+ drivers/input/serio/apbps2.c | 2 +-
+ drivers/input/serio/olpc_apsp.c | 2 +-
+ drivers/input/tablet/wacom_sys.c | 19 +
+ drivers/input/tablet/wacom_wac.c | 92 ++-
+ drivers/input/tablet/wacom_wac.h | 6 +
+ drivers/input/touchscreen/88pm860x-ts.c | 41 +-
+ drivers/input/touchscreen/Kconfig | 18 +-
+ drivers/input/touchscreen/Makefile | 2 +
+ drivers/input/touchscreen/ad7877.c | 5 -
+ drivers/input/touchscreen/ads7846.c | 2 +-
+ drivers/input/touchscreen/atmel_mxt_ts.c | 862 ++++++++++++++-------
+ drivers/input/touchscreen/auo-pixcir-ts.c | 2 +-
+ drivers/input/touchscreen/da9034-ts.c | 39 +-
+ drivers/input/touchscreen/egalax_ts.c | 2 +-
+ drivers/input/touchscreen/intel-mid-touch.c | 47 +-
+ drivers/input/touchscreen/lpc32xx_ts.c | 2 +-
+ drivers/input/touchscreen/mcs5000_ts.c | 83 +-
+ drivers/input/touchscreen/mms114.c | 4 +-
+ drivers/input/touchscreen/of_touchscreen.c | 45 ++
+ drivers/input/touchscreen/pixcir_i2c_ts.c | 281 ++++++-
+ drivers/input/touchscreen/sun4i-ts.c | 339 ++++++++
+ drivers/input/touchscreen/tsc2005.c | 157 +++-
+ drivers/input/touchscreen/zforce_ts.c | 2 +-
+ drivers/platform/chrome/chromeos_laptop.c | 33 +-
+ include/linux/gpio_keys.h | 48 +-
+ include/linux/i2c/atmel_mxt_ts.h | 27 +-
+ include/linux/input-polldev.h | 3 +
+ include/linux/input/pixcir_ts.h | 44 +-
+ include/linux/input/touchscreen.h | 22 +
+ include/linux/platform_data/omap4-keypad.h | 13 -
+ 64 files changed, 2471 insertions(+), 1119 deletions(-)
+ rename Documentation/devicetree/bindings/{gpio/gpio_keys.txt => input/gpio-keys.txt} (100%)
+ create mode 100644 Documentation/devicetree/bindings/input/st-keyscan.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt
+ create mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2005.txt
+ delete mode 100644 arch/arm/mach-omap2/omap4-keypad.h
+ create mode 100644 drivers/input/keyboard/st-keyscan.c
+ create mode 100644 drivers/input/touchscreen/of_touchscreen.c
+ create mode 100644 drivers/input/touchscreen/sun4i-ts.c
+ create mode 100644 include/linux/input/touchscreen.h
+ delete mode 100644 include/linux/platform_data/omap4-keypad.h
+Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12)
+$ git merge input-mt/for-next
+Already up-to-date.
+Merging block/for-next (6478f7987951 Merge branch 'for-3.16/core' into for-next)
+$ git merge block/for-next
+Resolved 'drivers/block/virtio_blk.c' using previous resolution.
+Auto-merging include/linux/blk_types.h
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/mtd/ubi/block.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Auto-merging drivers/char/random.c
+Auto-merging drivers/block/virtio_blk.c
+CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
+Auto-merging drivers/block/floppy.c
+Removing drivers/block/drbd/drbd_wrappers.h
+Auto-merging drivers/block/ataflop.c
+Auto-merging block/bio.c
+Auto-merging block/bio-integrity.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master bf89e85223b2] Merge remote-tracking branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/filesystems.tmpl | 2 +-
+ block/Makefile | 7 +-
+ {fs => block}/bio-integrity.c | 2 +-
+ {fs => block}/bio.c | 11 +-
+ block/blk-core.c | 113 ++-
+ block/blk-flush.c | 36 +-
+ block/blk-iopoll.c | 4 +-
+ block/blk-lib.c | 4 +-
+ block/blk-map.c | 3 -
+ block/blk-merge.c | 28 +-
+ block/blk-mq-cpu.c | 17 +-
+ block/blk-mq-cpumap.c | 27 +-
+ block/blk-mq-sysfs.c | 58 +-
+ block/blk-mq-tag.c | 561 +++++++++++--
+ block/blk-mq-tag.h | 71 +-
+ block/blk-mq.c | 1404 ++++++++++++++++++++++----------
+ block/blk-mq.h | 26 +-
+ block/blk-sysfs.c | 47 +-
+ block/blk-throttle.c | 10 +-
+ block/blk-timeout.c | 60 +-
+ block/blk.h | 9 +-
+ {mm => block}/bounce.c | 0
+ block/bsg.c | 2 +-
+ block/cfq-iosched.c | 4 +-
+ {fs => block}/ioprio.c | 0
+ block/scsi_ioctl.c | 4 -
+ drivers/block/amiflop.c | 2 +-
+ drivers/block/ataflop.c | 2 +-
+ drivers/block/cciss.c | 6 +-
+ drivers/block/drbd/drbd_actlog.c | 23 +-
+ drivers/block/drbd/drbd_int.h | 92 ++-
+ drivers/block/drbd/drbd_main.c | 28 +-
+ drivers/block/drbd/drbd_nl.c | 485 ++++++-----
+ drivers/block/drbd/drbd_nla.c | 1 -
+ drivers/block/drbd/drbd_proc.c | 2 +-
+ drivers/block/drbd/drbd_protocol.h | 12 +
+ drivers/block/drbd/drbd_receiver.c | 196 +++--
+ drivers/block/drbd/drbd_req.c | 74 +-
+ drivers/block/drbd/drbd_req.h | 6 +-
+ drivers/block/drbd/drbd_state.c | 38 +-
+ drivers/block/drbd/drbd_worker.c | 107 +--
+ drivers/block/drbd/drbd_wrappers.h | 54 --
+ drivers/block/floppy.c | 20 +-
+ drivers/block/hd.c | 10 +-
+ drivers/block/mg_disk.c | 12 +-
+ drivers/block/mtip32xx/mtip32xx.c | 1089 ++++++++++---------------
+ drivers/block/mtip32xx/mtip32xx.h | 32 +-
+ drivers/block/null_blk.c | 119 +--
+ drivers/block/paride/pcd.c | 2 +-
+ drivers/block/paride/pd.c | 4 +-
+ drivers/block/paride/pf.c | 4 +-
+ drivers/block/skd_main.c | 12 +-
+ drivers/block/swim.c | 2 +-
+ drivers/block/swim3.c | 6 +-
+ drivers/block/virtio_blk.c | 75 +-
+ drivers/block/xen-blkback/common.h | 4 +-
+ drivers/block/xen-blkback/xenbus.c | 53 +-
+ drivers/block/xen-blkfront.c | 44 +-
+ drivers/block/xsysace.c | 4 +-
+ drivers/block/z2ram.c | 6 +-
+ drivers/cdrom/cdrom.c | 1357 +++++++++++++++---------------
+ drivers/cdrom/gdrom.c | 2 +-
+ drivers/char/random.c | 1 +
+ drivers/ide/ide-disk.c | 5 +-
+ drivers/md/dm.c | 1 -
+ drivers/mtd/mtd_blkdevs.c | 3 +-
+ drivers/mtd/ubi/block.c | 2 +-
+ drivers/sbus/char/jsflash.c | 2 +-
+ drivers/scsi/scsi_lib.c | 5 +-
+ drivers/scsi/sd.c | 13 +-
+ fs/Makefile | 3 +-
+ include/linux/bio.h | 2 +-
+ include/linux/blk-mq.h | 100 ++-
+ include/linux/blk_types.h | 2 +
+ include/linux/blkdev.h | 36 +-
+ include/xen/interface/io/blkif.h | 2 +-
+ mm/Makefile | 1 -
+ 77 files changed, 3881 insertions(+), 2792 deletions(-)
+ rename {fs => block}/bio-integrity.c (99%)
+ rename {fs => block}/bio.c (99%)
+ rename {mm => block}/bounce.c (100%)
+ rename {fs => block}/ioprio.c (100%)
+ delete mode 100644 drivers/block/drbd/drbd_wrappers.h
+Merging device-mapper/for-next (4d5b14d850cb dm crypt: remove io_pending refcount member from dm_crypt_io)
+$ git merge device-mapper/for-next
+Auto-merging drivers/md/dm.c
+Auto-merging block/bio.c
+Merge made by the 'recursive' strategy.
+ Documentation/device-mapper/thin-provisioning.txt | 5 +-
+ block/bio.c | 3 +-
+ drivers/md/dm-bio-prison.c | 4 +-
+ drivers/md/dm-bio-prison.h | 2 +-
+ drivers/md/dm-cache-target.c | 2 +
+ drivers/md/dm-crypt.c | 267 ++++++++--------------
+ drivers/md/dm-mpath.c | 14 +-
+ drivers/md/dm-snap.c | 67 ++++--
+ drivers/md/dm-thin.c | 102 ++++++---
+ drivers/md/dm.c | 69 ++++--
+ include/linux/device-mapper.h | 2 +
+ 11 files changed, 287 insertions(+), 250 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 (06732b84b4cf mmc: sdhci-of-esdhc: Fixup compile error)
+$ git merge mmc/mmc-next
+Resolved 'include/linux/omap-dma.h' using previous resolution.
+Auto-merging include/linux/omap-dma.h
+CONFLICT (content): Merge conflict in include/linux/omap-dma.h
+Auto-merging drivers/mmc/host/rtsx_pci_sdmmc.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7054c6777d15] Merge remote-tracking branch 'mmc/mmc-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/mmc/mmc.txt | 2 +
+ .../devicetree/bindings/mmc/moxa,moxart-mmc.txt | 30 +
+ .../devicetree/bindings/mmc/sunxi-mmc.txt | 43 +
+ .../devicetree/bindings/mmc/synopsys-dw-mshc.txt | 5 -
+ MAINTAINERS | 3 +-
+ drivers/mmc/core/bus.c | 9 +-
+ drivers/mmc/core/core.c | 52 +-
+ drivers/mmc/core/debugfs.c | 8 +-
+ drivers/mmc/core/host.c | 4 +
+ drivers/mmc/core/mmc.c | 678 +++++----
+ drivers/mmc/core/sd.c | 28 +-
+ drivers/mmc/core/sd.h | 1 -
+ drivers/mmc/core/sdio.c | 53 +-
+ drivers/mmc/core/sdio_bus.c | 14 +-
+ drivers/mmc/core/sdio_irq.c | 41 +-
+ drivers/mmc/core/slot-gpio.c | 4 +-
+ drivers/mmc/host/Kconfig | 25 +-
+ drivers/mmc/host/Makefile | 3 +
+ drivers/mmc/host/atmel-mci.c | 13 +-
+ drivers/mmc/host/dw_mmc-exynos.c | 7 +-
+ drivers/mmc/host/dw_mmc.c | 180 +--
+ drivers/mmc/host/dw_mmc.h | 2 -
+ drivers/mmc/host/jz4740_mmc.c | 11 +-
+ drivers/mmc/host/mmci.c | 6 +-
+ drivers/mmc/host/moxart-mmc.c | 730 ++++++++++
+ drivers/mmc/host/mvsdio.c | 20 +-
+ drivers/mmc/host/mxcmmc.c | 140 +-
+ drivers/mmc/host/mxs-mmc.c | 7 +
+ drivers/mmc/host/omap.c | 10 +-
+ drivers/mmc/host/omap_hsmmc.c | 61 +-
+ drivers/mmc/host/rtsx_pci_sdmmc.c | 5 +
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 1456 ++++++++++++++++++++
+ drivers/mmc/host/sdhci-acpi.c | 8 +
+ drivers/mmc/host/sdhci-bcm-kona.c | 4 +
+ drivers/mmc/host/sdhci-bcm2835.c | 4 +
+ drivers/mmc/host/sdhci-cns3xxx.c | 13 +-
+ drivers/mmc/host/sdhci-dove.c | 78 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 83 +-
+ drivers/mmc/host/sdhci-esdhc.h | 4 +-
+ drivers/mmc/host/sdhci-of-arasan.c | 4 +
+ drivers/mmc/host/sdhci-of-esdhc.c | 70 +-
+ drivers/mmc/host/sdhci-of-hlwd.c | 4 +
+ drivers/mmc/host/sdhci-pci-o2micro.c | 78 +-
+ drivers/mmc/host/sdhci-pci-o2micro.h | 3 +
+ drivers/mmc/host/sdhci-pci.c | 9 +-
+ drivers/mmc/host/sdhci-pltfm.c | 4 +
+ drivers/mmc/host/sdhci-pxav2.c | 14 +-
+ drivers/mmc/host/sdhci-pxav3.c | 13 +-
+ drivers/mmc/host/sdhci-s3c.c | 39 +-
+ drivers/mmc/host/sdhci-sirf.c | 4 +
+ drivers/mmc/host/sdhci-spear.c | 5 +-
+ drivers/mmc/host/sdhci-tegra.c | 67 +-
+ drivers/mmc/host/sdhci.c | 749 +++++-----
+ drivers/mmc/host/sdhci.h | 20 +-
+ drivers/mmc/host/sh_mmcif.c | 9 +-
+ drivers/mmc/host/sunxi-mmc.c | 1049 ++++++++++++++
+ drivers/mmc/host/wmt-sdmmc.c | 2 +-
+ drivers/net/wireless/rsi/rsi_91x_sdio.c | 4 +-
+ include/linux/mmc/card.h | 29 +-
+ include/linux/mmc/dw_mmc.h | 14 -
+ include/linux/mmc/host.h | 59 +-
+ include/linux/mmc/mmc.h | 23 +-
+ include/linux/mmc/sdhci.h | 15 +-
+ include/linux/omap-dma.h | 19 +-
+ include/linux/omap-dmaengine.h | 21 +
+ 65 files changed, 4777 insertions(+), 1395 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mmc/moxa,moxart-mmc.txt
+ create mode 100644 Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
+ create mode 100644 drivers/mmc/host/moxart-mmc.c
+ create mode 100644 drivers/mmc/host/rtsx_usb_sdmmc.c
+ create mode 100644 drivers/mmc/host/sunxi-mmc.c
+ create mode 100644 include/linux/omap-dmaengine.h
+$ git am -3 ../patches/0001-dmaengine-omap-fix-for-code-movement.patch
+Applying: dmaengine: omap: fix for code movement
+$ git reset HEAD^
+Unstaged changes after reset:
+M include/linux/omap-dmaengine.h
+$ git add -A .
+$ git commit -v -a --amend
+[master 1157d7f1f116] Merge remote-tracking branch 'mmc/mmc-next'
+$ git revert 19b7f796c375
+[master 47d673b7fd55] Revert "mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs"
+ 4 files changed, 1100 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/mmc/sunxi-mmc.txt
+ delete mode 100644 drivers/mmc/host/sunxi-mmc.c
+Merging mmc-uh/next (5080a08d0f8a mmc: mmci: Enforce max frequency configuration through DT)
+$ git merge mmc-uh/next
+Auto-merging drivers/mmc/host/mmci.c
+Removing arch/arm/mach-ux500/board-mop500-sdi.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mmc/mmci.txt | 54 ++++-
+ arch/arm/boot/dts/ste-ccu9540.dts | 6 +-
+ arch/arm/boot/dts/ste-href.dtsi | 19 +-
+ arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 4 +-
+ arch/arm/boot/dts/ste-snowball.dts | 4 +-
+ arch/arm/boot/dts/ste-u300.dts | 4 +-
+ arch/arm/mach-ux500/Makefile | 3 +-
+ arch/arm/mach-ux500/board-mop500-sdi.c | 166 --------------
+ arch/arm/mach-ux500/board-mop500.h | 5 -
+ arch/arm/mach-ux500/cpu-db8500.c | 4 -
+ drivers/mmc/host/mmci.c | 300 +++++++------------------
+ drivers/mmc/host/mmci.h | 14 +-
+ include/linux/amba/mmci.h | 25 ---
+ 13 files changed, 168 insertions(+), 440 deletions(-)
+ delete mode 100644 arch/arm/mach-ux500/board-mop500-sdi.c
+Merging kgdb/kgdb-next (6bedf31c25dd kdb: Remove unhandled ssb command)
+$ git merge kgdb/kgdb-next
+Merge made by the 'recursive' strategy.
+Merging slab/for-next (201ed0edb712 Merge branch 'slab/next' into for-next)
+$ git merge slab/for-next
+Merge made by the 'recursive' strategy.
+ mm/slab_common.c | 2 +-
+ mm/slub.c | 16 +++++++++-------
+ 2 files changed, 10 insertions(+), 8 deletions(-)
+Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1)
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next (d592a9969141 raid5: add an option to avoid copy data from bio to stripe cache)
+$ git merge md/for-next
+Merge made by the 'recursive' strategy.
+ drivers/md/bitmap.c | 6 +-
+ drivers/md/md.c | 17 +++++-
+ drivers/md/raid5.c | 154 +++++++++++++++++++++++++++++++++++++++++-----------
+ drivers/md/raid5.h | 4 +-
+ 4 files changed, 140 insertions(+), 41 deletions(-)
+Merging mfd/master (90b128ed1557 Merge tag 'mfd-lee-3.13-3' of git://git.linaro.org/people/ljones/mfd)
+$ git merge mfd/master
+Already up-to-date.
+Merging mfd-lj/for-mfd-next (9f9b201a97e9 mfd: tps65218: Terminate of match table)
+$ git merge mfd-lj/for-mfd-next
+Resolved 'drivers/mmc/host/rtsx_usb_sdmmc.c' using previous resolution.
+Removing include/linux/mfd/pm8xxx/core.h
+Auto-merging drivers/mmc/host/rtsx_usb_sdmmc.c
+CONFLICT (add/add): Merge conflict in drivers/mmc/host/rtsx_usb_sdmmc.c
+Auto-merging drivers/mfd/syscon.c
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/i2c/busses/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9030b834e515] Merge remote-tracking branch 'mfd-lj/for-mfd-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt | 39 +
+ Documentation/devicetree/bindings/mfd/bcm590xx.txt | 4 +-
+ .../devicetree/bindings/mfd/sun6i-prcm.txt | 59 +
+ .../bindings/mfd/ti-keystone-devctrl.txt | 19 +
+ Documentation/devicetree/bindings/mfd/twl6040.txt | 2 +
+ drivers/extcon/Kconfig | 4 +-
+ drivers/extcon/extcon-max14577.c | 174 +-
+ drivers/gpio/gpio-stmpe.c | 18 +-
+ drivers/i2c/busses/Kconfig | 9 +
+ drivers/i2c/busses/Makefile | 1 +
+ drivers/i2c/busses/i2c-cros-ec-tunnel.c | 318 +++
+ drivers/memstick/host/Kconfig | 10 +
+ drivers/memstick/host/Makefile | 1 +
+ drivers/memstick/host/rtsx_usb_ms.c | 839 ++++++++
+ drivers/mfd/Kconfig | 37 +-
+ drivers/mfd/Makefile | 3 +
+ drivers/mfd/abx500-core.c | 16 -
+ drivers/mfd/arizona-core.c | 42 +-
+ drivers/mfd/arizona-irq.c | 2 +-
+ drivers/mfd/as3711.c | 2 +-
+ drivers/mfd/axp20x.c | 258 +++
+ drivers/mfd/bcm590xx.c | 69 +-
+ drivers/mfd/cros_ec.c | 10 +-
+ drivers/mfd/cros_ec_spi.c | 67 +-
+ drivers/mfd/db8500-prcmu.c | 5 +-
+ drivers/mfd/ipaq-micro.c | 482 +++++
+ drivers/mfd/kempld-core.c | 129 +-
+ drivers/mfd/lp3943.c | 2 +-
+ drivers/mfd/lpc_ich.c | 1 +
+ drivers/mfd/max14577.c | 347 +++-
+ drivers/mfd/max77686.c | 2 +-
+ drivers/mfd/max77693.c | 2 +-
+ drivers/mfd/max8907.c | 2 +-
+ drivers/mfd/max8997.c | 2 +-
+ drivers/mfd/max8998.c | 2 +-
+ drivers/mfd/mc13xxx-core.c | 26 +-
+ drivers/mfd/mfd-core.c | 11 +-
+ drivers/mfd/omap-usb-host.c | 2 +-
+ drivers/mfd/pm8921-core.c | 123 +-
+ drivers/mfd/rdc321x-southbridge.c | 2 +-
+ drivers/mfd/rtsx_usb.c | 16 +-
+ drivers/mfd/sec-core.c | 88 +-
+ drivers/mfd/sec-irq.c | 2 +-
+ drivers/mfd/sm501.c | 2 +-
+ drivers/mfd/stmpe-i2c.c | 30 +-
+ drivers/mfd/stmpe.c | 33 +-
+ drivers/mfd/stmpe.h | 2 +-
+ drivers/mfd/sun6i-prcm.c | 134 ++
+ drivers/mfd/syscon.c | 6 +-
+ drivers/mfd/tps6507x.c | 2 +-
+ drivers/mfd/tps65090.c | 41 +-
+ drivers/mfd/tps65218.c | 1 +
+ drivers/mfd/tps6586x.c | 2 +-
+ drivers/mfd/tps65910.c | 2 +-
+ drivers/mfd/twl6040.c | 42 +-
+ drivers/mfd/wm5102-tables.c | 2 +
+ drivers/mfd/wm5110-tables.c | 14 +-
+ drivers/mfd/wm8400-core.c | 2 +-
+ drivers/mfd/wm8997-tables.c | 14 +-
+ drivers/power/tps65090-charger.c | 11 -
+ drivers/regulator/Kconfig | 7 +-
+ drivers/regulator/arizona-ldo1.c | 57 +
+ drivers/regulator/arizona-micsupp.c | 37 +
+ drivers/regulator/bcm590xx-regulator.c | 92 +-
+ drivers/regulator/max14577.c | 277 ++-
+ drivers/rtc/rtc-s5m.c | 75 +-
+ include/linux/mfd/abx500.h | 1 -
+ include/linux/mfd/arizona/core.h | 3 +
+ include/linux/mfd/arizona/registers.h | 14 +-
+ include/linux/mfd/axp20x.h | 180 ++
+ include/linux/mfd/bcm590xx.h | 9 +-
+ include/linux/mfd/cros_ec.h | 4 +-
+ include/linux/mfd/cros_ec_commands.h | 1128 +++++++++-
+ include/linux/mfd/ipaq-micro.h | 148 ++
+ include/linux/mfd/kempld.h | 4 +
+ include/linux/mfd/max14577-private.h | 222 +-
+ include/linux/mfd/max14577.h | 19 +-
+ include/linux/mfd/mc13xxx.h | 22 +-
+ include/linux/mfd/palmas.h | 2166 ++++++++++----------
+ include/linux/mfd/pm8xxx/core.h | 81 -
+ include/linux/mfd/rdc321x.h | 2 +-
+ include/linux/mfd/samsung/core.h | 35 +-
+ include/linux/mfd/stmpe.h | 19 +-
+ include/linux/mfd/syscon.h | 2 +
+ include/linux/mfd/tps65090.h | 14 +
+ include/linux/mfd/tps65218.h | 1 -
+ include/linux/mfd/twl6040.h | 3 +
+ 87 files changed, 6305 insertions(+), 1906 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-cros-ec-tunnel.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/sun6i-prcm.txt
+ create mode 100644 Documentation/devicetree/bindings/mfd/ti-keystone-devctrl.txt
+ create mode 100644 drivers/i2c/busses/i2c-cros-ec-tunnel.c
+ create mode 100644 drivers/memstick/host/rtsx_usb_ms.c
+ create mode 100644 drivers/mfd/axp20x.c
+ create mode 100644 drivers/mfd/ipaq-micro.c
+ create mode 100644 drivers/mfd/sun6i-prcm.c
+ create mode 100644 include/linux/mfd/axp20x.h
+ create mode 100644 include/linux/mfd/ipaq-micro.h
+ delete mode 100644 include/linux/mfd/pm8xxx/core.h
+Merging battery/master (ac323d8d8070 power: max17040: Fix NULL pointer dereference when there is no platform_data)
+$ git merge battery/master
+Already up-to-date.
+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 (e1f0cbfb4603 Merge branches '3.16/fbdev', '3.16/fbdev-omap' and '3.16/omap-dss-dt' into for-next)
+$ git merge omap_dss2/for-next
+Recorded preimage for 'arch/arm/boot/dts/am437x-gp-evm.dts'
+Auto-merging include/linux/omap-dma.h
+Removing drivers/video/fbdev/omap2/dss/venc_panel.c
+Auto-merging arch/arm/boot/dts/omap5.dtsi
+Auto-merging arch/arm/boot/dts/omap4.dtsi
+Auto-merging arch/arm/boot/dts/omap3-ldp.dts
+Auto-merging arch/arm/boot/dts/omap3-evm-37xx.dts
+Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/am437x-gp-evm.dts
+Auto-merging arch/arm/boot/dts/am4372.dtsi
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/boot/dts/am437x-gp-evm.dts'.
+[master a9e747e7ca45] Merge remote-tracking branch 'omap_dss2/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/video/hdmi-connector.txt | 1 +
+ .../bindings/video/lgphilips,lb035q02.txt | 33 +
+ .../devicetree/bindings/video/panel-dpi.txt | 45 +
+ .../bindings/video/sharp,ls037v7dw01.txt | 43 +
+ .../devicetree/bindings/video/ti,omap4-dss.txt | 4 +
+ .../devicetree/bindings/video/ti,omap5-dss.txt | 96 +++
+ .../bindings/video/toppoly,td028ttec1.txt | 30 +
+ .../devicetree/bindings/video/tpo,td043mtea1.txt | 33 +
+ arch/arm/boot/dts/am4372.dtsi | 29 +
+ arch/arm/boot/dts/am437x-gp-evm.dts | 97 +++
+ arch/arm/boot/dts/am43x-epos-evm.dts | 96 +++
+ arch/arm/boot/dts/omap3-evm-37xx.dts | 50 ++
+ arch/arm/boot/dts/omap3-evm-common.dtsi | 26 +
+ arch/arm/boot/dts/omap3-gta04.dts | 90 ++
+ arch/arm/boot/dts/omap3-ldp.dts | 29 +-
+ arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 1 +
+ .../boot/dts/omap3-overo-chestnut43-common.dtsi | 1 +
+ arch/arm/boot/dts/omap3-overo-common-dvi.dtsi | 111 +++
+ arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 165 ++++
+ arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 178 ++++
+ arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 1 +
+ arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 1 +
+ arch/arm/boot/dts/omap3-overo-summit-common.dtsi | 1 +
+ arch/arm/boot/dts/omap3-overo-tobi-common.dtsi | 1 +
+ .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 71 ++
+ arch/arm/boot/dts/omap4-duovero-parlor.dts | 44 +
+ arch/arm/boot/dts/omap4.dtsi | 2 +
+ arch/arm/boot/dts/omap5-uevm.dts | 87 ++
+ arch/arm/boot/dts/omap5.dtsi | 62 ++
+ arch/arm/mach-omap2/display.c | 62 +-
+ drivers/video/console/fbcon.c | 1 +
+ drivers/video/fbdev/Kconfig | 11 +-
+ drivers/video/fbdev/bf54x-lq043fb.c | 2 -
+ drivers/video/fbdev/core/fbmem.c | 7 +-
+ drivers/video/fbdev/core/fbmon.c | 9 +-
+ drivers/video/fbdev/da8xx-fb.c | 14 +
+ drivers/video/fbdev/exynos/Kconfig | 2 +-
+ drivers/video/fbdev/gbefb.c | 2 +-
+ drivers/video/fbdev/grvga.c | 3 +-
+ drivers/video/fbdev/matrox/matroxfb_base.h | 2 +-
+ drivers/video/fbdev/mbx/Makefile | 3 +-
+ drivers/video/fbdev/mbx/mbxdebugfs.c | 2 +-
+ drivers/video/fbdev/mbx/mbxfb.c | 2 +
+ drivers/video/fbdev/mmp/Kconfig | 2 +-
+ drivers/video/fbdev/mmp/fb/mmpfb.c | 9 +-
+ drivers/video/fbdev/mmp/hw/Kconfig | 6 +-
+ drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 32 -
+ drivers/video/fbdev/mx3fb.c | 85 +-
+ drivers/video/fbdev/omap/Kconfig | 9 +
+ drivers/video/fbdev/omap/Makefile | 23 +-
+ drivers/video/fbdev/omap/lcdc.c | 67 +-
+ drivers/video/fbdev/omap/omapfb_main.c | 1 +
+ drivers/video/fbdev/omap2/Makefile | 2 +-
+ .../fbdev/omap2/displays-new/connector-hdmi.c | 25 +-
+ drivers/video/fbdev/omap2/displays-new/panel-dpi.c | 95 ++-
+ .../omap2/displays-new/panel-lgphilips-lb035q02.c | 77 +-
+ .../omap2/displays-new/panel-nec-nl8048hl11.c | 45 +-
+ .../omap2/displays-new/panel-sharp-ls037v7dw01.c | 210 +++--
+ .../omap2/displays-new/panel-tpo-td028ttec1.c | 33 +-
+ .../omap2/displays-new/panel-tpo-td043mtea1.c | 42 +-
+ drivers/video/fbdev/omap2/dss/Kconfig | 26 +-
+ drivers/video/fbdev/omap2/dss/Makefile | 7 +-
+ drivers/video/fbdev/omap2/dss/core.c | 6 +
+ drivers/video/fbdev/omap2/dss/dispc.c | 22 +-
+ drivers/video/fbdev/omap2/dss/dpi.c | 4 +
+ drivers/video/fbdev/omap2/dss/dsi.c | 18 +
+ drivers/video/fbdev/omap2/dss/dss.c | 20 +-
+ drivers/video/fbdev/omap2/dss/dss.h | 3 +
+ drivers/video/fbdev/omap2/dss/dss_features.c | 70 +-
+ drivers/video/fbdev/omap2/dss/hdmi.h | 17 +-
+ drivers/video/fbdev/omap2/dss/hdmi4.c | 113 ++-
+ drivers/video/fbdev/omap2/dss/hdmi4_core.c | 28 +-
+ drivers/video/fbdev/omap2/dss/hdmi5.c | 829 ++++++++++++++++++
+ drivers/video/fbdev/omap2/dss/hdmi5_core.c | 922 +++++++++++++++++++++
+ drivers/video/fbdev/omap2/dss/hdmi5_core.h | 306 +++++++
+ drivers/video/fbdev/omap2/dss/hdmi_common.c | 41 +
+ drivers/video/fbdev/omap2/dss/hdmi_phy.c | 265 ++++--
+ drivers/video/fbdev/omap2/dss/hdmi_pll.c | 107 ++-
+ drivers/video/fbdev/omap2/dss/hdmi_wp.c | 29 +-
+ drivers/video/fbdev/omap2/dss/omapdss-boot-init.c | 229 +++++
+ drivers/video/fbdev/omap2/dss/venc_panel.c | 232 ------
+ drivers/video/fbdev/pxa3xx-gcu.c | 6 +-
+ drivers/video/fbdev/s3fb.c | 3 +-
+ drivers/video/fbdev/wm8505fb.c | 2 +-
+ drivers/video/of_display_timing.c | 10 +-
+ include/linux/fb.h | 3 +-
+ include/linux/omap-dma.h | 2 +-
+ include/video/omapdss.h | 8 +-
+ 88 files changed, 4909 insertions(+), 732 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/video/lgphilips,lb035q02.txt
+ create mode 100644 Documentation/devicetree/bindings/video/panel-dpi.txt
+ create mode 100644 Documentation/devicetree/bindings/video/sharp,ls037v7dw01.txt
+ create mode 100644 Documentation/devicetree/bindings/video/ti,omap5-dss.txt
+ create mode 100644 Documentation/devicetree/bindings/video/toppoly,td028ttec1.txt
+ create mode 100644 Documentation/devicetree/bindings/video/tpo,td043mtea1.txt
+ create mode 100644 arch/arm/boot/dts/omap3-overo-common-dvi.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+ create mode 100644 arch/arm/boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5.c
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5_core.c
+ create mode 100644 drivers/video/fbdev/omap2/dss/hdmi5_core.h
+ create mode 100644 drivers/video/fbdev/omap2/dss/omapdss-boot-init.c
+ delete mode 100644 drivers/video/fbdev/omap2/dss/venc_panel.c
+Merging regulator/for-next (be8a3a859d34 Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218' and 'regulator/topic/tps6586x' into regulator-next)
+$ git merge regulator/for-next
+Auto-merging drivers/regulator/vexpress.c
+Auto-merging drivers/regulator/Kconfig
+Auto-merging drivers/mfd/tps6586x.c
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/mfd/s2mps11.txt | 14 +
+ .../devicetree/bindings/regulator/ltc3589.txt | 99 ++++
+ .../devicetree/bindings/regulator/tps65090.txt | 4 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ drivers/mfd/tps6586x.c | 4 +
+ drivers/regulator/Kconfig | 15 +
+ drivers/regulator/Makefile | 2 +
+ drivers/regulator/anatop-regulator.c | 2 +-
+ drivers/regulator/arizona-ldo1.c | 1 +
+ drivers/regulator/arizona-micsupp.c | 1 +
+ drivers/regulator/axp20x-regulator.c | 285 +++++++++++
+ drivers/regulator/core.c | 25 +-
+ drivers/regulator/devres.c | 6 +-
+ drivers/regulator/fixed.c | 13 +-
+ drivers/regulator/ltc3589.c | 554 +++++++++++++++++++++
+ drivers/regulator/max8952.c | 2 +-
+ drivers/regulator/of_regulator.c | 31 +-
+ drivers/regulator/palmas-regulator.c | 160 +-----
+ drivers/regulator/pbias-regulator.c | 25 +-
+ drivers/regulator/pfuze100-regulator.c | 8 +
+ drivers/regulator/s2mpa01.c | 19 +-
+ drivers/regulator/s2mps11.c | 113 ++++-
+ drivers/regulator/s5m8767.c | 37 +-
+ drivers/regulator/st-pwm.c | 2 +-
+ drivers/regulator/tps65090-regulator.c | 214 +++++++-
+ drivers/regulator/tps65217-regulator.c | 4 +-
+ drivers/regulator/tps65218-regulator.c | 37 +-
+ drivers/regulator/tps6586x-regulator.c | 68 ++-
+ drivers/regulator/vexpress.c | 2 +-
+ include/linux/mfd/core.h | 2 +-
+ include/linux/mfd/samsung/s2mps14.h | 2 +
+ include/linux/mfd/tps65090.h | 5 +
+ include/linux/mfd/tps65217.h | 1 -
+ include/linux/mfd/tps6586x.h | 2 +
+ include/linux/regulator/consumer.h | 42 +-
+ 35 files changed, 1495 insertions(+), 307 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/ltc3589.txt
+ create mode 100644 drivers/regulator/axp20x-regulator.c
+ create mode 100644 drivers/regulator/ltc3589.c
+Merging security/next (2fd4e6698f08 Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next)
+$ git merge security/next
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging include/linux/security.h
+Auto-merging Documentation/security/Smack.txt
+Merge made by the 'recursive' strategy.
+ Documentation/security/Smack.txt | 10 ++
+ include/linux/key.h | 11 ++
+ include/linux/security.h | 6 +-
+ security/capability.c | 2 +-
+ security/keys/internal.h | 11 +-
+ security/keys/key.c | 6 +-
+ security/keys/keyctl.c | 44 +++----
+ security/keys/keyring.c | 8 +-
+ security/keys/permission.c | 4 +-
+ security/keys/persistent.c | 4 +-
+ security/keys/proc.c | 2 +-
+ security/keys/sysctl.c | 2 +-
+ security/security.c | 2 +-
+ security/selinux/hooks.c | 2 +-
+ security/smack/smack.h | 16 ++-
+ security/smack/smack_access.c | 38 ++++--
+ security/smack/smack_lsm.c | 249 +++++++++++++++++++++++++++++----------
+ security/smack/smackfs.c | 76 +++++++++++-
+ 18 files changed, 367 insertions(+), 126 deletions(-)
+Merging selinux/next (47dd0b76ace9 selinux: conditionally reschedule in hashtab_insert while loading selinux policy)
+$ git merge selinux/next
+Auto-merging security/selinux/hooks.c
+Merge made by the 'recursive' strategy.
+ security/selinux/avc.c | 7 ++++++-
+ security/selinux/hooks.c | 11 +++++++----
+ security/selinux/include/avc.h | 4 ++--
+ security/selinux/ss/hashtab.c | 3 +++
+ security/selinux/ss/mls.c | 2 ++
+ 5 files changed, 20 insertions(+), 7 deletions(-)
+Merging lblnet/next (d8ec26d7f828 Linux 3.13)
+$ git merge lblnet/next
+Already up-to-date.
+Merging watchdog/master (ce7f15b26c9d watchdog: sp805: Set watchdog_device->timeout from ->set_timeout())
+$ git merge watchdog/master
+Removing drivers/watchdog/w83697ug_wdt.c
+Removing drivers/watchdog/w83697hf_wdt.c
+Auto-merging arch/powerpc/kernel/setup-common.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/watchdog/marvel.txt | 7 +
+ arch/powerpc/kernel/setup-common.c | 27 --
+ drivers/watchdog/Kconfig | 36 +-
+ drivers/watchdog/Makefile | 2 -
+ drivers/watchdog/ath79_wdt.c | 16 +-
+ drivers/watchdog/booke_wdt.c | 51 ++-
+ drivers/watchdog/imx2_wdt.c | 320 +++++++-------
+ drivers/watchdog/kempld_wdt.c | 2 +-
+ drivers/watchdog/of_xilinx_wdt.c | 2 +-
+ drivers/watchdog/orion_wdt.c | 213 ++++++++--
+ drivers/watchdog/shwdt.c | 2 -
+ drivers/watchdog/sp805_wdt.c | 4 +-
+ drivers/watchdog/sunxi_wdt.c | 22 +-
+ drivers/watchdog/via_wdt.c | 2 +-
+ drivers/watchdog/w83627hf_wdt.c | 15 +-
+ drivers/watchdog/w83697hf_wdt.c | 460 ---------------------
+ drivers/watchdog/w83697ug_wdt.c | 397 ------------------
+ 17 files changed, 417 insertions(+), 1161 deletions(-)
+ delete mode 100644 drivers/watchdog/w83697hf_wdt.c
+ delete mode 100644 drivers/watchdog/w83697ug_wdt.c
+Merging iommu/next (8005d3942e6f Merge branches 'iommu/fixes', 'arm/omap', 'arm/smmu', 'arm/shmobile', 'x86/amd', 'arm/exynos', 'arm/renesas' and 'ppc/pamu' into next)
+$ git merge iommu/next
+Resolved 'drivers/iommu/exynos-iommu.c' using previous resolution.
+Auto-merging drivers/iommu/exynos-iommu.c
+CONFLICT (content): Merge conflict in drivers/iommu/exynos-iommu.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e18b8cabc1ef] Merge remote-tracking branch 'iommu/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iommu/samsung,sysmmu.txt | 70 ++
+ drivers/iommu/Kconfig | 26 +-
+ drivers/iommu/Makefile | 1 +
+ drivers/iommu/amd_iommu.c | 6 -
+ drivers/iommu/amd_iommu_v2.c | 184 ++-
+ drivers/iommu/arm-smmu.c | 4 +-
+ drivers/iommu/exynos-iommu.c | 1038 +++++++++-------
+ drivers/iommu/fsl_pamu.c | 3 +-
+ drivers/iommu/ipmmu-vmsa.c | 1255 ++++++++++++++++++++
+ drivers/iommu/shmobile-ipmmu.c | 20 +-
+ include/linux/platform_data/ipmmu-vmsa.h | 24 +
+ 11 files changed, 2068 insertions(+), 563 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iommu/samsung,sysmmu.txt
+ create mode 100644 drivers/iommu/ipmmu-vmsa.c
+ create mode 100644 include/linux/platform_data/ipmmu-vmsa.h
+Merging dwmw2-iommu/master (5ae0566a0fff iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors)
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging vfio/next (4379d2ae1528 vfio: always select ANON_INODES)
+$ git merge vfio/next
+Already up-to-date.
+Merging osd/linux-next (ce5d36aac26c ore: Support for raid 6)
+$ git merge osd/linux-next
+Merge made by the 'recursive' strategy.
+ fs/exofs/Kconfig.ore | 2 ++
+ fs/exofs/ore.c | 100 ++++++++++++++++++++++++++++++++-------------------
+ fs/exofs/ore_raid.c | 56 +++++++++++++++--------------
+ fs/exofs/ore_raid.h | 21 ++---------
+ 4 files changed, 98 insertions(+), 81 deletions(-)
+Merging jc_docs/docs-next (5c050fb96380 docs: update the development process document)
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging trivial/for-next (31789538e3ba staging: go7007: remove reference to CONFIG_KMOD)
+$ git merge trivial/for-next
+Resolved 'Documentation/devicetree/bindings/arm/omap/omap.txt' using previous resolution.
+Auto-merging scripts/mod/modpost.c
+Auto-merging lib/Kconfig.debug
+Auto-merging include/linux/of_platform.h
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/net/wireless/ath/ath6kl/wmi.h
+Auto-merging drivers/net/wireless/ath/ath10k/wmi.h
+Auto-merging arch/arm64/include/asm/pgtable.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Auto-merging Documentation/networking/can.txt
+Auto-merging Documentation/hid/uhid.txt
+Auto-merging Documentation/gpio/consumer.txt
+Auto-merging Documentation/filesystems/proc.txt
+Auto-merging Documentation/edac.txt
+Auto-merging Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
+Auto-merging Documentation/devicetree/bindings/mtd/gpmc-nand.txt
+Auto-merging Documentation/devicetree/bindings/arm/omap/omap.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/arm/omap/omap.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c7611eb0e03d] Merge remote-tracking branch 'trivial/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/Changes | 5 +++++
+ Documentation/DMA-attributes.txt | 2 +-
+ Documentation/devicetree/bindings/arm/omap/omap.txt | 2 +-
+ Documentation/devicetree/bindings/bus/mvebu-mbus.txt | 2 +-
+ Documentation/devicetree/bindings/dma/dma.txt | 4 ++--
+ Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 2 +-
+ Documentation/devicetree/bindings/gpio/gpio-mcp23s08.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/k3-dw-mshc.txt | 2 +-
+ Documentation/devicetree/bindings/mmc/samsung-sdhci.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nand.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-nor.txt | 2 +-
+ Documentation/devicetree/bindings/mtd/gpmc-onenand.txt | 2 +-
+ .../devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt | 12 ++++++------
+ Documentation/devicetree/bindings/powerpc/4xx/reboot.txt | 2 +-
+ Documentation/devicetree/bindings/powerpc/fsl/dcsr.txt | 2 +-
+ Documentation/devicetree/bindings/regulator/regulator.txt | 2 +-
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +-
+ Documentation/dma-buf-sharing.txt | 6 +++---
+ Documentation/dynamic-debug-howto.txt | 2 +-
+ Documentation/edac.txt | 2 +-
+ Documentation/fb/sm501.txt | 2 +-
+ Documentation/fb/sstfb.txt | 2 +-
+ Documentation/filesystems/proc.txt | 7 ++++---
+ Documentation/filesystems/sharedsubtree.txt | 2 +-
+ Documentation/gpio/consumer.txt | 2 +-
+ Documentation/hid/uhid.txt | 2 +-
+ Documentation/input/alps.txt | 2 +-
+ Documentation/input/input.txt | 2 +-
+ Documentation/mtd/nand/pxa3xx-nand.txt | 2 +-
+ Documentation/networking/can.txt | 2 +-
+ Documentation/networking/dccp.txt | 2 +-
+ Documentation/powerpc/transactional_memory.txt | 2 +-
+ Documentation/printk-formats.txt | 4 ++--
+ Documentation/rbtree.txt | 2 +-
+ Documentation/rfkill.txt | 2 +-
+ Documentation/robust-futexes.txt | 2 +-
+ Documentation/s390/monreader.txt | 2 +-
+ Documentation/security/Yama.txt | 2 +-
+ Documentation/sound/alsa/ALSA-Configuration.txt | 4 ++--
+ Documentation/trace/events.txt | 2 +-
+ Documentation/usb/mass-storage.txt | 2 +-
+ Documentation/virtual/kvm/api.txt | 2 +-
+ Documentation/vm/transhuge.txt | 4 ++--
+ Documentation/x86/earlyprintk.txt | 2 +-
+ Documentation/x86/i386/IO-APIC.txt | 2 +-
+ arch/arm64/include/asm/pgtable.h | 2 +-
+ drivers/base/dma-buf.c | 2 +-
+ drivers/gpu/drm/exynos/exynos_drm_ipp.c | 2 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 4 ++--
+ drivers/net/wireless/ath/ath6kl/wmi.h | 2 +-
+ drivers/of/base.c | 4 ++--
+ drivers/pci/pci.c | 6 +++---
+ drivers/scsi/aic7xxx/aic79xx.h | 2 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 10 ----------
+ drivers/staging/media/go7007/go7007.txt | 1 -
+ include/linux/of_platform.h | 2 +-
+ include/net/wimax.h | 4 ++--
+ lib/Kconfig.debug | 4 ++--
+ mm/dmapool.c | 4 ++--
+ scripts/mod/modpost.c | 2 +-
+ 60 files changed, 83 insertions(+), 88 deletions(-)
+Merging audit/master (3efe33f5d2da audit: x86: drop arch from __audit_syscall_entry() interface)
+$ git merge audit/master
+Resolved 'arch/mips/include/asm/syscall.h' using previous resolution.
+Resolved 'arch/mips/kernel/ptrace.c' using previous resolution.
+Resolved 'arch/x86/Kconfig' using previous resolution.
+Resolved 'kernel/audit.c' using previous resolution.
+Auto-merging kernel/audit.c
+CONFLICT (content): Merge conflict in kernel/audit.c
+Auto-merging include/uapi/linux/audit.h
+Auto-merging arch/x86/kernel/ptrace.c
+Auto-merging arch/x86/Kconfig
+CONFLICT (content): Merge conflict in arch/x86/Kconfig
+Auto-merging arch/um/kernel/ptrace.c
+Auto-merging arch/s390/kernel/ptrace.c
+Auto-merging arch/mips/kernel/ptrace.c
+CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c
+Auto-merging arch/mips/include/asm/syscall.h
+CONFLICT (content): Merge conflict in arch/mips/include/asm/syscall.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d232c030b635] Merge remote-tracking branch 'audit/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/syscall.h | 11 +++++++++++
+ arch/alpha/kernel/ptrace.c | 2 +-
+ arch/arm/kernel/ptrace.c | 4 ++--
+ arch/ia64/include/asm/syscall.h | 6 ++++++
+ arch/ia64/kernel/ptrace.c | 2 +-
+ arch/microblaze/include/asm/syscall.h | 5 +++++
+ arch/microblaze/kernel/ptrace.c | 3 +--
+ arch/mips/include/asm/syscall.h | 2 +-
+ arch/mips/kernel/ptrace.c | 4 +---
+ arch/openrisc/include/asm/syscall.h | 5 +++++
+ arch/openrisc/kernel/ptrace.c | 3 +--
+ arch/parisc/include/asm/syscall.h | 11 +++++++++++
+ arch/parisc/kernel/ptrace.c | 9 +++------
+ arch/powerpc/include/asm/syscall.h | 6 ++++++
+ arch/powerpc/kernel/ptrace.c | 7 ++-----
+ arch/s390/kernel/ptrace.c | 4 +---
+ arch/sh/include/asm/syscall_32.h | 10 ++++++++++
+ arch/sh/include/asm/syscall_64.h | 14 ++++++++++++++
+ arch/sh/kernel/ptrace_32.c | 14 +-------------
+ arch/sh/kernel/ptrace_64.c | 17 +----------------
+ arch/sparc/include/asm/syscall.h | 7 +++++++
+ arch/sparc/include/asm/thread_info_32.h | 2 ++
+ arch/sparc/include/asm/thread_info_64.h | 2 ++
+ arch/sparc/kernel/ptrace_64.c | 9 ++-------
+ arch/um/kernel/ptrace.c | 3 +--
+ arch/x86/ia32/ia32entry.S | 12 ++++++------
+ arch/x86/kernel/entry_32.S | 11 +++++------
+ arch/x86/kernel/entry_64.S | 11 +++++------
+ arch/x86/kernel/ptrace.c | 8 ++------
+ arch/x86/um/asm/ptrace.h | 4 ----
+ arch/x86/um/asm/syscall.h | 15 +++++++++++++++
+ arch/xtensa/kernel/ptrace.c | 2 +-
+ include/asm-generic/syscall.h | 2 +-
+ include/linux/audit.h | 11 ++++++-----
+ include/uapi/linux/audit.h | 14 +-------------
+ kernel/auditsc.c | 17 +++++++----------
+ 36 files changed, 147 insertions(+), 122 deletions(-)
+ create mode 100644 arch/alpha/include/asm/syscall.h
+ create mode 100644 arch/x86/um/asm/syscall.h
+Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls)
+$ git merge fsnotify/for-next
+Already up-to-date.
+Merging devicetree/devicetree/next (08cf78ed41fe of_pci_irq: kill useless variable in of_irq_parse_pci())
+$ git merge devicetree/devicetree/next
+Resolved 'arch/arm/mach-vexpress/platsmp.c' using previous resolution.
+Auto-merging include/linux/of_address.h
+Auto-merging drivers/of/platform.c
+Auto-merging drivers/of/base.c
+Auto-merging drivers/of/address.c
+Auto-merging arch/powerpc/platforms/pseries/setup.c
+Auto-merging arch/powerpc/mm/hash_utils_64.c
+Auto-merging arch/powerpc/kernel/fadump.c
+Auto-merging arch/powerpc/kernel/epapr_paravirt.c
+Auto-merging arch/mips/cavium-octeon/setup.c
+Auto-merging arch/arm/mach-vexpress/platsmp.c
+CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/platsmp.c
+Auto-merging arch/arm/mach-exynos/exynos.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 93d2d0602e16] Merge remote-tracking branch 'devicetree/devicetree/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arc/include/asm/sections.h | 1 -
+ arch/arc/kernel/devtree.c | 2 +-
+ arch/arm/include/asm/prom.h | 2 -
+ arch/arm/kernel/devtree.c | 34 +--
+ arch/arm/mach-exynos/exynos.c | 2 +-
+ arch/arm/mm/init.c | 1 -
+ arch/arm/plat-samsung/s5p-dev-mfc.c | 4 +-
+ arch/arm64/mm/init.c | 21 --
+ arch/c6x/kernel/setup.c | 4 +-
+ arch/metag/kernel/setup.c | 4 -
+ arch/microblaze/kernel/prom.c | 39 +--
+ arch/mips/cavium-octeon/setup.c | 20 +-
+ arch/mips/include/asm/mips-boards/generic.h | 4 -
+ arch/mips/include/asm/prom.h | 6 +-
+ arch/mips/kernel/prom.c | 2 +-
+ arch/mips/lantiq/prom.c | 15 +-
+ arch/mips/lantiq/prom.h | 2 -
+ arch/mips/mti-sead3/sead3-setup.c | 8 +-
+ arch/mips/netlogic/xlp/dt.c | 19 +-
+ arch/mips/ralink/of.c | 29 +-
+ arch/openrisc/kernel/vmlinux.h | 2 -
+ arch/powerpc/include/asm/dcr-mmio.h | 4 -
+ arch/powerpc/include/asm/prom.h | 39 +++
+ arch/powerpc/kernel/Makefile | 1 +
+ arch/powerpc/kernel/epapr_paravirt.c | 2 +-
+ arch/powerpc/kernel/fadump.c | 4 +-
+ arch/powerpc/kernel/prom.c | 82 ++----
+ arch/powerpc/kernel/rtas.c | 2 +-
+ arch/powerpc/mm/hash_utils_64.c | 22 +-
+ arch/powerpc/platforms/52xx/efika.c | 4 +-
+ arch/powerpc/platforms/chrp/setup.c | 4 +-
+ arch/powerpc/platforms/powernv/opal.c | 12 +-
+ arch/powerpc/platforms/pseries/setup.c | 4 +-
+ arch/powerpc/sysdev/dcr.c | 6 +-
+ arch/x86/kernel/devicetree.c | 12 +-
+ arch/xtensa/kernel/setup.c | 3 +-
+ drivers/base/platform.c | 7 +-
+ drivers/of/Kconfig | 1 +
+ drivers/of/Makefile | 2 +
+ drivers/of/address.c | 24 +-
+ drivers/of/base.c | 115 ++++++--
+ drivers/of/fdt.c | 402 ++++++++++-----------------
+ drivers/of/irq.c | 22 ++
+ drivers/of/of_pci_irq.c | 8 +-
+ drivers/of/of_reserved_mem.c | 4 +-
+ drivers/of/platform.c | 76 ++---
+ drivers/of/selftest.c | 80 +++++-
+ drivers/of/testcase-data/testcases.dtsi | 1 +
+ drivers/of/testcase-data/tests-phandle.dtsi | 6 +-
+ drivers/of/testcase-data/tests-platform.dtsi | 35 +++
+ include/linux/of_address.h | 1 -
+ include/linux/of_fdt.h | 63 +----
+ include/linux/of_irq.h | 5 +
+ include/linux/string.h | 3 +
+ lib/string.c | 18 ++
+ 55 files changed, 567 insertions(+), 728 deletions(-)
+ create mode 100644 drivers/of/testcase-data/tests-platform.dtsi
+$ git am -3 ../patches/0001-of-fix-bad-merge-of-drivers-of-base.c.patch
+Applying: of: fix bad merge of drivers/of/base.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/of/base.c
+$ git add -A .
+$ git commit -v -a --amend
+[master da7185371982] Merge remote-tracking branch 'devicetree/devicetree/next'
+Merging dt-rh/for-next (728dd198aa54 Merge branch 'earlycon-dt' into for-next)
+$ git merge dt-rh/for-next
+Resolved 'Documentation/kernel-parameters.txt' using previous resolution.
+Auto-merging include/linux/of.h
+Auto-merging include/linux/clk-provider.h
+Auto-merging arch/x86/Kconfig
+Removing arch/arm64/kernel/early_printk.c
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 07f8b9b64cbf] Merge remote-tracking branch 'dt-rh/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 33 +
+ Documentation/devicetree/bindings/usb/dwc2.txt | 2 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/kernel-parameters.txt | 9 +
+ arch/arm/kernel/devtree.c | 11 +-
+ arch/arm/mach-imx/clk-imx35.c | 4 +-
+ arch/arm64/Kconfig | 3 +
+ arch/arm64/Kconfig.debug | 9 -
+ arch/arm64/kernel/Makefile | 1 -
+ arch/arm64/kernel/early_printk.c | 156 ---
+ arch/x86/Kconfig | 3 +
+ drivers/bluetooth/hci_ldisc.c | 24 +-
+ drivers/bluetooth/hci_uart.h | 1 +
+ drivers/clk/rockchip/clk-rockchip.c | 3 +-
+ drivers/clk/sunxi/clk-sunxi.c | 5 +-
+ drivers/clk/ti/gate.c | 2 +-
+ drivers/clocksource/clksrc-of.c | 2 +-
+ drivers/irqchip/irq-mxs.c | 4 +-
+ drivers/irqchip/irq-s3c24xx.c | 6 +-
+ drivers/irqchip/irqchip.c | 6 +-
+ drivers/irqchip/irqchip.h | 7 +-
+ drivers/of/Makefile | 2 +
+ drivers/of/fdt.c | 56 +
+ drivers/of/fdt_address.c | 241 ++++
+ drivers/of/of_reserved_mem.c | 2 +-
+ drivers/tty/serial/8250/8250_core.c | 5 -
+ drivers/tty/serial/8250/8250_dw.c | 81 +-
+ drivers/tty/serial/8250/8250_early.c | 138 +--
+ drivers/tty/serial/8250/Kconfig | 6 +-
+ drivers/tty/serial/Kconfig | 47 +-
+ drivers/tty/serial/Makefile | 5 +
+ drivers/tty/serial/amba-pl011.c | 31 +-
+ drivers/tty/serial/earlycon-arm-semihost.c | 61 +
+ drivers/tty/serial/earlycon.c | 172 +++
+ drivers/tty/serial/men_z135_uart.c | 866 +++++++++++++
+ drivers/tty/serial/mux.c | 4 +-
+ drivers/tty/serial/omap-serial.c | 94 +-
+ drivers/tty/serial/pch_uart.c | 13 +-
+ drivers/tty/serial/pxa.c | 5 -
+ drivers/tty/serial/sc16is7xx.c | 1280 ++++++++++++++++++++
+ drivers/tty/serial/serial_core.c | 3 +
+ drivers/tty/serial/serial_txx9.c | 5 -
+ drivers/tty/serial/xilinx_uartps.c | 1129 +++++++++--------
+ include/asm-generic/vmlinux.lds.h | 60 +-
+ include/linux/clk-provider.h | 5 +-
+ include/linux/clocksource.h | 16 +-
+ include/linux/of.h | 22 +
+ include/linux/of_fdt.h | 1 +
+ include/linux/of_reserved_mem.h | 22 +-
+ include/linux/serial_core.h | 22 +
+ include/linux/tty_ldisc.h | 5 +-
+ include/uapi/linux/serial_core.h | 8 +-
+ include/uapi/linux/serial_reg.h | 2 +-
+ 53 files changed, 3600 insertions(+), 1101 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt
+ delete mode 100644 arch/arm64/kernel/early_printk.c
+ create mode 100644 drivers/of/fdt_address.c
+ create mode 100644 drivers/tty/serial/earlycon-arm-semihost.c
+ create mode 100644 drivers/tty/serial/earlycon.c
+ create mode 100644 drivers/tty/serial/men_z135_uart.c
+ create mode 100644 drivers/tty/serial/sc16is7xx.c
+Merging spi/for-next (4bc9db0cac38 Merge remote-tracking branches 'spi/topic/id-const', 'spi/topic/oom', 'spi/topic/pxa2xx', 'spi/topic/rspi', 'spi/topic/sirf' and 'spi/topic/workqueue' into spi-next)
+$ git merge spi/for-next
+Auto-merging include/linux/spi/adi_spi3.h
+Auto-merging drivers/spi/spi-adi-v3.c
+Auto-merging Documentation/devicetree/bindings/spi/spi-bus.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/spi/fsl-spi.txt | 6 +
+ Documentation/devicetree/bindings/spi/spi-bus.txt | 2 +
+ .../devicetree/bindings/spi/spi-cadence.txt | 31 +
+ Documentation/devicetree/bindings/spi/spi-dw.txt | 24 +
+ arch/blackfin/mach-bf609/boards/ezkit.c | 22 +-
+ arch/blackfin/mach-bf609/clock.c | 7 +
+ drivers/spi/Kconfig | 13 +-
+ drivers/spi/Makefile | 3 +-
+ drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} | 433 ++++++-------
+ drivers/spi/spi-ath79.c | 1 -
+ drivers/spi/spi-atmel.c | 9 +-
+ drivers/spi/spi-bcm63xx-hsspi.c | 1 -
+ drivers/spi/spi-bcm63xx.c | 1 -
+ drivers/spi/spi-cadence.c | 673 +++++++++++++++++++++
+ drivers/spi/spi-dw-mmio.c | 22 +
+ drivers/spi/spi-dw.c | 197 +-----
+ drivers/spi/spi-dw.h | 24 +-
+ drivers/spi/spi-falcon.c | 1 -
+ drivers/spi/spi-fsl-dspi.c | 2 +-
+ drivers/spi/spi-fsl-espi.c | 40 +-
+ drivers/spi/spi-fsl-lib.c | 6 -
+ drivers/spi/spi-fsl-lib.h | 1 -
+ drivers/spi/spi-fsl-spi.c | 2 +-
+ drivers/spi/spi-gpio.c | 2 +-
+ drivers/spi/spi-nuc900.c | 1 -
+ drivers/spi/spi-omap-uwire.c | 1 -
+ drivers/spi/spi-pl022.c | 13 +-
+ drivers/spi/spi-pxa2xx-pci.c | 76 ++-
+ drivers/spi/spi-pxa2xx.c | 11 +-
+ drivers/spi/spi-qup.c | 6 +-
+ drivers/spi/spi-rspi.c | 8 +-
+ drivers/spi/spi-s3c24xx.c | 15 +-
+ drivers/spi/spi-s3c64xx.c | 6 +-
+ drivers/spi/spi-sh-msiof.c | 4 +-
+ drivers/spi/spi-sh-sci.c | 1 -
+ drivers/spi/spi-sirf.c | 305 ++++++----
+ drivers/spi/spi-sun4i.c | 1 -
+ drivers/spi/spi-sun6i.c | 1 -
+ drivers/spi/spi-tegra114.c | 2 +-
+ drivers/spi/spi-tegra20-sflash.c | 2 +-
+ drivers/spi/spi-tegra20-slink.c | 2 +-
+ drivers/spi/spi-tle62x0.c | 4 +-
+ drivers/spi/spi-topcliff-pch.c | 5 +-
+ drivers/spi/spi.c | 22 +-
+ .../bfin_spi3.h => include/linux/spi/adi_spi3.h | 20 +-
+ 45 files changed, 1365 insertions(+), 664 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-cadence.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-dw.txt
+ rename drivers/spi/{spi-bfin-v3.c => spi-adi-v3.c} (60%)
+ create mode 100644 drivers/spi/spi-cadence.c
+ rename arch/blackfin/include/asm/bfin_spi3.h => include/linux/spi/adi_spi3.h (97%)
+Merging tip/auto-latest (aec36eaab600 Merge branch 'x86/x32')
+$ git merge tip/auto-latest
+Resolved 'arch/arm64/include/asm/thread_info.h' using previous resolution.
+Resolved 'arch/arm64/mm/mmu.c' using previous resolution.
+Resolved 'drivers/block/mtip32xx/mtip32xx.c' using previous resolution.
+Removing tools/virtio/linux/types.h
+Auto-merging tools/testing/selftests/rcutorture/bin/parse-torture.sh
+Removing tools/perf/util/types.h
+Removing tools/perf/util/include/linux/types.h
+Removing tools/perf/util/include/linux/export.h
+Removing tools/perf/config/feature-checks/test-on-exit.c
+Removing tools/lib/lockdep/uinclude/linux/export.h
+Auto-merging tools/include/linux/types.h
+Auto-merging tools/include/linux/export.h
+Auto-merging net/unix/af_unix.c
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging net/ipv4/inetpeer.c
+Auto-merging net/core/dev.c
+Auto-merging net/bluetooth/hci_event.c
+Auto-merging mm/filemap.c
+Auto-merging lib/Makefile
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging init/main.c
+Auto-merging include/linux/uprobes.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/netdevice.h
+Auto-merging include/asm-generic/vmlinux.lds.h
+Auto-merging fs/nfs/write.c
+Auto-merging fs/nfs/pnfs.h
+Auto-merging fs/nfs/pnfs.c
+Auto-merging fs/nfs/pagelist.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/nfs/filelayout/filelayoutdev.c
+Auto-merging fs/gfs2/sys.c
+Auto-merging fs/gfs2/recovery.c
+Auto-merging fs/gfs2/glops.c
+Auto-merging fs/ext4/resize.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging drivers/net/wireless/ti/wlcore/main.c
+Auto-merging drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
+Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c
+Auto-merging drivers/net/ethernet/freescale/gianfar.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb4/sge.c
+Auto-merging drivers/net/ethernet/chelsio/cxgb/cxgb2.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+Auto-merging drivers/md/raid5.c
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-snap.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/drm_irq.c
+Auto-merging drivers/firewire/ohci.c
+Auto-merging drivers/block/mtip32xx/mtip32xx.c
+CONFLICT (content): Merge conflict in drivers/block/mtip32xx/mtip32xx.c
+Auto-merging block/blk-iopoll.c
+Removing arch/x86/vdso/vdsox32.S
+Removing arch/x86/vdso/vdso32.S
+Removing arch/x86/vdso/vdso.S
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/entry_32.S
+Removing arch/x86/include/asm/vdso32.h
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/tile/include/asm/thread_info.h
+Auto-merging arch/sparc/include/asm/bitops_64.h
+Auto-merging arch/sparc/include/asm/bitops_32.h
+Auto-merging arch/sparc/include/asm/atomic_64.h
+Auto-merging arch/sparc/include/asm/atomic_32.h
+Auto-merging arch/s390/pci/pci.c
+Auto-merging arch/s390/kernel/topology.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/mips/kernel/irq.c
+Auto-merging arch/arm64/mm/mmu.c
+CONFLICT (content): Merge conflict in arch/arm64/mm/mmu.c
+Auto-merging arch/arm64/kernel/setup.c
+Auto-merging arch/arm64/kernel/head.S
+Auto-merging arch/arm64/kernel/Makefile
+Auto-merging arch/arm64/include/asm/thread_info.h
+CONFLICT (content): Merge conflict in arch/arm64/include/asm/thread_info.h
+Auto-merging arch/arm64/include/asm/barrier.h
+Auto-merging arch/arm64/include/asm/atomic.h
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/kernel/topology.c
+Auto-merging arch/arm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master afe0ddb9027b] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/00-INDEX | 2 +
+ Documentation/RCU/checklist.txt | 12 +-
+ Documentation/RCU/rcu_dereference.txt | 371 +++++++++
+ Documentation/RCU/stallwarn.txt | 2 +-
+ Documentation/RCU/whatisRCU.txt | 55 +-
+ Documentation/arm/00-INDEX | 2 +
+ Documentation/arm/uefi.txt | 64 ++
+ Documentation/arm64/booting.txt | 4 +
+ Documentation/atomic_ops.txt | 31 +-
+ Documentation/efi-stub.txt | 33 +-
+ Documentation/kprobes.txt | 16 +-
+ Documentation/memory-barriers.txt | 42 +-
+ Documentation/timers/timer_stats.txt | 6 +-
+ Documentation/x86/x86_64/mm.txt | 2 +
+ arch/alpha/include/asm/atomic.h | 5 -
+ arch/alpha/include/asm/bitops.h | 3 -
+ arch/alpha/include/asm/thread_info.h | 4 +-
+ arch/arc/include/asm/atomic.h | 5 -
+ arch/arc/include/asm/bitops.h | 5 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/atomic.h | 5 -
+ arch/arm/include/asm/barrier.h | 3 +
+ arch/arm/include/asm/bitops.h | 4 +-
+ arch/arm/kernel/topology.c | 26 +
+ arch/arm/mach-iop13xx/include/mach/irqs.h | 2 -
+ arch/arm/mach-iop13xx/include/mach/time.h | 3 +
+ arch/arm/mach-iop13xx/iq81340mc.c | 1 +
+ arch/arm/mach-iop13xx/iq81340sc.c | 1 +
+ arch/arm/mach-iop13xx/msi.c | 51 +-
+ arch/arm/mach-iop13xx/setup.c | 1 +
+ arch/arm/mach-iop13xx/tpmi.c | 1 +
+ arch/arm64/Kconfig | 16 +
+ arch/arm64/include/asm/atomic.h | 5 -
+ arch/arm64/include/asm/barrier.h | 3 +
+ arch/arm64/include/asm/bitops.h | 9 -
+ arch/arm64/include/asm/efi.h | 14 +
+ arch/arm64/include/asm/mmu.h | 2 +
+ arch/arm64/include/asm/thread_info.h | 2 -
+ arch/arm64/kernel/Makefile | 3 +
+ arch/arm64/kernel/efi-entry.S | 109 +++
+ arch/arm64/kernel/efi-stub.c | 81 ++
+ arch/arm64/kernel/efi.c | 466 ++++++++++++
+ arch/arm64/kernel/head.S | 112 +++
+ arch/arm64/kernel/setup.c | 5 +
+ arch/arm64/mm/mmu.c | 65 +-
+ arch/avr32/include/asm/atomic.h | 5 -
+ arch/avr32/include/asm/bitops.h | 9 +-
+ arch/blackfin/include/asm/barrier.h | 3 +
+ arch/blackfin/include/asm/bitops.h | 14 +-
+ arch/c6x/include/asm/bitops.h | 8 +-
+ arch/cris/include/asm/atomic.h | 8 +-
+ arch/cris/include/asm/bitops.h | 9 +-
+ arch/frv/include/asm/atomic.h | 7 +-
+ arch/frv/include/asm/bitops.h | 6 -
+ arch/hexagon/include/asm/atomic.h | 6 +-
+ arch/hexagon/include/asm/bitops.h | 4 +-
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/include/asm/atomic.h | 7 +-
+ arch/ia64/include/asm/barrier.h | 3 +
+ arch/ia64/include/asm/bitops.h | 9 +-
+ arch/ia64/include/asm/hw_irq.h | 1 -
+ arch/ia64/include/asm/irq.h | 3 +
+ arch/ia64/include/asm/irq_remapping.h | 2 +
+ arch/ia64/include/asm/thread_info.h | 3 +-
+ arch/ia64/include/asm/topology.h | 24 -
+ arch/ia64/include/uapi/asm/cmpxchg.h | 9 +
+ arch/ia64/kernel/iosapic.c | 2 +-
+ arch/ia64/kernel/irq_ia64.c | 15 +-
+ arch/m32r/include/asm/atomic.h | 7 +-
+ arch/m32r/include/asm/bitops.h | 6 +-
+ arch/m68k/include/asm/atomic.h | 8 +-
+ arch/m68k/include/asm/bitops.h | 7 +-
+ arch/metag/include/asm/atomic.h | 6 +-
+ arch/metag/include/asm/barrier.h | 3 +
+ arch/metag/include/asm/bitops.h | 6 -
+ arch/metag/include/asm/thread_info.h | 6 +-
+ arch/mips/include/asm/atomic.h | 9 -
+ arch/mips/include/asm/barrier.h | 3 +
+ arch/mips/include/asm/bitops.h | 11 +-
+ arch/mips/kernel/irq.c | 4 +-
+ arch/mips/pci/msi-xlp.c | 10 +-
+ arch/mips/pci/pci-xlr.c | 10 +-
+ arch/mn10300/include/asm/atomic.h | 7 +-
+ arch/mn10300/include/asm/bitops.h | 4 +-
+ arch/mn10300/mm/tlb-smp.c | 4 +-
+ arch/openrisc/include/asm/bitops.h | 9 +-
+ arch/parisc/include/asm/atomic.h | 6 +-
+ arch/parisc/include/asm/bitops.h | 4 +-
+ arch/powerpc/include/asm/atomic.h | 6 +-
+ arch/powerpc/include/asm/barrier.h | 3 +
+ arch/powerpc/include/asm/bitops.h | 6 +-
+ arch/powerpc/kernel/crash.c | 2 +-
+ arch/powerpc/kernel/smp.c | 31 +-
+ arch/s390/include/asm/atomic.h | 5 -
+ arch/s390/include/asm/barrier.h | 5 +-
+ arch/s390/include/asm/topology.h | 13 +-
+ arch/s390/kernel/irq.c | 5 +-
+ arch/s390/kernel/topology.c | 20 +
+ arch/s390/pci/pci.c | 6 +-
+ arch/score/include/asm/bitops.h | 7 +-
+ arch/sh/include/asm/atomic.h | 6 +-
+ arch/sh/include/asm/bitops.h | 7 +-
+ arch/sparc/include/asm/atomic_32.h | 7 +-
+ arch/sparc/include/asm/atomic_64.h | 7 +-
+ arch/sparc/include/asm/barrier_64.h | 3 +
+ arch/sparc/include/asm/bitops_32.h | 3 -
+ arch/sparc/include/asm/bitops_64.h | 4 +-
+ arch/tile/Kconfig | 2 +
+ arch/tile/include/asm/atomic_32.h | 10 -
+ arch/tile/include/asm/atomic_64.h | 6 -
+ arch/tile/include/asm/barrier.h | 14 +
+ arch/tile/include/asm/bitops.h | 1 +
+ arch/tile/include/asm/bitops_32.h | 8 +-
+ arch/tile/include/asm/bitops_64.h | 4 -
+ arch/tile/include/asm/irq.h | 6 +-
+ arch/tile/include/asm/thread_info.h | 3 +-
+ arch/tile/include/asm/topology.h | 33 -
+ arch/tile/kernel/irq.c | 40 +-
+ arch/tile/kernel/pci_gx.c | 17 +-
+ arch/x86/Kconfig | 26 +-
+ arch/x86/boot/compressed/eboot.c | 3 +-
+ arch/x86/boot/compressed/head_64.S | 2 +-
+ arch/x86/boot/compressed/string.c | 4 -
+ arch/x86/boot/string.c | 9 +-
+ arch/x86/ia32/ia32_signal.c | 8 +-
+ arch/x86/include/asm/asm.h | 7 +
+ arch/x86/include/asm/atomic.h | 7 +-
+ arch/x86/include/asm/barrier.h | 4 +
+ arch/x86/include/asm/bitops.h | 6 +-
+ arch/x86/include/asm/cmdline.h | 6 +
+ arch/x86/include/asm/efi.h | 100 +--
+ arch/x86/include/asm/elf.h | 35 +-
+ arch/x86/include/asm/espfix.h | 16 +
+ arch/x86/include/asm/fixmap.h | 11 +-
+ arch/x86/include/asm/fpu-internal.h | 10 +-
+ arch/x86/include/asm/hw_irq.h | 4 +-
+ arch/x86/include/asm/io_apic.h | 2 -
+ arch/x86/include/asm/irq_remapping.h | 3 +
+ arch/x86/include/asm/kprobes.h | 2 +
+ arch/x86/include/asm/microcode.h | 1 +
+ arch/x86/include/asm/mmu.h | 2 +-
+ arch/x86/include/asm/pgtable_64_types.h | 2 +
+ arch/x86/include/asm/proto.h | 2 -
+ arch/x86/include/asm/setup.h | 2 +
+ arch/x86/include/asm/sync_bitops.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 4 +-
+ arch/x86/include/asm/traps.h | 3 +-
+ arch/x86/include/asm/uprobes.h | 20 +-
+ arch/x86/include/asm/uv/uv_hub.h | 12 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 42 +-
+ arch/x86/include/asm/vdso.h | 78 +-
+ arch/x86/include/asm/vdso32.h | 11 -
+ arch/x86/include/asm/vvar.h | 20 +-
+ arch/x86/include/uapi/asm/vsyscall.h | 7 +-
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/alternative.c | 3 +-
+ arch/x86/kernel/apic/hw_nmi.c | 5 +-
+ arch/x86/kernel/apic/io_apic.c | 158 +---
+ arch/x86/kernel/apic/x2apic_uv_x.c | 26 +-
+ arch/x86/kernel/apm_32.c | 11 -
+ arch/x86/kernel/cpu/common.c | 37 +
+ arch/x86/kernel/cpu/microcode/core.c | 6 +
+ arch/x86/kernel/cpu/microcode/core_early.c | 37 +
+ arch/x86/kernel/cpu/mshyperv.c | 9 -
+ arch/x86/kernel/cpu/perf_event.c | 4 +-
+ arch/x86/kernel/cpu/perf_event_amd_ibs.c | 3 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 22 +-
+ arch/x86/kernel/dumpstack.c | 9 +-
+ arch/x86/kernel/entry_32.S | 50 +-
+ arch/x86/kernel/entry_64.S | 284 +++----
+ arch/x86/kernel/espfix_64.c | 209 +++++
+ arch/x86/kernel/hpet.c | 8 +-
+ arch/x86/kernel/hw_breakpoint.c | 5 +-
+ arch/x86/kernel/i8259.c | 20 +-
+ arch/x86/kernel/irq.c | 13 +-
+ arch/x86/kernel/kprobes/core.c | 128 ++--
+ arch/x86/kernel/kprobes/ftrace.c | 17 +-
+ arch/x86/kernel/kprobes/opt.c | 32 +-
+ arch/x86/kernel/kvm.c | 4 +-
+ arch/x86/kernel/ldt.c | 10 +-
+ arch/x86/kernel/nmi.c | 18 +-
+ arch/x86/kernel/paravirt.c | 6 +
+ arch/x86/kernel/process_64.c | 7 +-
+ arch/x86/kernel/signal.c | 6 +-
+ arch/x86/kernel/smpboot.c | 7 +
+ arch/x86/kernel/traps.c | 145 ++--
+ arch/x86/kernel/uprobes.c | 843 +++++++++++++--------
+ arch/x86/kernel/vsyscall_64.c | 15 +-
+ arch/x86/lib/Makefile | 2 +-
+ arch/x86/lib/cmdline.c | 84 ++
+ arch/x86/lib/thunk_32.S | 3 +-
+ arch/x86/lib/thunk_64.S | 3 +
+ arch/x86/mm/dump_pagetables.c | 44 +-
+ arch/x86/mm/fault.c | 34 +-
+ arch/x86/mm/init_64.c | 29 +-
+ arch/x86/mm/ioremap.c | 32 +-
+ arch/x86/mm/pgtable.c | 27 +-
+ arch/x86/platform/efi/efi.c | 48 +-
+ arch/x86/platform/efi/efi_stub_64.S | 81 +-
+ arch/x86/platform/uv/bios_uv.c | 2 +-
+ arch/x86/platform/uv/uv_irq.c | 10 +-
+ arch/x86/realmode/rm/Makefile | 3 +-
+ arch/x86/syscalls/syscall_64.tbl | 6 +-
+ arch/x86/um/vdso/vma.c | 2 +-
+ arch/x86/vdso/.gitignore | 5 +-
+ arch/x86/vdso/Makefile | 90 +--
+ arch/x86/vdso/vclock_gettime.c | 26 +-
+ arch/x86/vdso/vdso-layout.lds.S | 40 +-
+ arch/x86/vdso/vdso.S | 3 -
+ arch/x86/vdso/vdso.lds.S | 7 +-
+ arch/x86/vdso/vdso2c.c | 156 ++++
+ arch/x86/vdso/vdso2c.h | 157 ++++
+ arch/x86/vdso/vdso32-setup.c | 211 +-----
+ arch/x86/vdso/vdso32.S | 9 -
+ arch/x86/vdso/vdso32/vdso32.lds.S | 15 +-
+ arch/x86/vdso/vdsox32.S | 3 -
+ arch/x86/vdso/vdsox32.lds.S | 7 +-
+ arch/x86/vdso/vma.c | 236 +++---
+ arch/x86/xen/mmu.c | 8 +-
+ arch/x86/xen/setup.c | 11 +-
+ arch/xtensa/include/asm/atomic.h | 7 +-
+ arch/xtensa/include/asm/barrier.h | 3 +
+ arch/xtensa/include/asm/bitops.h | 4 +-
+ block/blk-iopoll.c | 4 +-
+ crypto/chainiv.c | 2 +-
+ drivers/base/power/domain.c | 2 +-
+ drivers/block/loop.c | 2 +-
+ drivers/block/nbd.c | 2 +-
+ drivers/block/pktcdvd.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 2 +-
+ drivers/cpuidle/coupled.c | 2 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/firmware/efi/Kconfig | 7 +
+ drivers/firmware/efi/arm-stub.c | 278 +++++++
+ drivers/firmware/efi/efi-stub-helper.c | 144 +++-
+ drivers/firmware/efi/efi.c | 79 ++
+ drivers/firmware/efi/efivars.c | 192 ++++-
+ drivers/firmware/efi/fdt.c | 285 +++++++
+ drivers/firmware/efi/vars.c | 30 +-
+ drivers/gpu/drm/drm_irq.c | 10 +-
+ drivers/gpu/drm/i915/i915_irq.c | 2 +-
+ drivers/iommu/dmar.c | 8 +-
+ drivers/iommu/irq_remapping.c | 12 +-
+ drivers/md/bcache/bcache.h | 2 +-
+ drivers/md/bcache/closure.h | 2 +-
+ drivers/md/dm-bufio.c | 8 +-
+ drivers/md/dm-snap.c | 4 +-
+ drivers/md/dm.c | 2 +-
+ drivers/md/raid5.c | 2 +-
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 6 +-
+ drivers/misc/sgi-gru/grufile.c | 11 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 6 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 26 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 8 +-
+ drivers/net/ethernet/broadcom/cnic.c | 8 +-
+ drivers/net/ethernet/brocade/bna/bnad.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +-
+ drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +-
+ drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 8 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 6 +-
+ drivers/net/ethernet/tile/tilegx.c | 6 +-
+ drivers/net/wireless/ti/wlcore/main.c | 2 +-
+ drivers/pci/htirq.c | 13 +-
+ drivers/pci/xen-pcifront.c | 4 +-
+ drivers/s390/crypto/ap_bus.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/fcoe/fcoe.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
+ drivers/scsi/isci/remote_device.c | 2 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 2 +-
+ drivers/sh/intc/core.c | 6 -
+ drivers/staging/android/binder.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 2 +-
+ drivers/target/loopback/tcm_loop.c | 4 +-
+ drivers/target/target_core_alua.c | 26 +-
+ drivers/target/target_core_device.c | 6 +-
+ drivers/target/target_core_iblock.c | 2 +-
+ drivers/target/target_core_pr.c | 56 +-
+ drivers/target/target_core_transport.c | 16 +-
+ drivers/target/target_core_ua.c | 10 +-
+ drivers/tty/hvc/hvc_tile.c | 8 +-
+ drivers/tty/n_tty.c | 2 +-
+ drivers/tty/serial/mxs-auart.c | 4 +-
+ drivers/tty/serial/tilegx.c | 8 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 4 +-
+ drivers/usb/host/ehci-tilegx.c | 8 +-
+ drivers/usb/host/ohci-tilegx.c | 8 +-
+ drivers/usb/serial/usb_wwan.c | 2 +-
+ drivers/vhost/scsi.c | 2 +-
+ drivers/w1/w1_family.c | 4 +-
+ drivers/xen/events/events_base.c | 17 +-
+ drivers/xen/xen-pciback/pciback_ops.c | 4 +-
+ fs/binfmt_elf.c | 8 +
+ fs/btrfs/btrfs_inode.h | 2 +-
+ fs/btrfs/extent_io.c | 2 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/btrfs/ioctl.c | 2 +-
+ fs/buffer.c | 2 +-
+ fs/ext4/resize.c | 2 +-
+ fs/gfs2/glock.c | 8 +-
+ fs/gfs2/glops.c | 2 +-
+ fs/gfs2/lock_dlm.c | 4 +-
+ fs/gfs2/recovery.c | 2 +-
+ fs/gfs2/sys.c | 4 +-
+ fs/jbd2/commit.c | 6 +-
+ fs/nfs/dir.c | 12 +-
+ fs/nfs/filelayout/filelayoutdev.c | 4 +-
+ fs/nfs/inode.c | 2 +-
+ fs/nfs/nfs4state.c | 4 +-
+ fs/nfs/pagelist.c | 6 +-
+ fs/nfs/pnfs.c | 2 +-
+ fs/nfs/pnfs.h | 2 +-
+ fs/nfs/write.c | 4 +-
+ fs/ocfs2/cluster/heartbeat.c | 2 +-
+ fs/proc/task_mmu.c | 6 +
+ fs/ubifs/lpt_commit.c | 4 +-
+ fs/ubifs/tnc_commit.c | 4 +-
+ include/asm-generic/atomic.h | 7 +-
+ include/asm-generic/barrier.h | 8 +
+ include/asm-generic/bitops.h | 9 +-
+ include/asm-generic/bitops/atomic.h | 2 +-
+ include/asm-generic/bitops/lock.h | 2 +-
+ include/asm-generic/vmlinux.lds.h | 10 +
+ include/linux/atomic.h | 36 +
+ include/linux/bitops.h | 20 +
+ include/linux/buffer_head.h | 2 +-
+ include/linux/compiler-intel.h | 3 -
+ include/linux/compiler.h | 2 +
+ include/linux/efi.h | 24 +-
+ include/linux/genhd.h | 2 +-
+ include/linux/interrupt.h | 54 +-
+ include/linux/irq.h | 38 +-
+ include/linux/irqdesc.h | 4 +
+ include/linux/kprobes.h | 21 +-
+ include/linux/mm.h | 10 +-
+ include/linux/mm_types.h | 6 +
+ include/linux/netdevice.h | 2 +-
+ include/linux/percpu.h | 2 +-
+ include/linux/perf_event.h | 1 +
+ include/linux/rcupdate.h | 72 +-
+ include/linux/rcutiny.h | 4 +
+ include/linux/rcutree.h | 1 +
+ include/linux/sched.h | 110 +--
+ include/linux/sched/prio.h | 16 +
+ include/linux/sunrpc/sched.h | 8 +-
+ include/linux/sunrpc/xprt.h | 8 +-
+ include/linux/thread_info.h | 14 -
+ include/linux/topology.h | 128 +---
+ include/linux/torture.h | 8 +-
+ include/linux/tracehook.h | 2 +-
+ include/linux/uprobes.h | 4 +
+ include/net/ip_vs.h | 4 +-
+ include/uapi/linux/perf_event.h | 8 +-
+ init/main.c | 4 +
+ kernel/cpu.c | 6 +-
+ kernel/debug/debug_core.c | 4 +-
+ kernel/events/core.c | 117 +--
+ kernel/events/uprobes.c | 66 +-
+ kernel/futex.c | 56 +-
+ kernel/hrtimer.c | 1 +
+ kernel/irq/Kconfig | 9 +
+ kernel/irq/chip.c | 5 +-
+ kernel/irq/internals.h | 6 +
+ kernel/irq/irqdesc.c | 95 ++-
+ kernel/irq/manage.c | 4 +-
+ kernel/irq/spurious.c | 106 ++-
+ kernel/kmod.c | 2 +-
+ kernel/kprobes.c | 392 ++++++----
+ kernel/locking/lockdep_internals.h | 6 +-
+ kernel/locking/locktorture.c | 12 +-
+ kernel/locking/rwsem-xadd.c | 49 ++
+ kernel/notifier.c | 22 +-
+ kernel/rcu/rcutorture.c | 217 ++++--
+ kernel/rcu/tiny_plugin.h | 8 +-
+ kernel/rcu/tree.c | 331 +++++---
+ kernel/rcu/tree.h | 11 +-
+ kernel/rcu/tree_plugin.h | 144 +---
+ kernel/rcu/update.c | 30 +
+ kernel/sched/core.c | 407 ++++++----
+ kernel/sched/cpudeadline.c | 33 +-
+ kernel/sched/cpudeadline.h | 6 +-
+ kernel/sched/cpupri.c | 13 +-
+ kernel/sched/cpupri.h | 2 +-
+ kernel/sched/deadline.c | 6 +-
+ kernel/sched/fair.c | 226 ++++--
+ kernel/sched/idle.c | 130 ++--
+ kernel/sched/rt.c | 119 ++-
+ kernel/sched/sched.h | 26 +-
+ kernel/sched/stop_task.c | 4 +-
+ kernel/sched/wait.c | 2 +-
+ kernel/softirq.c | 4 +-
+ kernel/sys.c | 6 +-
+ kernel/sysctl.c | 5 +
+ kernel/torture.c | 40 +-
+ kernel/trace/trace_event_perf.c | 5 +-
+ kernel/trace/trace_kprobe.c | 71 +-
+ kernel/trace/trace_probe.c | 65 +-
+ kernel/trace/trace_probe.h | 15 +-
+ kernel/trace/trace_uprobe.c | 66 +-
+ kernel/workqueue.c | 6 +-
+ lib/Makefile | 3 +-
+ lib/fdt_empty_tree.c | 2 +
+ mm/backing-dev.c | 2 +-
+ mm/filemap.c | 4 +-
+ mm/huge_memory.c | 2 +-
+ mm/memory.c | 3 -
+ mm/mmap.c | 89 ++-
+ net/atm/pppoatm.c | 2 +-
+ net/bluetooth/hci_event.c | 4 +-
+ net/core/dev.c | 8 +-
+ net/core/link_watch.c | 2 +-
+ net/ipv4/inetpeer.c | 2 +-
+ net/ipv4/tcp_output.c | 4 +-
+ net/netfilter/nf_conntrack_core.c | 2 +-
+ net/rds/ib_recv.c | 4 +-
+ net/rds/iw_recv.c | 4 +-
+ net/rds/send.c | 6 +-
+ net/rds/tcp_send.c | 2 +-
+ net/sunrpc/auth.c | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 2 +-
+ net/sunrpc/backchannel_rqst.c | 4 +-
+ net/sunrpc/xprt.c | 4 +-
+ net/sunrpc/xprtsock.c | 16 +-
+ net/unix/af_unix.c | 2 +-
+ sound/pci/bt87x.c | 4 +-
+ tools/include/linux/compiler.h | 2 +
+ tools/{virtio => include}/linux/export.h | 5 +
+ .../lockdep/uinclude => include}/linux/types.h | 29 +-
+ tools/lib/lockdep/Makefile | 2 +-
+ tools/lib/lockdep/uinclude/linux/export.h | 7 -
+ tools/perf/Documentation/perf-diff.txt | 26 +-
+ tools/perf/Documentation/perf-report.txt | 43 +-
+ tools/perf/Documentation/perf-top.txt | 32 +-
+ tools/perf/MANIFEST | 2 +
+ tools/perf/Makefile.perf | 12 +-
+ tools/perf/arch/arm/Makefile | 7 +
+ tools/perf/arch/arm/include/perf_regs.h | 7 +-
+ tools/perf/arch/arm/tests/dwarf-unwind.c | 60 ++
+ tools/perf/arch/arm/tests/regs_load.S | 58 ++
+ tools/perf/arch/arm/util/unwind-libdw.c | 36 +
+ tools/perf/arch/arm64/Makefile | 7 +
+ tools/perf/arch/arm64/include/perf_regs.h | 88 +++
+ tools/perf/arch/arm64/util/dwarf-regs.c | 80 ++
+ tools/perf/arch/arm64/util/unwind-libunwind.c | 82 ++
+ tools/perf/arch/x86/include/perf_regs.h | 2 +-
+ tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +-
+ tools/perf/arch/x86/util/tsc.c | 2 +-
+ tools/perf/arch/x86/util/tsc.h | 2 +-
+ tools/perf/builtin-annotate.c | 3 +-
+ tools/perf/builtin-diff.c | 50 +-
+ tools/perf/builtin-inject.c | 2 +-
+ tools/perf/builtin-kmem.c | 88 +--
+ tools/perf/builtin-lock.c | 10 +-
+ tools/perf/builtin-mem.c | 15 +-
+ tools/perf/builtin-record.c | 158 ++--
+ tools/perf/builtin-report.c | 196 ++---
+ tools/perf/builtin-sched.c | 80 +-
+ tools/perf/builtin-top.c | 28 +-
+ tools/perf/config/Makefile | 20 +-
+ tools/perf/config/feature-checks/Makefile | 4 -
+ tools/perf/config/feature-checks/test-all.c | 5 -
+ tools/perf/config/feature-checks/test-on-exit.c | 16 -
+ tools/perf/perf-completion.sh | 4 +-
+ tools/perf/perf-sys.h | 190 +++++
+ tools/perf/perf.h | 248 +-----
+ tools/perf/tests/attr.c | 7 -
+ tools/perf/tests/builtin-test.c | 18 +-
+ tools/perf/tests/code-reading.c | 5 +-
+ tools/perf/tests/dso-data.c | 2 +-
+ tools/perf/tests/dwarf-unwind.c | 2 +-
+ tools/perf/tests/evsel-tp-sched.c | 3 -
+ tools/perf/tests/hists_common.c | 205 +++++
+ tools/perf/tests/hists_common.h | 47 ++
+ tools/perf/tests/hists_filter.c | 290 +++++++
+ tools/perf/tests/hists_link.c | 173 +----
+ tools/perf/tests/hists_output.c | 618 +++++++++++++++
+ tools/perf/tests/keep-tracking.c | 2 +-
+ tools/perf/tests/mmap-thread-lookup.c | 233 ++++++
+ tools/perf/tests/parse-events.c | 142 ++--
+ tools/perf/tests/parse-no-sample-id-all.c | 2 +-
+ tools/perf/tests/perf-time-to-tsc.c | 3 +-
+ tools/perf/tests/rdpmc.c | 2 +-
+ tools/perf/tests/sample-parsing.c | 2 +-
+ tools/perf/tests/tests.h | 6 +-
+ tools/perf/tests/thread-mg-share.c | 90 +++
+ tools/perf/ui/browser.h | 4 +-
+ tools/perf/ui/browsers/hists.c | 233 +++---
+ tools/perf/ui/gtk/hists.c | 52 +-
+ tools/perf/ui/hist.c | 252 ++++--
+ tools/perf/ui/progress.h | 2 +-
+ tools/perf/ui/setup.c | 2 -
+ tools/perf/ui/stdio/hist.c | 81 +-
+ tools/perf/util/annotate.h | 2 +-
+ tools/perf/util/build-id.c | 2 +-
+ tools/perf/util/build-id.h | 2 +-
+ tools/perf/util/callchain.c | 78 ++
+ tools/perf/util/callchain.h | 8 +
+ tools/perf/util/config.c | 4 +
+ tools/perf/util/cpumap.c | 160 ++++
+ tools/perf/util/cpumap.h | 35 +
+ tools/perf/util/dso.h | 2 +-
+ tools/perf/util/event.c | 4 +-
+ tools/perf/util/event.h | 24 +
+ tools/perf/util/evsel.h | 9 +-
+ tools/perf/util/header.h | 4 +-
+ tools/perf/util/hist.c | 187 ++---
+ tools/perf/util/hist.h | 46 +-
+ tools/perf/util/include/linux/bitmap.h | 3 +
+ tools/perf/util/include/linux/export.h | 6 -
+ tools/perf/util/include/linux/list.h | 1 +
+ tools/perf/util/include/linux/types.h | 29 -
+ tools/perf/util/machine.c | 11 +
+ tools/perf/util/map.c | 118 ++-
+ tools/perf/util/map.h | 14 +-
+ tools/perf/util/pager.c | 12 +-
+ tools/perf/util/parse-events.h | 3 +-
+ tools/perf/util/parse-events.y | 14 +-
+ tools/perf/util/perf_regs.h | 2 +-
+ tools/perf/util/pmu.c | 6 +-
+ tools/perf/util/pmu.h | 2 +-
+ tools/perf/util/session.c | 5 +-
+ tools/perf/util/sort.c | 436 ++++++++++-
+ tools/perf/util/sort.h | 6 +
+ tools/perf/util/stat.h | 2 +-
+ tools/perf/util/svghelper.c | 2 +-
+ tools/perf/util/svghelper.h | 2 +-
+ tools/perf/util/symbol.h | 4 +-
+ tools/perf/util/thread.c | 52 +-
+ tools/perf/util/thread.h | 3 +-
+ tools/perf/util/top.h | 2 +-
+ tools/perf/util/types.h | 24 -
+ tools/perf/util/unwind-libdw.c | 2 +-
+ tools/perf/util/unwind.h | 2 +-
+ tools/perf/util/util.c | 2 +
+ tools/perf/util/util.h | 2 +-
+ tools/perf/util/values.h | 2 +-
+ .../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
+ .../testing/selftests/rcutorture/bin/functions.sh | 48 +-
+ .../testing/selftests/rcutorture/bin/kvm-build.sh | 6 +-
+ .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 2 +-
+ .../selftests/rcutorture/bin/kvm-recheck.sh | 24 +-
+ .../selftests/rcutorture/bin/kvm-test-1-run.sh | 47 +-
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 142 ++--
+ .../bin/{parse-rcutorture.sh => parse-torture.sh} | 22 +-
+ .../selftests/rcutorture/configs/rcu/TREE02-T | 25 +
+ .../selftests/rcutorture/configs/rcu/TREE08.boot | 1 +
+ tools/virtio/Makefile | 2 +-
+ tools/virtio/linux/kernel.h | 7 -
+ tools/virtio/linux/types.h | 28 -
+ 558 files changed, 11905 insertions(+), 5602 deletions(-)
+ create mode 100644 Documentation/RCU/rcu_dereference.txt
+ create mode 100644 Documentation/arm/uefi.txt
+ create mode 100644 arch/arm64/include/asm/efi.h
+ create mode 100644 arch/arm64/kernel/efi-entry.S
+ create mode 100644 arch/arm64/kernel/efi-stub.c
+ create mode 100644 arch/arm64/kernel/efi.c
+ create mode 100644 arch/x86/include/asm/cmdline.h
+ create mode 100644 arch/x86/include/asm/espfix.h
+ delete mode 100644 arch/x86/include/asm/vdso32.h
+ create mode 100644 arch/x86/kernel/espfix_64.c
+ create mode 100644 arch/x86/lib/cmdline.c
+ delete mode 100644 arch/x86/vdso/vdso.S
+ create mode 100644 arch/x86/vdso/vdso2c.c
+ create mode 100644 arch/x86/vdso/vdso2c.h
+ delete mode 100644 arch/x86/vdso/vdso32.S
+ delete mode 100644 arch/x86/vdso/vdsox32.S
+ create mode 100644 drivers/firmware/efi/arm-stub.c
+ create mode 100644 drivers/firmware/efi/fdt.c
+ create mode 100644 lib/fdt_empty_tree.c
+ rename tools/{virtio => include}/linux/export.h (70%)
+ rename tools/{lib/lockdep/uinclude => include}/linux/types.h (63%)
+ delete mode 100644 tools/lib/lockdep/uinclude/linux/export.h
+ create mode 100644 tools/perf/arch/arm/tests/dwarf-unwind.c
+ create mode 100644 tools/perf/arch/arm/tests/regs_load.S
+ create mode 100644 tools/perf/arch/arm/util/unwind-libdw.c
+ create mode 100644 tools/perf/arch/arm64/Makefile
+ create mode 100644 tools/perf/arch/arm64/include/perf_regs.h
+ create mode 100644 tools/perf/arch/arm64/util/dwarf-regs.c
+ create mode 100644 tools/perf/arch/arm64/util/unwind-libunwind.c
+ delete mode 100644 tools/perf/config/feature-checks/test-on-exit.c
+ create mode 100644 tools/perf/perf-sys.h
+ create mode 100644 tools/perf/tests/hists_common.c
+ create mode 100644 tools/perf/tests/hists_common.h
+ create mode 100644 tools/perf/tests/hists_filter.c
+ create mode 100644 tools/perf/tests/hists_output.c
+ create mode 100644 tools/perf/tests/mmap-thread-lookup.c
+ create mode 100644 tools/perf/tests/thread-mg-share.c
+ delete mode 100644 tools/perf/util/include/linux/export.h
+ delete mode 100644 tools/perf/util/include/linux/types.h
+ delete mode 100644 tools/perf/util/types.h
+ rename tools/testing/selftests/rcutorture/bin/{parse-rcutorture.sh => parse-torture.sh} (79%)
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE02-T
+ create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
+ delete mode 100644 tools/virtio/linux/types.h
+$ git am -3 ../patches
+$ git am -3 ../patches/x86_vdso__When_vdso2c_fails__unlink_the_output.patch
+Applying: x86,vdso: When vdso2c fails, unlink the output
+$ git am -3 ../patches/x86_vdso__Fix_cross-compilation_from_big-endian_architectures.patch
+Applying: x86,vdso: Fix cross-compilation from big-endian architectures
+Merging clockevents/clockevents/next (2529c3a33079 clocksource: Add Freescale FlexTimer Module (FTM) timer support)
+$ git merge clockevents/clockevents/next
+Resolved 'arch/arm/boot/dts/vf610.dtsi' using previous resolution.
+Auto-merging drivers/clocksource/Makefile
+Auto-merging drivers/clocksource/Kconfig
+Auto-merging arch/arm/mach-vexpress/Kconfig
+Auto-merging arch/arm/boot/dts/vf610.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/vf610.dtsi
+Auto-merging arch/arm/boot/dts/sun6i-a31.dtsi
+Auto-merging Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master a9f0dfc95a61] Merge remote-tracking branch 'clockevents/clockevents/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/arm/global_timer.txt | 7 +-
+ .../bindings/timer/allwinner,sun5i-a13-hstimer.txt | 4 +
+ ...efm32,timer.txt => energymicro,efm32-timer.txt} | 4 +-
+ .../devicetree/bindings/timer/fsl,ftm-timer.txt | 31 ++
+ arch/arm/boot/dts/sun6i-a31.dtsi | 11 +
+ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 10 +-
+ arch/arm/boot/dts/vf610.dtsi | 13 +
+ arch/arm/mach-vexpress/Kconfig | 1 +
+ drivers/clocksource/Kconfig | 5 +
+ drivers/clocksource/Makefile | 1 +
+ drivers/clocksource/arm_global_timer.c | 5 +-
+ drivers/clocksource/dw_apb_timer_of.c | 2 +-
+ drivers/clocksource/em_sti.c | 4 +-
+ drivers/clocksource/fsl_ftm_timer.c | 367 +++++++++++++++++++++
+ drivers/clocksource/mmio.c | 8 +-
+ drivers/clocksource/qcom-timer.c | 13 +
+ drivers/clocksource/sh_cmt.c | 4 +-
+ drivers/clocksource/sh_mtu2.c | 4 +-
+ drivers/clocksource/sh_tmu.c | 6 +-
+ drivers/clocksource/time-efm32.c | 3 +-
+ drivers/clocksource/timer-sun5i.c | 6 +
+ 21 files changed, 483 insertions(+), 26 deletions(-)
+ rename Documentation/devicetree/bindings/timer/{efm32,timer.txt => energymicro,efm32-timer.txt} (87%)
+ create mode 100644 Documentation/devicetree/bindings/timer/fsl,ftm-timer.txt
+ create mode 100644 drivers/clocksource/fsl_ftm_timer.c
+Merging edac/linux_next (49856dc973cd sb_edac: mark MCE messages as KERN_DEBUG)
+$ git merge edac/linux_next
+Already up-to-date.
+Merging edac-amd/for-next (aa2064d7dd35 EDAC: Fix MC scrub mode comparsion bug for correctable errors)
+$ git merge edac-amd/for-next
+Merge made by the 'recursive' strategy.
+ drivers/edac/edac_mc.c | 2 +-
+ drivers/edac/mce_amd.c | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+Merging irqchip/irqchip/for-next (3203bea71513 Documentation: add Broadcom STB Level-2 interrupt controller binding)
+$ git merge irqchip/irqchip/for-next
+Auto-merging drivers/irqchip/irq-gic.c
+Merge made by the 'recursive' strategy.
+ .../bindings/interrupt-controller/brcm,l2-intc.txt | 29 +++
+ .../marvell,armada-370-xp-mpic.txt} | 0
+ drivers/irqchip/Kconfig | 6 +
+ drivers/irqchip/Makefile | 1 +
+ drivers/irqchip/irq-brcmstb-l2.c | 202 +++++++++++++++++++++
+ drivers/irqchip/irq-gic.c | 2 +-
+ include/linux/irqchip/arm-gic.h | 2 +
+ 7 files changed, 241 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,l2-intc.txt
+ rename Documentation/devicetree/bindings/{arm/armada-370-xp-mpic.txt => interrupt-controller/marvell,armada-370-xp-mpic.txt} (100%)
+ create mode 100644 drivers/irqchip/irq-brcmstb-l2.c
+Merging ftrace/for-next (c5da08377636 Merge branch 'trace/ftrace/arm64' into trace/for-next)
+$ git merge ftrace/for-next
+Auto-merging include/linux/kprobes.h
+Auto-merging arch/x86/kernel/entry_64.S
+Auto-merging arch/x86/kernel/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/trace/tracepoints.txt | 24 ++++
+ MAINTAINERS | 1 -
+ arch/arm/include/asm/ftrace.h | 10 +-
+ arch/blackfin/include/asm/ftrace.h | 11 +-
+ arch/parisc/include/asm/ftrace.h | 10 +-
+ arch/sh/include/asm/ftrace.h | 10 +-
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/entry_64.S | 204 --------------------------
+ arch/x86/kernel/ftrace.c | 45 +-----
+ arch/x86/kernel/mcount_64.S | 217 ++++++++++++++++++++++++++++
+ arch/xtensa/include/asm/ftrace.h | 14 +-
+ include/linux/ftrace.h | 58 ++++----
+ include/linux/ftrace_event.h | 3 +
+ include/linux/kprobes.h | 2 +-
+ include/linux/trace_seq.h | 10 ++
+ include/linux/tracepoint.h | 10 ++
+ include/trace/ftrace.h | 57 +++++++-
+ kernel/trace/ftrace.c | 267 +++++++++++++++--------------------
+ kernel/trace/trace.c | 107 +++++---------
+ kernel/trace/trace.h | 41 +++---
+ kernel/trace/trace_functions.c | 56 +++-----
+ kernel/trace/trace_functions_graph.c | 1 -
+ kernel/trace/trace_irqsoff.c | 71 ++++++----
+ kernel/trace/trace_nop.c | 1 -
+ kernel/trace/trace_output.c | 41 ++++++
+ kernel/trace/trace_sched_wakeup.c | 70 +++++----
+ kernel/trace/trace_selftest.c | 69 ++++-----
+ kernel/trace/trace_stack.c | 8 +-
+ 28 files changed, 726 insertions(+), 693 deletions(-)
+ create mode 100644 arch/x86/kernel/mcount_64.S
+Merging rcu/rcu/next (61f38db3e3c0 rcu: Provide API to suppress stall warnings while sysrc runs)
+$ git merge rcu/rcu/next
+Already up-to-date.
+Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions)
+$ git merge uprobes/for-next
+Already up-to-date.
+Merging kvm/linux-next (1f854112553a KVM: vmx: DR7 masking on task switch emulation is wrong)
+$ git merge kvm/linux-next
+Auto-merging virt/kvm/async_pf.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kernel/kvm.c
+Auto-merging arch/x86/include/asm/traps.h
+Auto-merging arch/s390/mm/pgtable.c
+Auto-merging arch/s390/kvm/kvm-s390.c
+Auto-merging arch/s390/kernel/entry64.S
+Auto-merging arch/s390/kernel/entry.S
+Auto-merging arch/s390/kernel/asm-offsets.c
+Auto-merging arch/s390/include/asm/ptrace.h
+Auto-merging arch/s390/include/asm/mmu_context.h
+Auto-merging arch/s390/include/asm/lowcore.h
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/virtual/kvm/api.txt | 10 +-
+ Documentation/virtual/kvm/devices/vm.txt | 26 ++
+ Documentation/virtual/kvm/s390-diag.txt | 2 +
+ arch/s390/include/asm/ctl_reg.h | 14 +
+ arch/s390/include/asm/kvm_host.h | 162 +++++++-
+ arch/s390/include/asm/lowcore.h | 10 +-
+ arch/s390/include/asm/mmu.h | 2 +
+ arch/s390/include/asm/mmu_context.h | 1 +
+ arch/s390/include/asm/pgalloc.h | 3 +-
+ arch/s390/include/asm/pgtable.h | 169 ++++----
+ arch/s390/include/asm/ptrace.h | 44 ++
+ arch/s390/include/asm/sclp.h | 8 +-
+ arch/s390/include/uapi/asm/kvm.h | 28 ++
+ arch/s390/include/uapi/asm/sie.h | 245 +++++++++++
+ arch/s390/kernel/asm-offsets.c | 14 +-
+ arch/s390/kernel/entry.S | 4 +-
+ arch/s390/kernel/entry64.S | 4 +-
+ arch/s390/kvm/Makefile | 4 +-
+ arch/s390/kvm/diag.c | 19 +-
+ arch/s390/kvm/gaccess.c | 673 +++++++++++++++++++++++++++++++
+ arch/s390/kvm/gaccess.h | 374 +++++++++++++----
+ arch/s390/kvm/guestdbg.c | 482 ++++++++++++++++++++++
+ arch/s390/kvm/intercept.c | 222 +++++++++-
+ arch/s390/kvm/interrupt.c | 401 +++++++++++++-----
+ arch/s390/kvm/kvm-s390.c | 552 ++++++++++++++++++++-----
+ arch/s390/kvm/kvm-s390.h | 73 +++-
+ arch/s390/kvm/priv.c | 301 ++++++++++----
+ arch/s390/kvm/sigp.c | 47 ++-
+ arch/s390/kvm/trace-s390.h | 43 ++
+ arch/s390/kvm/trace.h | 99 +++--
+ arch/s390/mm/pgtable.c | 89 +++-
+ arch/x86/include/asm/kvm_emulate.h | 1 -
+ arch/x86/include/asm/kvm_host.h | 7 +-
+ arch/x86/include/asm/traps.h | 5 +
+ arch/x86/kernel/kvm.c | 2 +-
+ arch/x86/kvm/cpuid.c | 11 +-
+ arch/x86/kvm/cpuid.h | 7 +
+ arch/x86/kvm/emulate.c | 80 ++--
+ arch/x86/kvm/irq.c | 1 +
+ arch/x86/kvm/mmu.c | 84 ++--
+ arch/x86/kvm/mmu.h | 33 ++
+ arch/x86/kvm/paging_tmpl.h | 7 +-
+ arch/x86/kvm/pmu.c | 7 +-
+ arch/x86/kvm/svm.c | 63 +--
+ arch/x86/kvm/trace.h | 20 +-
+ arch/x86/kvm/vmx.c | 333 +++++++++------
+ arch/x86/kvm/x86.c | 61 ++-
+ drivers/s390/char/sclp_early.c | 34 +-
+ include/linux/kvm_host.h | 15 +-
+ include/uapi/linux/kvm.h | 7 +-
+ virt/kvm/async_pf.c | 4 +-
+ virt/kvm/eventfd.c | 68 +++-
+ virt/kvm/irq_comm.c | 17 +-
+ virt/kvm/irqchip.c | 31 +-
+ virt/kvm/kvm_main.c | 24 +-
+ 55 files changed, 4151 insertions(+), 896 deletions(-)
+ create mode 100644 Documentation/virtual/kvm/devices/vm.txt
+ create mode 100644 arch/s390/include/uapi/asm/sie.h
+ create mode 100644 arch/s390/kvm/gaccess.c
+ create mode 100644 arch/s390/kvm/guestdbg.c
+Merging kvm-arm/next (1252b3313642 arm64: KVM: Enable minimalistic support for Cortex-A53)
+$ git merge kvm-arm/next
+Auto-merging include/uapi/linux/kvm.h
+Auto-merging arch/arm64/kernel/smp.c
+Auto-merging Documentation/virtual/kvm/api.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/psci.txt | 37 +++-
+ Documentation/virtual/kvm/api.txt | 17 ++
+ arch/arm/include/asm/kvm_host.h | 2 +-
+ arch/arm/include/asm/kvm_psci.h | 6 +-
+ arch/arm/include/asm/psci.h | 7 +-
+ arch/arm/include/uapi/asm/kvm.h | 10 +-
+ arch/arm/kernel/psci.c | 196 +++++++++++++++++----
+ arch/arm/kernel/psci_smp.c | 33 ++++
+ arch/arm/kvm/arm.c | 1 +
+ arch/arm/kvm/handle_exit.c | 10 +-
+ arch/arm/kvm/psci.c | 235 +++++++++++++++++++++++--
+ arch/arm64/include/asm/cpu_ops.h | 2 +
+ arch/arm64/include/asm/cputype.h | 1 +
+ arch/arm64/include/asm/kvm_host.h | 2 +-
+ arch/arm64/include/asm/kvm_psci.h | 6 +-
+ arch/arm64/include/asm/psci.h | 2 +-
+ arch/arm64/include/uapi/asm/kvm.h | 13 +-
+ arch/arm64/kernel/psci.c | 231 ++++++++++++++++++++----
+ arch/arm64/kernel/smp.c | 22 +++
+ arch/arm64/kvm/guest.c | 2 +
+ arch/arm64/kvm/handle_exit.c | 10 +-
+ arch/arm64/kvm/sys_regs_generic_v8.c | 2 +
+ include/uapi/linux/Kbuild | 1 +
+ include/uapi/linux/kvm.h | 9 +
+ include/uapi/linux/psci.h | 90 ++++++++++
+ 25 files changed, 831 insertions(+), 116 deletions(-)
+ create mode 100644 include/uapi/linux/psci.h
+Merging kvm-ppc/kvm-ppc-next (0f689a33ad17 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
+$ 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 (77945ca73e9a x86/xen: map foreign pfns for autotranslated guests)
+$ git merge xen-tip/linux-next
+Auto-merging arch/x86/xen/setup.c
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging arch/x86/xen/enlighten.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/xen/hypercall.h | 16 +++-
+ arch/arm/include/asm/xen/interface.h | 2 +
+ arch/arm/xen/enlighten.c | 9 ++
+ arch/arm/xen/hypercall.S | 1 +
+ arch/arm64/xen/hypercall.S | 1 +
+ arch/x86/include/asm/xen/hypercall.h | 2 +-
+ arch/x86/include/asm/xen/interface.h | 3 +
+ arch/x86/xen/enlighten.c | 1 +
+ arch/x86/xen/mmu.c | 125 +++++++++++++++++++++++--
+ arch/x86/xen/p2m.c | 174 +++++++++++++++++++++++------------
+ arch/x86/xen/setup.c | 15 ++-
+ arch/x86/xen/suspend.c | 23 ++++-
+ arch/x86/xen/xen-ops.h | 2 +
+ drivers/xen/manage.c | 45 ++-------
+ drivers/xen/xen-acpi-processor.c | 4 +-
+ drivers/xen/xen-pciback/pci_stub.c | 25 ++++-
+ drivers/xen/xen-pciback/xenbus.c | 4 +
+ include/xen/interface/xen.h | 6 +-
+ include/xen/xen-ops.h | 4 -
+ 19 files changed, 334 insertions(+), 128 deletions(-)
+Merging percpu/for-next (92a82b81ba46 Merge branch 'for-3.16' into for-next)
+$ git merge percpu/for-next
+Auto-merging include/linux/percpu.h
+Auto-merging include/linux/cgroup.h
+Merge made by the 'recursive' strategy.
+ include/linux/cgroup.h | 2 +-
+ include/linux/percpu-refcount.h | 34 +++++++++++++++++++++++++++++++++-
+ include/linux/percpu.h | 2 +-
+ 3 files changed, 35 insertions(+), 3 deletions(-)
+Merging workqueues/for-next (015af06e103f kernel/workqueue.c: pr_warning/pr_warn & printk/pr_info)
+$ git merge workqueues/for-next
+Auto-merging kernel/workqueue.c
+Merge made by the 'recursive' strategy.
+ include/linux/workqueue.h | 40 +---
+ kernel/workqueue.c | 448 +++++++++++++++-----------------------------
+ kernel/workqueue_internal.h | 2 +
+ 3 files changed, 154 insertions(+), 336 deletions(-)
+Merging drivers-x86/linux-next (7a70906e55bf alienware-wmi: cover some scenarios where memory allocations would fail)
+$ git merge drivers-x86/linux-next
+Merge made by the 'recursive' strategy.
+Merging chrome-platform/for-next (2b8454a75b90 platform/chrome: unregister platform driver/device when module exit)
+$ 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 (d126a4dba4f5 Merge remote-tracking branches 'regmap/topic/irq', 'regmap/topic/le', 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/smbus' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ drivers/base/regmap/regcache-rbtree.c | 8 +--
+ drivers/base/regmap/regmap-i2c.c | 104 +++++++++++++++++++++++++++++++++-
+ drivers/base/regmap/regmap-irq.c | 9 ++-
+ drivers/base/regmap/regmap-mmio.c | 35 +++++++++---
+ drivers/base/regmap/regmap.c | 83 ++++++++++++++++++++++++++-
+ include/linux/regmap.h | 6 ++
+ 6 files changed, 227 insertions(+), 18 deletions(-)
+Merging hsi/for-next (eafaebd987fc HSI: Introduce Nokia N900 modem driver)
+$ git merge hsi/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/hsi/client-devices.txt | 44 +
+ .../devicetree/bindings/hsi/nokia-modem.txt | 57 +
+ Documentation/devicetree/bindings/hsi/omap-ssi.txt | 97 ++
+ Documentation/hsi.txt | 75 ++
+ MAINTAINERS | 4 +-
+ drivers/hsi/Kconfig | 1 +
+ drivers/hsi/Makefile | 1 +
+ drivers/hsi/clients/Kconfig | 17 +
+ drivers/hsi/clients/Makefile | 4 +-
+ drivers/hsi/clients/hsi_char.c | 14 +-
+ drivers/hsi/clients/nokia-modem.c | 285 ++++
+ drivers/hsi/clients/ssi_protocol.c | 1191 +++++++++++++++++
+ drivers/hsi/controllers/Kconfig | 19 +
+ drivers/hsi/controllers/Makefile | 6 +
+ drivers/hsi/controllers/omap_ssi.c | 625 +++++++++
+ drivers/hsi/controllers/omap_ssi.h | 166 +++
+ drivers/hsi/controllers/omap_ssi_port.c | 1399 ++++++++++++++++++++
+ drivers/hsi/controllers/omap_ssi_regs.h | 171 +++
+ drivers/hsi/hsi.c | 275 +++-
+ include/linux/hsi/hsi.h | 39 +-
+ include/linux/hsi/ssi_protocol.h | 42 +
+ 21 files changed, 4513 insertions(+), 19 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/hsi/client-devices.txt
+ create mode 100644 Documentation/devicetree/bindings/hsi/nokia-modem.txt
+ create mode 100644 Documentation/devicetree/bindings/hsi/omap-ssi.txt
+ create mode 100644 Documentation/hsi.txt
+ create mode 100644 drivers/hsi/clients/nokia-modem.c
+ create mode 100644 drivers/hsi/clients/ssi_protocol.c
+ create mode 100644 drivers/hsi/controllers/Kconfig
+ create mode 100644 drivers/hsi/controllers/Makefile
+ create mode 100644 drivers/hsi/controllers/omap_ssi.c
+ create mode 100644 drivers/hsi/controllers/omap_ssi.h
+ create mode 100644 drivers/hsi/controllers/omap_ssi_port.c
+ create mode 100644 drivers/hsi/controllers/omap_ssi_regs.h
+ create mode 100644 include/linux/hsi/ssi_protocol.h
+Merging leds/for-next (0c9a03b68511 leds: Remove duplicated OOM message for individual driver)
+$ git merge leds/for-next
+Removing include/linux/platform_data/leds-pca9685.h
+Removing drivers/leds/leds-pca9685.c
+Auto-merging drivers/leds/Makefile
+Auto-merging drivers/leds/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/leds/leds-lp55xx.txt | 8 +-
+ .../devicetree/bindings/leds/leds-pwm.txt | 2 +
+ drivers/leds/Kconfig | 10 -
+ drivers/leds/Makefile | 1 -
+ drivers/leds/dell-led.c | 171 ++++++++++++++++-
+ drivers/leds/leds-88pm860x.c | 5 +-
+ drivers/leds/leds-adp5520.c | 5 +-
+ drivers/leds/leds-bd2802.c | 4 +-
+ drivers/leds/leds-da903x.c | 4 +-
+ drivers/leds/leds-da9052.c | 3 +-
+ drivers/leds/leds-lp5523.c | 3 +-
+ drivers/leds/leds-pca9685.c | 213 ---------------------
+ drivers/leds/leds-pwm.c | 144 +++++++-------
+ drivers/leds/leds-s3c24xx.c | 4 +-
+ drivers/leds/leds-sunfire.c | 4 +-
+ drivers/leds/trigger/ledtrig-cpu.c | 2 +-
+ include/linux/dell-led.h | 10 +
+ include/linux/platform_data/leds-pca9685.h | 35 ----
+ 18 files changed, 264 insertions(+), 364 deletions(-)
+ delete mode 100644 drivers/leds/leds-pca9685.c
+ create mode 100644 include/linux/dell-led.h
+ delete mode 100644 include/linux/platform_data/leds-pca9685.h
+Merging driver-core/driver-core-next (cda43576afa6 crypto/nx/nx-842: dev_set_drvdata can no longer fail)
+$ git merge driver-core/driver-core-next
+Resolved 'drivers/iommu/exynos-iommu.c' using previous resolution.
+Auto-merging kernel/sysctl.c
+Auto-merging include/linux/device.h
+Auto-merging drivers/iommu/exynos-iommu.c
+CONFLICT (content): Merge conflict in drivers/iommu/exynos-iommu.c
+Auto-merging drivers/crypto/nx/nx-842.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master eb6e838f9e42] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/base/Kconfig | 17 +++++++++++------
+ drivers/base/base.h | 3 ---
+ drivers/base/dd.c | 26 --------------------------
+ drivers/crypto/nx/nx-842.c | 7 +------
+ drivers/vfio/vfio.c | 8 +-------
+ fs/kernfs/dir.c | 1 +
+ fs/kernfs/file.c | 41 +++++++++++++++++++++++++++++++++++------
+ fs/kernfs/kernfs-internal.h | 5 +++++
+ fs/kernfs/mount.c | 22 +++++++++++++++++-----
+ fs/sysfs/group.c | 10 +++++-----
+ fs/sysfs/mount.c | 4 +++-
+ include/linux/device.h | 15 +++++++++++++--
+ include/linux/init.h | 14 +++++++++++++-
+ include/linux/kernfs.h | 17 ++++++++++++-----
+ include/linux/kobject.h | 2 ++
+ include/linux/sysfs.h | 2 +-
+ kernel/cgroup.c | 4 +++-
+ kernel/ksysfs.c | 5 ++++-
+ kernel/sysctl.c | 4 ++--
+ lib/devres.c | 10 +++++-----
+ lib/kobject_uevent.c | 6 ++++++
+ 21 files changed, 140 insertions(+), 83 deletions(-)
+Merging tty/tty-next (bd71a1c08807 serial: kgdb_nmi: Improve console integration with KDB I/O)
+$ git merge tty/tty-next
+Auto-merging kernel/printk/printk.c
+Auto-merging include/linux/platform_data/atmel.h
+Auto-merging drivers/tty/serial/8250/8250_core.c
+Auto-merging drivers/tty/hvc/hvc_console.c
+Auto-merging arch/arm/mach-at91/gpio.c
+Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9263_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9261_devices.c
+Auto-merging arch/arm/mach-at91/at91sam9260_devices.c
+Auto-merging arch/arm/mach-at91/at91rm9200_devices.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serial/atmel-usart.txt | 12 +-
+ .../devicetree/bindings/serial/of-serial.txt | 1 +
+ .../bindings/serial/renesas,sci-serial.txt | 1 +
+ Documentation/serial/driver | 25 +++
+ arch/arm/include/asm/dcc.h | 41 ++++
+ arch/arm/mach-at91/at91rm9200_devices.c | 16 +-
+ arch/arm/mach-at91/at91sam9260_devices.c | 7 -
+ arch/arm/mach-at91/at91sam9261_devices.c | 4 -
+ arch/arm/mach-at91/at91sam9263_devices.c | 4 -
+ arch/arm/mach-at91/at91sam9g45_devices.c | 5 -
+ arch/arm/mach-at91/at91sam9rl_devices.c | 5 -
+ arch/arm/mach-at91/gpio.c | 13 ++
+ drivers/parport/parport_serial.c | 9 +
+ drivers/tty/hvc/hvc_console.c | 9 +-
+ drivers/tty/hvc/hvc_dcc.c | 42 +---
+ drivers/tty/n_hdlc.c | 8 +-
+ drivers/tty/serial/8250/8250_core.c | 6 +-
+ drivers/tty/serial/8250/8250_dma.c | 17 +-
+ drivers/tty/serial/8250/8250_pci.c | 19 ++
+ drivers/tty/serial/Kconfig | 10 +-
+ drivers/tty/serial/Makefile | 3 +
+ drivers/tty/serial/atmel_serial.c | 230 +++++++++++++++++----
+ drivers/tty/serial/cpm_uart/cpm_uart_core.c | 8 +-
+ drivers/tty/serial/efm32-uart.c | 1 +
+ drivers/tty/serial/imx.c | 81 +++-----
+ drivers/tty/serial/kgdb_nmi.c | 59 +++---
+ drivers/tty/serial/men_z135_uart.c | 7 +-
+ drivers/tty/serial/of_serial.c | 5 +
+ drivers/tty/serial/samsung.c | 35 +++-
+ drivers/tty/serial/samsung.h | 23 +--
+ drivers/tty/serial/sc16is7xx.c | 19 +-
+ drivers/tty/serial/sccnxp.c | 6 +-
+ drivers/tty/serial/serial_core.c | 12 +-
+ drivers/tty/serial/serial_mctrl_gpio.c | 143 +++++++++++++
+ drivers/tty/serial/serial_mctrl_gpio.h | 110 ++++++++++
+ drivers/tty/serial/sirfsoc_uart.c | 51 ++---
+ drivers/tty/serial/sirfsoc_uart.h | 4 -
+ drivers/tty/serial/st-asc.c | 8 +-
+ drivers/tty/serial/uartlite.c | 17 +-
+ drivers/tty/vt/consolemap.c | 54 ++---
+ drivers/tty/vt/vt.c | 89 +++++++-
+ drivers/video/console/vgacon.c | 17 +-
+ include/linux/console_struct.h | 5 +-
+ include/linux/platform_data/atmel.h | 1 -
+ kernel/printk/printk.c | 1 +
+ 45 files changed, 886 insertions(+), 357 deletions(-)
+ create mode 100644 arch/arm/include/asm/dcc.h
+ create mode 100644 drivers/tty/serial/serial_mctrl_gpio.c
+ create mode 100644 drivers/tty/serial/serial_mctrl_gpio.h
+Merging usb/usb-next (70d2f61fc755 USB: orinoco_usb: remove CONFIG_USB_DEBUG support)
+$ git merge usb/usb-next
+Auto-merging include/linux/usb/usb_phy_generic.h
+Auto-merging drivers/usb/serial/usb_wwan.c
+Auto-merging drivers/usb/serial/option.c
+Removing drivers/usb/phy/phy-mv-u3d-usb.h
+Removing drivers/usb/phy/phy-mv-u3d-usb.c
+Auto-merging drivers/usb/host/xhci-mem.c
+Auto-merging drivers/usb/gadget/u_ether.c
+Auto-merging drivers/usb/gadget/tcm_usb_gadget.c
+Auto-merging drivers/usb/gadget/storage_common.c
+Removing drivers/usb/gadget/s3c-hsotg.h
+Auto-merging drivers/usb/dwc2/gadget.c
+Auto-merging drivers/usb/core/hub.c
+Auto-merging drivers/usb/common/usb-otg-fsm.c
+Auto-merging drivers/net/wireless/orinoco/orinoco_usb.c
+Auto-merging drivers/gpu/drm/udl/udl_main.c
+Auto-merging arch/arm/configs/omap2plus_defconfig
+Auto-merging arch/arm/configs/keystone_defconfig
+Auto-merging arch/arm/configs/davinci_all_defconfig
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/configfs-usb-gadget | 45 +
+ .../ABI/testing/sysfs-platform-chipidea-usb-otg | 56 +
+ Documentation/DocBook/Makefile | 3 +-
+ Documentation/DocBook/writing_musb_glue_layer.tmpl | 873 ++++
+ .../devicetree/bindings/phy/samsung-phy.txt | 47 +
+ .../devicetree/bindings/phy/sun4i-usb-phy.txt | 23 +-
+ Documentation/devicetree/bindings/phy/ti-phy.txt | 7 +
+ .../devicetree/bindings/usb/ci-hdrc-qcom.txt | 17 +
+ .../devicetree/bindings/usb/ehci-orion.txt | 5 +
+ .../devicetree/bindings/usb/exynos-usb.txt | 31 +
+ Documentation/devicetree/bindings/usb/gr-udc.txt | 22 +-
+ .../devicetree/bindings/usb/msm-hsusb.txt | 78 +
+ Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 +
+ Documentation/devicetree/bindings/usb/usb-ohci.txt | 1 +
+ Documentation/devicetree/bindings/usb/usb-xhci.txt | 8 +-
+ Documentation/devicetree/bindings/usb/usb3503.txt | 8 +
+ Documentation/usb/chipidea.txt | 71 +
+ arch/arm/configs/badge4_defconfig | 2 -
+ arch/arm/configs/cm_x2xx_defconfig | 1 -
+ arch/arm/configs/cm_x300_defconfig | 1 -
+ arch/arm/configs/colibri_pxa270_defconfig | 1 -
+ arch/arm/configs/colibri_pxa300_defconfig | 2 -
+ arch/arm/configs/corgi_defconfig | 1 -
+ arch/arm/configs/davinci_all_defconfig | 1 -
+ arch/arm/configs/em_x270_defconfig | 1 -
+ arch/arm/configs/ep93xx_defconfig | 1 -
+ arch/arm/configs/footbridge_defconfig | 2 -
+ arch/arm/configs/ixp4xx_defconfig | 1 -
+ arch/arm/configs/keystone_defconfig | 1 -
+ arch/arm/configs/kzm9g_defconfig | 1 -
+ arch/arm/configs/mini2440_defconfig | 1 -
+ arch/arm/configs/mv78xx0_defconfig | 1 -
+ arch/arm/configs/neponset_defconfig | 2 -
+ arch/arm/configs/omap1_defconfig | 2 -
+ arch/arm/configs/omap2plus_defconfig | 1 -
+ arch/arm/configs/pcm027_defconfig | 1 -
+ arch/arm/configs/raumfeld_defconfig | 1 -
+ arch/arm/configs/s3c2410_defconfig | 1 -
+ arch/arm/configs/s3c6400_defconfig | 1 -
+ arch/arm/configs/spitz_defconfig | 1 -
+ arch/arm/configs/tct_hammer_defconfig | 1 -
+ arch/arm/configs/trizeps4_defconfig | 1 -
+ arch/arm/configs/viper_defconfig | 1 -
+ arch/arm/configs/zeus_defconfig | 1 -
+ arch/arm/mach-msm/board-msm7x30.c | 2 +-
+ arch/arm/mach-msm/board-qsd8x50.c | 2 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 1 -
+ arch/arm/mach-omap2/usb-host.c | 10 +-
+ arch/arm/mach-pxa/zeus.c | 89 +-
+ arch/avr32/configs/hammerhead_defconfig | 1 -
+ arch/blackfin/configs/BF526-EZBRD_defconfig | 1 -
+ arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 1 -
+ arch/blackfin/configs/BF527-EZKIT_defconfig | 1 -
+ arch/blackfin/configs/BF548-EZKIT_defconfig | 1 -
+ arch/blackfin/configs/CM-BF527_defconfig | 1 -
+ arch/blackfin/configs/CM-BF548_defconfig | 1 -
+ arch/blackfin/configs/IP0X_defconfig | 1 -
+ arch/ia64/configs/bigsur_defconfig | 1 -
+ arch/ia64/configs/generic_defconfig | 1 -
+ arch/ia64/configs/gensparse_defconfig | 1 -
+ arch/ia64/configs/tiger_defconfig | 1 -
+ arch/mips/configs/fuloong2e_defconfig | 1 -
+ arch/mips/configs/lemote2f_defconfig | 1 -
+ arch/mips/configs/mpc30x_defconfig | 1 -
+ arch/mips/configs/msp71xx_defconfig | 1 -
+ arch/mips/configs/mtx1_defconfig | 1 -
+ arch/mips/configs/rm200_defconfig | 1 -
+ arch/mips/configs/sb1250_swarm_defconfig | 1 -
+ arch/mips/configs/tb0219_defconfig | 1 -
+ arch/mips/configs/tb0226_defconfig | 1 -
+ arch/parisc/configs/c3000_defconfig | 2 -
+ arch/parisc/configs/default_defconfig | 1 -
+ arch/parisc/configs/generic-64bit_defconfig | 1 -
+ arch/powerpc/configs/40x/ep405_defconfig | 1 -
+ arch/powerpc/configs/44x/canyonlands_defconfig | 1 -
+ arch/powerpc/configs/44x/currituck_defconfig | 1 -
+ arch/powerpc/configs/44x/sam440ep_defconfig | 1 -
+ arch/powerpc/configs/52xx/cm5200_defconfig | 1 -
+ arch/powerpc/configs/52xx/pcm030_defconfig | 1 -
+ arch/powerpc/configs/52xx/tqm5200_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc832x_rdb_defconfig | 1 -
+ arch/powerpc/configs/83xx/mpc834x_itx_defconfig | 1 -
+ arch/powerpc/configs/83xx/sbc834x_defconfig | 1 -
+ arch/powerpc/configs/85xx/ge_imp3a_defconfig | 1 -
+ arch/powerpc/configs/85xx/socrates_defconfig | 1 -
+ arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 1 -
+ arch/powerpc/configs/86xx/mpc8641_hpcn_defconfig | 1 -
+ arch/powerpc/configs/amigaone_defconfig | 1 -
+ arch/powerpc/configs/c2k_defconfig | 1 -
+ arch/powerpc/configs/cell_defconfig | 1 -
+ arch/powerpc/configs/celleb_defconfig | 1 -
+ arch/powerpc/configs/chrp32_defconfig | 1 -
+ arch/powerpc/configs/g5_defconfig | 1 -
+ arch/powerpc/configs/linkstation_defconfig | 1 -
+ arch/powerpc/configs/maple_defconfig | 1 -
+ arch/powerpc/configs/mpc5200_defconfig | 1 -
+ arch/powerpc/configs/mpc86xx_defconfig | 1 -
+ arch/powerpc/configs/pmac32_defconfig | 1 -
+ arch/powerpc/configs/ppc6xx_defconfig | 2 -
+ arch/powerpc/configs/storcenter_defconfig | 1 -
+ arch/sh/configs/apsh4ad0a_defconfig | 1 -
+ arch/sh/configs/ecovec24_defconfig | 1 -
+ arch/sh/configs/landisk_defconfig | 1 -
+ arch/sh/configs/rsk7203_defconfig | 1 -
+ arch/sh/configs/rsk7264_defconfig | 1 -
+ arch/sh/configs/rsk7269_defconfig | 1 -
+ arch/sh/configs/sdk7780_defconfig | 2 -
+ arch/sh/configs/se7343_defconfig | 2 -
+ arch/sh/configs/se7780_defconfig | 1 -
+ arch/sh/configs/sh2007_defconfig | 1 -
+ arch/sh/configs/sh7785lcr_defconfig | 1 -
+ arch/sh/configs/titan_defconfig | 1 -
+ arch/sh/configs/urquell_defconfig | 1 -
+ arch/unicore32/configs/unicore32_defconfig | 1 -
+ arch/x86/configs/i386_defconfig | 1 -
+ arch/x86/configs/x86_64_defconfig | 1 -
+ drivers/gpu/drm/udl/udl_main.c | 3 +-
+ drivers/media/rc/redrat3.c | 102 +-
+ drivers/media/rc/streamzap.c | 9 -
+ drivers/net/wireless/orinoco/orinoco_usb.c | 50 +-
+ drivers/phy/Kconfig | 13 +-
+ drivers/phy/Makefile | 1 +
+ drivers/phy/phy-exynos-mipi-video.c | 2 +-
+ drivers/phy/phy-exynos5-usbdrd.c | 676 +++
+ drivers/phy/phy-exynos5250-sata.c | 2 +-
+ drivers/phy/phy-omap-usb2.c | 30 +-
+ drivers/phy/phy-sun4i-usb.c | 75 +-
+ drivers/staging/media/lirc/lirc_igorplugusb.c | 30 +-
+ drivers/staging/usbip/userspace/README | 1 -
+ drivers/usb/Makefile | 3 +-
+ drivers/usb/chipidea/Makefile | 1 +
+ drivers/usb/chipidea/bits.h | 10 +
+ drivers/usb/chipidea/ci.h | 23 +
+ drivers/usb/chipidea/ci_hdrc_msm.c | 24 +-
+ drivers/usb/chipidea/core.c | 92 +-
+ drivers/usb/chipidea/debug.c | 135 +
+ drivers/usb/chipidea/host.c | 21 +-
+ drivers/usb/chipidea/otg.c | 48 +-
+ drivers/usb/chipidea/otg.h | 23 +-
+ drivers/usb/chipidea/otg_fsm.c | 842 ++++
+ drivers/usb/chipidea/otg_fsm.h | 129 +
+ drivers/usb/chipidea/udc.c | 69 +-
+ drivers/usb/chipidea/usbmisc_imx.c | 68 +
+ drivers/usb/class/cdc-acm.c | 177 +-
+ drivers/usb/class/cdc-acm.h | 14 +-
+ drivers/usb/class/usbtmc.c | 6 +-
+ drivers/usb/common/Makefile | 6 +
+ drivers/usb/{ => common}/usb-common.c | 0
+ .../{phy/phy-fsm-usb.c => common/usb-otg-fsm.c} | 1 +
+ drivers/usb/core/Kconfig | 16 +-
+ drivers/usb/core/hcd-pci.c | 1 -
+ drivers/usb/core/hcd.c | 49 +-
+ drivers/usb/core/hub.c | 950 ++--
+ drivers/usb/core/hub.h | 41 +-
+ drivers/usb/core/port.c | 289 +-
+ drivers/usb/core/usb-acpi.c | 107 +-
+ drivers/usb/core/usb.h | 16 +-
+ drivers/usb/dwc2/Kconfig | 61 +-
+ drivers/usb/dwc2/Makefile | 37 +-
+ drivers/usb/dwc2/core.c | 68 +
+ drivers/usb/dwc2/core.h | 182 +
+ drivers/usb/{gadget/s3c-hsotg.c => dwc2/gadget.c} | 598 +--
+ drivers/usb/dwc2/hw.h | 12 +-
+ drivers/usb/dwc2/platform.c | 6 +
+ drivers/usb/dwc3/Kconfig | 4 +-
+ drivers/usb/dwc3/core.c | 253 +-
+ drivers/usb/dwc3/dwc3-exynos.c | 71 +-
+ drivers/usb/dwc3/dwc3-omap.c | 2 +-
+ drivers/usb/dwc3/dwc3-pci.c | 21 +-
+ drivers/usb/dwc3/gadget.c | 83 +-
+ drivers/usb/gadget/Kconfig | 10 +-
+ drivers/usb/gadget/Makefile | 1 -
+ drivers/usb/gadget/atmel_usba_udc.c | 2 +-
+ drivers/usb/gadget/composite.c | 316 +-
+ drivers/usb/gadget/configfs.c | 556 ++-
+ drivers/usb/gadget/configfs.h | 12 +
+ drivers/usb/gadget/dummy_hcd.c | 4 +-
+ drivers/usb/gadget/f_fs.c | 33 +-
+ drivers/usb/gadget/f_rndis.c | 33 +-
+ drivers/usb/gadget/f_subset.c | 2 +-
+ drivers/usb/gadget/f_uac2.c | 10 +-
+ drivers/usb/gadget/fotg210-udc.c | 8 +-
+ drivers/usb/gadget/fsl_udc_core.c | 8 +-
+ drivers/usb/gadget/fusb300_udc.c | 8 +-
+ drivers/usb/gadget/gr_udc.c | 55 +-
+ drivers/usb/gadget/inode.c | 3 +-
+ drivers/usb/gadget/m66592-udc.c | 1 -
+ drivers/usb/gadget/mv_u3d_core.c | 14 +-
+ drivers/usb/gadget/net2280.c | 4 +-
+ drivers/usb/gadget/r8a66597-udc.c | 1 -
+ drivers/usb/gadget/rndis.c | 28 +-
+ drivers/usb/gadget/s3c-hsotg.h | 378 --
+ drivers/usb/gadget/s3c2410_udc.c | 3 +-
+ drivers/usb/gadget/storage_common.c | 52 +-
+ drivers/usb/gadget/tcm_usb_gadget.c | 16 +-
+ drivers/usb/gadget/u_ether.c | 32 +-
+ drivers/usb/gadget/u_f.c | 2 +-
+ drivers/usb/gadget/u_f.h | 26 +
+ drivers/usb/gadget/u_os_desc.h | 90 +
+ drivers/usb/gadget/u_rndis.h | 3 +
+ drivers/usb/gadget/udc-core.c | 2 +
+ drivers/usb/gadget/uvc_queue.c | 12 +-
+ drivers/usb/host/Kconfig | 34 +-
+ drivers/usb/host/Makefile | 4 +
+ drivers/usb/host/ehci-exynos.c | 141 +-
+ drivers/usb/host/ehci-hub.c | 12 +-
+ drivers/usb/host/ehci-msm.c | 7 +-
+ drivers/usb/host/ehci-mv.c | 16 +-
+ drivers/usb/host/ehci-orion.c | 92 +-
+ drivers/usb/host/ehci-platform.c | 26 +-
+ drivers/usb/host/ehci-spear.c | 13 +-
+ drivers/usb/host/ehci-tegra.c | 15 +-
+ drivers/usb/host/ehci.h | 3 +
+ drivers/usb/host/max3421-hcd.c | 1957 ++++++++
+ drivers/usb/host/ohci-at91.c | 11 +-
+ drivers/usb/host/ohci-exynos.c | 145 +-
+ drivers/usb/host/ohci-hcd.c | 2 +-
+ drivers/usb/host/ohci-hub.c | 8 +-
+ drivers/usb/host/ohci-platform.c | 27 +-
+ drivers/usb/host/ohci-pxa27x.c | 68 +
+ drivers/usb/host/ohci-s3c2410.c | 13 +-
+ drivers/usb/host/ohci.h | 3 +
+ drivers/usb/host/pci-quirks.h | 1 +
+ drivers/usb/host/xhci-hub.c | 43 +-
+ drivers/usb/host/xhci-mem.c | 17 +-
+ drivers/usb/host/xhci-mvebu.c | 72 +
+ drivers/usb/host/xhci-mvebu.h | 21 +
+ drivers/usb/host/xhci-pci.c | 10 +-
+ drivers/usb/host/xhci-plat.c | 51 +-
+ drivers/usb/host/xhci-ring.c | 587 +--
+ drivers/usb/host/xhci.c | 271 +-
+ drivers/usb/host/xhci.h | 49 +-
+ drivers/usb/misc/appledisplay.c | 15 +-
+ drivers/usb/misc/ftdi-elan.c | 4878 ++++++++++----------
+ drivers/usb/misc/iowarrior.c | 38 +-
+ drivers/usb/misc/usb3503.c | 59 +-
+ drivers/usb/misc/usbtest.c | 13 +
+ drivers/usb/misc/yurex.c | 3 +-
+ drivers/usb/musb/Kconfig | 5 +-
+ drivers/usb/musb/am35x.c | 14 +-
+ drivers/usb/musb/blackfin.c | 14 +-
+ drivers/usb/musb/da8xx.c | 16 +-
+ drivers/usb/musb/davinci.c | 8 +-
+ drivers/usb/musb/musb_core.c | 35 +
+ drivers/usb/musb/musb_core.h | 9 +
+ drivers/usb/musb/musb_dsps.c | 29 +-
+ drivers/usb/musb/tusb6010.c | 28 +-
+ drivers/usb/musb/tusb6010.h | 8 -
+ drivers/usb/musb/tusb6010_omap.c | 2 +-
+ drivers/usb/phy/Kconfig | 27 +-
+ drivers/usb/phy/Makefile | 2 -
+ drivers/usb/phy/phy-am335x.c | 4 +-
+ drivers/usb/phy/phy-generic.c | 65 +-
+ drivers/usb/phy/phy-generic.h | 8 +-
+ drivers/usb/phy/phy-keystone.c | 4 +-
+ drivers/usb/phy/phy-msm-usb.c | 702 +--
+ drivers/usb/phy/phy-mv-u3d-usb.c | 338 --
+ drivers/usb/phy/phy-mv-u3d-usb.h | 105 -
+ drivers/usb/phy/phy-ulpi.c | 1 +
+ drivers/usb/serial/bus.c | 14 +-
+ drivers/usb/serial/keyspan.c | 4 +-
+ drivers/usb/serial/kobil_sct.c | 22 +-
+ drivers/usb/serial/option.c | 13 +-
+ drivers/usb/serial/qcserial.c | 143 +-
+ drivers/usb/serial/sierra.c | 198 +-
+ drivers/usb/serial/usb-serial.c | 38 +-
+ drivers/usb/serial/usb-wwan.h | 6 +-
+ drivers/usb/serial/usb_wwan.c | 234 +-
+ drivers/usb/storage/ene_ub6250.c | 3 +-
+ drivers/usb/wusbcore/wa-rpipe.c | 4 +-
+ drivers/uwb/beacon.c | 7 +-
+ drivers/uwb/drp.c | 294 +-
+ drivers/uwb/est.c | 2 -
+ drivers/uwb/ie-rcv.c | 2 -
+ drivers/uwb/radio.c | 2 +-
+ drivers/uwb/rsv.c | 21 +-
+ include/linux/mfd/syscon/exynos5-pmu.h | 44 +
+ include/linux/platform_data/max3421-hcd.h | 24 +
+ include/linux/usb.h | 2 +
+ include/linux/usb/composite.h | 79 +
+ include/linux/usb/msm_hsusb.h | 39 +-
+ include/linux/usb/msm_hsusb_hw.h | 14 +-
+ .../usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} | 13 +-
+ .../multibuff/device_app/aio_multibuff.c | 349 ++
+ .../ffs-aio-example/multibuff/host_app/Makefile | 13 +
+ .../usb/ffs-aio-example/multibuff/host_app/test.c | 146 +
+ .../ffs-aio-example/simple/device_app/aio_simple.c | 335 ++
+ tools/usb/ffs-aio-example/simple/host_app/Makefile | 13 +
+ tools/usb/ffs-aio-example/simple/host_app/test.c | 148 +
+ 291 files changed, 14358 insertions(+), 6800 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg
+ create mode 100644 Documentation/DocBook/writing_musb_glue_layer.tmpl
+ create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-qcom.txt
+ create mode 100644 Documentation/usb/chipidea.txt
+ create mode 100644 drivers/phy/phy-exynos5-usbdrd.c
+ create mode 100644 drivers/usb/chipidea/otg_fsm.c
+ create mode 100644 drivers/usb/chipidea/otg_fsm.h
+ create mode 100644 drivers/usb/common/Makefile
+ rename drivers/usb/{ => common}/usb-common.c (100%)
+ rename drivers/usb/{phy/phy-fsm-usb.c => common/usb-otg-fsm.c} (99%)
+ rename drivers/usb/{gadget/s3c-hsotg.c => dwc2/gadget.c} (85%)
+ delete mode 100644 drivers/usb/gadget/s3c-hsotg.h
+ create mode 100644 drivers/usb/gadget/u_os_desc.h
+ create mode 100644 drivers/usb/host/max3421-hcd.c
+ create mode 100644 drivers/usb/host/xhci-mvebu.c
+ create mode 100644 drivers/usb/host/xhci-mvebu.h
+ delete mode 100644 drivers/usb/phy/phy-mv-u3d-usb.c
+ delete mode 100644 drivers/usb/phy/phy-mv-u3d-usb.h
+ create mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
+ create mode 100644 include/linux/platform_data/max3421-hcd.h
+ rename include/linux/usb/{usb_phy_gen_xceiv.h => usb_phy_generic.h} (53%)
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/device_app/aio_multibuff.c
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/Makefile
+ create mode 100644 tools/usb/ffs-aio-example/multibuff/host_app/test.c
+ create mode 100644 tools/usb/ffs-aio-example/simple/device_app/aio_simple.c
+ create mode 100644 tools/usb/ffs-aio-example/simple/host_app/Makefile
+ create mode 100644 tools/usb/ffs-aio-example/simple/host_app/test.c
+$ git am -3 ../patches/0001-usb-hub_handle_remote_wakeup-only-exists-for-CONFIG.patch
+Applying: usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/usb/core/hub.c
+$ git add -A .
+$ git commit -v -a --amend
+[master fba0e5c6b1d6] Merge remote-tracking branch 'usb/usb-next'
+Merging usb-gadget/next (7751b6fb0586 usb: musb: tusb6010: Use musb->tusb_revision instead of tusb_get_revision call.)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging staging/staging-next (aec46bbdeab1 Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()")
+$ git merge staging/staging-next
+Auto-merging include/linux/device.h
+Removing drivers/staging/vt6656/tcrc.h
+Removing drivers/staging/vt6656/tcrc.c
+Removing drivers/staging/vt6656/srom.h
+Removing drivers/staging/vt6656/rndis.h
+Removing drivers/staging/vt6656/hostap.h
+Removing drivers/staging/vt6656/hostap.c
+Removing drivers/staging/vt6656/device_cfg.h
+Removing drivers/staging/vt6656/control.h
+Removing drivers/staging/vt6656/control.c
+Removing drivers/staging/vt6656/aes_ccmp.h
+Removing drivers/staging/vt6656/aes_ccmp.c
+Removing drivers/staging/unisys/visorchipset/filexfer.h
+Removing drivers/staging/unisys/visorchipset/filexfer.c
+Removing drivers/staging/unisys/include/guidutils.h
+Auto-merging drivers/staging/speakup/kobjects.c
+Removing drivers/staging/sbe-2t3e3/netdev.c
+Removing drivers/staging/sbe-2t3e3/module.c
+Removing drivers/staging/sbe-2t3e3/maps.c
+Removing drivers/staging/sbe-2t3e3/main.c
+Removing drivers/staging/sbe-2t3e3/io.c
+Removing drivers/staging/sbe-2t3e3/intr.c
+Removing drivers/staging/sbe-2t3e3/exar7300.c
+Removing drivers/staging/sbe-2t3e3/exar7250.c
+Removing drivers/staging/sbe-2t3e3/dc.c
+Removing drivers/staging/sbe-2t3e3/ctrl.h
+Removing drivers/staging/sbe-2t3e3/ctrl.c
+Removing drivers/staging/sbe-2t3e3/cpld.c
+Removing drivers/staging/sbe-2t3e3/TODO
+Removing drivers/staging/sbe-2t3e3/Makefile
+Removing drivers/staging/sbe-2t3e3/Kconfig
+Removing drivers/staging/sbe-2t3e3/2t3e3.h
+Removing drivers/staging/rts5139/xd.h
+Removing drivers/staging/rts5139/xd.c
+Removing drivers/staging/rts5139/trace.h
+Removing drivers/staging/rts5139/sd_cprm.h
+Removing drivers/staging/rts5139/sd_cprm.c
+Removing drivers/staging/rts5139/sd.h
+Removing drivers/staging/rts5139/sd.c
+Removing drivers/staging/rts5139/rts51x_transport.h
+Removing drivers/staging/rts5139/rts51x_transport.c
+Removing drivers/staging/rts5139/rts51x_scsi.h
+Removing drivers/staging/rts5139/rts51x_scsi.c
+Removing drivers/staging/rts5139/rts51x_fop.h
+Removing drivers/staging/rts5139/rts51x_fop.c
+Removing drivers/staging/rts5139/rts51x_chip.h
+Removing drivers/staging/rts5139/rts51x_chip.c
+Removing drivers/staging/rts5139/rts51x_card.h
+Removing drivers/staging/rts5139/rts51x_card.c
+Removing drivers/staging/rts5139/rts51x.h
+Removing drivers/staging/rts5139/rts51x.c
+Removing drivers/staging/rts5139/ms_mg.h
+Removing drivers/staging/rts5139/ms_mg.c
+Removing drivers/staging/rts5139/ms.h
+Removing drivers/staging/rts5139/ms.c
+Removing drivers/staging/rts5139/debug.h
+Removing drivers/staging/rts5139/TODO
+Removing drivers/staging/rts5139/Makefile
+Removing drivers/staging/rts5139/Kconfig
+Auto-merging drivers/staging/rtl8821ae/core.c
+CONFLICT (content): Merge conflict in drivers/staging/rtl8821ae/core.c
+Removing drivers/staging/rtl8723au/os_dep/osdep_service.c
+Removing drivers/staging/rtl8723au/include/usb_vendor_req.h
+Removing drivers/staging/rtl8723au/include/usb_osintf.h
+Removing drivers/staging/rtl8723au/include/usb_hal.h
+Removing drivers/staging/rtl8723au/include/rtw_qos.h
+Removing drivers/staging/rtl8723au/include/rtw_p2p.h
+Removing drivers/staging/rtl8723au/include/rtw_ioctl.h
+Removing drivers/staging/rtl8723au/include/odm_types.h
+Removing drivers/staging/rtl8723au/include/mp_custom_oid.h
+Removing drivers/staging/rtl8723au/include/ethernet.h
+Removing drivers/staging/rtl8723au/include/cmd_osdep.h
+Removing drivers/staging/rtl8723au/core/rtw_p2p.c
+Removing drivers/staging/rtl8723au/core/rtw_io.c
+Auto-merging drivers/staging/rtl8192ee/rtl8192ee/sw.h
+Removing drivers/staging/rtl8188eu/include/odm_interface.h
+Auto-merging drivers/staging/netlogic/xlr_net.c
+Auto-merging drivers/staging/media/lirc/lirc_serial.c
+Removing drivers/staging/lustre/lustre/lov/lov_log.c
+Auto-merging drivers/staging/lustre/lustre/llite/vvp_io.c
+Auto-merging drivers/staging/lustre/lustre/llite/rw26.c
+Auto-merging drivers/staging/lustre/lustre/llite/rw.c
+Auto-merging drivers/staging/lustre/lustre/llite/lloop.c
+Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
+Auto-merging drivers/staging/lustre/lustre/llite/file.c
+Auto-merging drivers/staging/lustre/lustre/lclient/lcommon_cl.c
+Removing drivers/staging/lustre/lustre/includResolved 'drivers/staging/rtl8821ae/core.c' using previous resolution.
+e/obd_lov.h
+Removing drivers/staging/lustre/lustre/include/ioctl.h
+Auto-merging drivers/staging/imx-drm/parallel-display.c
+Auto-merging drivers/staging/imx-drm/imx-hdmi.c
+Removing drivers/staging/iio/adc/ad799x_ring.c
+Removing drivers/staging/iio/adc/ad799x.h
+Auto-merging drivers/staging/et131x/et131x.c
+Removing drivers/staging/et131x/Module.symvers
+Removing drivers/staging/android/ram_console.h
+Auto-merging drivers/staging/android/binder.c
+Auto-merging drivers/iio/adc/ad799x.c
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6101f27562a6] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-bus-iio | 46 +-
+ .../ABI/testing/sysfs-bus-iio-proximity-as3935 | 16 +
+ .../devicetree/bindings/iio/proximity/as3935.txt | 28 +
+ .../bindings/staging/imx-drm/fsl-imx-drm.txt | 1 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/driver-model/devres.txt | 3 +
+ MAINTAINERS | 11 +-
+ arch/x86/Kconfig | 1 -
+ drivers/base/devres.c | 97 +
+ drivers/iio/Kconfig | 2 +
+ drivers/iio/Makefile | 1 +
+ drivers/iio/accel/Kconfig | 12 +
+ drivers/iio/accel/Makefile | 1 +
+ drivers/iio/accel/hid-sensor-accel-3d.c | 45 +-
+ drivers/iio/accel/mma8452.c | 439 ++
+ drivers/iio/accel/st_accel_core.c | 7 +
+ drivers/iio/adc/Kconfig | 21 +-
+ drivers/iio/adc/Makefile | 1 +
+ .../iio/adc/ad799x_core.c => iio/adc/ad799x.c} | 160 +-
+ drivers/iio/adc/exynos_adc.c | 131 +-
+ drivers/iio/adc/max1363.c | 16 +-
+ drivers/iio/adc/mcp3422.c | 33 +-
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 151 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.c | 17 +-
+ .../iio/common/hid-sensors/hid-sensor-trigger.h | 1 +
+ drivers/iio/common/st_sensors/st_sensors_core.c | 37 +
+ drivers/iio/gyro/hid-sensor-gyro-3d.c | 45 +-
+ drivers/iio/gyro/itg3200_core.c | 2 -
+ drivers/iio/gyro/st_gyro_core.c | 7 +
+ drivers/iio/iio_core.h | 2 +-
+ drivers/iio/imu/inv_mpu6050/Kconfig | 2 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 +
+ drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 1 +
+ drivers/iio/industrialio-buffer.c | 41 +-
+ drivers/iio/industrialio-core.c | 74 +-
+ drivers/iio/industrialio-event.c | 10 +-
+ drivers/iio/inkern.c | 34 +-
+ drivers/iio/light/gp2ap020a00f.c | 8 +-
+ drivers/iio/light/hid-sensor-als.c | 48 +-
+ drivers/iio/light/hid-sensor-prox.c | 25 +-
+ drivers/iio/magnetometer/Kconfig | 3 +-
+ drivers/iio/magnetometer/ak8975.c | 71 +-
+ drivers/iio/magnetometer/hid-sensor-magn-3d.c | 40 +-
+ drivers/iio/magnetometer/mag3110.c | 19 +-
+ drivers/iio/magnetometer/st_magn_core.c | 7 +
+ drivers/iio/orientation/Kconfig | 12 +
+ drivers/iio/orientation/Makefile | 1 +
+ drivers/iio/orientation/hid-sensor-incl-3d.c | 37 +-
+ drivers/iio/orientation/hid-sensor-rotation.c | 346 +
+ drivers/iio/pressure/Kconfig | 10 +
+ drivers/iio/pressure/Makefile | 1 +
+ drivers/iio/pressure/hid-sensor-press.c | 41 +-
+ drivers/iio/pressure/mpl115.c | 211 +
+ drivers/iio/pressure/st_pressure_core.c | 42 +-
+ drivers/iio/proximity/Kconfig | 19 +
+ drivers/iio/proximity/Makefile | 6 +
+ drivers/iio/proximity/as3935.c | 456 ++
+ drivers/iio/temperature/Kconfig | 10 +
+ drivers/iio/temperature/Makefile | 1 +
+ drivers/iio/temperature/mlx90614.c | 150 +
+ drivers/platform/goldfish/goldfish_pipe.c | 34 +-
+ drivers/platform/goldfish/pdev_bus.c | 11 +-
+ drivers/staging/Kconfig | 8 +-
+ drivers/staging/Makefile | 4 +-
+ drivers/staging/android/alarm-dev.c | 1 +
+ drivers/staging/android/binder.c | 53 +-
+ drivers/staging/android/ion/ion.c | 14 +
+ drivers/staging/android/ion/ion_carveout_heap.c | 2 +-
+ drivers/staging/android/ion/ion_chunk_heap.c | 2 +-
+ drivers/staging/android/ion/ion_heap.c | 2 +
+ drivers/staging/android/ion/ion_page_pool.c | 49 +-
+ drivers/staging/android/ion/ion_priv.h | 3 +-
+ drivers/staging/android/ion/ion_system_heap.c | 68 +-
+ drivers/staging/android/logger.c | 3 +
+ drivers/staging/android/ram_console.h | 22 -
+ drivers/staging/android/sw_sync.c | 2 +
+ drivers/staging/android/sync.c | 12 +
+ drivers/staging/android/timed_gpio.c | 5 +-
+ drivers/staging/android/uapi/ion.h | 12 +-
+ drivers/staging/bcm/Bcmchar.c | 447 +-
+ drivers/staging/bcm/CmHost.c | 1231 +--
+ drivers/staging/bcm/InterfaceDld.c | 6 +-
+ drivers/staging/bcm/InterfaceIdleMode.c | 3 +-
+ drivers/staging/bcm/InterfaceMisc.h | 12 +-
+ drivers/staging/bcm/PHSModule.c | 9 +-
+ drivers/staging/bcm/Qos.c | 203 +-
+ drivers/staging/bcm/Transmit.c | 19 +-
+ drivers/staging/bcm/hostmibs.c | 51 +-
+ drivers/staging/comedi/Kconfig | 22 +-
+ drivers/staging/comedi/TODO | 1 -
+ drivers/staging/comedi/comedi_buf.c | 66 +-
+ drivers/staging/comedi/comedi_fops.c | 93 +-
+ drivers/staging/comedi/comedi_internal.h | 6 +-
+ drivers/staging/comedi/comedidev.h | 21 +-
+ drivers/staging/comedi/drivers.c | 2 +-
+ drivers/staging/comedi/drivers/8253.h | 109 +-
+ drivers/staging/comedi/drivers/8255.c | 5 +-
+ drivers/staging/comedi/drivers/8255.h | 4 +-
+ .../staging/comedi/drivers/addi-data/addi_common.h | 10 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 130 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 169 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3200.c | 50 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.c | 6 +-
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 7 +-
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 180 +-
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 26 +-
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 55 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 338 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 433 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 509 +-
+ .../staging/comedi/drivers/amplc_dio200_common.c | 56 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 5 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 325 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 388 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 1 +
+ drivers/staging/comedi/drivers/cb_pcidas.c | 174 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 144 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 11 +-
+ drivers/staging/comedi/drivers/comedi_fc.c | 22 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 5 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 28 +-
+ drivers/staging/comedi/drivers/das08.h | 4 +-
+ drivers/staging/comedi/drivers/das16.c | 93 +-
+ drivers/staging/comedi/drivers/das16m1.c | 106 +-
+ drivers/staging/comedi/drivers/das1800.c | 188 +-
+ drivers/staging/comedi/drivers/das6402.c | 2 +-
+ drivers/staging/comedi/drivers/das800.c | 117 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 88 +-
+ drivers/staging/comedi/drivers/dt2801.c | 2 +-
+ drivers/staging/comedi/drivers/dt2814.c | 9 +-
+ drivers/staging/comedi/drivers/dt282x.c | 28 +-
+ drivers/staging/comedi/drivers/dt3000.c | 31 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 36 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 1 +
+ drivers/staging/comedi/drivers/me4000.c | 100 +-
+ drivers/staging/comedi/drivers/mite.c | 38 +-
+ drivers/staging/comedi/drivers/mite.h | 6 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 5 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 6 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 6 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 89 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 8 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 2 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 189 +-
+ drivers/staging/comedi/drivers/ni_labpc_isadma.c | 7 +-
+ drivers/staging/comedi/drivers/ni_mio_common.c | 142 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 28 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 10 +-
+ drivers/staging/comedi/drivers/ni_tiocmd.c | 42 +-
+ drivers/staging/comedi/drivers/pcl711.c | 35 +-
+ drivers/staging/comedi/drivers/pcl726.c | 5 +-
+ drivers/staging/comedi/drivers/pcl730.c | 36 +
+ drivers/staging/comedi/drivers/pcl812.c | 28 +-
+ drivers/staging/comedi/drivers/pcl816.c | 17 +-
+ drivers/staging/comedi/drivers/pcl818.c | 19 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 61 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 32 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 20 +-
+ drivers/staging/comedi/drivers/rtd520.c | 42 +-
+ drivers/staging/comedi/drivers/s626.c | 92 +-
+ drivers/staging/comedi/drivers/skel.c | 29 +-
+ drivers/staging/comedi/drivers/usbdux.c | 58 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 40 +-
+ drivers/staging/comedi/drivers/usbduxsigma.c | 40 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 29 +-
+ drivers/staging/cxt1e1/functions.c | 18 -
+ drivers/staging/cxt1e1/hwprobe.c | 16 +-
+ drivers/staging/cxt1e1/linux.c | 38 +-
+ drivers/staging/cxt1e1/musycc.c | 2678 +++----
+ drivers/staging/cxt1e1/pmc93x6_eeprom.c | 550 +-
+ drivers/staging/cxt1e1/pmcc4_drv.c | 47 +-
+ drivers/staging/cxt1e1/pmcc4_private.h | 2 +-
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 23 +-
+ drivers/staging/cxt1e1/sbecrc.c | 5 +-
+ drivers/staging/cxt1e1/sbeproc.c | 2 +-
+ drivers/staging/dgap/dgap.c | 1326 ++--
+ drivers/staging/dgap/dgap.h | 461 +-
+ drivers/staging/dgnc/dgnc_cls.c | 4 -
+ drivers/staging/dgnc/dgnc_cls.h | 1 -
+ drivers/staging/dgnc/dgnc_driver.c | 43 +-
+ drivers/staging/dgnc/dgnc_neo.c | 115 +-
+ drivers/staging/dgnc/dgnc_sysfs.c | 2 +-
+ drivers/staging/dgnc/dgnc_tty.c | 152 +-
+ drivers/staging/et131x/Module.symvers | 0
+ drivers/staging/et131x/et131x.c | 5 +-
+ drivers/staging/frontier/tranzport.c | 10 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000.h | 15 +-
+ drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 6 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 12 +-
+ .../staging/ft1000/ft1000-usb/ft1000_download.c | 3 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 142 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 25 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 2 +-
+ drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 37 +-
+ drivers/staging/ft1000/ft1000.h | 7 +-
+ drivers/staging/fwserial/dma_fifo.c | 32 +-
+ drivers/staging/fwserial/dma_fifo.h | 22 +-
+ drivers/staging/fwserial/fwserial.c | 42 +-
+ drivers/staging/gdm72xx/TODO | 1 -
+ drivers/staging/gdm72xx/gdm_qos.c | 100 +-
+ drivers/staging/gdm72xx/gdm_qos.h | 17 -
+ drivers/staging/gdm72xx/gdm_sdio.c | 27 +-
+ drivers/staging/gdm72xx/gdm_sdio.h | 29 +-
+ drivers/staging/gdm72xx/gdm_usb.c | 64 +-
+ drivers/staging/gdm72xx/gdm_usb.h | 11 +-
+ drivers/staging/gdm72xx/gdm_wimax.c | 104 +-
+ drivers/staging/gdm72xx/gdm_wimax.h | 29 +-
+ drivers/staging/gdm72xx/hci.h | 87 +-
+ drivers/staging/gdm72xx/netlink_k.c | 11 +-
+ drivers/staging/gdm72xx/netlink_k.h | 4 +-
+ drivers/staging/gdm72xx/sdio_boot.c | 4 +-
+ drivers/staging/gdm72xx/sdio_boot.h | 2 +-
+ drivers/staging/gdm72xx/usb_boot.c | 39 +-
+ drivers/staging/gdm72xx/usb_boot.h | 4 +-
+ drivers/staging/gdm72xx/usb_ids.h | 2 +-
+ drivers/staging/gdm72xx/wm_ioctl.h | 22 +-
+ drivers/staging/goldfish/README | 1 -
+ drivers/staging/goldfish/goldfish_audio.c | 22 +-
+ drivers/staging/goldfish/goldfish_nand.c | 26 +-
+ drivers/staging/goldfish/goldfish_nand_reg.h | 3 +-
+ drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 2 +-
+ drivers/staging/gs_fpgaboot/io.c | 6 +
+ drivers/staging/iio/Documentation/iio_utils.h | 4 +-
+ drivers/staging/iio/adc/Kconfig | 20 -
+ drivers/staging/iio/adc/Makefile | 4 -
+ drivers/staging/iio/adc/ad7280a.c | 4 +-
+ drivers/staging/iio/adc/ad7606.h | 4 +-
+ drivers/staging/iio/adc/ad7816.c | 2 +-
+ drivers/staging/iio/adc/ad799x.h | 121 -
+ drivers/staging/iio/adc/ad799x_ring.c | 84 -
+ drivers/staging/iio/adc/spear_adc.c | 315 +-
+ drivers/staging/iio/addac/adt7316.c | 4 +-
+ drivers/staging/iio/cdc/ad7152.c | 2 +-
+ drivers/staging/iio/cdc/ad7746.c | 2 +-
+ drivers/staging/iio/light/tsl2583.c | 38 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 3 +-
+ drivers/staging/imx-drm/imx-hdmi.c | 20 +-
+ drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h | 5 +
+ drivers/staging/imx-drm/ipu-v3/ipu-common.c | 47 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dc.c | 97 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-di.c | 2 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dmfc.c | 25 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-dp.c | 71 +-
+ drivers/staging/imx-drm/ipu-v3/ipu-prv.h | 3 +
+ drivers/staging/imx-drm/ipuv3-crtc.c | 16 +-
+ drivers/staging/imx-drm/ipuv3-plane.c | 4 +
+ drivers/staging/imx-drm/parallel-display.c | 2 +
+ drivers/staging/keucr/init.c | 1 +
+ drivers/staging/keucr/init.h | 5 -
+ drivers/staging/keucr/scsiglue.c | 2 +-
+ drivers/staging/keucr/smil.h | 3 +-
+ drivers/staging/keucr/smilmain.c | 34 +-
+ drivers/staging/keucr/smilsub.c | 1 +
+ drivers/staging/keucr/transport.c | 1 +
+ drivers/staging/line6/capture.c | 3 +
+ drivers/staging/line6/driver.c | 1 +
+ drivers/staging/line6/midi.c | 2 +
+ drivers/staging/line6/pcm.c | 2 +-
+ drivers/staging/line6/playback.c | 11 +-
+ drivers/staging/line6/pod.c | 5 +
+ drivers/staging/line6/toneport.c | 3 +
+ drivers/staging/line6/variax.c | 2 +
+ drivers/staging/lustre/TODO | 5 +-
+ .../staging/lustre/include/linux/libcfs/curproc.h | 1 -
+ .../staging/lustre/include/linux/libcfs/libcfs.h | 1 +
+ .../lustre/include/linux/libcfs/libcfs_cpu.h | 9 +-
+ .../lustre/include/linux/libcfs/libcfs_crypto.h | 2 +-
+ .../lustre/include/linux/libcfs/libcfs_debug.h | 4 +-
+ .../lustre/include/linux/libcfs/libcfs_hash.h | 8 +-
+ .../lustre/include/linux/libcfs/libcfs_private.h | 4 +-
+ .../lustre/include/linux/libcfs/linux/linux-lock.h | 2 +-
+ .../lustre/include/linux/libcfs/linux/linux-mem.h | 5 +
+ .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +-
+ .../staging/lustre/include/linux/lnet/lib-types.h | 6 +-
+ drivers/staging/lustre/include/linux/lnet/lnetst.h | 2 +-
+ drivers/staging/lustre/include/linux/lnet/ptllnd.h | 2 +-
+ .../lustre/include/linux/lnet/ptllnd_wire.h | 14 +-
+ drivers/staging/lustre/include/linux/lnet/types.h | 8 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +-
+ .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 68 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 78 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 4 +-
+ .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 82 +-
+ .../lustre/lnet/klnds/socklnd/socklnd_lib-linux.c | 73 +-
+ drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +-
+ drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +-
+ drivers/staging/lustre/lnet/lnet/router.c | 2 +-
+ drivers/staging/lustre/lustre/fid/lproc_fid.c | 41 +-
+ drivers/staging/lustre/lustre/include/dt_object.h | 9 +-
+ drivers/staging/lustre/lustre/include/ioctl.h | 106 -
+ drivers/staging/lustre/lustre/include/linux/obd.h | 6 +-
+ .../staging/lustre/lustre/include/lprocfs_status.h | 5 +-
+ drivers/staging/lustre/lustre/include/lu_object.h | 8 +-
+ drivers/staging/lustre/lustre/include/lu_ref.h | 4 +-
+ .../lustre/lustre/include/lustre/lustre_idl.h | 28 +-
+ .../lustre/lustre/include/lustre/lustre_user.h | 5 +-
+ .../staging/lustre/lustre/include/lustre_debug.h | 1 -
+ drivers/staging/lustre/lustre/include/lustre_dlm.h | 12 +-
+ drivers/staging/lustre/lustre/include/lustre_lib.h | 34 +-
+ drivers/staging/lustre/lustre/include/lustre_log.h | 10 -
+ drivers/staging/lustre/lustre/include/lustre_mdc.h | 23 +-
+ drivers/staging/lustre/lustre/include/lustre_net.h | 4 +-
+ drivers/staging/lustre/lustre/include/obd.h | 24 +-
+ drivers/staging/lustre/lustre/include/obd_class.h | 19 +-
+ drivers/staging/lustre/lustre/include/obd_lov.h | 116 -
+ .../staging/lustre/lustre/include/obd_support.h | 10 +-
+ drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 17 +-
+ .../staging/lustre/lustre/lclient/lcommon_misc.c | 15 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 2 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 4 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 10 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 16 +-
+ drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +-
+ drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c | 23 +
+ .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 18 +-
+ .../lustre/lustre/libcfs/linux/linux-curproc.c | 152 -
+ .../lustre/lustre/libcfs/linux/linux-module.c | 15 +-
+ .../lustre/lustre/libcfs/linux/linux-tcpip.c | 43 +-
+ drivers/staging/lustre/lustre/libcfs/module.c | 3 +-
+ drivers/staging/lustre/lustre/libcfs/nidstrings.c | 12 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.c | 14 +-
+ drivers/staging/lustre/lustre/libcfs/tracefile.h | 2 +-
+ drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +-
+ drivers/staging/lustre/lustre/llite/dcache.c | 26 +-
+ drivers/staging/lustre/lustre/llite/dir.c | 15 +-
+ drivers/staging/lustre/lustre/llite/file.c | 152 +-
+ drivers/staging/lustre/lustre/llite/llite_capa.c | 4 +-
+ .../staging/lustre/lustre/llite/llite_internal.h | 177 +-
+ drivers/staging/lustre/lustre/llite/llite_lib.c | 138 +-
+ drivers/staging/lustre/lustre/llite/llite_mmap.c | 23 +-
+ drivers/staging/lustre/lustre/llite/llite_nfs.c | 4 +-
+ drivers/staging/lustre/lustre/llite/lloop.c | 10 +-
+ drivers/staging/lustre/lustre/llite/lproc_llite.c | 155 +-
+ drivers/staging/lustre/lustre/llite/namei.c | 40 +-
+ drivers/staging/lustre/lustre/llite/remote_perm.c | 2 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 7 -
+ drivers/staging/lustre/lustre/llite/rw26.c | 19 +-
+ drivers/staging/lustre/lustre/llite/statahead.c | 68 +-
+ drivers/staging/lustre/lustre/llite/super25.c | 9 +-
+ drivers/staging/lustre/lustre/llite/symlink.c | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_dev.c | 10 +-
+ drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 +-
+ drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +-
+ drivers/staging/lustre/lustre/llite/vvp_object.c | 35 +-
+ drivers/staging/lustre/lustre/llite/xattr.c | 7 +-
+ drivers/staging/lustre/lustre/llite/xattr_cache.c | 4 +-
+ drivers/staging/lustre/lustre/lmv/lmv_obd.c | 25 +-
+ drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 16 +-
+ drivers/staging/lustre/lustre/lov/Makefile | 2 +-
+ drivers/staging/lustre/lustre/lov/lov_dev.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_ea.c | 14 +-
+ drivers/staging/lustre/lustre/lov/lov_internal.h | 37 +-
+ drivers/staging/lustre/lustre/lov/lov_lock.c | 42 +-
+ drivers/staging/lustre/lustre/lov/lov_log.c | 272 -
+ drivers/staging/lustre/lustre/lov/lov_merge.c | 6 +-
+ drivers/staging/lustre/lustre/lov/lov_obd.c | 31 +-
+ drivers/staging/lustre/lustre/lov/lov_object.c | 3 +-
+ drivers/staging/lustre/lustre/lov/lov_offset.c | 1 -
+ drivers/staging/lustre/lustre/lov/lov_pack.c | 10 +-
+ drivers/staging/lustre/lustre/lov/lov_request.c | 1 -
+ drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lovsub_lock.c | 2 +-
+ drivers/staging/lustre/lustre/lov/lovsub_object.c | 2 +-
+ drivers/staging/lustre/lustre/mdc/mdc_locks.c | 23 +-
+ drivers/staging/lustre/lustre/mdc/mdc_reint.c | 11 +-
+ drivers/staging/lustre/lustre/mdc/mdc_request.c | 49 +-
+ drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 22 +-
+ drivers/staging/lustre/lustre/mgc/mgc_request.c | 8 +-
+ drivers/staging/lustre/lustre/obdclass/cl_lock.c | 16 +-
+ drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +-
+ drivers/staging/lustre/lustre/obdclass/cl_page.c | 4 +-
+ drivers/staging/lustre/lustre/obdclass/class_obd.c | 50 +-
+ drivers/staging/lustre/lustre/obdclass/debug.c | 12 -
+ drivers/staging/lustre/lustre/obdclass/genops.c | 6 +-
+ .../lustre/lustre/obdclass/linux/linux-module.c | 42 +-
+ .../staging/lustre/lustre/obdclass/llog_ioctl.c | 2 +-
+ drivers/staging/lustre/lustre/obdclass/llog_obd.c | 29 +-
+ drivers/staging/lustre/lustre/obdclass/obd_mount.c | 18 +-
+ .../staging/lustre/lustre/obdecho/echo_client.c | 11 +-
+ drivers/staging/lustre/lustre/osc/lproc_osc.c | 84 +-
+ drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +-
+ .../staging/lustre/lustre/osc/osc_cl_internal.h | 9 +
+ drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +-
+ drivers/staging/lustre/lustre/osc/osc_io.c | 28 +-
+ drivers/staging/lustre/lustre/osc/osc_lock.c | 3 +-
+ drivers/staging/lustre/lustre/osc/osc_object.c | 2 +-
+ drivers/staging/lustre/lustre/osc/osc_request.c | 1 -
+ drivers/staging/lustre/lustre/ptlrpc/client.c | 50 +-
+ drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_bulk.c | 12 +-
+ .../staging/lustre/lustre/ptlrpc/gss/gss_pipefs.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/import.c | 36 +-
+ .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/nrs.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/pack_generic.c | 1 +
+ drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 +-
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 4 +
+ .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 32 +-
+ drivers/staging/lustre/lustre/ptlrpc/recover.c | 6 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec.c | 24 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 4 +-
+ drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 10 +-
+ drivers/staging/lustre/lustre/ptlrpc/service.c | 20 +-
+ drivers/staging/media/lirc/lirc_serial.c | 81 -
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 1 +
+ drivers/staging/netlogic/xlr_net.c | 1 +
+ drivers/staging/nokia_h4p/nokia_fw-bcm.c | 3 +-
+ drivers/staging/octeon-usb/octeon-hcd.c | 130 +-
+ drivers/staging/olpc_dcon/olpc_dcon.c | 8 +-
+ drivers/staging/ozwpan/TODO | 2 +-
+ drivers/staging/ozwpan/ozhcd.c | 21 +-
+ drivers/staging/ozwpan/ozproto.c | 4 +-
+ drivers/staging/panel/panel.c | 310 +-
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 8 +-
+ drivers/staging/rtl8188eu/core/rtw_br_ext.c | 1 +
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 35 -
+ drivers/staging/rtl8188eu/core/rtw_led.c | 1415 +---
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 19 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 13 +-
+ drivers/staging/rtl8188eu/core/rtw_mp.c | 1 -
+ drivers/staging/rtl8188eu/core/rtw_p2p.c | 6 +-
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 18 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 72 +-
+ drivers/staging/rtl8188eu/core/rtw_security.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 30 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 2 -
+ drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 14 -
+ drivers/staging/rtl8188eu/hal/hal_intf.c | 16 -
+ drivers/staging/rtl8188eu/hal/odm.c | 174 +-
+ drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 12 -
+ drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 24 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 14 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_phycfg.c | 208 -
+ drivers/staging/rtl8188eu/hal/rtl8188e_rf6052.c | 45 -
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 43 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 22 +-
+ drivers/staging/rtl8188eu/hal/usb_halinit.c | 66 -
+ drivers/staging/rtl8188eu/hal/usb_ops_linux.c | 26 +-
+ drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 1 -
+ drivers/staging/rtl8188eu/include/drv_types.h | 1 -
+ drivers/staging/rtl8188eu/include/hal_intf.h | 8 -
+ drivers/staging/rtl8188eu/include/odm.h | 8 -
+ drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 2 -
+ drivers/staging/rtl8188eu/include/odm_debug.h | 6 +-
+ drivers/staging/rtl8188eu/include/odm_interface.h | 91 -
+ drivers/staging/rtl8188eu/include/odm_precomp.h | 1 -
+ drivers/staging/rtl8188eu/include/odm_types.h | 25 -
+ drivers/staging/rtl8188eu/include/osdep_service.h | 59 -
+ drivers/staging/rtl8188eu/include/recv_osdep.h | 4 -
+ drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 1 -
+ drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 -
+ drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_cmd.h | 1 -
+ drivers/staging/rtl8188eu/include/rtw_led.h | 119 +-
+ drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 53 -
+ drivers/staging/rtl8188eu/include/usb_ops.h | 1 -
+ drivers/staging/rtl8188eu/include/xmit_osdep.h | 6 -
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 69 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 16 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 40 +-
+ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 259 +-
+ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 7 -
+ drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 10 -
+ drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 +
+ drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 95 +-
+ .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 5 -
+ drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 2771 -------
+ drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 5 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 -
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 20 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 3 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 14 +-
+ drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_rx.c | 5 +-
+ drivers/staging/rtl8192e/rtllib_softmac.c | 5 +-
+ drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +-
+ drivers/staging/rtl8192ee/Kconfig | 15 +
+ drivers/staging/rtl8192ee/Makefile | 40 +
+ drivers/staging/rtl8192ee/TODO | 12 +
+ drivers/staging/rtl8192ee/base.c | 1852 +++++
+ drivers/staging/rtl8192ee/base.h | 163 +
+ .../staging/rtl8192ee/btcoexist/halbt_precomp.h | 50 +
+ .../staging/rtl8192ee/btcoexist/halbtc8192e2ant.c | 4110 ++++++++++
+ .../staging/rtl8192ee/btcoexist/halbtc8192e2ant.h | 161 +
+ .../staging/rtl8192ee/btcoexist/halbtc8723b1ant.c | 3146 ++++++++
+ .../staging/rtl8192ee/btcoexist/halbtc8723b1ant.h | 160 +
+ .../staging/rtl8192ee/btcoexist/halbtc8723b2ant.c | 3929 ++++++++++
+ .../staging/rtl8192ee/btcoexist/halbtc8723b2ant.h | 145 +
+ .../staging/rtl8192ee/btcoexist/halbtc8821a1ant.c | 2780 +++++++
+ .../staging/rtl8192ee/btcoexist/halbtc8821a1ant.h | 158 +
+ .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.c | 3438 ++++++++
+ .../staging/rtl8192ee/btcoexist/halbtc8821a2ant.h | 179 +
+ drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c | 1297 +++
+ drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h | 537 ++
+ drivers/staging/rtl8192ee/btcoexist/rtl_btc.c | 194 +
+ drivers/staging/rtl8192ee/btcoexist/rtl_btc.h | 62 +
+ drivers/staging/rtl8192ee/cam.c | 337 +
+ drivers/staging/rtl8192ee/cam.h | 52 +
+ drivers/staging/rtl8192ee/compat.h | 70 +
+ drivers/staging/rtl8192ee/core.c | 1600 ++++
+ drivers/staging/rtl8192ee/core.h | 39 +
+ drivers/staging/rtl8192ee/debug.c | 978 +++
+ drivers/staging/rtl8192ee/debug.h | 221 +
+ drivers/staging/rtl8192ee/efuse.c | 1233 +++
+ drivers/staging/rtl8192ee/efuse.h | 127 +
+ drivers/staging/rtl8192ee/pci.c | 2397 ++++++
+ drivers/staging/rtl8192ee/pci.h | 342 +
+ drivers/staging/rtl8192ee/ps.c | 983 +++
+ drivers/staging/rtl8192ee/ps.h | 52 +
+ drivers/staging/rtl8192ee/rc.c | 288 +
+ drivers/staging/rtl8192ee/rc.h | 47 +
+ drivers/staging/rtl8192ee/regd.c | 448 ++
+ drivers/staging/rtl8192ee/regd.h | 63 +
+ drivers/staging/rtl8192ee/rtl8192ee/def.h | 106 +
+ drivers/staging/rtl8192ee/rtl8192ee/dm.c | 1258 +++
+ drivers/staging/rtl8192ee/rtl8192ee/dm.h | 343 +
+ drivers/staging/rtl8192ee/rtl8192ee/fw.c | 945 +++
+ drivers/staging/rtl8192ee/rtl8192ee/fw.h | 213 +
+ drivers/staging/rtl8192ee/rtl8192ee/hw.c | 2544 ++++++
+ drivers/staging/rtl8192ee/rtl8192ee/hw.h | 67 +
+ drivers/staging/rtl8192ee/rtl8192ee/led.c | 134 +
+ drivers/staging/rtl8192ee/rtl8192ee/led.h | 37 +
+ drivers/staging/rtl8192ee/rtl8192ee/phy.c | 3282 ++++++++
+ drivers/staging/rtl8192ee/rtl8192ee/phy.h | 154 +
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseq.c | 108 +
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseq.h | 355 +
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c | 139 +
+ drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.h | 69 +
+ drivers/staging/rtl8192ee/rtl8192ee/reg.h | 2240 ++++++
+ drivers/staging/rtl8192ee/rtl8192ee/rf.c | 150 +
+ drivers/staging/rtl8192ee/rtl8192ee/rf.h | 39 +
+ drivers/staging/rtl8192ee/rtl8192ee/sw.c | 428 +
+ .../drv_types_linux.h => rtl8192ee/rtl8192ee/sw.h} | 25 +-
+ drivers/staging/rtl8192ee/rtl8192ee/table.c | 882 +++
+ drivers/staging/rtl8192ee/rtl8192ee/table.h | 48 +
+ drivers/staging/rtl8192ee/rtl8192ee/trx.c | 1286 +++
+ drivers/staging/rtl8192ee/rtl8192ee/trx.h | 877 +++
+ drivers/staging/rtl8192ee/stats.c | 290 +
+ drivers/staging/rtl8192ee/stats.h | 43 +
+ drivers/staging/rtl8192ee/wifi.h | 2644 +++++++
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 16 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 45 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 84 +-
+ .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 46 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 5 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 45 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 22 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 16 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 10 +-
+ drivers/staging/rtl8192u/r8180_93cx6.c | 46 +-
+ drivers/staging/rtl8192u/r8190_rtl8256.c | 6 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 18 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 18 +-
+ drivers/staging/rtl8192u/r8192U_wx.c | 246 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 3 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 12 +-
+ drivers/staging/rtl8192u/r819xU_firmware_img.c | 1042 +--
+ drivers/staging/rtl8192u/r819xU_phy.c | 6 +-
+ drivers/staging/rtl8712/hal_init.c | 2 +-
+ drivers/staging/rtl8712/ieee80211.c | 8 +-
+ drivers/staging/rtl8712/mlme_linux.c | 3 +-
+ drivers/staging/rtl8712/osdep_service.h | 5 -
+ drivers/staging/rtl8712/rtl8712_cmd.c | 3 +-
+ drivers/staging/rtl8712/rtl8712_recv.c | 13 +-
+ drivers/staging/rtl8712/rtl871x_cmd.c | 123 +-
+ drivers/staging/rtl8712/rtl871x_io.c | 11 +-
+ drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 47 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 48 +-
+ drivers/staging/rtl8712/rtl871x_mp.c | 13 +-
+ drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 49 +-
+ drivers/staging/rtl8712/rtl871x_recv.c | 10 +-
+ drivers/staging/rtl8712/rtl871x_security.c | 9 +-
+ drivers/staging/rtl8712/rtl871x_sta_mgt.c | 4 +-
+ drivers/staging/rtl8712/rtl871x_xmit.c | 16 +-
+ drivers/staging/rtl8712/usb_intf.c | 2 +-
+ drivers/staging/rtl8712/usb_ops_linux.c | 4 +-
+ drivers/staging/rtl8723au/Kconfig | 8 -
+ drivers/staging/rtl8723au/Makefile | 10 +-
+ drivers/staging/rtl8723au/core/rtw_ap.c | 439 +-
+ drivers/staging/rtl8723au/core/rtw_cmd.c | 734 +-
+ drivers/staging/rtl8723au/core/rtw_efuse.c | 363 +-
+ drivers/staging/rtl8723au/core/rtw_ieee80211.c | 961 +--
+ drivers/staging/rtl8723au/core/rtw_io.c | 266 -
+ drivers/staging/rtl8723au/core/rtw_ioctl_set.c | 250 +-
+ drivers/staging/rtl8723au/core/rtw_led.c | 48 +-
+ drivers/staging/rtl8723au/core/rtw_mlme.c | 1568 ++--
+ drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 6741 ++++------------
+ drivers/staging/rtl8723au/core/rtw_p2p.c | 4001 ----------
+ drivers/staging/rtl8723au/core/rtw_pwrctrl.c | 342 +-
+ drivers/staging/rtl8723au/core/rtw_recv.c | 313 +-
+ drivers/staging/rtl8723au/core/rtw_security.c | 61 +-
+ drivers/staging/rtl8723au/core/rtw_sreset.c | 79 +-
+ drivers/staging/rtl8723au/core/rtw_sta_mgt.c | 127 +-
+ drivers/staging/rtl8723au/core/rtw_wlan_util.c | 1015 ++-
+ drivers/staging/rtl8723au/core/rtw_xmit.c | 523 +-
+ .../staging/rtl8723au/hal/HalDMOutSrc8723A_CE.c | 133 +-
+ drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 8 +-
+ drivers/staging/rtl8723au/hal/hal_com.c | 276 +-
+ drivers/staging/rtl8723au/hal/hal_intf.c | 384 +-
+ drivers/staging/rtl8723au/hal/odm.c | 181 +-
+ drivers/staging/rtl8723au/hal/odm_HWConfig.c | 43 +-
+ drivers/staging/rtl8723au/hal/odm_interface.c | 121 +-
+ .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 647 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_cmd.c | 291 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_dm.c | 33 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 1381 +---
+ drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 89 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 22 +-
+ drivers/staging/rtl8723au/hal/rtl8723a_sreset.c | 11 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_led.c | 27 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_recv.c | 76 +-
+ drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 69 +-
+ drivers/staging/rtl8723au/hal/usb_halinit.c | 641 +-
+ drivers/staging/rtl8723au/hal/usb_ops_linux.c | 310 +-
+ drivers/staging/rtl8723au/include/Hal8723APhyCfg.h | 14 +-
+ drivers/staging/rtl8723au/include/Hal8723PwrSeq.h | 104 +-
+ drivers/staging/rtl8723au/include/cmd_osdep.h | 26 -
+ drivers/staging/rtl8723au/include/drv_types.h | 81 -
+ drivers/staging/rtl8723au/include/ethernet.h | 22 -
+ drivers/staging/rtl8723au/include/hal_com.h | 13 +-
+ drivers/staging/rtl8723au/include/hal_intf.h | 305 +-
+ drivers/staging/rtl8723au/include/ieee80211.h | 256 +-
+ drivers/staging/rtl8723au/include/ioctl_cfg80211.h | 50 -
+ drivers/staging/rtl8723au/include/mlme_osdep.h | 4 -
+ drivers/staging/rtl8723au/include/mp_custom_oid.h | 342 -
+ drivers/staging/rtl8723au/include/odm.h | 227 +-
+ drivers/staging/rtl8723au/include/odm_HWConfig.h | 16 +-
+ drivers/staging/rtl8723au/include/odm_debug.h | 42 +-
+ drivers/staging/rtl8723au/include/odm_interface.h | 57 -
+ drivers/staging/rtl8723au/include/odm_precomp.h | 4 -
+ drivers/staging/rtl8723au/include/odm_reg.h | 5 +-
+ drivers/staging/rtl8723au/include/odm_types.h | 36 -
+ drivers/staging/rtl8723au/include/osdep_intf.h | 12 +-
+ drivers/staging/rtl8723au/include/osdep_service.h | 119 -
+ drivers/staging/rtl8723au/include/recv_osdep.h | 9 -
+ .../rtl8723au/include/rtl8723a_bt-coexist.h | 122 +-
+ .../staging/rtl8723au/include/rtl8723a_bt_intf.h | 69 +
+ drivers/staging/rtl8723au/include/rtl8723a_cmd.h | 18 +-
+ drivers/staging/rtl8723au/include/rtl8723a_dm.h | 2 -
+ drivers/staging/rtl8723au/include/rtl8723a_hal.h | 60 +-
+ drivers/staging/rtl8723au/include/rtl8723a_recv.h | 21 +-
+ drivers/staging/rtl8723au/include/rtl8723a_spec.h | 314 +-
+ drivers/staging/rtl8723au/include/rtl8723a_xmit.h | 10 +-
+ drivers/staging/rtl8723au/include/rtw_ap.h | 4 +-
+ drivers/staging/rtl8723au/include/rtw_cmd.h | 144 +-
+ drivers/staging/rtl8723au/include/rtw_efuse.h | 11 +-
+ drivers/staging/rtl8723au/include/rtw_event.h | 60 +-
+ drivers/staging/rtl8723au/include/rtw_ht.h | 4 +-
+ drivers/staging/rtl8723au/include/rtw_io.h | 193 +-
+ drivers/staging/rtl8723au/include/rtw_ioctl.h | 26 -
+ drivers/staging/rtl8723au/include/rtw_ioctl_set.h | 23 +-
+ drivers/staging/rtl8723au/include/rtw_mlme.h | 272 +-
+ drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 192 +-
+ drivers/staging/rtl8723au/include/rtw_p2p.h | 158 -
+ drivers/staging/rtl8723au/include/rtw_pwrctrl.h | 4 -
+ drivers/staging/rtl8723au/include/rtw_qos.h | 26 -
+ drivers/staging/rtl8723au/include/rtw_recv.h | 26 +-
+ drivers/staging/rtl8723au/include/rtw_security.h | 61 +-
+ drivers/staging/rtl8723au/include/rtw_sreset.h | 28 +-
+ drivers/staging/rtl8723au/include/rtw_xmit.h | 34 +-
+ drivers/staging/rtl8723au/include/sta_info.h | 34 +-
+ drivers/staging/rtl8723au/include/usb_hal.h | 20 -
+ drivers/staging/rtl8723au/include/usb_ops.h | 31 +-
+ drivers/staging/rtl8723au/include/usb_ops_linux.h | 37 +-
+ drivers/staging/rtl8723au/include/usb_osintf.h | 24 -
+ drivers/staging/rtl8723au/include/usb_vendor_req.h | 31 -
+ drivers/staging/rtl8723au/include/wifi.h | 552 --
+ drivers/staging/rtl8723au/include/wlan_bssdef.h | 83 +-
+ drivers/staging/rtl8723au/include/xmit_osdep.h | 19 -
+ drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 1996 ++---
+ drivers/staging/rtl8723au/os_dep/mlme_linux.c | 109 +-
+ drivers/staging/rtl8723au/os_dep/os_intfs.c | 255 +-
+ drivers/staging/rtl8723au/os_dep/osdep_service.c | 175 -
+ drivers/staging/rtl8723au/os_dep/recv_linux.c | 66 +-
+ drivers/staging/rtl8723au/os_dep/usb_intf.c | 110 +-
+ drivers/staging/rtl8723au/os_dep/usb_ops_linux.c | 89 +-
+ drivers/staging/rtl8723au/os_dep/xmit_linux.c | 41 -
+ drivers/staging/rtl8821ae/base.c | 49 +-
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.c | 506 +-
+ .../staging/rtl8821ae/btcoexist/halbtc8192e2ant.h | 2 -
+ .../staging/rtl8821ae/btcoexist/halbtc8723b1ant.c | 402 +-
+ .../staging/rtl8821ae/btcoexist/halbtc8723b2ant.c | 147 +-
+ drivers/staging/rtl8821ae/btcoexist/halbtcoutsrc.c | 127 +-
+ drivers/staging/rtl8821ae/btcoexist/rtl_btc.c | 2 +-
+ drivers/staging/rtl8821ae/cam.c | 2 -
+ drivers/staging/rtl8821ae/compat.h | 57 -
+ drivers/staging/rtl8821ae/core.c | 146 +-
+ drivers/staging/rtl8821ae/debug.c | 5 -
+ drivers/staging/rtl8821ae/efuse.c | 2 -
+ drivers/staging/rtl8821ae/pci.c | 134 +-
+ drivers/staging/rtl8821ae/pci.h | 5 -
+ drivers/staging/rtl8821ae/ps.c | 26 -
+ drivers/staging/rtl8821ae/rc.c | 20 +-
+ drivers/staging/rtl8821ae/regd.c | 52 -
+ drivers/staging/rtl8821ae/regd.h | 8 -
+ drivers/staging/rtl8821ae/rtl8821ae/hw.h | 35 +-
+ drivers/staging/rtl8821ae/rtl8821ae/sw.c | 33 +-
+ drivers/staging/rtl8821ae/rtl8821ae/trx.c | 45 -
+ drivers/staging/rtl8821ae/rtl8821ae/trx.h | 11 -
+ drivers/staging/rtl8821ae/stats.c | 2 -
+ drivers/staging/rtl8821ae/wifi.h | 4 +-
+ drivers/staging/rts5139/Kconfig | 16 -
+ drivers/staging/rts5139/Makefile | 43 -
+ drivers/staging/rts5139/TODO | 9 -
+ drivers/staging/rts5139/debug.h | 46 -
+ drivers/staging/rts5139/ms.c | 4185 ----------
+ drivers/staging/rts5139/ms.h | 261 -
+ drivers/staging/rts5139/ms_mg.c | 643 --
+ drivers/staging/rts5139/ms_mg.h | 41 -
+ drivers/staging/rts5139/rts51x.c | 857 --
+ drivers/staging/rts5139/rts51x.h | 194 -
+ drivers/staging/rts5139/rts51x_card.c | 940 ---
+ drivers/staging/rts5139/rts51x_card.h | 870 ---
+ drivers/staging/rts5139/rts51x_chip.c | 1014 ---
+ drivers/staging/rts5139/rts51x_chip.h | 821 --
+ drivers/staging/rts5139/rts51x_fop.c | 292 -
+ drivers/staging/rts5139/rts51x_fop.h | 57 -
+ drivers/staging/rts5139/rts51x_scsi.c | 2135 -----
+ drivers/staging/rts5139/rts51x_scsi.h | 154 -
+ drivers/staging/rts5139/rts51x_transport.c | 736 --
+ drivers/staging/rts5139/rts51x_transport.h | 67 -
+ drivers/staging/rts5139/sd.c | 3274 --------
+ drivers/staging/rts5139/sd.h | 275 -
+ drivers/staging/rts5139/sd_cprm.c | 1056 ---
+ drivers/staging/rts5139/sd_cprm.h | 54 -
+ drivers/staging/rts5139/trace.h | 95 -
+ drivers/staging/rts5139/xd.c | 2145 -----
+ drivers/staging/rts5139/xd.h | 191 -
+ drivers/staging/rts5208/rtsx.c | 2 +-
+ drivers/staging/rts5208/rtsx_chip.c | 2 +-
+ drivers/staging/sbe-2t3e3/2t3e3.h | 889 ---
+ drivers/staging/sbe-2t3e3/Kconfig | 13 -
+ drivers/staging/sbe-2t3e3/Makefile | 4 -
+ drivers/staging/sbe-2t3e3/TODO | 6 -
+ drivers/staging/sbe-2t3e3/cpld.c | 351 -
+ drivers/staging/sbe-2t3e3/ctrl.c | 350 -
+ drivers/staging/sbe-2t3e3/ctrl.h | 131 -
+ drivers/staging/sbe-2t3e3/dc.c | 460 --
+ drivers/staging/sbe-2t3e3/exar7250.c | 185 -
+ drivers/staging/sbe-2t3e3/exar7300.c | 165 -
+ drivers/staging/sbe-2t3e3/intr.c | 579 --
+ drivers/staging/sbe-2t3e3/io.c | 330 -
+ drivers/staging/sbe-2t3e3/main.c | 172 -
+ drivers/staging/sbe-2t3e3/maps.c | 101 -
+ drivers/staging/sbe-2t3e3/module.c | 208 -
+ drivers/staging/sbe-2t3e3/netdev.c | 143 -
+ drivers/staging/sep/sep_crypto.c | 10 +
+ drivers/staging/sep/sep_dev.h | 1 +
+ drivers/staging/sep/sep_main.c | 3 +-
+ drivers/staging/serqt_usb2/serqt_usb2.c | 25 +-
+ drivers/staging/silicom/bpctl_mod.c | 189 +-
+ drivers/staging/silicom/bypasslib/bp_ioctl.h | 4 +-
+ drivers/staging/silicom/bypasslib/bypass.c | 53 +-
+ drivers/staging/skein/Kconfig | 32 +
+ drivers/staging/skein/Makefile | 9 +
+ drivers/staging/skein/TODO | 8 +
+ drivers/staging/skein/skein.c | 883 +++
+ drivers/staging/skein/skein.h | 346 +
+ drivers/staging/skein/skein_api.c | 239 +
+ drivers/staging/skein/skein_api.h | 230 +
+ drivers/staging/skein/skein_block.c | 776 ++
+ drivers/staging/skein/skein_block.h | 22 +
+ drivers/staging/skein/skein_iv.h | 186 +
+ drivers/staging/skein/threefish_api.c | 77 +
+ drivers/staging/skein/threefish_api.h | 170 +
+ drivers/staging/skein/threefish_block.c | 8258 ++++++++++++++++++++
+ drivers/staging/slicoss/TODO | 1 -
+ drivers/staging/slicoss/slic.h | 13 -
+ drivers/staging/slicoss/slicoss.c | 657 +-
+ drivers/staging/speakup/kobjects.c | 2 +-
+ drivers/staging/speakup/synth.c | 3 +
+ drivers/staging/tidspbridge/core/dsp-clock.c | 4 +-
+ drivers/staging/unisys/channels/channel.c | 2 +-
+ drivers/staging/unisys/channels/chanstub.c | 5 +-
+ drivers/staging/unisys/channels/chanstub.h | 2 +-
+ .../unisys/common-spar/include/channels/channel.h | 47 +-
+ .../common-spar/include/channels/channel_guid.h | 30 +-
+ .../include/channels/controlframework.h | 2 +-
+ .../include/channels/controlvmchannel.h | 21 +-
+ .../common-spar/include/channels/diagchannel.h | 14 +-
+ .../common-spar/include/channels/iochannel.h | 14 +-
+ .../common-spar/include/channels/vbuschannel.h | 12 +-
+ .../include/controlvmcompletionstatus.h | 2 +-
+ .../include/diagnostics/appos_subsystems.h | 2 +-
+ .../unisys/common-spar/include/iovmcall_gnuc.h | 2 +-
+ .../unisys/common-spar/include/vbusdeviceinfo.h | 2 +-
+ .../staging/unisys/common-spar/include/version.h | 2 +-
+ .../unisys/common-spar/include/vmcallinterface.h | 2 +-
+ drivers/staging/unisys/include/commontypes.h | 51 +-
+ drivers/staging/unisys/include/guestlinuxdebug.h | 6 +-
+ drivers/staging/unisys/include/guidutils.h | 203 -
+ drivers/staging/unisys/include/periodic_work.h | 2 +-
+ drivers/staging/unisys/include/procobjecttree.h | 2 +-
+ drivers/staging/unisys/include/sparstop.h | 2 +-
+ drivers/staging/unisys/include/timskmod.h | 2 +-
+ drivers/staging/unisys/include/timskmodutils.h | 4 +-
+ drivers/staging/unisys/include/uisqueue.h | 15 +-
+ drivers/staging/unisys/include/uisthread.h | 2 +-
+ drivers/staging/unisys/include/uisutils.h | 44 +-
+ drivers/staging/unisys/include/uniklog.h | 2 +-
+ drivers/staging/unisys/uislib/uislib.c | 935 +--
+ drivers/staging/unisys/uislib/uisqueue.c | 2 +-
+ drivers/staging/unisys/uislib/uisthread.c | 2 +-
+ drivers/staging/unisys/uislib/uisutils.c | 55 +-
+ drivers/staging/unisys/virthba/virthba.c | 21 +-
+ drivers/staging/unisys/virthba/virthba.h | 2 +-
+ drivers/staging/unisys/virtpci/virtpci.c | 19 +-
+ drivers/staging/unisys/virtpci/virtpci.h | 5 +-
+ drivers/staging/unisys/visorchannel/globals.h | 2 +-
+ drivers/staging/unisys/visorchannel/visorchannel.h | 48 +-
+ .../unisys/visorchannel/visorchannel_funcs.c | 45 +-
+ .../unisys/visorchannel/visorchannel_main.c | 7 +-
+ drivers/staging/unisys/visorchipset/Makefile | 2 +-
+ drivers/staging/unisys/visorchipset/controlvm.h | 2 +-
+ .../staging/unisys/visorchipset/controlvm_direct.c | 2 +-
+ drivers/staging/unisys/visorchipset/file.c | 2 +-
+ drivers/staging/unisys/visorchipset/file.h | 2 +-
+ drivers/staging/unisys/visorchipset/filexfer.c | 506 --
+ drivers/staging/unisys/visorchipset/filexfer.h | 147 -
+ drivers/staging/unisys/visorchipset/globals.h | 2 +-
+ drivers/staging/unisys/visorchipset/parser.c | 7 +-
+ drivers/staging/unisys/visorchipset/parser.h | 6 +-
+ drivers/staging/unisys/visorchipset/testing.h | 7 +-
+ drivers/staging/unisys/visorchipset/visorchipset.h | 18 +-
+ .../unisys/visorchipset/visorchipset_main.c | 28 +-
+ .../unisys/visorchipset/visorchipset_umode.h | 2 +-
+ drivers/staging/unisys/visorutil/charqueue.c | 4 +-
+ drivers/staging/unisys/visorutil/charqueue.h | 2 +-
+ drivers/staging/unisys/visorutil/easyproc.c | 8 +-
+ drivers/staging/unisys/visorutil/easyproc.h | 2 +-
+ drivers/staging/unisys/visorutil/memregion.h | 4 +-
+ .../staging/unisys/visorutil/memregion_direct.c | 8 +-
+ drivers/staging/unisys/visorutil/periodic_work.c | 3 +-
+ drivers/staging/unisys/visorutil/procobjecttree.c | 8 +-
+ drivers/staging/unisys/visorutil/visorkmodutils.c | 57 +-
+ drivers/staging/usbip/stub_dev.c | 1 +
+ drivers/staging/usbip/stub_tx.c | 3 +-
+ drivers/staging/usbip/usbip_common.h | 2 +
+ .../staging/usbip/userspace/libsrc/usbip_common.c | 4 +-
+ .../staging/usbip/userspace/libsrc/usbip_common.h | 2 +-
+ .../staging/usbip/userspace/libsrc/vhci_driver.c | 2 +-
+ drivers/staging/usbip/userspace/src/usbip_attach.c | 1 +
+ drivers/staging/usbip/userspace/src/usbip_port.c | 2 +-
+ drivers/staging/usbip/userspace/src/usbipd.c | 10 +-
+ drivers/staging/usbip/vhci_hcd.c | 2 +
+ drivers/staging/vme/devices/vme_user.c | 9 +-
+ drivers/staging/vt6655/IEEE11h.c | 6 -
+ drivers/staging/vt6655/baseband.c | 101 +-
+ drivers/staging/vt6655/bssdb.c | 6 +-
+ drivers/staging/vt6655/bssdb.h | 2 -
+ drivers/staging/vt6655/card.c | 195 +-
+ drivers/staging/vt6655/card.h | 1 -
+ drivers/staging/vt6655/channel.c | 80 +-
+ drivers/staging/vt6655/datarate.c | 24 +-
+ drivers/staging/vt6655/desc.h | 47 -
+ drivers/staging/vt6655/device.h | 19 +-
+ drivers/staging/vt6655/device_main.c | 298 +-
+ drivers/staging/vt6655/dpc.c | 142 +-
+ drivers/staging/vt6655/hostap.c | 73 +-
+ drivers/staging/vt6655/ioctl.c | 7 +-
+ drivers/staging/vt6655/ioctl.h | 9 -
+ drivers/staging/vt6655/iowpa.h | 7 -
+ drivers/staging/vt6655/iwctl.c | 474 +-
+ drivers/staging/vt6655/key.c | 55 +-
+ drivers/staging/vt6655/key.h | 2 -
+ drivers/staging/vt6655/mac.c | 96 +-
+ drivers/staging/vt6655/mac.h | 1 -
+ drivers/staging/vt6655/mib.c | 81 +-
+ drivers/staging/vt6655/mib.h | 8 -
+ drivers/staging/vt6655/michael.c | 33 +-
+ drivers/staging/vt6655/power.c | 36 +-
+ drivers/staging/vt6655/power.h | 3 -
+ drivers/staging/vt6655/rf.c | 69 +-
+ drivers/staging/vt6655/rxtx.c | 329 +-
+ drivers/staging/vt6655/rxtx.h | 11 -
+ drivers/staging/vt6655/tether.c | 4 +-
+ drivers/staging/vt6655/tkip.c | 7 +-
+ drivers/staging/vt6655/vntwifi.c | 115 +-
+ drivers/staging/vt6655/vntwifi.h | 14 -
+ drivers/staging/vt6655/wcmd.c | 126 +-
+ drivers/staging/vt6655/wctl.c | 9 +-
+ drivers/staging/vt6655/wmgr.c | 410 +-
+ drivers/staging/vt6655/wmgr.h | 30 -
+ drivers/staging/vt6655/wpa.c | 8 +-
+ drivers/staging/vt6655/wpa2.c | 41 +-
+ drivers/staging/vt6655/wpactl.c | 95 +-
+ drivers/staging/vt6655/wroute.c | 1 -
+ drivers/staging/vt6656/Makefile | 4 -
+ drivers/staging/vt6656/aes_ccmp.c | 373 -
+ drivers/staging/vt6656/aes_ccmp.h | 35 -
+ drivers/staging/vt6656/baseband.c | 1494 ++--
+ drivers/staging/vt6656/baseband.h | 22 +-
+ drivers/staging/vt6656/bssdb.c | 61 +-
+ drivers/staging/vt6656/card.c | 1045 ++-
+ drivers/staging/vt6656/card.h | 8 +-
+ drivers/staging/vt6656/control.c | 79 -
+ drivers/staging/vt6656/control.h | 54 -
+ drivers/staging/vt6656/datarate.c | 1 -
+ drivers/staging/vt6656/desc.h | 68 -
+ drivers/staging/vt6656/device.h | 241 +-
+ drivers/staging/vt6656/device_cfg.h | 87 -
+ drivers/staging/vt6656/dpc.c | 471 +-
+ drivers/staging/vt6656/firmware.c | 12 +-
+ drivers/staging/vt6656/hostap.c | 779 --
+ drivers/staging/vt6656/hostap.h | 58 -
+ drivers/staging/vt6656/int.c | 5 +-
+ drivers/staging/vt6656/iocmd.h | 387 -
+ drivers/staging/vt6656/iowpa.h | 53 -
+ drivers/staging/vt6656/iwctl.c | 64 +-
+ drivers/staging/vt6656/key.c | 42 +-
+ drivers/staging/vt6656/mac.c | 328 +-
+ drivers/staging/vt6656/mac.h | 16 +-
+ drivers/staging/vt6656/main_usb.c | 193 +-
+ drivers/staging/vt6656/power.c | 7 +-
+ drivers/staging/vt6656/rf.c | 137 +-
+ drivers/staging/vt6656/rf.h | 12 +-
+ drivers/staging/vt6656/rndis.h | 151 -
+ drivers/staging/vt6656/rxtx.c | 753 +-
+ drivers/staging/vt6656/rxtx.h | 12 +-
+ drivers/staging/vt6656/srom.h | 112 -
+ drivers/staging/vt6656/tcrc.c | 183 -
+ drivers/staging/vt6656/tcrc.h | 38 -
+ drivers/staging/vt6656/tether.c | 7 +-
+ drivers/staging/vt6656/tether.h | 4 -
+ drivers/staging/vt6656/usbpipe.c | 329 +-
+ drivers/staging/vt6656/usbpipe.h | 11 +-
+ drivers/staging/vt6656/wcmd.c | 92 +-
+ drivers/staging/vt6656/wctl.c | 2 +-
+ drivers/staging/vt6656/wmgr.c | 76 +-
+ drivers/staging/vt6656/wpactl.c | 5 +-
+ drivers/staging/winbond/wb35tx.c | 6 +-
+ drivers/staging/winbond/wb35tx_s.h | 2 +-
+ drivers/staging/wlags49_h2/wl_priv.c | 14 +-
+ drivers/staging/wlags49_h2/wl_wext.c | 11 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 227 +-
+ drivers/staging/wlan-ng/p80211conv.c | 31 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 139 +-
+ drivers/staging/wlan-ng/p80211req.c | 9 +-
+ drivers/staging/wlan-ng/prism2fw.c | 101 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 123 +-
+ drivers/staging/wlan-ng/prism2mgmt.h | 5 +
+ drivers/staging/wlan-ng/prism2mib.c | 4 +-
+ drivers/staging/wlan-ng/prism2sta.c | 25 +-
+ drivers/staging/wlan-ng/prism2usb.c | 164 +-
+ drivers/staging/xgifb/TODO | 3 +-
+ drivers/staging/xgifb/XGI_main.h | 4 -
+ drivers/staging/xgifb/XGI_main_26.c | 3 +
+ drivers/staging/xgifb/vb_def.h | 2 -
+ drivers/staging/xgifb/vb_init.c | 2 +
+ drivers/staging/xgifb/vb_setmode.c | 3 +
+ drivers/staging/xgifb/vgatypes.h | 2 -
+ drivers/staging/xillybus/xillybus.h | 1 -
+ drivers/staging/xillybus/xillybus_core.c | 2 +-
+ drivers/staging/xillybus/xillybus_of.c | 47 +-
+ drivers/staging/xillybus/xillybus_pcie.c | 65 +-
+ drivers/tty/goldfish.c | 68 +-
+ include/linux/device.h | 6 +
+ include/linux/goldfish.h | 15 +
+ include/linux/hid-sensor-hub.h | 8 +-
+ include/linux/hid-sensor-ids.h | 1 +
+ include/linux/iio/common/st_sensors.h | 4 +
+ include/linux/iio/consumer.h | 13 +
+ include/linux/iio/iio.h | 24 +
+ include/linux/iio/types.h | 4 +
+ 974 files changed, 86239 insertions(+), 77344 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
+ create mode 100644 Documentation/devicetree/bindings/iio/proximity/as3935.txt
+ create mode 100644 drivers/iio/accel/mma8452.c
+ rename drivers/{staging/iio/adc/ad799x_core.c => iio/adc/ad799x.c} (80%)
+ create mode 100644 drivers/iio/orientation/hid-sensor-rotation.c
+ create mode 100644 drivers/iio/pressure/mpl115.c
+ create mode 100644 drivers/iio/proximity/Kconfig
+ create mode 100644 drivers/iio/proximity/Makefile
+ create mode 100644 drivers/iio/proximity/as3935.c
+ create mode 100644 drivers/iio/temperature/mlx90614.c
+ delete mode 100644 drivers/staging/android/ram_console.h
+ delete mode 100644 drivers/staging/et131x/Module.symvers
+ delete mode 100644 drivers/staging/iio/adc/ad799x.h
+ delete mode 100644 drivers/staging/iio/adc/ad799x_ring.c
+ delete mode 100644 drivers/staging/lustre/lustre/include/ioctl.h
+ delete mode 100644 drivers/staging/lustre/lustre/include/obd_lov.h
+ delete mode 100644 drivers/staging/lustre/lustre/lov/lov_log.c
+ delete mode 100644 drivers/staging/rtl8188eu/include/odm_interface.h
+ create mode 100644 drivers/staging/rtl8192ee/Kconfig
+ create mode 100644 drivers/staging/rtl8192ee/Makefile
+ create mode 100644 drivers/staging/rtl8192ee/TODO
+ create mode 100644 drivers/staging/rtl8192ee/base.c
+ create mode 100644 drivers/staging/rtl8192ee/base.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbt_precomp.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8192e2ant.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b1ant.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8723b2ant.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a1ant.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtc8821a2ant.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/halbtcoutsrc.h
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/rtl_btc.c
+ create mode 100644 drivers/staging/rtl8192ee/btcoexist/rtl_btc.h
+ create mode 100644 drivers/staging/rtl8192ee/cam.c
+ create mode 100644 drivers/staging/rtl8192ee/cam.h
+ create mode 100644 drivers/staging/rtl8192ee/compat.h
+ create mode 100644 drivers/staging/rtl8192ee/core.c
+ create mode 100644 drivers/staging/rtl8192ee/core.h
+ create mode 100644 drivers/staging/rtl8192ee/debug.c
+ create mode 100644 drivers/staging/rtl8192ee/debug.h
+ create mode 100644 drivers/staging/rtl8192ee/efuse.c
+ create mode 100644 drivers/staging/rtl8192ee/efuse.h
+ create mode 100644 drivers/staging/rtl8192ee/pci.c
+ create mode 100644 drivers/staging/rtl8192ee/pci.h
+ create mode 100644 drivers/staging/rtl8192ee/ps.c
+ create mode 100644 drivers/staging/rtl8192ee/ps.h
+ create mode 100644 drivers/staging/rtl8192ee/rc.c
+ create mode 100644 drivers/staging/rtl8192ee/rc.h
+ create mode 100644 drivers/staging/rtl8192ee/regd.c
+ create mode 100644 drivers/staging/rtl8192ee/regd.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/def.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/dm.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/dm.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/fw.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/fw.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/hw.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/hw.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/led.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/led.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/phy.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/phy.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseq.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseq.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/pwrseqcmd.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/reg.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/rf.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/rf.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/sw.c
+ rename drivers/staging/{rtl8188eu/include/drv_types_linux.h => rtl8192ee/rtl8192ee/sw.h} (51%)
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/table.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/table.h
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/trx.c
+ create mode 100644 drivers/staging/rtl8192ee/rtl8192ee/trx.h
+ create mode 100644 drivers/staging/rtl8192ee/stats.c
+ create mode 100644 drivers/staging/rtl8192ee/stats.h
+ create mode 100644 drivers/staging/rtl8192ee/wifi.h
+ delete mode 100644 drivers/staging/rtl8723au/core/rtw_io.c
+ delete mode 100644 drivers/staging/rtl8723au/core/rtw_p2p.c
+ delete mode 100644 drivers/staging/rtl8723au/include/cmd_osdep.h
+ delete mode 100644 drivers/staging/rtl8723au/include/ethernet.h
+ delete mode 100644 drivers/staging/rtl8723au/include/mp_custom_oid.h
+ delete mode 100644 drivers/staging/rtl8723au/include/odm_types.h
+ create mode 100644 drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_ioctl.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_p2p.h
+ delete mode 100644 drivers/staging/rtl8723au/include/rtw_qos.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_hal.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_osintf.h
+ delete mode 100644 drivers/staging/rtl8723au/include/usb_vendor_req.h
+ delete mode 100644 drivers/staging/rtl8723au/os_dep/osdep_service.c
+ delete mode 100644 drivers/staging/rts5139/Kconfig
+ delete mode 100644 drivers/staging/rts5139/Makefile
+ delete mode 100644 drivers/staging/rts5139/TODO
+ delete mode 100644 drivers/staging/rts5139/debug.h
+ delete mode 100644 drivers/staging/rts5139/ms.c
+ delete mode 100644 drivers/staging/rts5139/ms.h
+ delete mode 100644 drivers/staging/rts5139/ms_mg.c
+ delete mode 100644 drivers/staging/rts5139/ms_mg.h
+ delete mode 100644 drivers/staging/rts5139/rts51x.c
+ delete mode 100644 drivers/staging/rts5139/rts51x.h
+ delete mode 100644 drivers/staging/rts5139/rts51x_card.c
+ delete mode 100644 drivers/staging/rts5139/rts51x_card.h
+ delete mode 100644 drivers/staging/rts5139/rts51x_chip.c
+ delete mode 100644 drivers/staging/rts5139/rts51x_chip.h
+ delete mode 100644 drivers/staging/rts5139/rts51x_fop.c
+ delete mode 100644 drivers/staging/rts5139/rts51x_fop.h
+ delete mode 100644 drivers/staging/rts5139/rts51x_scsi.c
+ delete mode 100644 drivers/staging/rts5139/rts51x_scsi.h
+ delete mode 100644 drivers/staging/rts5139/rts51x_transport.c
+ delete mode 100644 drivers/staging/rts5139/rts51x_transport.h
+ delete mode 100644 drivers/staging/rts5139/sd.c
+ delete mode 100644 drivers/staging/rts5139/sd.h
+ delete mode 100644 drivers/staging/rts5139/sd_cprm.c
+ delete mode 100644 drivers/staging/rts5139/sd_cprm.h
+ delete mode 100644 drivers/staging/rts5139/trace.h
+ delete mode 100644 drivers/staging/rts5139/xd.c
+ delete mode 100644 drivers/staging/rts5139/xd.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/2t3e3.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/Kconfig
+ delete mode 100644 drivers/staging/sbe-2t3e3/Makefile
+ delete mode 100644 drivers/staging/sbe-2t3e3/TODO
+ delete mode 100644 drivers/staging/sbe-2t3e3/cpld.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/ctrl.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/ctrl.h
+ delete mode 100644 drivers/staging/sbe-2t3e3/dc.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/exar7250.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/exar7300.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/intr.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/io.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/main.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/maps.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/module.c
+ delete mode 100644 drivers/staging/sbe-2t3e3/netdev.c
+ create mode 100644 drivers/staging/skein/Kconfig
+ create mode 100644 drivers/staging/skein/Makefile
+ create mode 100644 drivers/staging/skein/TODO
+ create mode 100644 drivers/staging/skein/skein.c
+ create mode 100644 drivers/staging/skein/skein.h
+ create mode 100644 drivers/staging/skein/skein_api.c
+ create mode 100644 drivers/staging/skein/skein_api.h
+ create mode 100644 drivers/staging/skein/skein_block.c
+ create mode 100644 drivers/staging/skein/skein_block.h
+ create mode 100644 drivers/staging/skein/skein_iv.h
+ create mode 100644 drivers/staging/skein/threefish_api.c
+ create mode 100644 drivers/staging/skein/threefish_api.h
+ create mode 100644 drivers/staging/skein/threefish_block.c
+ delete mode 100644 drivers/staging/unisys/include/guidutils.h
+ delete mode 100644 drivers/staging/unisys/visorchipset/filexfer.c
+ delete mode 100644 drivers/staging/unisys/visorchipset/filexfer.h
+ delete mode 100644 drivers/staging/vt6656/aes_ccmp.c
+ delete mode 100644 drivers/staging/vt6656/aes_ccmp.h
+ delete mode 100644 drivers/staging/vt6656/control.c
+ delete mode 100644 drivers/staging/vt6656/control.h
+ delete mode 100644 drivers/staging/vt6656/device_cfg.h
+ delete mode 100644 drivers/staging/vt6656/hostap.c
+ delete mode 100644 drivers/staging/vt6656/hostap.h
+ delete mode 100644 drivers/staging/vt6656/rndis.h
+ delete mode 100644 drivers/staging/vt6656/srom.h
+ delete mode 100644 drivers/staging/vt6656/tcrc.c
+ delete mode 100644 drivers/staging/vt6656/tcrc.h
+ create mode 100644 include/linux/goldfish.h
+Merging char-misc/char-misc-next (a100d88df1e9 hv: use correct order when freeing monitor_pages)
+$ git merge char-misc/char-misc-next
+Auto-merging include/linux/mfd/palmas.h
+Auto-merging drivers/misc/genwqe/card_utils.c
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/connector/connector.txt | 15 +-
+ .../devicetree/bindings/misc/arm-charlcd.txt | 18 +
+ Documentation/devicetree/bindings/spmi/spmi.txt | 2 +-
+ Documentation/w1/w1.generic | 2 +-
+ Documentation/w1/w1.netlink | 13 +-
+ MAINTAINERS | 1 +
+ drivers/Makefile | 2 -
+ drivers/char/applicom.c | 1 -
+ drivers/connector/connector.c | 17 +-
+ drivers/extcon/extcon-adc-jack.c | 49 +-
+ drivers/extcon/extcon-arizona.c | 40 +-
+ drivers/extcon/extcon-class.c | 151 +++++
+ drivers/extcon/extcon-gpio.c | 37 +-
+ drivers/extcon/extcon-max14577.c | 25 +-
+ drivers/extcon/extcon-max77693.c | 23 +-
+ drivers/extcon/extcon-max8997.c | 16 +-
+ drivers/extcon/extcon-palmas.c | 41 +-
+ drivers/hv/channel.c | 19 +-
+ drivers/hv/channel_mgmt.c | 52 +-
+ drivers/hv/connection.c | 39 +-
+ drivers/hv/hv.c | 2 +
+ drivers/hv/hv_balloon.c | 29 +-
+ drivers/hv/hyperv_vmbus.h | 5 +
+ drivers/mcb/mcb-core.c | 20 +-
+ drivers/mcb/mcb-pci.c | 17 +-
+ drivers/misc/Kconfig | 5 +-
+ drivers/misc/arm-charlcd.c | 7 +
+ drivers/misc/ds1682.c | 5 +-
+ drivers/misc/genwqe/card_debugfs.c | 4 +-
+ drivers/misc/genwqe/card_utils.c | 2 +-
+ drivers/misc/mei/amthif.c | 2 -
+ drivers/misc/mei/bus.c | 4 +-
+ drivers/misc/mei/client.c | 90 ++-
+ drivers/misc/mei/hbm.c | 97 ++-
+ drivers/misc/mei/hbm.h | 2 +
+ drivers/misc/mei/hw-me-regs.h | 9 +
+ drivers/misc/mei/hw-me.c | 322 +++++++++-
+ drivers/misc/mei/hw-me.h | 15 +-
+ drivers/misc/mei/hw-txe-regs.h | 2 +-
+ drivers/misc/mei/hw-txe.c | 111 +++-
+ drivers/misc/mei/hw-txe.h | 21 +-
+ drivers/misc/mei/hw.h | 25 +-
+ drivers/misc/mei/init.c | 60 +-
+ drivers/misc/mei/main.c | 1 -
+ drivers/misc/mei/mei_dev.h | 101 +++-
+ drivers/misc/mei/pci-me.c | 256 +++++---
+ drivers/misc/mei/pci-txe.c | 155 ++++-
+ drivers/misc/mei/wd.c | 2 -
+ drivers/uio/uio.c | 2 +-
+ drivers/uio/uio_dmem_genirq.c | 4 +-
+ drivers/w1/w1.c | 2 +
+ drivers/w1/w1.h | 8 -
+ drivers/w1/w1_int.c | 4 +
+ drivers/w1/w1_netlink.c | 649 +++++++++++++--------
+ drivers/w1/w1_netlink.h | 36 ++
+ include/linux/connector.h | 1 +
+ include/linux/extcon.h | 37 ++
+ include/linux/hyperv.h | 7 +
+ include/linux/mcb.h | 6 +-
+ include/linux/mfd/palmas.h | 2 +-
+ include/linux/miscdevice.h | 2 +-
+ 61 files changed, 2095 insertions(+), 599 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/misc/arm-charlcd.txt
+Merging cgroup/for-next (5533e0114425 cgroup: disallow debug controller on the default hierarchy)
+$ git merge cgroup/for-next
+Resolved 'mm/memcontrol.c' using previous resolution.
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/events/core.c
+Auto-merging kernel/cgroup.c
+Auto-merging block/cfq-iosched.c
+Auto-merging block/blk-throttle.c
+Auto-merging block/bio.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5537c1224737] Merge remote-tracking branch 'cgroup/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroups/memory.txt | 6 +-
+ Documentation/cgroups/unified-hierarchy.txt | 359 +++++
+ MAINTAINERS | 47 +-
+ block/bio.c | 2 +-
+ block/blk-cgroup.c | 2 +-
+ block/blk-cgroup.h | 2 +-
+ block/blk-throttle.c | 32 +-
+ block/cfq-iosched.c | 28 +-
+ include/linux/cgroup.h | 272 ++--
+ include/linux/cgroup_subsys.h | 11 +-
+ kernel/cgroup.c | 1884 +++++++++++++++++----------
+ kernel/cgroup_freezer.c | 26 +-
+ kernel/cpuset.c | 46 +-
+ kernel/events/core.c | 3 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/cpuacct.c | 2 +-
+ mm/hugetlb_cgroup.c | 37 +-
+ mm/memcontrol.c | 188 +--
+ net/core/netclassid_cgroup.c | 2 +-
+ net/core/netprio_cgroup.c | 14 +-
+ net/ipv4/tcp_memcontrol.c | 31 +-
+ security/device_cgroup.c | 33 +-
+ 22 files changed, 1992 insertions(+), 1037 deletions(-)
+ create mode 100644 Documentation/cgroups/unified-hierarchy.txt
+Merging scsi/for-next (68fd4d9d14cb Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/sd.c
+Auto-merging drivers/scsi/scsi_lib.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/pm8001/pm8001_ctl.c
+Auto-merging drivers/scsi/atari_scsi.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/scsi/LICENSE.qla2xxx | 2 +-
+ MAINTAINERS | 38 +-
+ drivers/message/fusion/mptbase.c | 2 +-
+ drivers/message/fusion/mptctl.c | 6 +-
+ drivers/message/fusion/mptfc.c | 12 +-
+ drivers/message/fusion/mptsas.c | 10 +-
+ drivers/message/fusion/mptscsih.c | 8 +-
+ drivers/message/fusion/mptscsih.h | 2 +-
+ drivers/message/fusion/mptspi.c | 12 +-
+ drivers/scsi/NCR5380.c | 137 +++---
+ drivers/scsi/NCR5380.h | 32 +-
+ drivers/scsi/aic7xxx/aic79xx_pci.c | 18 +-
+ drivers/scsi/arm/acornscsi.c | 53 ---
+ drivers/scsi/arm/cumana_1.c | 3 -
+ drivers/scsi/arm/oak.c | 3 -
+ drivers/scsi/atari_NCR5380.c | 193 ++++----
+ drivers/scsi/atari_scsi.c | 24 +-
+ drivers/scsi/atari_scsi.h | 119 -----
+ drivers/scsi/be2iscsi/be.h | 11 +
+ drivers/scsi/be2iscsi/be_cmds.h | 31 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 12 +-
+ drivers/scsi/be2iscsi/be_main.c | 93 +++-
+ drivers/scsi/be2iscsi/be_main.h | 7 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 64 ++-
+ drivers/scsi/be2iscsi/be_mgmt.h | 2 +
+ drivers/scsi/bfa/bfad.c | 2 +-
+ drivers/scsi/bnx2fc/bnx2fc_hwi.c | 64 +--
+ drivers/scsi/dtc.c | 2 -
+ drivers/scsi/esas2r/esas2r_main.c | 2 +-
+ drivers/scsi/fnic/fnic.h | 5 +-
+ drivers/scsi/fnic/fnic_debugfs.c | 238 ++++++++--
+ drivers/scsi/fnic/fnic_fcs.c | 61 ++-
+ drivers/scsi/fnic/fnic_main.c | 23 +-
+ drivers/scsi/fnic/fnic_scsi.c | 13 +-
+ drivers/scsi/fnic/fnic_trace.c | 326 +++++++++++++-
+ drivers/scsi/fnic/fnic_trace.h | 38 ++
+ drivers/scsi/g_NCR5380.c | 4 -
+ drivers/scsi/g_NCR5380.h | 7 -
+ drivers/scsi/hpsa.c | 31 +-
+ drivers/scsi/hpsa.h | 1 +
+ drivers/scsi/libiscsi.c | 4 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 21 +
+ drivers/scsi/mac_scsi.c | 10 -
+ drivers/scsi/mac_scsi.h | 10 -
+ drivers/scsi/megaraid/megaraid_sas_base.c | 15 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 24 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 24 +-
+ drivers/scsi/pas16.h | 3 -
+ drivers/scsi/pm8001/pm8001_ctl.c | 3 +
+ drivers/scsi/qla2xxx/qla_attr.c | 6 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 49 +-
+ drivers/scsi/qla2xxx/qla_bsg.h | 9 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 127 +++---
+ drivers/scsi/qla2xxx/qla_dbg.h | 5 +-
+ drivers/scsi/qla2xxx/qla_def.h | 44 +-
+ drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 14 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 14 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 2 +-
+ drivers/scsi/qla2xxx/qla_init.c | 53 +--
+ drivers/scsi/qla2xxx/qla_inline.h | 15 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 148 ++++--
+ drivers/scsi/qla2xxx/qla_isr.c | 23 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 96 +++-
+ drivers/scsi/qla2xxx/qla_mid.c | 2 +-
+ drivers/scsi/qla2xxx/qla_mr.c | 64 ++-
+ drivers/scsi/qla2xxx/qla_mr.h | 3 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 87 ++--
+ drivers/scsi/qla2xxx/qla_nx.h | 6 +-
+ drivers/scsi/qla2xxx/qla_nx2.c | 510 +++++++++++++++++----
+ drivers/scsi/qla2xxx/qla_nx2.h | 50 ++-
+ drivers/scsi/qla2xxx/qla_os.c | 105 +++--
+ drivers/scsi/qla2xxx/qla_settings.h | 2 +-
+ drivers/scsi/qla2xxx/qla_sup.c | 9 +-
+ drivers/scsi/qla2xxx/qla_target.c | 650 +++++++++++++++++++++++++--
+ drivers/scsi/qla2xxx/qla_target.h | 84 +++-
+ drivers/scsi/qla2xxx/qla_tmpl.c | 91 +++-
+ drivers/scsi/qla2xxx/qla_tmpl.h | 17 +-
+ drivers/scsi/qla2xxx/qla_version.h | 4 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 41 +-
+ drivers/scsi/qla4xxx/ql4_83xx.c | 106 +----
+ drivers/scsi/qla4xxx/ql4_83xx.h | 44 ++
+ drivers/scsi/qla4xxx/ql4_def.h | 1 +
+ drivers/scsi/qla4xxx/ql4_fw.h | 4 +
+ drivers/scsi/qla4xxx/ql4_glbl.h | 3 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 32 +-
+ drivers/scsi/qla4xxx/ql4_isr.c | 12 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 8 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 458 ++++++++++++++++++-
+ drivers/scsi/qla4xxx/ql4_nx.h | 3 +
+ drivers/scsi/qla4xxx/ql4_os.c | 41 +-
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi_debug.c | 8 +
+ drivers/scsi/scsi_error.c | 7 +
+ drivers/scsi/scsi_lib.c | 225 ++++------
+ drivers/scsi/sd.c | 48 +-
+ drivers/scsi/sr.c | 19 +-
+ drivers/scsi/sun3_NCR5380.c | 195 ++++----
+ drivers/scsi/sun3_scsi.c | 241 +++++++---
+ drivers/scsi/sun3_scsi.h | 199 +-------
+ drivers/scsi/sun3_scsi_vme.c | 588 +-----------------------
+ drivers/scsi/t128.c | 4 -
+ drivers/scsi/t128.h | 7 -
+ drivers/scsi/ufs/ufs.h | 36 +-
+ drivers/scsi/ufs/ufshcd.c | 722 ++++++++++++++++++++----------
+ drivers/scsi/ufs/ufshcd.h | 22 +-
+ drivers/scsi/ufs/ufshci.h | 32 +-
+ drivers/scsi/virtio_scsi.c | 78 +---
+ include/scsi/scsi_cmnd.h | 9 +
+ include/scsi/scsi_driver.h | 9 +-
+ 115 files changed, 4632 insertions(+), 2704 deletions(-)
+Merging scsi-core/core-for-3.16 (2a863ba8f6f5 sd: medium access timeout counter fails to reset)
+$ git merge scsi-core/core-for-3.16
+Already up-to-date.
+Merging scsi-drivers/drivers-for-3.16 (73d02c200b0e mptfusion: fix msgContext in mptctl_hp_hostinfo)
+$ git merge scsi-drivers/drivers-for-3.16
+Already up-to-date.
+Merging target-updates/for-next (6ac1564eaf22 iscsi-target: Fix incorrect buffer usage in non-leading connection login)
+$ git merge target-updates/for-next
+Resolved 'drivers/scsi/qla2xxx/qla_target.c' using previous resolution.
+Resolved 'drivers/scsi/virtio_scsi.c' using previous resolution.
+Auto-merging drivers/vhost/scsi.c
+Auto-merging drivers/scsi/virtio_scsi.c
+CONFLICT (content): Merge conflict in drivers/scsi/virtio_scsi.c
+Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c
+Auto-merging drivers/scsi/qla2xxx/qla_target.h
+Auto-merging drivers/scsi/qla2xxx/qla_target.c
+CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1f8f082b9df9] Merge remote-tracking branch 'target-updates/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/ulp/isert/ib_isert.c | 66 +++----
+ drivers/infiniband/ulp/isert/ib_isert.h | 2 +-
+ drivers/scsi/Kconfig | 1 +
+ drivers/scsi/qla2xxx/qla_target.c | 195 ++++++++++++-------
+ drivers/scsi/qla2xxx/qla_target.h | 6 +
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 4 +-
+ drivers/scsi/qla2xxx/tcm_qla2xxx.h | 2 +
+ drivers/scsi/virtio_scsi.c | 86 +++++++--
+ drivers/target/iscsi/iscsi_target_login.c | 5 +-
+ drivers/target/iscsi/iscsi_target_nego.c | 6 +
+ drivers/vhost/scsi.c | 305 ++++++++++++++++++++----------
+ include/linux/virtio_scsi.h | 15 +-
+ 12 files changed, 479 insertions(+), 214 deletions(-)
+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 (697787a16cae pinctrl: msm: Add more MSM8X74 pin definitions)
+$ git merge pinctrl/for-next
+Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7791.c
+Auto-merging drivers/pinctrl/sh-pfc/pfc-r8a7790.c
+Removing drivers/pinctrl/pinctrl-sunxi.h
+Removing drivers/pinctrl/pinctrl-sunxi-pins.h
+Auto-merging drivers/acpi/acpi_lpss.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 9 +-
+ .../bindings/pinctrl/fsl,imx6sx-pinctrl.txt | 36 +
+ .../bindings/pinctrl/marvell,orion-pinctrl.txt | 91 +
+ .../bindings/pinctrl/pinctrl-bindings.txt | 1 +
+ .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 88 +
+ .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 95 +
+ .../bindings/pinctrl/qcom,msm8974-pinctrl.txt | 22 +-
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 28 +-
+ arch/arm/Kconfig | 2 +-
+ drivers/acpi/acpi_lpss.c | 1 +
+ drivers/pinctrl/Kconfig | 39 +-
+ drivers/pinctrl/Makefile | 6 +-
+ drivers/pinctrl/berlin/Kconfig | 20 +
+ drivers/pinctrl/berlin/Makefile | 4 +
+ drivers/pinctrl/berlin/berlin-bg2.c | 274 ++
+ drivers/pinctrl/berlin/berlin-bg2cd.c | 217 ++
+ drivers/pinctrl/berlin/berlin-bg2q.c | 436 +++
+ drivers/pinctrl/berlin/berlin.c | 348 ++
+ drivers/pinctrl/berlin/berlin.h | 61 +
+ drivers/pinctrl/core.c | 17 +-
+ drivers/pinctrl/mvebu/Kconfig | 4 +
+ drivers/pinctrl/mvebu/Makefile | 1 +
+ drivers/pinctrl/mvebu/pinctrl-orion.c | 261 ++
+ drivers/pinctrl/pinconf-generic.c | 4 +-
+ drivers/pinctrl/pinctrl-adi2.c | 2 +-
+ drivers/pinctrl/pinctrl-apq8064.c | 613 ++++
+ drivers/pinctrl/pinctrl-at91.c | 129 +-
+ drivers/pinctrl/pinctrl-baytrail.c | 68 +-
+ drivers/pinctrl/pinctrl-exynos.c | 67 +
+ drivers/pinctrl/pinctrl-imx.c | 2 +-
+ drivers/pinctrl/pinctrl-imx6sx.c | 407 +++
+ drivers/pinctrl/pinctrl-ipq8064.c | 653 ++++
+ drivers/pinctrl/pinctrl-lantiq.h | 1 +
+ drivers/pinctrl/pinctrl-msm.c | 103 +-
+ drivers/pinctrl/pinctrl-msm.h | 3 +-
+ drivers/pinctrl/pinctrl-msm8x74.c | 680 +++-
+ drivers/pinctrl/pinctrl-rockchip.c | 221 +-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/pinctrl-samsung.h | 1 +
+ drivers/pinctrl/pinctrl-st.c | 130 +-
+ drivers/pinctrl/pinctrl-sunxi-pins.h | 3863 --------------------
+ drivers/pinctrl/pinctrl-sunxi.h | 548 ---
+ drivers/pinctrl/pinctrl-tegra.c | 49 +-
+ drivers/pinctrl/pinctrl-tegra.h | 133 +-
+ drivers/pinctrl/pinctrl-tegra114.c | 412 +--
+ drivers/pinctrl/pinctrl-tegra124.c | 520 ++-
+ drivers/pinctrl/pinctrl-tegra20.c | 244 +-
+ drivers/pinctrl/pinctrl-tegra30.c | 551 ++-
+ drivers/pinctrl/pinmux.c | 23 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 3 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 138 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 412 ++-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2 +
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 5 +
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 350 +-
+ drivers/pinctrl/sunxi/Kconfig | 36 +
+ drivers/pinctrl/sunxi/Makefile | 10 +
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1039 ++++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 690 ++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 411 +++
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 141 +
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 865 +++++
+ drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1065 ++++++
+ drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c | 145 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 258 ++
+ 66 files changed, 10872 insertions(+), 6190 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,orion-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
+ create mode 100644 drivers/pinctrl/berlin/Kconfig
+ create mode 100644 drivers/pinctrl/berlin/Makefile
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2cd.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2q.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.h
+ create mode 100644 drivers/pinctrl/mvebu/pinctrl-orion.c
+ create mode 100644 drivers/pinctrl/pinctrl-apq8064.c
+ create mode 100644 drivers/pinctrl/pinctrl-imx6sx.c
+ create mode 100644 drivers/pinctrl/pinctrl-ipq8064.c
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi-pins.h
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi.h
+ create mode 100644 drivers/pinctrl/sunxi/Kconfig
+ create mode 100644 drivers/pinctrl/sunxi/Makefile
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
+ rename drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c (87%)
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi.h
+$ git reset --hard HEAD^
+HEAD is now at 1f8f082b9df9 Merge remote-tracking branch 'target-updates/for-next'
+Merging next-20140529 version of pinctrl
+$ git merge -m next-20140529/pinctrl 48659ae2d64359eef85f65b5a4ff3a9e2b8e6230
+Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
+Removing drivers/pinctrl/pinctrl-sunxi.h
+Removing drivers/pinctrl/pinctrl-sunxi-pins.h
+Auto-merging drivers/acpi/acpi_lpss.c
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 9 +-
+ .../bindings/pinctrl/fsl,imx6sx-pinctrl.txt | 36 +
+ .../bindings/pinctrl/marvell,orion-pinctrl.txt | 91 +
+ .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 88 +
+ .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 95 +
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 28 +-
+ arch/arm/Kconfig | 2 +-
+ drivers/acpi/acpi_lpss.c | 1 +
+ drivers/pinctrl/Kconfig | 39 +-
+ drivers/pinctrl/Makefile | 6 +-
+ drivers/pinctrl/berlin/Kconfig | 20 +
+ drivers/pinctrl/berlin/Makefile | 4 +
+ drivers/pinctrl/berlin/berlin-bg2.c | 274 ++
+ drivers/pinctrl/berlin/berlin-bg2cd.c | 217 ++
+ drivers/pinctrl/berlin/berlin-bg2q.c | 436 +++
+ drivers/pinctrl/berlin/berlin.c | 348 ++
+ drivers/pinctrl/berlin/berlin.h | 61 +
+ drivers/pinctrl/core.c | 17 +-
+ drivers/pinctrl/mvebu/Kconfig | 4 +
+ drivers/pinctrl/mvebu/Makefile | 1 +
+ drivers/pinctrl/mvebu/pinctrl-orion.c | 261 ++
+ drivers/pinctrl/pinconf-generic.c | 3 +-
+ drivers/pinctrl/pinctrl-adi2.c | 2 +-
+ drivers/pinctrl/pinctrl-apq8064.c | 566 +++
+ drivers/pinctrl/pinctrl-at91.c | 129 +-
+ drivers/pinctrl/pinctrl-baytrail.c | 68 +-
+ drivers/pinctrl/pinctrl-exynos.c | 67 +
+ drivers/pinctrl/pinctrl-imx.c | 2 +-
+ drivers/pinctrl/pinctrl-imx6sx.c | 407 +++
+ drivers/pinctrl/pinctrl-ipq8064.c | 653 ++++
+ drivers/pinctrl/pinctrl-lantiq.h | 1 +
+ drivers/pinctrl/pinctrl-msm.c | 103 +-
+ drivers/pinctrl/pinctrl-msm.h | 3 +-
+ drivers/pinctrl/pinctrl-msm8x74.c | 3 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 221 +-
+ drivers/pinctrl/pinctrl-samsung.c | 2 +
+ drivers/pinctrl/pinctrl-samsung.h | 1 +
+ drivers/pinctrl/pinctrl-st.c | 130 +-
+ drivers/pinctrl/pinctrl-sunxi-pins.h | 3863 --------------------
+ drivers/pinctrl/pinctrl-sunxi.h | 548 ---
+ drivers/pinctrl/pinctrl-tegra.c | 49 +-
+ drivers/pinctrl/pinctrl-tegra.h | 133 +-
+ drivers/pinctrl/pinctrl-tegra114.c | 412 +--
+ drivers/pinctrl/pinctrl-tegra124.c | 520 ++-
+ drivers/pinctrl/pinctrl-tegra20.c | 244 +-
+ drivers/pinctrl/pinctrl-tegra30.c | 551 ++-
+ drivers/pinctrl/pinmux.c | 23 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 3 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +
+ drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 138 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 412 ++-
+ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 2 +
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 5 +
+ drivers/pinctrl/sirf/pinctrl-sirf.c | 274 +-
+ drivers/pinctrl/sunxi/Kconfig | 36 +
+ drivers/pinctrl/sunxi/Makefile | 10 +
+ drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1039 ++++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c | 690 ++++
+ drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c | 411 +++
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 141 +
+ drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 865 +++++
+ drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c | 1065 ++++++
+ drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c | 145 +-
+ drivers/pinctrl/sunxi/pinctrl-sunxi.h | 258 ++
+ 64 files changed, 10212 insertions(+), 6026 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx6sx-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/marvell,orion-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt
+ create mode 100644 drivers/pinctrl/berlin/Kconfig
+ create mode 100644 drivers/pinctrl/berlin/Makefile
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2cd.c
+ create mode 100644 drivers/pinctrl/berlin/berlin-bg2q.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.c
+ create mode 100644 drivers/pinctrl/berlin/berlin.h
+ create mode 100644 drivers/pinctrl/mvebu/pinctrl-orion.c
+ create mode 100644 drivers/pinctrl/pinctrl-apq8064.c
+ create mode 100644 drivers/pinctrl/pinctrl-imx6sx.c
+ create mode 100644 drivers/pinctrl/pinctrl-ipq8064.c
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi-pins.h
+ delete mode 100644 drivers/pinctrl/pinctrl-sunxi.h
+ create mode 100644 drivers/pinctrl/sunxi/Kconfig
+ create mode 100644 drivers/pinctrl/sunxi/Makefile
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
+ rename drivers/pinctrl/{ => sunxi}/pinctrl-sunxi.c (87%)
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sunxi.h
+Merging vhost/linux-next (d3d665a654a3 vhost-scsi: whitespace tweak)
+$ git merge vhost/linux-next
+Already up-to-date.
+Merging remoteproc/for-next (bd88acba5f98 remoteproc/ste_modem: staticize local symbols)
+$ git merge remoteproc/for-next
+Already up-to-date.
+Merging rpmsg/for-next (397944df3290 rpmsg: fix kconfig dependencies for VIRTIO)
+$ git merge rpmsg/for-next
+Already up-to-date.
+Merging gpio/for-next (fc346270124a gpio: select IRQ_DOMAIN for gpiolib irqchip helpers)
+$ git merge gpio/for-next
+Resolved 'Documentation/driver-model/devres.txt' using previous resolution.
+Resolved 'drivers/gpio/gpio-mcp23s08.c' using previous resolution.
+Auto-merging drivers/gpio/gpio-mcp23s08.c
+CONFLICT (content): Merge conflict in drivers/gpio/gpio-mcp23s08.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+CONFLICT (content): Merge conflict in Documentation/driver-model/devres.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 7529fc725389] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/acpi/enumeration.txt | 2 +-
+ .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 6 +
+ Documentation/driver-model/devres.txt | 7 +
+ Documentation/gpio/driver.txt | 59 ++++++
+ MAINTAINERS | 1 +
+ drivers/gpio/Kconfig | 20 +-
+ drivers/gpio/Makefile | 2 +-
+ drivers/gpio/devres.c | 43 +++++
+ drivers/gpio/gpio-adp5520.c | 4 +-
+ drivers/gpio/gpio-adp5588.c | 4 +-
+ drivers/gpio/gpio-bt8xx.c | 19 +-
+ drivers/gpio/gpio-davinci.c | 4 +-
+ drivers/gpio/gpio-dwapb.c | 38 ++--
+ drivers/gpio/gpio-em.c | 3 +-
+ drivers/gpio/gpio-ep93xx.c | 34 +---
+ drivers/gpio/gpio-ge.c | 174 ++++++-----------
+ drivers/gpio/gpio-generic.c | 9 +
+ drivers/gpio/gpio-grgpio.c | 2 +-
+ drivers/gpio/gpio-janz-ttl.c | 38 +---
+ drivers/gpio/gpio-kempld.c | 4 +-
+ drivers/gpio/gpio-lynxpoint.c | 4 +-
+ drivers/gpio/gpio-max730x.c | 5 +-
+ drivers/gpio/gpio-mcp23s08.c | 15 +-
+ drivers/gpio/gpio-moxart.c | 4 +-
+ drivers/gpio/gpio-mvebu.c | 13 +-
+ drivers/gpio/gpio-omap.c | 205 +++++++++++----------
+ drivers/gpio/gpio-palmas.c | 6 +-
+ drivers/gpio/gpio-pca953x.c | 102 ++++------
+ drivers/gpio/gpio-pcf857x.c | 11 +-
+ drivers/gpio/gpio-pch.c | 1 +
+ drivers/gpio/gpio-pl061.c | 27 ++-
+ drivers/gpio/gpio-rc5t583.c | 4 +-
+ drivers/gpio/gpio-rcar.c | 9 +-
+ drivers/gpio/gpio-rdc321x.c | 23 +--
+ drivers/gpio/gpio-sch.c | 26 ++-
+ drivers/gpio/gpio-sch311x.c | 16 +-
+ drivers/gpio/gpio-spear-spics.c | 4 +-
+ drivers/gpio/gpio-sx150x.c | 1 -
+ drivers/gpio/gpio-tc3589x.c | 148 ++++-----------
+ drivers/gpio/gpio-tegra.c | 6 +-
+ drivers/gpio/gpio-timberdale.c | 47 ++---
+ drivers/gpio/gpio-tps6586x.c | 4 +-
+ drivers/gpio/gpio-tps65910.c | 4 +-
+ drivers/gpio/gpio-xilinx.c | 2 +-
+ drivers/gpio/gpio-zevio.c | 18 +-
+ drivers/gpio/gpiolib-acpi.c | 5 +-
+ drivers/gpio/gpiolib-of.c | 16 +-
+ drivers/gpio/gpiolib.c | 101 ++++++++--
+ drivers/gpio/gpiolib.h | 5 +
+ include/linux/gpio/consumer.h | 41 +++++
+ include/linux/gpio/driver.h | 5 +-
+ include/linux/mfd/tc3589x.h | 1 -
+ include/linux/of_gpio.h | 35 +---
+ 53 files changed, 702 insertions(+), 685 deletions(-)
+Merging dma-mapping/dma-mapping-next (f70e3c4f8b6a CMA: correct unlock target)
+$ git merge dma-mapping/dma-mapping-next
+Auto-merging arch/arm/mm/dma-mapping.c
+Merge made by the 'recursive' strategy.
+ arch/arm/include/asm/dma-iommu.h | 1 -
+ arch/arm/mm/dma-mapping.c | 17 +++++++++--------
+ drivers/base/dma-contiguous.c | 34 ++++++++++++++++++++++++++--------
+ 3 files changed, 35 insertions(+), 17 deletions(-)
+Merging pwm/for-next (39fd3f99aba3 pwm: fsl-ftm: set pwm_chip can_sleep flag)
+$ git merge pwm/for-next
+Resolved 'drivers/leds/leds-pwm.c' using previous resolution.
+Removing include/linux/platform_data/pwm-renesas-tpu.h
+Auto-merging drivers/pwm/pwm-spear.c
+Auto-merging drivers/leds/leds-pwm.c
+CONFLICT (content): Merge conflict in drivers/leds/leds-pwm.c
+Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c
+Auto-merging arch/arm/mach-omap2/board-omap3beagle.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ceef100334c1] Merge remote-tracking branch 'pwm/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/pwm/bcm-kona-pwm.txt | 21 ++
+ Documentation/pwm.txt | 10 +-
+ arch/arm/mach-omap2/board-omap3beagle.c | 3 +-
+ arch/arm/mach-pxa/hx4700.c | 3 +-
+ arch/arm/mach-shmobile/board-armadillo800eva.c | 14 +-
+ arch/arm/plat-samsung/dev-backlight.c | 2 -
+ drivers/leds/leds-pwm.c | 6 +-
+ drivers/pwm/Kconfig | 9 +
+ drivers/pwm/Makefile | 1 +
+ drivers/pwm/core.c | 8 +-
+ drivers/pwm/pwm-ab8500.c | 13 +-
+ drivers/pwm/pwm-atmel.c | 1 +
+ drivers/pwm/pwm-bcm-kona.c | 318 +++++++++++++++++++++
+ drivers/pwm/pwm-fsl-ftm.c | 1 +
+ drivers/pwm/pwm-imx.c | 4 +-
+ drivers/pwm/pwm-lp3943.c | 1 +
+ drivers/pwm/pwm-lpss.c | 161 +++++++++--
+ drivers/pwm/pwm-mxs.c | 1 +
+ drivers/pwm/pwm-pxa.c | 4 +-
+ drivers/pwm/pwm-renesas-tpu.c | 23 +-
+ drivers/pwm/pwm-samsung.c | 3 -
+ drivers/pwm/pwm-spear.c | 6 +-
+ drivers/pwm/pwm-tegra.c | 4 +-
+ drivers/pwm/pwm-tiecap.c | 4 +-
+ drivers/pwm/pwm-tiehrpwm.c | 10 +-
+ drivers/pwm/pwm-twl.c | 8 -
+ drivers/pwm/pwm-vt8500.c | 4 +-
+ drivers/video/backlight/pwm_bl.c | 87 +++---
+ include/linux/platform_data/pwm-renesas-tpu.h | 16 --
+ include/linux/pwm.h | 6 +-
+ include/linux/pwm_backlight.h | 5 +-
+ 31 files changed, 577 insertions(+), 180 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pwm/bcm-kona-pwm.txt
+ create mode 100644 drivers/pwm/pwm-bcm-kona.c
+ delete mode 100644 include/linux/platform_data/pwm-renesas-tpu.h
+Merging dma-buf/for-next (68f965a6028f DRM: Armada: update dma_buf_export use)
+$ git merge dma-buf/for-next
+Resolved 'drivers/gpu/drm/i915/i915_gem_dmabuf.c' using previous resolution.
+Resolved 'drivers/staging/android/sync.c' using previous resolution.
+Auto-merging include/drm/drmP.h
+Auto-merging drivers/staging/android/sync.c
+CONFLICT (content): Merge conflict in drivers/staging/android/sync.c
+Auto-merging drivers/staging/android/sw_sync.c
+Auto-merging drivers/staging/android/ion/ion.c
+Auto-merging drivers/gpu/drm/tegra/gem.c
+Auto-merging drivers/gpu/drm/radeon/radeon_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_dmabuf.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_dmabuf.c
+Auto-merging drivers/gpu/drm/armada/armada_gem.c
+Auto-merging drivers/base/dma-buf.c
+Auto-merging drivers/base/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c3aa2de7291f] Merge remote-tracking branch 'dma-buf/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/device-drivers.tmpl | 3 +
+ drivers/base/Kconfig | 9 +
+ drivers/base/Makefile | 2 +-
+ drivers/base/dma-buf.c | 168 ++++-
+ drivers/base/fence.c | 468 +++++++++++++
+ drivers/base/reservation.c | 440 +++++++++++-
+ drivers/gpu/drm/armada/armada_gem.c | 2 +-
+ drivers/gpu/drm/drm_prime.c | 8 +-
+ drivers/gpu/drm/exynos/exynos_drm_dmabuf.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_dmabuf.c | 3 +-
+ drivers/gpu/drm/nouveau/nouveau_drm.c | 1 +
+ drivers/gpu/drm/nouveau/nouveau_gem.h | 1 +
+ drivers/gpu/drm/nouveau/nouveau_prime.c | 7 +
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_drv.c | 2 +
+ drivers/gpu/drm/radeon/radeon_prime.c | 8 +
+ drivers/gpu/drm/tegra/gem.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_object.c | 2 +-
+ drivers/media/v4l2-core/videobuf2-dma-contig.c | 2 +-
+ drivers/staging/android/Kconfig | 1 +
+ drivers/staging/android/Makefile | 2 +-
+ drivers/staging/android/ion/ion.c | 3 +-
+ drivers/staging/android/sw_sync.c | 4 +-
+ drivers/staging/android/sync.c | 912 +++++++++----------------
+ drivers/staging/android/sync.h | 79 ++-
+ drivers/staging/android/sync_debug.c | 247 +++++++
+ drivers/staging/android/trace/sync.h | 12 +-
+ include/drm/drmP.h | 3 +
+ include/linux/dma-buf.h | 21 +-
+ include/linux/fence.h | 355 ++++++++++
+ include/linux/reservation.h | 82 ++-
+ include/linux/seqno-fence.h | 119 ++++
+ include/trace/events/fence.h | 128 ++++
+ 33 files changed, 2435 insertions(+), 665 deletions(-)
+ create mode 100644 drivers/base/fence.c
+ create mode 100644 drivers/staging/android/sync_debug.c
+ create mode 100644 include/linux/fence.h
+ create mode 100644 include/linux/seqno-fence.h
+ create mode 100644 include/trace/events/fence.h
+Merging userns/for-next (3efe1ac78e99 vfs: Block intuitively in the case of BSD accounting files)
+$ git merge userns/for-next
+Resolved 'fs/dcache.c' using previous resolution.
+Resolved 'fs/namei.c' using previous resolution.
+Resolved 'fs/namespace.c' using previous resolution.
+Auto-merging include/linux/dcache.h
+Auto-merging fs/proc/fd.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/namespace.c
+CONFLICT (content): Merge conflict in fs/namespace.c
+Auto-merging fs/namei.c
+CONFLICT (content): Merge conflict in fs/namei.c
+Auto-merging fs/mount.h
+Auto-merging fs/kernfs/dir.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/dcache.c
+CONFLICT (content): Merge conflict in fs/dcache.c
+Auto-merging fs/ceph/dir.c
+Auto-merging fs/btrfs/ioctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 79d28ea828f7] Merge remote-tracking branch 'userns/for-next'
+$ git diff -M --stat --summary HEAD^..
+ fs/afs/dir.c | 5 --
+ fs/btrfs/ioctl.c | 5 +-
+ fs/ceph/dir.c | 1 -
+ fs/cifs/readdir.c | 6 +--
+ fs/dcache.c | 140 ++++++++++++++++++-------------------------------
+ fs/fuse/dir.c | 7 +--
+ fs/gfs2/dentry.c | 3 --
+ fs/kernfs/dir.c | 11 ----
+ fs/mount.h | 22 ++++++++
+ fs/namei.c | 22 ++++----
+ fs/namespace.c | 130 +++++++++++++++++++++++++++++++++++++++++----
+ fs/nfs/dir.c | 7 +--
+ fs/proc/base.c | 10 +---
+ fs/proc/fd.c | 2 -
+ include/linux/dcache.h | 3 +-
+ kernel/acct.c | 25 +++++++--
+ 16 files changed, 231 insertions(+), 168 deletions(-)
+Merging ktest/for-next (4c16b1d6d5e0 ktest: Update documentation on config_bisect)
+$ git merge ktest/for-next
+Merge made by the 'recursive' strategy.
+ tools/testing/ktest/ktest.pl | 581 +++++++++++++++++++---------------------
+ tools/testing/ktest/sample.conf | 65 ++---
+ 2 files changed, 297 insertions(+), 349 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 (4c8f8062515a Merge branch 'clk-fixes' into clk-next)
+$ git merge clk/clk-next
+Resolved 'Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt' using previous resolution.
+Auto-merging include/linux/clk-provider.h
+Auto-merging drivers/clk/sunxi/clk-sunxi.c
+Auto-merging drivers/clk/Makefile
+Auto-merging drivers/clk/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master df50d2c26c3c] Merge remote-tracking branch 'clk/clk-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/clk.txt | 16 +-
+ .../devicetree/bindings/clock/bcm-kona-clock.txt | 116 ++--
+ .../devicetree/bindings/clock/clock-bindings.txt | 9 +-
+ .../devicetree/bindings/clock/fixed-clock.txt | 1 -
+ .../devicetree/bindings/clock/hix5hd2-clock.txt | 31 ++
+ .../devicetree/bindings/clock/lsi,axm5516-clks.txt | 29 +
+ .../devicetree/bindings/clock/qcom,gcc.txt | 1 +
+ .../bindings/clock/renesas,cpg-mstp-clocks.txt | 1 +
+ .../bindings/clock/renesas,r8a7740-cpg-clocks.txt | 41 ++
+ .../bindings/clock/renesas,r8a7779-cpg-clocks.txt | 27 +
+ MAINTAINERS | 5 +
+ arch/arm/boot/dts/bcm21664.dtsi | 164 ++++--
+ drivers/clk/Kconfig | 8 +-
+ drivers/clk/Makefile | 2 +
+ drivers/clk/bcm/Kconfig | 2 +-
+ drivers/clk/bcm/Makefile | 1 +
+ drivers/clk/bcm/clk-bcm21664.c | 290 ++++++++++
+ drivers/clk/bcm/clk-bcm281xx.c | 231 ++++----
+ drivers/clk/bcm/clk-kona-setup.c | 229 ++++++--
+ drivers/clk/bcm/clk-kona.c | 266 ++++++++-
+ drivers/clk/bcm/clk-kona.h | 160 +++++-
+ drivers/clk/clk-axm5516.c | 615 +++++++++++++++++++++
+ drivers/clk/clk-divider.c | 93 +++-
+ drivers/clk/clk-s2mps11.c | 88 ++-
+ drivers/clk/clk-si570.c | 2 +-
+ drivers/clk/clk-u300.c | 1 +
+ drivers/clk/clk.c | 46 +-
+ drivers/clk/clk.h | 1 +
+ drivers/clk/clkdev.c | 34 +-
+ drivers/clk/hisilicon/Makefile | 1 +
+ drivers/clk/hisilicon/clk-hix5hd2.c | 101 ++++
+ drivers/clk/hisilicon/clk.c | 41 +-
+ drivers/clk/hisilicon/clk.h | 3 +
+ drivers/clk/qcom/Kconfig | 4 +-
+ drivers/clk/qcom/Makefile | 1 +
+ drivers/clk/qcom/common.c | 99 ++++
+ drivers/clk/qcom/common.h | 34 ++
+ drivers/clk/qcom/gcc-msm8660.c | 77 +--
+ drivers/clk/qcom/gcc-msm8960.c | 109 ++--
+ drivers/clk/qcom/gcc-msm8974.c | 79 +--
+ drivers/clk/qcom/mmcc-msm8960.c | 78 +--
+ drivers/clk/qcom/mmcc-msm8974.c | 80 +--
+ drivers/clk/shmobile/Makefile | 2 +
+ drivers/clk/shmobile/clk-mstp.c | 2 +-
+ drivers/clk/shmobile/clk-r8a7740.c | 199 +++++++
+ drivers/clk/shmobile/clk-r8a7779.c | 180 ++++++
+ drivers/clk/socfpga/clk-gate.c | 1 -
+ drivers/clk/socfpga/clk-periph.c | 22 +-
+ drivers/clk/socfpga/clk.h | 4 +
+ drivers/clk/sunxi/clk-factors.c | 36 ++
+ drivers/clk/sunxi/clk-sunxi.c | 37 ++
+ drivers/clk/tegra/clk-id.h | 1 +
+ drivers/clk/tegra/clk-pll.c | 33 +-
+ drivers/clk/tegra/clk-tegra-periph.c | 10 +-
+ drivers/clk/tegra/clk-tegra114.c | 22 +-
+ drivers/clk/tegra/clk-tegra124.c | 21 +-
+ drivers/clk/versatile/clk-icst.c | 1 +
+ drivers/clk/versatile/clk-impd1.c | 38 +-
+ drivers/clk/zynq/clkc.c | 12 +
+ include/dt-bindings/clock/bcm21664.h | 62 +++
+ include/dt-bindings/clock/bcm281xx.h | 12 +
+ include/dt-bindings/clock/hix5hd2-clock.h | 58 ++
+ include/dt-bindings/clock/qcom,gcc-msm8960.h | 7 +-
+ include/dt-bindings/clock/r8a7779-clock.h | 64 +++
+ include/dt-bindings/clock/tegra114-car.h | 3 +-
+ include/dt-bindings/clock/tegra124-car.h | 3 +-
+ include/dt-bindings/reset/qcom,gcc-msm8960.h | 2 +-
+ include/linux/clk-provider.h | 127 +++--
+ include/linux/clk/shmobile.h | 3 +
+ include/linux/clk/sunxi.h | 22 +
+ 70 files changed, 3356 insertions(+), 845 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/hix5hd2-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/lsi,axm5516-clks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7740-cpg-clocks.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/renesas,r8a7779-cpg-clocks.txt
+ create mode 100644 drivers/clk/bcm/clk-bcm21664.c
+ create mode 100644 drivers/clk/clk-axm5516.c
+ create mode 100644 drivers/clk/hisilicon/clk-hix5hd2.c
+ create mode 100644 drivers/clk/qcom/common.c
+ create mode 100644 drivers/clk/qcom/common.h
+ create mode 100644 drivers/clk/shmobile/clk-r8a7740.c
+ create mode 100644 drivers/clk/shmobile/clk-r8a7779.c
+ create mode 100644 include/dt-bindings/clock/bcm21664.h
+ create mode 100644 include/dt-bindings/clock/hix5hd2-clock.h
+ create mode 100644 include/dt-bindings/clock/r8a7779-clock.h
+ create mode 100644 include/linux/clk/sunxi.h
+Merging random/dev (f9c6d4987b23 random: fix BUG_ON caused by accounting simplification)
+$ 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
+Merge made by the 'recursive' strategy.
+ lib/lzo/lzo1x_decompress_safe.c | 4 ++++
+ lib/lzo/lzodefs.h | 6 ++++++
+ 2 files changed, 10 insertions(+)
+Merging arm64-hugepages/for-next/hugepages (af07484863e0 ARM64: mm: THP support.)
+$ git merge arm64-hugepages/for-next/hugepages
+Already up-to-date.
+Merging aio/master (fa88b6f8803c aio: cleanup: flatten kill_ioctx())
+$ git merge aio/master
+Auto-merging fs/aio.c
+Merge made by the 'recursive' strategy.
+ fs/aio.c | 70 +++++++++++++++++++++++++++++++++-------------------------------
+ 1 file changed, 36 insertions(+), 34 deletions(-)
+Merging llvmlinux/for-next (4f6d454aae03 unwind_support)
+$ git merge llvmlinux/for-next
+Auto-merging arch/arm/kernel/unwind.c
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 2 +-
+ arch/arm/include/asm/glue-cache.h | 22 +++++++++++-----------
+ arch/arm/kernel/unwind.c | 2 +-
+ crypto/shash.c | 3 ++-
+ net/netfilter/xt_repldata.h | 22 +++++++++++++++++-----
+ 5 files changed, 32 insertions(+), 19 deletions(-)
+Merging powernv-cpuidle/powernv-cpuidle (0888839c5b62 cpuidle/powernv: Parse device tree to setup idle states)
+$ git merge powernv-cpuidle/powernv-cpuidle
+Already up-to-date.
+Merging rd-docs/master (8b1cbef71a7e These days most people use git to send patches so I have added a section about that.)
+$ git merge rd-docs/master
+Auto-merging MAINTAINERS
+Auto-merging Documentation/email-clients.txt
+Merge made by the 'recursive' strategy.
+ Documentation/email-clients.txt | 11 +++++++++++
+ MAINTAINERS | 2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+Merging akpm-current/current (bf01fce89bc0 kernel/seccomp.c: kernel-doc warning fix)
+$ git merge --no-ff akpm-current/current
+Resolved 'arch/powerpc/include/asm/topology.h' using previous resolution.
+Resolved 'fs/ext4/page-io.c' using previous resolution.
+Resolved 'kernel/kexec.c' using previous resolution.
+Resolved 'mm/memcontrol.c' using previous resolution.
+Auto-merging mm/vmscan.c
+Auto-merging mm/slub.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/shmem.c
+Auto-merging mm/page_io.c
+Auto-merging mm/page-writeback.c
+Auto-merging mm/mmap.c
+Auto-merging mm/memory.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/memcontrol.c
+CONFLICT (content): Merge conflict in mm/memcontrol.c
+Auto-merging mm/memblock.c
+Auto-merging mm/huge_memory.c
+Auto-merging mm/filemap.c
+Auto-merging mm/dmapool.c
+Auto-merging mm/Makefile
+Auto-merging mm/Kconfig
+Auto-merging lib/string.c
+Auto-merging lib/Makefile
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/seccomp.c
+Auto-merging kernel/sched/rt.c
+Auto-merging kernel/sched/deadline.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/kmod.c
+Auto-merging kernel/kexec.c
+CONFLICT (content): Merge conflict in kernel/kexec.c
+Auto-merging kernel/cpuset.c
+Auto-merging kernel/cpu.c
+Auto-merging kernel/audit.c
+Auto-merging kernel/acct.c
+Auto-merging init/main.c
+Auto-merging init/Kconfig
+Auto-merging include/linux/topology.h
+Auto-merging include/linux/thread_info.h
+Auto-merging include/linux/string.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/page-flags.h
+Auto-merging include/linux/mm_types.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/memblock.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/buffer_head.h
+Auto-merging include/linux/blkdev.h
+Auto-merging fs/proc/task_mmu.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/dlm/dlmmaster.c
+Auto-merging fs/ntfs/file.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/fuse/file.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/f2fs/node.c
+Auto-merging fs/f2fs/checkpoint.c
+Auto-merging fs/ext4/page-io.c
+CONFLICT (content): Merge conflict in fs/ext4/page-io.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/cifs/smb2pdu.h
+Auto-merging fs/cifs/smb2pdu.c
+Auto-merging fs/cifs/smb2ops.c
+Auto-merging fs/ceph/addr.c
+Auto-merging fs/buffer.c
+Auto-merging fs/btrfs/file.c
+Auto-merging fs/btrfs/extent_io.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/binfmt_elf.c
+Auto-merging fs/affs/file.c
+Auto-merging fs/9p/vfs_file.c
+Auto-merging drivers/video/backlight/backlight.c
+Auto-merging drivers/leds/Kconfig
+Auto-merging drivers/base/dma-contiguous.c
+Auto-merging drivers/base/Kconfig
+Auto-merging arch/x86/mm/init_64.c
+Removing arch/x86/include/asm/scatterlist.h
+Auto-merging arch/x86/Kconfig
+Removing arch/sparc/include/asm/scatterlist.h
+Removing arch/score/include/asm/scatterlist.h
+Removing arch/s390/include/asm/scatterlist.h
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/platforms/52xx/efika.c
+Auto-merging arch/powerpc/include/asm/topology.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/topology.h
+Removing arch/powerpc/include/asm/scatterlist.h
+Auto-merging arch/powerpc/Kconfig
+Removing arch/mn10300/include/asm/scatterlist.h
+Auto-merging arch/mips/kernel/traps.c
+Removing arch/microblaze/include/asm/scatterlist.h
+Auto-merging arch/m68k/include/asm/unistd.h
+Removing arch/m32r/include/asm/scatterlist.h
+Auto-merging arch/ia64/include/asm/topology.h
+Removing arch/ia64/include/asm/scatterlist.h
+Auto-merging arch/ia64/Kconfig
+Removing arch/frv/include/asm/scatterlist.h
+Removing arch/cris/include/asm/scatterlist.h
+Auto-merging arch/arm64/Kconfig
+Removing arch/arm/include/asm/scatterlist.h
+Auto-merging arch/arm/Kconfig
+Removing arch/alpha/include/asm/scatterlist.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/printk-formats.txt
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/cgroups/memory.txt
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master d02539cb1878] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 7 +
+ Documentation/CodingStyle | 22 +-
+ Documentation/SubmittingPatches | 22 +-
+ Documentation/cgroups/memory.txt | 16 +-
+ .../devicetree/bindings/rtc/haoyu,hym8563.txt | 3 +
+ .../devicetree/bindings/rtc/xgene-rtc.txt | 28 +
+ Documentation/filesystems/vfat.txt | 5 +
+ Documentation/kernel-parameters.txt | 19 +-
+ Documentation/leds/leds-class.txt | 3 -
+ Documentation/memory-hotplug.txt | 125 ++--
+ Documentation/printk-formats.txt | 6 +
+ Documentation/sysctl/kernel.txt | 21 +
+ Documentation/sysctl/vm.txt | 17 +-
+ MAINTAINERS | 5 +-
+ arch/alpha/include/asm/Kbuild | 1 +
+ arch/alpha/include/asm/scatterlist.h | 6 -
+ arch/arc/kernel/troubleshoot.c | 10 +-
+ arch/arm/Kconfig | 1 +
+ arch/arm/include/asm/Kbuild | 1 +
+ arch/arm/include/asm/scatterlist.h | 12 -
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/boot/dts/apm-storm.dtsi | 21 +
+ arch/blackfin/include/asm/unistd.h | 1 -
+ arch/cris/include/asm/Kbuild | 1 +
+ arch/cris/include/asm/scatterlist.h | 6 -
+ arch/cris/include/asm/unistd.h | 1 -
+ arch/frv/include/asm/Kbuild | 1 +
+ arch/frv/include/asm/scatterlist.h | 6 -
+ arch/frv/include/asm/unistd.h | 1 -
+ arch/ia64/Kconfig | 1 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/scatterlist.h | 7 -
+ arch/ia64/include/asm/topology.h | 3 +-
+ arch/m32r/include/asm/Kbuild | 1 +
+ arch/m32r/include/asm/scatterlist.h | 6 -
+ arch/m68k/include/asm/signal.h | 9 -
+ arch/m68k/include/asm/unistd.h | 1 -
+ arch/m68k/kernel/sys_m68k.c | 18 +-
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/scatterlist.h | 1 -
+ arch/microblaze/include/asm/unistd.h | 1 -
+ arch/mips/dec/Makefile | 2 +-
+ arch/mips/dec/platform.c | 44 ++
+ arch/mips/include/asm/unistd.h | 1 -
+ arch/mips/kernel/traps.c | 2 +
+ arch/mips/mm/c-octeon.c | 2 +
+ arch/mn10300/include/asm/Kbuild | 1 +
+ arch/mn10300/include/asm/scatterlist.h | 16 -
+ arch/mn10300/include/asm/unistd.h | 1 -
+ arch/parisc/include/asm/unistd.h | 1 -
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/include/asm/Kbuild | 1 +
+ arch/powerpc/include/asm/pgtable.h | 6 +
+ arch/powerpc/include/asm/scatterlist.h | 17 -
+ arch/powerpc/include/asm/topology.h | 8 +-
+ arch/powerpc/include/asm/unistd.h | 1 -
+ arch/powerpc/mm/dma-noncoherent.c | 1 +
+ arch/powerpc/mm/subpage-prot.c | 6 +-
+ arch/powerpc/platforms/44x/warp.c | 1 +
+ arch/powerpc/platforms/52xx/efika.c | 1 +
+ arch/powerpc/platforms/amigaone/setup.c | 1 +
+ arch/s390/Kconfig | 1 +
+ arch/s390/include/asm/Kbuild | 1 +
+ arch/s390/include/asm/scatterlist.h | 3 -
+ arch/score/include/asm/Kbuild | 1 +
+ arch/score/include/asm/scatterlist.h | 6 -
+ arch/sh/include/asm/unistd.h | 1 -
+ arch/sh/kernel/hw_breakpoint.c | 4 +-
+ arch/sh/kernel/kprobes.c | 30 +-
+ arch/sh/kernel/localtimer.c | 2 +-
+ arch/sh/kernel/perf_event.c | 8 +-
+ arch/sh/kernel/smp.c | 2 +-
+ arch/sparc/Kconfig | 1 +
+ arch/sparc/include/asm/Kbuild | 1 +
+ arch/sparc/include/asm/scatterlist.h | 8 -
+ arch/sparc/include/asm/unistd.h | 1 -
+ arch/tile/mm/homecache.c | 2 +-
+ arch/um/include/asm/Kbuild | 1 +
+ arch/unicore32/mm/ioremap.c | 4 +-
+ arch/x86/Kconfig | 7 +-
+ arch/x86/include/asm/Kbuild | 3 +-
+ arch/x86/include/asm/mce.h | 2 -
+ arch/x86/include/asm/pgtable-2level.h | 59 --
+ arch/x86/include/asm/pgtable.h | 20 +-
+ arch/x86/include/asm/pgtable_64.h | 8 +-
+ arch/x86/include/asm/pgtable_types.h | 66 +-
+ arch/x86/include/asm/scatterlist.h | 8 -
+ arch/x86/include/asm/signal.h | 6 -
+ arch/x86/include/asm/swiotlb.h | 7 +
+ arch/x86/include/asm/unistd.h | 1 -
+ arch/x86/kernel/amd_gart_64.c | 2 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 5 -
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/kernel/pci-dma.c | 11 +-
+ arch/x86/kernel/pci-swiotlb.c | 9 +-
+ arch/x86/kernel/setup.c | 2 +-
+ arch/x86/mm/init_64.c | 34 +-
+ arch/x86/mm/numa.c | 6 +-
+ arch/x86/mm/pageattr-test.c | 2 +-
+ arch/x86/pci/sta2x11-fixup.c | 6 +-
+ arch/x86/platform/uv/uv_nmi.c | 2 +-
+ block/genhd.c | 2 +-
+ drivers/base/Kconfig | 2 +-
+ drivers/base/dma-contiguous.c | 42 +-
+ drivers/base/memory.c | 12 -
+ drivers/block/brd.c | 16 +-
+ drivers/block/zram/zram_drv.c | 4 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 6 +
+ drivers/input/Kconfig | 9 +
+ drivers/input/Makefile | 3 +
+ drivers/input/input.c | 6 +
+ drivers/input/leds.c | 249 ++++++++
+ drivers/iommu/intel-iommu.c | 33 +-
+ drivers/leds/Kconfig | 3 -
+ drivers/misc/ti-st/st_core.c | 2 +-
+ drivers/net/irda/donauboe.c | 15 +-
+ drivers/nubus/nubus.c | 18 +-
+ drivers/rapidio/devices/tsi721.c | 11 +-
+ drivers/rtc/Kconfig | 42 +-
+ drivers/rtc/Makefile | 4 +
+ drivers/rtc/interface.c | 14 +-
+ drivers/rtc/rtc-88pm860x.c | 3 +-
+ drivers/rtc/rtc-at91rm9200.c | 14 +-
+ drivers/rtc/rtc-bfin.c | 16 +-
+ drivers/rtc/rtc-cmos.c | 85 ++-
+ drivers/rtc/rtc-da9052.c | 122 ++--
+ drivers/rtc/rtc-da9063.c | 333 ++++++++++
+ drivers/rtc/rtc-ds1343.c | 689 +++++++++++++++++++++
+ drivers/rtc/rtc-ds1742.c | 2 +-
+ drivers/rtc/rtc-efi.c | 2 +-
+ drivers/rtc/rtc-hym8563.c | 5 +-
+ drivers/rtc/rtc-isl12057.c | 2 +-
+ drivers/rtc/rtc-m41t80.c | 104 ++--
+ drivers/rtc/rtc-mcp795.c | 199 ++++++
+ drivers/rtc/rtc-mv.c | 2 +-
+ drivers/rtc/rtc-omap.c | 71 ++-
+ drivers/rtc/rtc-palmas.c | 2 +-
+ drivers/rtc/rtc-xgene.c | 278 +++++++++
+ drivers/tty/Kconfig | 4 +
+ drivers/tty/sysrq.c | 8 +-
+ drivers/tty/vt/keyboard.c | 110 +++-
+ drivers/video/backlight/backlight.c | 2 -
+ fs/9p/v9fs.c | 2 +-
+ fs/9p/vfs_dir.c | 1 -
+ fs/9p/vfs_file.c | 4 +-
+ fs/9p/vfs_inode.c | 6 +-
+ fs/9p/vfs_inode_dotl.c | 7 +-
+ fs/affs/affs.h | 16 +-
+ fs/affs/amigaffs.c | 15 +-
+ fs/affs/bitmap.c | 21 +-
+ fs/affs/dir.c | 8 +-
+ fs/affs/file.c | 46 +-
+ fs/affs/inode.c | 14 +-
+ fs/affs/namei.c | 39 +-
+ fs/affs/super.c | 43 +-
+ fs/affs/symlink.c | 2 +-
+ fs/autofs4/dev-ioctl.c | 2 +-
+ fs/befs/btree.c | 11 +-
+ fs/befs/datastream.c | 2 +-
+ fs/befs/linuxvfs.c | 29 +-
+ fs/binfmt_elf.c | 25 +-
+ fs/binfmt_flat.c | 2 +-
+ fs/block_dev.c | 63 ++
+ fs/btrfs/extent_io.c | 11 +-
+ fs/btrfs/file.c | 5 +-
+ fs/buffer.c | 49 +-
+ fs/cachefiles/bind.c | 17 +-
+ fs/cachefiles/daemon.c | 31 +-
+ fs/cachefiles/interface.c | 3 +-
+ fs/cachefiles/internal.h | 30 +-
+ fs/cachefiles/main.c | 9 +-
+ fs/cachefiles/namei.c | 53 +-
+ fs/cachefiles/security.c | 10 +-
+ fs/cachefiles/xattr.c | 10 +-
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/debugfs.c | 6 +-
+ fs/ceph/inode.c | 2 +-
+ fs/ceph/mds_client.c | 6 +-
+ fs/ceph/mdsmap.c | 2 +-
+ fs/cifs/cifsacl.c | 2 +-
+ fs/cifs/cifssmb.c | 20 +-
+ fs/cifs/sess.c | 2 +-
+ fs/cifs/smb2misc.c | 38 +-
+ fs/cifs/smb2ops.c | 2 +-
+ fs/cifs/smb2pdu.c | 2 +-
+ fs/cifs/smb2pdu.h | 28 +-
+ fs/coda/cnode.c | 4 +-
+ fs/coda/coda_linux.h | 8 +-
+ fs/coda/dir.c | 18 +-
+ fs/coda/inode.c | 29 +-
+ fs/coda/psdev.c | 39 +-
+ fs/coda/upcall.c | 14 +-
+ fs/configfs/configfs_internal.h | 6 +
+ fs/configfs/dir.c | 8 +-
+ fs/configfs/inode.c | 5 +-
+ fs/configfs/item.c | 58 +-
+ fs/configfs/mount.c | 4 +-
+ fs/devpts/inode.c | 26 +-
+ fs/efivarfs/super.c | 2 +-
+ fs/efs/dir.c | 18 +-
+ fs/efs/efs.h | 6 +
+ fs/efs/file.c | 14 +-
+ fs/efs/inode.c | 42 +-
+ fs/efs/namei.c | 8 +-
+ fs/efs/super.c | 42 +-
+ fs/exportfs/expfs.c | 4 +-
+ fs/ext4/fsync.c | 5 +-
+ fs/ext4/mballoc.c | 14 +-
+ fs/ext4/page-io.c | 2 +-
+ fs/f2fs/checkpoint.c | 3 -
+ fs/f2fs/node.c | 2 -
+ fs/fat/fat.h | 3 +-
+ fs/fat/inode.c | 344 +++++++---
+ fs/fscache/cache.c | 13 +-
+ fs/fscache/cookie.c | 2 +-
+ fs/fscache/histogram.c | 6 +-
+ fs/fscache/internal.h | 26 +-
+ fs/fscache/main.c | 7 +-
+ fs/fscache/netfs.c | 7 +-
+ fs/fscache/object-list.c | 8 +-
+ fs/fscache/operation.c | 3 +-
+ fs/fscache/page.c | 6 +-
+ fs/fuse/dev.c | 2 +-
+ fs/fuse/file.c | 2 -
+ fs/gfs2/aops.c | 1 -
+ fs/gfs2/meta_io.c | 4 +-
+ fs/hfsplus/attributes.c | 36 +-
+ fs/hfsplus/bnode.c | 49 +-
+ fs/hfsplus/btree.c | 2 +-
+ fs/hfsplus/catalog.c | 89 ++-
+ fs/hfsplus/dir.c | 42 +-
+ fs/hfsplus/extents.c | 10 +-
+ fs/hfsplus/hfsplus_fs.h | 10 +-
+ fs/hfsplus/hfsplus_raw.h | 1 +
+ fs/hfsplus/options.c | 9 +-
+ fs/hfsplus/super.c | 4 +-
+ fs/hfsplus/wrapper.c | 10 +-
+ fs/hfsplus/xattr.c | 53 +-
+ fs/hfsplus/xattr_security.c | 49 +-
+ fs/hfsplus/xattr_trusted.c | 32 +-
+ fs/hfsplus/xattr_user.c | 32 +-
+ fs/hpfs/alloc.c | 2 +-
+ fs/hpfs/buffer.c | 12 +-
+ fs/hpfs/dir.c | 6 +-
+ fs/hpfs/dnode.c | 44 +-
+ fs/hpfs/ea.c | 6 +-
+ fs/hpfs/hpfs_fn.h | 5 +
+ fs/hpfs/inode.c | 3 +-
+ fs/hpfs/map.c | 17 +-
+ fs/hpfs/name.c | 11 +-
+ fs/hpfs/namei.c | 2 +-
+ fs/hpfs/super.c | 55 +-
+ fs/hugetlbfs/inode.c | 25 +-
+ fs/isofs/Makefile | 2 +
+ fs/isofs/compress.c | 17 +-
+ fs/isofs/export.c | 11 +-
+ fs/isofs/inode.c | 88 ++-
+ fs/isofs/namei.c | 5 +-
+ fs/isofs/rock.c | 44 +-
+ fs/jffs2/background.c | 12 +-
+ fs/jfs/jfs_logmgr.c | 2 +-
+ fs/jfs/super.c | 45 +-
+ fs/libfs.c | 34 +-
+ fs/mpage.c | 107 ++--
+ fs/notify/fanotify/fanotify_user.c | 45 +-
+ fs/notify/mark.c | 2 +-
+ fs/ntfs/attrib.c | 1 -
+ fs/ntfs/compress.c | 2 +-
+ fs/ntfs/file.c | 1 -
+ fs/ntfs/super.c | 4 +-
+ fs/ntfs/sysctl.c | 2 +-
+ fs/ocfs2/alloc.c | 6 +-
+ fs/ocfs2/cluster/tcp.c | 33 +-
+ fs/ocfs2/dlm/dlmdebug.c | 2 +-
+ fs/ocfs2/dlm/dlmlock.c | 2 +-
+ fs/ocfs2/dlm/dlmmaster.c | 20 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 10 +-
+ fs/ocfs2/dlm/dlmunlock.c | 18 +-
+ fs/ocfs2/file.c | 2 +-
+ fs/ocfs2/journal.c | 17 +-
+ fs/ocfs2/namei.c | 145 ++++-
+ fs/ocfs2/ocfs2.h | 1 +
+ fs/ocfs2/refcounttree.c | 7 +-
+ fs/ocfs2/stackglue.c | 2 +-
+ fs/ocfs2/super.c | 8 +-
+ fs/ocfs2/uptodate.c | 2 +-
+ fs/proc/task_mmu.c | 287 ++++-----
+ fs/pstore/platform.c | 19 +-
+ fs/pstore/ram_core.c | 36 +-
+ fs/readdir.c | 2 +
+ fs/squashfs/squashfs.h | 2 +-
+ fs/ufs/balloc.c | 6 +-
+ include/asm-generic/ioctl.h | 5 +
+ include/asm-generic/pgtable.h | 8 +-
+ include/linux/blkdev.h | 13 +
+ include/linux/bootmem.h | 6 +-
+ include/linux/buffer_head.h | 2 -
+ include/linux/compaction.h | 4 +-
+ include/linux/compiler.h | 13 +-
+ include/linux/cpuset.h | 29 +-
+ include/linux/crc64_ecma.h | 56 ++
+ include/linux/dma-contiguous.h | 9 +-
+ include/linux/fs.h | 1 +
+ include/linux/gfp.h | 15 +-
+ include/linux/hugetlb.h | 12 +-
+ include/linux/hugetlb_inline.h | 7 +
+ include/linux/idr.h | 13 +-
+ include/linux/input.h | 21 +
+ include/linux/jump_label.h | 20 +-
+ include/linux/mc146818rtc.h | 4 +
+ include/linux/memblock.h | 2 +
+ include/linux/memcontrol.h | 32 +-
+ include/linux/memory_hotplug.h | 14 +-
+ include/linux/migrate.h | 11 +-
+ include/linux/mm.h | 53 +-
+ include/linux/mm_types.h | 2 +-
+ include/linux/mmdebug.h | 15 +-
+ include/linux/mmzone.h | 35 +-
+ include/linux/page-flags.h | 5 +
+ include/linux/pageblock-flags.h | 30 +-
+ include/linux/pagemap.h | 139 ++++-
+ include/linux/plist.h | 45 ++
+ include/linux/printk.h | 38 +-
+ include/linux/proc_fs.h | 4 +
+ include/linux/ptrace.h | 32 +
+ include/linux/rmap.h | 4 -
+ include/linux/scatterlist.h | 2 +-
+ include/linux/sched.h | 14 +-
+ include/linux/sched/sysctl.h | 4 +
+ include/linux/shm.h | 3 +-
+ include/linux/signal.h | 21 +-
+ include/linux/slab.h | 20 +-
+ include/linux/smp.h | 2 +
+ include/linux/string.h | 1 +
+ include/linux/swap.h | 38 +-
+ include/linux/swapfile.h | 2 +-
+ include/linux/swapops.h | 2 +-
+ include/linux/swiotlb.h | 2 +
+ include/linux/syscalls.h | 4 +-
+ include/linux/thread_info.h | 2 -
+ include/linux/topology.h | 3 +-
+ include/linux/vm_event_item.h | 4 +
+ include/linux/vmstat.h | 6 +
+ include/linux/zbud.h | 2 +-
+ include/scsi/scsi.h | 2 +-
+ include/trace/events/compaction.h | 25 +-
+ include/trace/events/gfpflags.h | 1 -
+ include/trace/events/vmscan.h | 19 +-
+ include/uapi/linux/shm.h | 17 +-
+ init/Kconfig | 23 +-
+ init/main.c | 81 ++-
+ ipc/compat.c | 2 +-
+ ipc/compat_mq.c | 2 +-
+ ipc/msg.c | 188 +++---
+ ipc/sem.c | 160 ++---
+ ipc/shm.c | 23 +-
+ ipc/util.c | 12 +-
+ ipc/util.h | 10 +-
+ kernel/acct.c | 6 +-
+ kernel/audit.c | 2 +-
+ kernel/backtracetest.c | 18 +-
+ kernel/capability.c | 6 +-
+ kernel/compat.c | 8 +-
+ kernel/cpu.c | 31 +-
+ kernel/cpuset.c | 14 +-
+ kernel/debug/kdb/kdb_bt.c | 2 +-
+ kernel/debug/kdb/kdb_io.c | 2 +-
+ kernel/debug/kdb/kdb_main.c | 2 +-
+ kernel/exec_domain.c | 14 +-
+ kernel/exit.c | 61 +-
+ kernel/fork.c | 20 +-
+ kernel/gcov/base.c | 6 +
+ kernel/gcov/gcc_4_7.c | 5 +
+ kernel/hung_task.c | 4 +-
+ kernel/kexec.c | 70 +--
+ kernel/kmod.c | 5 +-
+ kernel/latencytop.c | 5 +-
+ kernel/panic.c | 23 +-
+ kernel/posix-timers.c | 57 +-
+ kernel/printk/printk.c | 343 ++++++----
+ kernel/profile.c | 20 +-
+ kernel/reboot.c | 21 +-
+ kernel/res_counter.c | 7 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/deadline.c | 7 +-
+ kernel/sched/rt.c | 8 +-
+ kernel/seccomp.c | 4 +-
+ kernel/signal.c | 95 ++-
+ kernel/smp.c | 35 +-
+ kernel/stop_machine.c | 52 +-
+ kernel/sys_ni.c | 2 +
+ kernel/sysctl.c | 92 ++-
+ kernel/time/ntp.c | 20 +-
+ kernel/time/sched_clock.c | 4 +
+ kernel/time/timekeeping.c | 7 +-
+ kernel/tracepoint.c | 2 +
+ kernel/user.c | 1 -
+ kernel/user_namespace.c | 33 +-
+ kernel/utsname_sysctl.c | 4 +-
+ lib/Kconfig | 14 +
+ lib/Kconfig.debug | 25 +-
+ lib/Makefile | 1 +
+ lib/btree.c | 1 +
+ lib/crc32.c | 4 +-
+ lib/crc64_ecma.c | 341 ++++++++++
+ lib/idr.c | 40 +-
+ lib/libcrc32c.c | 5 +-
+ lib/plist.c | 56 +-
+ lib/radix-tree.c | 7 +-
+ lib/scatterlist.c | 4 +-
+ lib/string.c | 8 +-
+ lib/swiotlb.c | 2 +-
+ lib/vsprintf.c | 24 +-
+ lib/xz/Kconfig | 24 +-
+ lib/xz/xz_dec_lzma2.c | 4 +
+ mm/Kconfig | 2 +-
+ mm/Makefile | 2 +-
+ mm/compaction.c | 266 ++++----
+ mm/dmapool.c | 27 +-
+ mm/filemap.c | 240 ++++---
+ mm/fremap.c | 7 +-
+ mm/frontswap.c | 13 +-
+ mm/gup.c | 662 ++++++++++++++++++++
+ mm/huge_memory.c | 34 +-
+ mm/hugetlb.c | 362 +++++++----
+ mm/internal.h | 36 +-
+ mm/kmemleak.c | 4 +-
+ mm/memblock.c | 26 +-
+ mm/memcontrol.c | 452 +++++---------
+ mm/memory-failure.c | 29 +-
+ mm/memory.c | 662 +-------------------
+ mm/memory_hotplug.c | 148 +++--
+ mm/mempolicy.c | 289 ++++-----
+ mm/mempool.c | 2 +
+ mm/migrate.c | 61 +-
+ mm/mmap.c | 9 +-
+ mm/msync.c | 8 +-
+ mm/page-writeback.c | 4 +-
+ mm/page_alloc.c | 373 ++++++-----
+ mm/page_io.c | 21 +-
+ mm/pagewalk.c | 375 +++++++----
+ mm/rmap.c | 47 +-
+ mm/shmem.c | 8 +-
+ mm/slab.c | 45 +-
+ mm/slab.h | 48 +-
+ mm/slab_common.c | 95 ++-
+ mm/slob.c | 3 +-
+ mm/slub.c | 225 ++++---
+ mm/swap.c | 238 ++++---
+ mm/swap_state.c | 2 +-
+ mm/swapfile.c | 224 +++----
+ mm/util.c | 30 +
+ mm/vmacache.c | 22 +-
+ mm/vmalloc.c | 13 +-
+ mm/vmscan.c | 148 +++--
+ mm/vmstat.c | 12 +-
+ mm/zbud.c | 4 +-
+ mm/zsmalloc.c | 4 +-
+ scripts/checkpatch.pl | 98 ++-
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/sysctl/Makefile | 19 +
+ tools/testing/selftests/sysctl/common_tests | 109 ++++
+ tools/testing/selftests/sysctl/run_numerictests | 10 +
+ tools/testing/selftests/sysctl/run_stringtests | 77 +++
+ tools/vm/page-types.c | 35 +-
+ usr/Kconfig | 77 ---
+ 466 files changed, 9944 insertions(+), 5444 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/rtc/xgene-rtc.txt
+ delete mode 100644 arch/alpha/include/asm/scatterlist.h
+ delete mode 100644 arch/arm/include/asm/scatterlist.h
+ delete mode 100644 arch/cris/include/asm/scatterlist.h
+ delete mode 100644 arch/frv/include/asm/scatterlist.h
+ delete mode 100644 arch/ia64/include/asm/scatterlist.h
+ delete mode 100644 arch/m32r/include/asm/scatterlist.h
+ delete mode 100644 arch/microblaze/include/asm/scatterlist.h
+ create mode 100644 arch/mips/dec/platform.c
+ delete mode 100644 arch/mn10300/include/asm/scatterlist.h
+ delete mode 100644 arch/powerpc/include/asm/scatterlist.h
+ delete mode 100644 arch/s390/include/asm/scatterlist.h
+ delete mode 100644 arch/score/include/asm/scatterlist.h
+ delete mode 100644 arch/sparc/include/asm/scatterlist.h
+ delete mode 100644 arch/x86/include/asm/scatterlist.h
+ create mode 100644 drivers/input/leds.c
+ create mode 100644 drivers/rtc/rtc-da9063.c
+ create mode 100644 drivers/rtc/rtc-ds1343.c
+ create mode 100644 drivers/rtc/rtc-mcp795.c
+ create mode 100644 drivers/rtc/rtc-xgene.c
+ create mode 100644 include/linux/crc64_ecma.h
+ create mode 100644 lib/crc64_ecma.c
+ create mode 100644 mm/gup.c
+ create mode 100644 tools/testing/selftests/sysctl/Makefile
+ create mode 100644 tools/testing/selftests/sysctl/common_tests
+ create mode 100644 tools/testing/selftests/sysctl/run_numerictests
+ create mode 100644 tools/testing/selftests/sysctl/run_stringtests
+$ 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: mm/page_io.c: work around gcc bug
+Applying: arm: convert use of typedef ctl_table to struct ctl_table
+Applying: ia64: convert use of typedef ctl_table to struct ctl_table
+Applying: tile: convert use of typedef ctl_table to struct ctl_table
+Applying: cdrom: convert use of typedef ctl_table to struct ctl_table
+Applying: random: convert use of typedef ctl_table to struct ctl_table
+Applying: parport: convert use of typedef ctl_table to struct ctl_table
+Applying: scsi: convert use of typedef ctl_table to struct ctl_table
+Applying: coda: convert use of typedef ctl_table to struct ctl_table
+Applying: fscache: convert use of typedef ctl_table to struct ctl_table
+Applying: lockd: convert use of typedef ctl_table to struct ctl_table
+Applying: nfs: convert use of typedef ctl_table to struct ctl_table
+Applying: inotify: convert use of typedef ctl_table to struct ctl_table
+Applying: ntfs: convert use of typedef ctl_table to struct ctl_table
+Applying: fs: convert use of typedef ctl_table to struct ctl_table
+Applying: key: convert use of typedef ctl_table to struct ctl_table
+Applying: ipc: convert use of typedef ctl_table to struct ctl_table
+Applying: sysctl: convert use of typedef ctl_table to struct ctl_table
+Applying: mm: convert use of typedef ctl_table to struct ctl_table
+Applying: mfd/rtc: sec/s5m: rename SEC* symbols to S5M
+Applying: rtc: s5m: remove undocumented time init on first boot
+Applying: rtc: s5m: use shorter time of register update
+Applying: rtc: s5m: support different register layout
+Applying: rtc: s5m: add support for S2MPS14 RTC
+Applying: rtc: s5m: consolidate two device type switch statements
+Applying: blackfin/ptrace: call find_vma with the mmap_sem held
+Applying: kernel/watchdog.c: print traces for all cpus on lockup detection
+Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix
+Applying: kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection-fix-2
+Applying: kernel/watchdog.c: convert printk/pr_warning to pr_foo()
+Applying: init/main.c: code clean-up
+Applying: fs/reiserfs/bitmap.c: coding style fixes
+Applying: fs/reiserfs/stree.c: remove obsolete __constant
+Applying: rwsem: Support optimistic spinning
+Applying: rwsem-support-optimistic-spinning-checkpatch-fixes
+Applying: rwsem-support-optimistic-spinning-fix
+Applying: kernel/kprobes.c: convert printk to pr_foo()
+Applying: sysrq: rcu-ify __handle_sysrq
+Applying: sysrq,rcu: suppress RCU stall warnings while sysrq runs
+Applying: memcg, mm: introduce lowlimit reclaim
+Applying: memcg-mm-introduce-lowlimit-reclaim-fix
+Applying: memcg: allow setting low_limit
+Applying: memcg, doc: clarify global vs. limit reclaims
+Applying: memcg-doc-clarify-global-vs-limit-reclaims-fix
+Applying: memcg: document memory.low_limit_in_bytes
+Applying: vmscan: memcg: check whether the low limit should be ignored
+Applying: vmscan: memcg: always use swappiness of the reclaimed memcg
+Applying: mm/kmemleak.c: use %u to print ->checksum
+Applying: mm: introduce kmemleak_update_trace()
+Applying: lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
+Applying: mm/mempool.c: update the kmemleak stack trace for mempool allocations
+Applying: mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
+Applying: mm: memcontrol: clean up memcg zoneinfo lookup
+Applying: mm: memcontrol: remove unnecessary memcg argument from soft limit functions
+Applying: mm: mark remap_file_pages() syscall as deprecated
+Applying: mm-mark-remap_file_pages-syscall-as-deprecated-fix
+Applying: mm: replace remap_file_pages() syscall with emulation
+Applying: mm-replace-remap_file_pages-syscall-with-emulation-fix
+Applying: mm: remap_file_pages: initialize populate before usage
+Applying: mm: remap_file_pages: grab file ref to prevent race while mmaping
+Applying: memcg: deprecate memory.force_empty knob
+Applying: memcg-deprecate-memoryforce_empty-knob-fix
+Applying: fat: add i_disksize to represent uninitialized size
+Applying: fat: add fat_fallocate operation
+Applying: fat: zero out seek range on _fat_get_block
+Applying: fat: fallback to buffered write in case of fallocated region on direct IO
+Applying: fat: permit to return phy block number by fibmap in fallocated region
+Applying: Documentation/filesystems/vfat.txt: update the limitation for fat fallocate
+Applying: nmi: provide the option to issue an NMI back trace to every cpu but current
+Applying: nmi-provide-the-option-to-issue-an-nmi-back-trace-to-every-cpu-but-current-fix
+Applying: fs/dlm/config.c: convert simple_str to kstr
+Applying: fs/dlm/lockspace.c: convert simple_str to kstr
+Applying: fs/dlm/debug_fs.c: replace seq_printf by seq_puts
+Applying: mm/kmemleak-test.c: use pr_fmt for logging
+Applying: bio: modify __bio_add_page() to accept pages that don't start a new segment
+Applying: bio-modify-__bio_add_page-to-accept-pages-that-dont-start-a-new-segment-v3
+Applying: MAINTAINERS: add linux-api for review of API/ABI changes
+Applying: MAINTAINERS: adi-buildroot-devel is moderated
+Applying: mm: convert some level-less printks to pr_*
+Applying: drivers/w1/w1_int.c: call put_device if device_register fails
+Applying: ufs: sb mutex merge + mutex_destroy
+Applying: mm: add strictlimit knob
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + a381cf0cf672...ce302326271a akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (ce302326271a 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/cgroups/memory.txt | 54 +++---
+ Documentation/filesystems/vfat.txt | 10 +
+ Documentation/kernel-parameters.txt | 5 +
+ Documentation/kmemleak.txt | 1 +
+ Documentation/sysctl/kernel.txt | 17 ++
+ Documentation/vm/remap_file_pages.txt | 27 +++
+ MAINTAINERS | 25 ++-
+ arch/arm/kernel/isa.c | 6 +-
+ arch/blackfin/kernel/ptrace.c | 8 +-
+ arch/ia64/kernel/crash.c | 4 +-
+ arch/ia64/kernel/perfmon.c | 6 +-
+ arch/sparc/include/asm/irq_64.h | 2 +-
+ arch/sparc/kernel/process_64.c | 18 +-
+ arch/tile/kernel/proc.c | 4 +-
+ arch/x86/include/asm/irq.h | 2 +-
+ arch/x86/kernel/apic/hw_nmi.c | 18 +-
+ block/bio.c | 48 ++---
+ block/bounce.c | 7 +-
+ drivers/cdrom/cdrom.c | 10 +-
+ drivers/char/random.c | 4 +-
+ drivers/gpio/gpio-zevio.c | 4 +
+ drivers/parport/procfs.c | 58 +++---
+ drivers/rtc/Kconfig | 4 +-
+ drivers/rtc/rtc-s5m.c | 310 +++++++++++++++++++-----------
+ drivers/scsi/scsi_sysctl.c | 6 +-
+ drivers/tty/sysrq.c | 21 +-
+ drivers/w1/w1_int.c | 5 +-
+ fs/coda/sysctl.c | 4 +-
+ fs/dcache.c | 2 +-
+ fs/dlm/config.c | 26 ++-
+ fs/dlm/debug_fs.c | 34 ++--
+ fs/dlm/lockspace.c | 21 +-
+ fs/drop_caches.c | 2 +-
+ fs/eventpoll.c | 2 +-
+ fs/fat/cache.c | 70 +++++--
+ fs/fat/fat.h | 6 +-
+ fs/fat/file.c | 78 +++++++-
+ fs/fat/inode.c | 87 ++++++++-
+ fs/file_table.c | 4 +-
+ fs/fscache/main.c | 4 +-
+ fs/inode.c | 2 +-
+ fs/lockd/svc.c | 6 +-
+ fs/nfs/nfs4sysctl.c | 6 +-
+ fs/nfs/sysctl.c | 6 +-
+ fs/notify/inotify/inotify_user.c | 2 +-
+ fs/ntfs/sysctl.c | 4 +-
+ fs/reiserfs/bitmap.c | 13 +-
+ fs/reiserfs/stree.c | 8 +-
+ fs/ufs/balloc.c | 30 +--
+ fs/ufs/ialloc.c | 17 +-
+ fs/ufs/super.c | 28 +--
+ fs/ufs/ufs.h | 1 -
+ include/linux/fs.h | 8 +-
+ include/linux/key.h | 2 +-
+ include/linux/kmemleak.h | 4 +
+ include/linux/memcontrol.h | 14 ++
+ include/linux/mfd/samsung/rtc.h | 86 +++++----
+ include/linux/nmi.h | 12 +-
+ include/linux/res_counter.h | 40 ++++
+ include/linux/rwsem.h | 25 ++-
+ init/main.c | 23 +--
+ ipc/ipc_sysctl.c | 14 +-
+ ipc/mq_sysctl.c | 12 +-
+ kernel/kprobes.c | 36 ++--
+ kernel/locking/rwsem-xadd.c | 229 +++++++++++++++++++---
+ kernel/locking/rwsem.c | 31 ++-
+ kernel/res_counter.c | 2 +
+ kernel/sysctl.c | 13 +-
+ kernel/utsname_sysctl.c | 6 +-
+ kernel/watchdog.c | 49 ++++-
+ lib/radix-tree.c | 6 +
+ mm/Makefile | 2 +-
+ mm/backing-dev.c | 35 ++++
+ mm/fremap.c | 279 ---------------------------
+ mm/kmemleak-test.c | 36 ++--
+ mm/kmemleak.c | 36 +++-
+ mm/memblock.c | 10 +-
+ mm/memcontrol.c | 192 +++++++++++-------
+ mm/mempolicy.c | 5 +-
+ mm/mempool.c | 6 +
+ mm/mmap.c | 90 ++++++++-
+ mm/nobootmem.c | 2 -
+ mm/nommu.c | 13 +-
+ mm/page-writeback.c | 2 +-
+ mm/page_alloc.c | 12 +-
+ mm/page_io.c | 4 +-
+ mm/vmscan.c | 71 +++++--
+ 88 files changed, 1659 insertions(+), 903 deletions(-)
+ create mode 100644 Documentation/vm/remap_file_pages.txt
+ delete mode 100644 mm/fremap.c
projects / karo-tx-linux.git / commitdiff