Add linux-next specific files for 20151102

[karo-tx-linux.git] / Next / merge.log

$ date -R
Mon, 02 Nov 2015 09:00:19 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 523e13455ec9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Merging origin/master (ca04d396a322 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
$ git merge origin/master
Updating 523e13455ec9..ca04d396a322
Fast-forward
 arch/arm/boot/dts/emev2-kzm9d.dts               |  8 +++----
 arch/arm/boot/dts/ste-snowball.dts              | 10 ++++-----
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi   | 12 +++++-----
 arch/x86/kernel/apic/io_apic.c                  |  4 +++-
 arch/x86/kernel/pci-dma.c                       |  5 +++--
 arch/x86/kernel/process.c                       |  3 +++
 drivers/clocksource/arm_global_timer.c          |  9 ++++++--
 drivers/clocksource/fsl_ftm_timer.c             |  2 +-
 drivers/clocksource/samsung_pwm_timer.c         |  2 +-
 drivers/clocksource/sh_mtu2.c                   |  4 +++-
 drivers/clocksource/time-pistachio.c            |  3 ++-
 drivers/clocksource/timer-digicolor.c           |  2 +-
 drivers/clocksource/timer-prima2.c              |  2 +-
 drivers/clocksource/vf_pit_timer.c              |  2 +-
 drivers/gpu/drm/drm_crtc.c                      |  4 ++--
 drivers/gpu/drm/radeon/atombios_encoders.c      | 19 ++++++++++++----
 drivers/gpu/drm/radeon/radeon_encoders.c        |  1 -
 drivers/gpu/drm/radeon/radeon_legacy_encoders.c |  1 +
 drivers/irqchip/irq-armada-370-xp.c             |  1 +
 drivers/irqchip/irq-tegra.c                     |  1 +
 drivers/md/md.c                                 |  3 +--
 drivers/md/raid5.c                              |  6 +++--
 drivers/scsi/mvsas/mv_sas.c                     |  2 ++
 drivers/scsi/scsi_dh.c                          |  8 +++++--
 drivers/scsi/scsi_priv.h                        |  2 ++
 drivers/scsi/scsi_sysfs.c                       |  2 ++
 drivers/usb/musb/omap2430.c                     | 29 ++++++++++++++++++++-----
 include/linux/omap-dma.h                        |  2 +-
 tools/testing/selftests/x86/entry_from_vm86.c   |  4 ++++
 29 files changed, 106 insertions(+), 47 deletions(-)
Merging fixes/master (25cb62b76430 Linux 4.3-rc5)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (38850d786a79 ARM: 8449/1: fix bug in vdsomunge swab32 macro)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
 arch/arm/vdso/vdsomunge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging m68k-current/for-linus (95bc06ef049b m68k/defconfig: Update defconfigs for v4.3-rc1)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
Merging powerpc-fixes/fixes (977bf062bba3 powerpc/dma: dma_set_coherent_mask() should not be GPL only)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-merge-mpe/fixes
Already up-to-date.
Merging sparc/master (73958c651fbf sparc64: use ENTRY/ENDPROC in VISsave)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/include/uapi/asm/asi.h |  2 +-
 arch/sparc/lib/VISsave.S          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
Merging net/master (5dbebbb44a6a net: bcmgenet: Software reset EPHY after power on)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/broadcom/genet/bcmgenet.c |  4 +++-
 drivers/net/ethernet/broadcom/genet/bcmgenet.h |  1 +
 drivers/net/ethernet/broadcom/genet/bcmmii.c   | 18 ++++++++++++++++++
 drivers/net/ethernet/freescale/fec_main.c      |  2 +-
 drivers/net/ethernet/smsc/smsc911x.c           |  1 +
 net/tipc/udp_media.c                           |  5 +++++
 6 files changed, 29 insertions(+), 2 deletions(-)
Merging ipsec/master (ca064bd89363 xfrm: Fix pmtu discovery for local generated packets.)
$ git merge ipsec/master
Already up-to-date.
Merging ipvs/master (6ece90f9a13e netfilter: fix Kconfig dependencies for nf_dup_ipv{4,6})
$ git merge ipvs/master
Already up-to-date.
Merging sound-current/for-linus (cadd16ea33a9 ALSA: hda - Disable 64bit address for Creative HDA controllers)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
 sound/pci/hda/hda_intel.c     |  3 +++
 sound/pci/hda/patch_realtek.c | 13 +++++++++++++
 2 files changed, 16 insertions(+)
Merging pci-current/for-linus (1266963170f5 PCI: Prevent out of bounds access in numa_node override)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless-drivers/master (de28a05ee28e Merge tag 'iwlwifi-for-kalle-2015-10-05' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes)
$ git merge wireless-drivers/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (9ffecb102835 Linux 4.3-rc3)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (f235f664a8af fbcon: initialize blink interval before calling fb_set_par)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (32b88194f71d Linux 4.3-rc7)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (25cb62b76430 Linux 4.3-rc5)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (32b88194f71d Linux 4.3-rc7)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging usb-chipidea-fixes/ci-for-usb-stable (f256896afdb6 usb: chipidea: otg: gadget module load and unload support)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/imx27.dtsi       |  16 +++--
 drivers/usb/chipidea/ci_hdrc_imx.c | 131 ++++++++++++++++++++++++++++++++-----
 drivers/usb/chipidea/debug.c       |   2 +
 drivers/usb/chipidea/udc.c         |  17 +++++
 4 files changed, 144 insertions(+), 22 deletions(-)
Merging staging.current/staging-linus (32b88194f71d Linux 4.3-rc7)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (25cb62b76430 Linux 4.3-rc5)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (195562194aad Input: alps - only the Dell Latitude D420/430/620/630 have separate stick button bits)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (3fc89adb9fa4 crypto: api - Only abort operations on fatal signal)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
$ git merge ide/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr())
$ git merge rr-fixes/fixes
Already up-to-date.
Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (ae7858180510 selftests: exec: revert to default emit rule)
$ git merge kselftest-fixes/fixes
Already up-to-date.
Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
$ git merge backlight-fixes/for-backlight-fixes
Already up-to-date.
Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
$ git merge ftrace-fixes/for-next-urgent
Already up-to-date.
Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (1d337b286098 drm/i915/skl: Prevent unclaimed register writes on skylake.)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/intel_pm.c | 5 +++++
 1 file changed, 5 insertions(+)
Merging asm-generic/master (4008cb3ad223 asm-generic: temporarily add back asm-generic/io-64-nonatomic*.h)
$ git merge asm-generic/master
Auto-merging include/linux/count_zeros.h
Auto-merging drivers/block/nvme-core.c
Merge made by the 'recursive' strategy.
 drivers/acpi/nfit.c                                |  2 +-
 drivers/acpi/osl.c                                 |  2 +-
 drivers/block/drbd/drbd_bitmap.c                   |  2 +-
 drivers/block/nvme-core.c                          |  2 +-
 drivers/crypto/hifn_795x.c                         |  2 --
 drivers/edac/i3200_edac.c                          |  2 +-
 drivers/edac/ie31200_edac.c                        |  2 +-
 drivers/edac/x38_edac.c                            |  2 +-
 drivers/gpio/gpio-mxc.c                            |  2 +-
 drivers/i2c/busses/i2c-ismt.c                      |  2 +-
 drivers/infiniband/hw/mlx5/main.c                  |  2 +-
 drivers/net/ethernet/intel/i40e/i40e_osdep.h       |  2 +-
 drivers/net/ethernet/intel/i40evf/i40e_osdep.h     |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  2 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |  2 +-
 .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |  2 +-
 drivers/net/ethernet/rocker/rocker.c               |  2 +-
 drivers/platform/x86/ibm_rtl.c                     |  2 +-
 drivers/platform/x86/intel_ips.c                   |  2 +-
 drivers/scsi/qla4xxx/ql4_nx.c                      |  2 +-
 drivers/tty/n_tracerouter.c                        |  2 +-
 drivers/tty/n_tracesink.c                          |  2 +-
 include/asm-generic/cmpxchg.h                      | 11 ++++---
 include/asm-generic/io-64-nonatomic-hi-lo.h        | 34 ++--------------------
 include/asm-generic/io-64-nonatomic-lo-hi.h        | 34 ++--------------------
 .../{asm-generic/bitops => linux}/count_zeros.h    |  6 ++--
 include/linux/io-64-nonatomic-hi-lo.h              | 32 ++++++++++++++++++++
 include/linux/io-64-nonatomic-lo-hi.h              | 32 ++++++++++++++++++++
 lib/mpi/longlong.h                                 |  2 +-
 lib/mpi/mpicoder.c                                 |  2 +-
 30 files changed, 101 insertions(+), 96 deletions(-)
 rename include/{asm-generic/bitops => linux}/count_zeros.h (92%)
 create mode 100644 include/linux/io-64-nonatomic-hi-lo.h
 create mode 100644 include/linux/io-64-nonatomic-lo-hi.h
Merging arc/for-next (5a364c2a1762 ARC: mm: PAE40 support)
$ git merge arc/for-next
Auto-merging mm/huge_memory.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/features/vm/THP/arch-support.txt     |   2 +-
 .../features/vm/pte_special/arch-support.txt       |   2 +-
 MAINTAINERS                                        |   1 +
 arch/arc/Kconfig                                   |  40 ++++
 arch/arc/boot/dts/axc001.dtsi                      |   2 +-
 arch/arc/boot/dts/axc003.dtsi                      |   2 +-
 arch/arc/boot/dts/axc003_idu.dtsi                  |   2 +-
 arch/arc/boot/dts/nsim_hs.dts                      |  12 +-
 arch/arc/boot/dts/skeleton.dtsi                    |   2 +-
 arch/arc/boot/dts/vdk_axc003.dtsi                  |   2 +-
 arch/arc/boot/dts/vdk_axc003_idu.dtsi              |   2 +-
 arch/arc/include/asm/arcregs.h                     |   6 +-
 arch/arc/include/asm/cache.h                       |   2 +
 arch/arc/include/asm/cacheflush.h                  |   8 +-
 arch/arc/include/asm/entry-compact.h               |  13 +-
 arch/arc/include/asm/highmem.h                     |  61 ++++++
 arch/arc/include/asm/hugepage.h                    |  81 +++++++
 arch/arc/include/asm/irq.h                         |   1 +
 arch/arc/include/asm/irqflags-compact.h            |  16 +-
 arch/arc/include/asm/kmap_types.h                  |  18 ++
 arch/arc/include/asm/mach_desc.h                   |  10 +-
 arch/arc/include/asm/mcip.h                        |   3 -
 arch/arc/include/asm/mmu.h                         |   7 +
 arch/arc/include/asm/page.h                        |   9 +-
 arch/arc/include/asm/pgalloc.h                     |  12 +-
 arch/arc/include/asm/pgtable.h                     |  88 ++++----
 arch/arc/include/asm/processor.h                   |   7 +-
 arch/arc/include/asm/setup.h                       |   7 +
 arch/arc/include/asm/smp.h                         |   7 +
 arch/arc/include/asm/tlbflush.h                    |   5 +
 arch/arc/include/uapi/asm/page.h                   |  11 +-
 arch/arc/kernel/entry-arcv2.S                      |   2 +-
 arch/arc/kernel/entry-compact.S                    |  43 ++--
 arch/arc/kernel/head.S                             |  49 +++--
 arch/arc/kernel/intc-compact.c                     |  90 ++------
 arch/arc/kernel/irq.c                              |  20 +-
 arch/arc/kernel/mcip.c                             |  46 +---
 arch/arc/kernel/setup.c                            |   7 +-
 arch/arc/kernel/smp.c                              |  66 +++---
 arch/arc/kernel/time.c                             |   3 -
 arch/arc/kernel/vmlinux.lds.S                      |   2 +-
 arch/arc/mm/Makefile                               |   1 +
 arch/arc/mm/cache.c                                |  91 +++++---
 arch/arc/mm/fault.c                                |  13 +-
 arch/arc/mm/highmem.c                              | 140 ++++++++++++
 arch/arc/mm/init.c                                 | 104 ++++++---
 arch/arc/mm/tlb.c                                  | 234 +++++++++++++++++----
 arch/arc/mm/tlbex.S                                |  51 +++--
 arch/arc/plat-axs10x/axs10x.c                      |   8 -
 arch/arc/plat-sim/platform.c                       |   4 -
 include/asm-generic/pgtable.h                      |  37 +++-
 mm/huge_memory.c                                   |   2 +-
 mm/pgtable-generic.c                               | 100 +++++----
 53 files changed, 1075 insertions(+), 479 deletions(-)
 create mode 100644 arch/arc/include/asm/highmem.h
 create mode 100644 arch/arc/include/asm/hugepage.h
 create mode 100644 arch/arc/include/asm/kmap_types.h
 create mode 100644 arch/arc/mm/highmem.c
Merging arm/for-next (4f96dfc97367 Merge branches 'drm-dwhdmi-devel', 'drm-tda998x-devel2' and 'drm-armada-devel' into for-next)
$ git merge arm/for-next
Removing drivers/gpu/drm/armada/armada_slave.h
Removing drivers/gpu/drm/armada/armada_slave.c
Removing drivers/gpu/drm/armada/armada_output.h
Removing drivers/gpu/drm/armada/armada_output.c
Removing Documentation/arm/SA1100/Victor
Merge made by the 'recursive' strategy.
 Documentation/arm/SA1100/Victor               |  16 -
 Documentation/arm/memory.txt                  |   2 +-
 Documentation/devicetree/bindings/arm/twd.txt |   5 +
 arch/arm/Kconfig                              |   7 +-
 arch/arm/include/asm/cmpxchg.h                |  12 +
 arch/arm/include/asm/irqflags.h               |  10 +
 arch/arm/include/asm/mach/arch.h              |   2 +-
 arch/arm/include/asm/memory.h                 |   2 +
 arch/arm/include/asm/pgtable.h                |   2 +-
 arch/arm/include/asm/smp.h                    |   4 +-
 arch/arm/include/asm/unistd.h                 |   7 -
 arch/arm/kernel/devtree.c                     |  12 +-
 arch/arm/kernel/entry-armv.S                  |  33 +-
 arch/arm/kernel/hw_breakpoint.c               |   1 -
 arch/arm/kernel/kgdb.c                        |  31 +-
 arch/arm/kernel/smp.c                         |  12 +-
 arch/arm/kernel/smp_twd.c                     |  11 +-
 arch/arm/kernel/traps.c                       |  52 --
 arch/arm/lib/clear_user.S                     |   4 +
 arch/arm/mm/Kconfig                           |  12 -
 arch/arm/mm/dma-mapping.c                     |   7 +
 arch/arm/mm/fault.c                           |  22 +
 arch/arm/mm/fault.h                           |   1 +
 arch/arm/mm/mmu.c                             |   4 +
 drivers/gpu/drm/armada/Kconfig                |   9 -
 drivers/gpu/drm/armada/Makefile               |   3 +-
 drivers/gpu/drm/armada/armada_crtc.c          | 258 +++++++---
 drivers/gpu/drm/armada/armada_crtc.h          |  34 +-
 drivers/gpu/drm/armada/armada_drm.h           |  16 -
 drivers/gpu/drm/armada/armada_drv.c           | 148 +-----
 drivers/gpu/drm/armada/armada_output.c        | 142 ------
 drivers/gpu/drm/armada/armada_output.h        |  33 --
 drivers/gpu/drm/armada/armada_overlay.c       | 147 +++---
 drivers/gpu/drm/armada/armada_slave.c         | 139 ------
 drivers/gpu/drm/armada/armada_slave.h         |  26 -
 drivers/gpu/drm/bridge/Kconfig                |  12 +
 drivers/gpu/drm/bridge/Makefile               |   1 +
 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c    | 653 ++++++++++++++++++++++++++
 drivers/gpu/drm/bridge/dw_hdmi-audio.h        |  14 +
 drivers/gpu/drm/bridge/dw_hdmi.c              | 391 +++++++++------
 drivers/gpu/drm/bridge/dw_hdmi.h              |   3 +
 drivers/gpu/drm/i2c/tda998x_drv.c             | 487 ++++++++-----------
 drivers/gpu/ipu-v3/ipu-dc.c                   |  15 +-
 drivers/gpu/ipu-v3/ipu-di.c                   | 129 ++---
 include/linux/amba/bus.h                      |   2 -
 lib/nmi_backtrace.c                           |  11 +-
 46 files changed, 1609 insertions(+), 1335 deletions(-)
 delete mode 100644 Documentation/arm/SA1100/Victor
 delete mode 100644 drivers/gpu/drm/armada/armada_output.c
 delete mode 100644 drivers/gpu/drm/armada/armada_output.h
 delete mode 100644 drivers/gpu/drm/armada/armada_slave.c
 delete mode 100644 drivers/gpu/drm/armada/armada_slave.h
 create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-ahb-audio.c
 create mode 100644 drivers/gpu/drm/bridge/dw_hdmi-audio.h
Merging arm-perf/for-next/perf (6ff33f3902c3 Linux 4.3-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (cd676572bf18 ARM: SoC: document merges)
$ git merge arm-soc/for-next
Removing drivers/clk/clk-bcm2835.c
Removing arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
Auto-merging arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts
Auto-merging arch/arm/mm/Kconfig
Removing arch/arm/mach-shmobile/sh-gpio.h
Removing arch/arm/mach-shmobile/r8a7778.h
Removing arch/arm/mach-shmobile/intc.h
Removing arch/arm/mach-shmobile/console.c
Removing arch/arm/mach-shmobile/clock.h
Removing arch/arm/mach-shmobile/clock.c
Removing arch/arm/mach-shmobile/clock-r8a7778.c
Removing arch/arm/mach-shmobile/board-bockw.c
Removing arch/arm/mach-shmobile/board-bockw-reference.c
Removing arch/arm/mach-shmobile/Makefile.boot
Removing arch/arm/mach-omap2/sram34xx.S
Removing arch/arm/mach-omap2/devices.h
Removing arch/arm/mach-omap2/clkt34xx_dpll3m2.c
Removing arch/arm/mach-omap1/include/mach/board-voiceblue.h
Removing arch/arm/mach-omap1/board-voiceblue.c
Removing arch/arm/configs/bockw_defconfig
Removing arch/arm/boot/dts/r8a7778-bockw-reference.dts
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/power/pd-samsung.txt
Auto-merging Documentation/devicetree/bindings/board/fsl-board.txt
Removing Documentation/devicetree/bindings/arm/samsung-boards.txt
Merge made by the 'recursive' strategy.
 Documentation/arm/Samsung/Bootloader-interface.txt |    5 +-
 Documentation/arm/keystone/knav-qmss.txt           |   56 +
 Documentation/arm/sunxi/README                     |    2 +-
 Documentation/devicetree/bindings/arm/amlogic.txt  |   10 +-
 Documentation/devicetree/bindings/arm/apm/scu.txt  |   17 +
 Documentation/devicetree/bindings/arm/arm,scpi.txt |  188 +++
 .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt   |  162 +-
 .../devicetree/bindings/arm/bcm/brcm,nsp.txt       |   34 +
 .../devicetree/bindings/arm/coherency-fabric.txt   |    5 +
 Documentation/devicetree/bindings/arm/cpus.txt     |    2 +
 Documentation/devicetree/bindings/arm/fsl.txt      |   16 +-
 .../bindings/arm/hisilicon/hisilicon.txt           |    4 +
 .../devicetree/bindings/arm/keystone/keystone.txt  |   20 +-
 .../devicetree/bindings/arm/mvebu-cpu-config.txt   |   20 +
 Documentation/devicetree/bindings/arm/pmu.txt      |    1 +
 Documentation/devicetree/bindings/arm/psci.txt     |    6 +
 Documentation/devicetree/bindings/arm/rockchip.txt |   11 +
 .../devicetree/bindings/arm/samsung-boards.txt     |   27 -
 .../bindings/arm/samsung/samsung-boards.txt        |   69 +
 Documentation/devicetree/bindings/arm/shmobile.txt |   10 +-
 Documentation/devicetree/bindings/arm/sunxi.txt    |    1 +
 .../bindings/arm/uniphier/cache-uniphier.txt       |   60 +
 .../{powerpc/fsl/board.txt => board/fsl-board.txt} |   14 +-
 .../devicetree/bindings/bus/sunxi-rsb.txt          |   47 +
 .../bindings/clock/brcm,bcm2835-cprman.txt         |   45 +
 .../devicetree/bindings/clock/qcom,gcc.txt         |    4 +
 .../devicetree/bindings/clock/qcom,mmcc.txt        |    4 +
 .../devicetree/bindings/gpio/gpio-mpc8xxx.txt      |    4 +-
 .../devicetree/bindings/hwmon/pwm-fan.txt          |   29 +-
 .../devicetree/bindings/iommu/samsung,sysmmu.txt   |    2 +-
 .../bindings/memory-controllers/arm,pl172.txt      |    8 +-
 .../renesas-memory-controllers.txt                 |    6 +-
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |    4 +
 .../devicetree/bindings/pci/arm,juno-r1-pcie.txt   |   10 +
 .../bindings/pci/plda,xpressrich3-axi.txt          |   12 +
 .../power_domain.txt => power/pd-samsung.txt}      |    5 +-
 .../devicetree/bindings/power_supply/qcom_smbb.txt |  131 ++
 .../devicetree/bindings/soc/mediatek/scpsys.txt    |   10 +-
 .../devicetree/bindings/soc/qcom/qcom,smem.txt     |   57 +
 .../bindings/soc/rockchip/power_domain.txt         |   46 +
 .../bindings/soc/ti/keystone-navigator-qmss.txt    |    1 -
 .../bindings/timer/mediatek,mtk-timer.txt          |    8 +-
 Documentation/devicetree/bindings/usb/dwc3.txt     |    3 +-
 .../devicetree/bindings/vendor-prefixes.txt        |    3 +
 Documentation/hwmon/scpi-hwmon                     |   33 +
 Documentation/spi/pxa2xx                           |    6 -
 MAINTAINERS                                        |   44 +-
 arch/arm/Kconfig                                   |   26 +-
 arch/arm/Kconfig.debug                             |   44 +-
 arch/arm/arm-soc-for-next-contents.txt             |  287 ++++
 arch/arm/boot/dts/Makefile                         |   57 +-
 arch/arm/boot/dts/am335x-base0033.dts              |   48 +-
 arch/arm/boot/dts/am335x-bone-common.dtsi          |    3 +-
 arch/arm/boot/dts/am335x-bonegreen.dts             |   53 +
 arch/arm/boot/dts/am335x-evm.dts                   |    2 +-
 arch/arm/boot/dts/am335x-evmsk.dts                 |    2 +-
 arch/arm/boot/dts/am335x-igep0033.dtsi             |   40 +-
 arch/arm/boot/dts/am335x-phycore-som.dtsi          |   36 +-
 arch/arm/boot/dts/am335x-wega.dtsi                 |   13 +-
 arch/arm/boot/dts/am437x-gp-evm.dts                |   31 +-
 arch/arm/boot/dts/am437x-idk-evm.dts               |    2 +-
 arch/arm/boot/dts/am437x-sk-evm.dts                |    2 +-
 arch/arm/boot/dts/am43x-epos-evm.dts               |    2 +-
 arch/arm/boot/dts/am57xx-beagle-x15.dts            |  117 +-
 arch/arm/boot/dts/armada-370-db.dts                |    3 +-
 arch/arm/boot/dts/armada-370-dlink-dns327l.dts     |    3 +-
 arch/arm/boot/dts/armada-370-mirabox.dts           |    7 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts     |    9 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts     |    9 +-
 arch/arm/boot/dts/armada-370-rd.dts                |    3 +-
 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts  |   36 +
 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts  |  133 ++
 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi |  231 +++
 .../dts/armada-370-seagate-personal-cloud-2bay.dts |   51 +
 .../boot/dts/armada-370-seagate-personal-cloud.dts |   37 +
 .../dts/armada-370-seagate-personal-cloud.dtsi     |  178 +++
 arch/arm/boot/dts/armada-370-synology-ds213j.dts   |    3 +-
 arch/arm/boot/dts/armada-370.dtsi                  |   37 +
 arch/arm/boot/dts/armada-375-db.dts                |    4 +-
 arch/arm/boot/dts/armada-375.dtsi                  |   33 +
 arch/arm/boot/dts/armada-385-db-ap.dts             |    4 +-
 arch/arm/boot/dts/armada-385-linksys.dtsi          |    4 +-
 arch/arm/boot/dts/armada-388-db.dts                |    4 +-
 arch/arm/boot/dts/armada-388-gp.dts                |   19 +-
 arch/arm/boot/dts/armada-388-rd.dts                |    4 +-
 arch/arm/boot/dts/armada-38x.dtsi                  |   33 +
 arch/arm/boot/dts/armada-xp-axpwifiap.dts          |    4 +-
 arch/arm/boot/dts/armada-xp-db.dts                 |    4 +-
 arch/arm/boot/dts/armada-xp-gp.dts                 |    4 +-
 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts    |    4 +-
 arch/arm/boot/dts/armada-xp-linksys-mamba.dts      |    4 +-
 arch/arm/boot/dts/armada-xp-matrix.dts             |    4 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |   90 +-
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |    4 +-
 arch/arm/boot/dts/armada-xp-synology-ds414.dts     |    4 +-
 arch/arm/boot/dts/armada-xp.dtsi                   |   35 +
 arch/arm/boot/dts/at91-sama5d2_xplained.dts        |  118 ++
 arch/arm/boot/dts/at91-sama5d3_xplained.dts        |    2 +-
 arch/arm/boot/dts/at91-sama5d4_xplained.dts        |    2 +-
 arch/arm/boot/dts/at91-sama5d4ek.dts               |   27 +
 arch/arm/boot/dts/at91rm9200.dtsi                  |    8 +-
 arch/arm/boot/dts/at91sam9260.dtsi                 |    2 +-
 arch/arm/boot/dts/at91sam9261.dtsi                 |    2 +-
 arch/arm/boot/dts/at91sam9263.dtsi                 |    2 +-
 arch/arm/boot/dts/at91sam9g45.dtsi                 |    2 +-
 arch/arm/boot/dts/at91sam9m10g45ek.dts             |    2 +
 arch/arm/boot/dts/at91sam9n12.dtsi                 |    2 +-
 arch/arm/boot/dts/at91sam9n12ek.dts                |    8 +-
 arch/arm/boot/dts/at91sam9rl.dtsi                  |    2 +-
 arch/arm/boot/dts/at91sam9x5.dtsi                  |    5 +-
 arch/arm/boot/dts/at91sam9x5ek.dtsi                |    8 +
 arch/arm/boot/dts/axp209.dtsi                      |    5 +
 arch/arm/boot/dts/axp22x.dtsi                      |  143 ++
 arch/arm/boot/dts/bcm-cygnus.dtsi                  |  334 +++--
 arch/arm/boot/dts/bcm-nsp.dtsi                     |  119 ++
 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts           |   30 +
 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts           |   23 +
 arch/arm/boot/dts/bcm2835-rpi-b.dts                |    8 +-
 arch/arm/boot/dts/bcm2835-rpi.dtsi                 |    4 +
 arch/arm/boot/dts/bcm2835.dtsi                     |   64 +-
 arch/arm/boot/dts/bcm4708-netgear-r6250.dts        |   11 +
 arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts        |    1 +
 arch/arm/boot/dts/bcm4709-netgear-r7000.dts        |  106 ++
 arch/arm/boot/dts/bcm7445.dtsi                     |   84 ++
 arch/arm/boot/dts/bcm911360_entphn.dts             |   28 +-
 arch/arm/boot/dts/bcm911360k.dts                   |    9 +-
 arch/arm/boot/dts/bcm958300k.dts                   |   44 +-
 arch/arm/boot/dts/bcm958305k.dts                   |   40 +-
 arch/arm/boot/dts/bcm958625k.dts                   |   57 +
 arch/arm/boot/dts/bcm9hmidc.dtsi                   |   42 +
 arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts         |    3 +-
 arch/arm/boot/dts/berlin2.dtsi                     |   23 +
 arch/arm/boot/dts/berlin2cd-google-chromecast.dts  |    3 +-
 arch/arm/boot/dts/berlin2cd.dtsi                   |   20 +
 arch/arm/boot/dts/berlin2q-marvell-dmp.dts         |    3 +-
 arch/arm/boot/dts/berlin2q.dtsi                    |   23 +
 arch/arm/boot/dts/cx92755.dtsi                     |    7 +
 arch/arm/boot/dts/cx92755_equinox.dts              |    9 +
 arch/arm/boot/dts/dove.dtsi                        |   17 +-
 arch/arm/boot/dts/dra7-evm.dts                     |  222 ++-
 arch/arm/boot/dts/dra7.dtsi                        |   60 +
 arch/arm/boot/dts/dra72-evm.dts                    |  162 +-
 arch/arm/boot/dts/dra72x.dtsi                      |   21 +
 arch/arm/boot/dts/dra74x.dtsi                      |   51 +
 arch/arm/boot/dts/efm32gg-dk3750.dts               |    8 +-
 arch/arm/boot/dts/efm32gg.dtsi                     |   32 +-
 arch/arm/boot/dts/exynos3250-monk.dts              |    9 +-
 arch/arm/boot/dts/exynos3250-rinato.dts            |   11 +-
 arch/arm/boot/dts/exynos3250.dtsi                  |    4 +-
 arch/arm/boot/dts/exynos4.dtsi                     |    8 +
 arch/arm/boot/dts/exynos4210-origen.dts            |   15 +-
 arch/arm/boot/dts/exynos4210-smdkv310.dts          |    3 +-
 arch/arm/boot/dts/exynos4210-trats.dts             |   31 +-
 arch/arm/boot/dts/exynos4210-universal_c210.dts    |   44 +-
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |   27 +-
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |   45 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |    8 +-
 arch/arm/boot/dts/exynos4412-origen.dts            |   15 +-
 arch/arm/boot/dts/exynos4412-tiny4412.dts          |    9 +-
 arch/arm/boot/dts/exynos4412-trats2.dts            |  140 +-
 arch/arm/boot/dts/exynos5250-arndale.dts           |    8 +-
 arch/arm/boot/dts/exynos5250-smdk5250.dts          |   16 +-
 arch/arm/boot/dts/exynos5250-snow-common.dtsi      |  684 +++++++++
 arch/arm/boot/dts/exynos5250-snow-rev5.dts         |   47 +
 arch/arm/boot/dts/exynos5250-snow.dts              |  671 +--------
 arch/arm/boot/dts/exynos5250.dtsi                  |    4 +
 arch/arm/boot/dts/exynos5420-arndale-octa.dts      |    3 +-
 arch/arm/boot/dts/exynos5420-peach-pit.dts         |    9 +-
 arch/arm/boot/dts/exynos5420-smdk5420.dts          |   14 +-
 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi  |   61 +
 arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |  102 +-
 arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts    |   51 +
 arch/arm/boot/dts/exynos5422-odroidxu3.dts         |   51 +
 arch/arm/boot/dts/exynos5422-odroidxu4.dts         |   48 +
 arch/arm/boot/dts/exynos5440-ssdk5440.dts          |    5 +-
 arch/arm/boot/dts/exynos5800-peach-pi.dts          |    9 +-
 arch/arm/boot/dts/hi3620-hi4511.dts                |    3 +-
 arch/arm/boot/dts/hisi-x5hd2-dkb.dts               |    2 +-
 arch/arm/boot/dts/imx23.dtsi                       |    6 +-
 arch/arm/boot/dts/imx28-evk.dts                    |    2 +-
 arch/arm/boot/dts/imx28-m28evk.dts                 |    2 +-
 arch/arm/boot/dts/imx28.dtsi                       |    6 +-
 arch/arm/boot/dts/imx31.dtsi                       |    2 +-
 arch/arm/boot/dts/imx35.dtsi                       |    2 +-
 arch/arm/boot/dts/imx50-evk.dts                    |    2 +-
 arch/arm/boot/dts/imx53-smd.dts                    |    2 +-
 arch/arm/boot/dts/imx6dl-nit6xlite.dts             |   49 +
 arch/arm/boot/dts/imx6dl-nitrogen6x.dts            |   44 +-
 arch/arm/boot/dts/imx6dl-rex-basic.dts             |    2 +-
 arch/arm/boot/dts/imx6dl-sabrelite.dts             |   40 +-
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            |    2 +-
 arch/arm/boot/dts/imx6q-gw5400-a.dts               |    2 +-
 arch/arm/boot/dts/imx6q-nitrogen6_max.dts          |   53 +
 arch/arm/boot/dts/imx6q-nitrogen6x.dts             |   44 +-
 arch/arm/boot/dts/imx6q-rex-pro.dts                |    2 +-
 arch/arm/boot/dts/imx6q-sabrelite.dts              |   40 +-
 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |    2 +-
 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |    2 +-
 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi       |    2 +-
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi           |  630 ++++++++
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |  873 +++++++++++
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |  189 ++-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |    6 +-
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |    2 +-
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |  118 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |    2 +-
 arch/arm/boot/dts/imx6qdl.dtsi                     |   12 +-
 arch/arm/boot/dts/imx6sl-evk.dts                   |    2 +-
 arch/arm/boot/dts/imx6sl.dtsi                      |   21 +-
 arch/arm/boot/dts/imx6sx-sdb-reva.dts              |    4 +-
 arch/arm/boot/dts/imx6sx-sdb.dts                   |    4 +-
 arch/arm/boot/dts/imx6sx-sdb.dtsi                  |    2 +-
 arch/arm/boot/dts/imx6sx.dtsi                      |    2 +-
 arch/arm/boot/dts/imx6ul-14x14-evk.dts             |   22 +
 arch/arm/boot/dts/imx6ul.dtsi                      |   29 +
 arch/arm/boot/dts/imx7d-pinfunc.h                  |  122 +-
 arch/arm/boot/dts/imx7d-sdb.dts                    |  100 +-
 arch/arm/boot/dts/imx7d.dtsi                       |  165 ++
 arch/arm/boot/dts/k2e-evm.dts                      |    2 +-
 arch/arm/boot/dts/k2e-netcp.dtsi                   |   23 +
 arch/arm/boot/dts/k2e.dtsi                         |    3 +
 arch/arm/boot/dts/k2hk-evm.dts                     |    2 +-
 arch/arm/boot/dts/k2hk-netcp.dtsi                  |   24 +
 arch/arm/boot/dts/k2hk.dtsi                        |    3 +
 arch/arm/boot/dts/k2l-evm.dts                      |    2 +-
 arch/arm/boot/dts/k2l-netcp.dtsi                   |   23 +
 arch/arm/boot/dts/k2l.dtsi                         |    3 +
 arch/arm/boot/dts/keystone.dtsi                    |    7 +-
 arch/arm/boot/dts/kirkwood.dtsi                    |   29 +-
 arch/arm/boot/dts/lpc18xx.dtsi                     |  134 ++
 arch/arm/boot/dts/lpc4350-hitex-eval.dts           |  175 +++
 arch/arm/boot/dts/lpc4357-ea4357-devkit.dts        |   95 ++
 arch/arm/boot/dts/ls1021a-twr.dts                  |   13 +
 arch/arm/boot/dts/ls1021a.dtsi                     |   44 +
 arch/arm/boot/dts/meson8b-mxq.dts                  |   67 +
 arch/arm/boot/dts/meson8b-odroidc1.dts             |   67 +
 arch/arm/boot/dts/meson8b.dtsi                     |  186 +++
 arch/arm/boot/dts/mt8127.dtsi                      |   27 +
 arch/arm/boot/dts/mt8135-evbp1.dts                 |   23 -
 arch/arm/boot/dts/mt8135.dtsi                      |   27 +
 arch/arm/boot/dts/nspire.dtsi                      |    2 +-
 arch/arm/boot/dts/omap2420-n8x0-common.dtsi        |    6 +-
 arch/arm/boot/dts/omap3-beagle-xm.dts              |    2 +-
 arch/arm/boot/dts/omap3-beagle.dts                 |    2 +-
 arch/arm/boot/dts/omap3-cm-t3x.dtsi                |    2 +-
 arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi |    2 +-
 arch/arm/boot/dts/omap3-evm-common.dtsi            |    4 +-
 arch/arm/boot/dts/omap3-gta04.dtsi                 |   10 +-
 arch/arm/boot/dts/omap3-gta04a5.dts                |    2 +-
 arch/arm/boot/dts/omap3-igep.dtsi                  |   70 +-
 arch/arm/boot/dts/omap3-igep0020-common.dtsi       |   60 +-
 arch/arm/boot/dts/omap3-igep0020-rev-f.dts         |    2 +-
 arch/arm/boot/dts/omap3-igep0020.dts               |   11 +-
 arch/arm/boot/dts/omap3-igep0030-common.dtsi       |    2 +-
 arch/arm/boot/dts/omap3-igep0030-rev-g.dts         |    2 +-
 arch/arm/boot/dts/omap3-igep0030.dts               |    2 +-
 arch/arm/boot/dts/omap3-ldp.dts                    |    2 +-
 arch/arm/boot/dts/omap3-lilly-a83x.dtsi            |    4 +-
 arch/arm/boot/dts/omap3-lilly-dbb056.dts           |    4 +-
 arch/arm/boot/dts/omap3-n950-n9.dtsi               |    2 +-
 arch/arm/boot/dts/omap3-overo-base.dtsi            |    2 +-
 arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi    |    2 +-
 arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi    |    2 +-
 arch/arm/boot/dts/omap3-pandora-common.dtsi        |    4 +-
 arch/arm/boot/dts/omap3-tao3530.dtsi               |    4 +-
 arch/arm/boot/dts/omap3-zoom3.dts                  |    2 +-
 arch/arm/boot/dts/omap4-panda-common.dtsi          |    4 +-
 arch/arm/boot/dts/omap4-sdp.dts                    |    6 +-
 arch/arm/boot/dts/omap4-var-som-om44-wlan.dtsi     |    2 +-
 arch/arm/boot/dts/omap4-var-som-om44.dtsi          |    2 +-
 arch/arm/boot/dts/omap4460.dtsi                    |    2 +-
 arch/arm/boot/dts/omap5-board-common.dtsi          |  655 ++++++++
 arch/arm/boot/dts/omap5-cm-t54.dts                 |    2 +-
 arch/arm/boot/dts/omap5-igep0050.dts               |   54 +
 arch/arm/boot/dts/omap5-uevm.dts                   |  618 +-------
 arch/arm/boot/dts/orion5x.dtsi                     |   22 +-
 arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts        |   48 +-
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |   60 +-
 arch/arm/boot/dts/qcom-apq8064.dtsi                |   43 +-
 arch/arm/boot/dts/qcom-apq8084.dtsi                |    1 +
 arch/arm/boot/dts/qcom-msm8974.dtsi                |   95 +-
 arch/arm/boot/dts/qcom-pm8941.dtsi                 |   24 +-
 arch/arm/boot/dts/r8a7778-bockw-reference.dts      |  139 --
 arch/arm/boot/dts/r8a7778.dtsi                     |    2 +-
 arch/arm/boot/dts/r8a7779-marzen.dts               |    6 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |   16 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |    2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |    9 +-
 arch/arm/boot/dts/r8a7791-porter.dts               |  282 ++++
 arch/arm/boot/dts/r8a7791.dtsi                     |    2 +-
 arch/arm/boot/dts/r8a7794-silk.dts                 |  114 ++
 arch/arm/boot/dts/r8a7794.dtsi                     |  326 +++-
 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi     |   41 +
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |    2 +
 arch/arm/boot/dts/rk3066a-marsboard.dts            |    8 +
 arch/arm/boot/dts/rk3066a-rayeager.dts             |    2 +
 arch/arm/boot/dts/rk3188-radxarock.dts             |   21 +
 arch/arm/boot/dts/rk3188.dtsi                      |   20 +
 arch/arm/boot/dts/rk3288-firefly.dtsi              |   55 +-
 arch/arm/boot/dts/rk3288-popmetal.dts              |   85 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |  277 ++++
 arch/arm/boot/dts/rk3288-rock2-square.dts          |  167 +++
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            |  176 +++
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   12 -
 arch/arm/boot/dts/rk3288.dtsi                      |  134 +-
 arch/arm/boot/dts/s3c2416.dtsi                     |    2 +-
 arch/arm/boot/dts/s5pv210-aquila.dts               |    2 +-
 arch/arm/boot/dts/s5pv210-goni.dts                 |    4 +-
 arch/arm/boot/dts/sama5d2-pinfunc.h                |  880 +++++++++++
 arch/arm/boot/dts/sama5d2.dtsi                     |  154 +-
 arch/arm/boot/dts/sama5d3.dtsi                     |    5 +-
 arch/arm/boot/dts/sama5d3_mci2.dtsi                |    6 +-
 arch/arm/boot/dts/sama5d3xmb.dtsi                  |    2 +
 arch/arm/boot/dts/sama5d4.dtsi                     |   49 +-
 arch/arm/boot/dts/sh73a0-kzm9g.dts                 |    2 +-
 arch/arm/boot/dts/socfpga.dtsi                     |  135 +-
 arch/arm/boot/dts/socfpga_arria10.dtsi             |    8 +
 arch/arm/boot/dts/socfpga_arria10_socdk.dtsi       |   27 +
 arch/arm/boot/dts/stih407-b2120.dts                |    1 +
 arch/arm/boot/dts/stih407-family.dtsi              |   74 +-
 arch/arm/boot/dts/stih407-pinctrl.dtsi             |  390 ++++-
 arch/arm/boot/dts/stih407.dtsi                     |   13 -
 arch/arm/boot/dts/stih410-b2120.dts                |   25 +
 arch/arm/boot/dts/stih410.dtsi                     |   23 +-
 arch/arm/boot/dts/stih418-b2199.dts                |    8 +
 arch/arm/boot/dts/stih418-clock.dtsi               |    2 +-
 arch/arm/boot/dts/stih418.dtsi                     |    6 +
 arch/arm/boot/dts/stihxxx-b2120.dtsi               |   14 +
 arch/arm/boot/dts/sun4i-a10-a1000.dts              |    4 +
 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |   12 +
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |    4 +
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts           |   11 +-
 arch/arm/boot/dts/sun4i-a10-inet1.dts              |  226 +++
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |  117 +-
 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |  227 +++
 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts         |   15 +
 arch/arm/boot/dts/sun4i-a10-marsboard.dts          |   23 +
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |   12 +
 arch/arm/boot/dts/sun4i-a10-pcduino.dts            |   58 +-
 arch/arm/boot/dts/sun4i-a10-pcduino2.dts           |   78 +
 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts   |  199 +++
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   31 +
 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts       |  159 ++
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |    2 +-
 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts           |  224 +++
 arch/arm/boot/dts/sun5i-a10s.dtsi                  |   35 +-
 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts      |  227 +++
 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts          |   60 +
 arch/arm/boot/dts/sun5i-a13.dtsi                   |   10 +
 arch/arm/boot/dts/sun5i-q8-common.dtsi             |  180 +++
 arch/arm/boot/dts/sun5i-r8-chip.dts                |  218 +++
 arch/arm/boot/dts/sun5i-r8.dtsi                    |   59 +
 arch/arm/boot/dts/sun5i.dtsi                       |   52 +
 arch/arm/boot/dts/sun6i-a31-colombus.dts           |   36 +
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  132 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   |   31 +-
 arch/arm/boot/dts/sun6i-a31s-primo81.dts           |  255 ++++
 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi     |  140 ++
 arch/arm/boot/dts/sun6i-a31s-sina31s.dts           |  153 ++
 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts   |  194 +++
 .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts     |  134 ++
 arch/arm/boot/dts/sun7i-a20-bananapi.dts           |   74 +-
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |   23 +
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |    4 +
 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts     |  198 +++
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |   12 +
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |   47 +
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |    6 +
 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts      |   29 +
 arch/arm/boot/dts/sun7i-a20-orangepi.dts           |   29 +
 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts      |   65 +-
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |   54 +-
 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts     |   33 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts   |  226 +++
 arch/arm/boot/dts/sun7i-a20.dtsi                   |   39 +
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   70 +-
 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts           |  145 ++
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts      |   55 +-
 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts        |  137 +-
 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts          |   65 +
 arch/arm/boot/dts/sun8i-a23.dtsi                   |   25 +
 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts         |   89 +-
 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  134 +-
 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts          |   65 +
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |    4 +
 arch/arm/boot/dts/sun8i-a33.dtsi                   |   45 +
 arch/arm/boot/dts/sun8i-q8-common.dtsi             |  101 ++
 arch/arm/boot/dts/sun9i-a80.dtsi                   |    2 +-
 arch/arm/boot/dts/sunxi-q8-common.dtsi             |   83 ++
 arch/arm/boot/dts/tegra124-nyan.dtsi               |   15 +-
 arch/arm/boot/dts/tegra124.dtsi                    |   20 +-
 arch/arm/boot/dts/tegra20.dtsi                     |    4 +-
 arch/arm/boot/dts/tegra30-apalis-eval.dts          |   13 +-
 arch/arm/boot/dts/tegra30-apalis.dtsi              |  214 +--
 arch/arm/boot/dts/tegra30-colibri-eval-v3.dts      |    9 +-
 arch/arm/boot/dts/tegra30-colibri.dtsi             |  196 ++-
 arch/arm/boot/dts/tegra30.dtsi                     |   10 +-
 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts         |    8 +-
 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi            |   20 +-
 arch/arm/boot/dts/uniphier-ph1-ld6b-ref.dts        |    8 +-
 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts        |    8 +-
 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi           |   21 +-
 arch/arm/boot/dts/uniphier-ph1-pro5.dtsi           |   34 +-
 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts        |    8 +-
 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi           |   21 +-
 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts        |    8 +-
 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi           |   20 +-
 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts  |   78 +
 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts   |   78 +
 arch/arm/boot/dts/uniphier-proxstream2.dtsi        |   23 +-
 arch/arm/boot/dts/vf-colibri.dtsi                  |   39 +
 arch/arm/boot/dts/vf500-colibri-eval-v3.dts        |    5 +
 arch/arm/boot/dts/vf500-colibri.dtsi               |   47 +
 arch/arm/boot/dts/vf610-twr.dts                    |   47 +
 arch/arm/boot/dts/vfxxx.dtsi                       |   11 +
 arch/arm/boot/dts/wm8750.dtsi                      |    2 +-
 arch/arm/configs/at91_dt_defconfig                 |   15 -
 arch/arm/configs/bockw_defconfig                   |  133 --
 arch/arm/configs/exynos_defconfig                  |   18 +-
 arch/arm/configs/imx_v6_v7_defconfig               |    2 +-
 arch/arm/configs/keystone_defconfig                |   54 +-
 arch/arm/configs/lpc18xx_defconfig                 |   26 +-
 arch/arm/configs/multi_v7_defconfig                |   48 +-
 arch/arm/configs/mvebu_v7_defconfig                |    9 +-
 arch/arm/configs/qcom_defconfig                    |    8 +-
 arch/arm/configs/sama5_defconfig                   |   16 +-
 arch/arm/configs/shmobile_defconfig                |    4 +-
 arch/arm/configs/socfpga_defconfig                 |    2 +
 arch/arm/configs/sunxi_defconfig                   |    4 +
 arch/arm/configs/tegra_defconfig                   |   10 +-
 arch/arm/include/asm/hardware/cache-uniphier.h     |   46 +
 arch/arm/include/debug/at91.S                      |   18 +-
 arch/arm/kernel/irq.c                              |    3 +
 arch/arm/kernel/psci_smp.c                         |    4 +-
 arch/arm/mach-at91/pm_suspend.S                    |    2 +
 arch/arm/mach-bcm/Kconfig                          |   15 +
 arch/arm/mach-bcm/Makefile                         |    5 +-
 arch/arm/mach-bcm/bcm_nsp.c                        |   25 +
 arch/arm/mach-bcm/brcmstb.c                        |    9 +
 arch/arm/mach-berlin/berlin.c                      |    6 +
 arch/arm/mach-berlin/platsmp.c                     |   38 +-
 arch/arm/mach-cns3xxx/pcie.c                       |   71 +-
 arch/arm/mach-davinci/board-dm644x-evm.c           |    4 +-
 arch/arm/mach-davinci/clock.c                      |   16 +-
 arch/arm/mach-digicolor/Kconfig                    |    3 +
 arch/arm/mach-exynos/suspend.c                     |    3 +-
 arch/arm/mach-imx/common.h                         |    1 +
 arch/arm/mach-imx/gpc.c                            |    8 +-
 arch/arm/mach-imx/mach-imx6ul.c                    |    9 +
 arch/arm/mach-imx/mach-imx7d.c                     |   74 +
 arch/arm/mach-imx/pm-imx6.c                        |   46 +-
 arch/arm/mach-imx/suspend-imx6.S                   |    3 +
 arch/arm/mach-keystone/keystone.c                  |    3 +
 arch/arm/mach-mediatek/Makefile                    |    3 +
 arch/arm/mach-mediatek/mediatek.c                  |   27 +
 arch/arm/mach-mediatek/platsmp.c                   |  141 ++
 arch/arm/mach-meson/Kconfig                        |    5 +
 arch/arm/mach-meson/meson.c                        |    1 +
 arch/arm/mach-mvebu/board-v7.c                     |   35 -
 arch/arm/mach-mvebu/coherency.c                    |   60 +
 arch/arm/mach-mvebu/pmsu.c                         |   33 +-
 arch/arm/mach-omap1/Kconfig                        |    7 -
 arch/arm/mach-omap1/Makefile                       |    1 -
 arch/arm/mach-omap1/board-voiceblue.c              |  296 ----
 arch/arm/mach-omap1/include/mach/board-voiceblue.h |   19 -
 arch/arm/mach-omap2/Kconfig                        |    1 +
 arch/arm/mach-omap2/Makefile                       |    3 -
 arch/arm/mach-omap2/board-generic.c                |   12 +-
 arch/arm/mach-omap2/board-ldp.c                    |    2 +-
 arch/arm/mach-omap2/board-rx51.c                   |    2 +-
 arch/arm/mach-omap2/clkt34xx_dpll3m2.c             |  122 --
 arch/arm/mach-omap2/common.h                       |    3 +-
 arch/arm/mach-omap2/devices.c                      |   53 -
 arch/arm/mach-omap2/devices.h                      |   19 -
 arch/arm/mach-omap2/id.c                           |   30 +-
 arch/arm/mach-omap2/omap-hotplug.c                 |    2 +-
 arch/arm/mach-omap2/omap-wakeupgen.c               |   10 +-
 .../omap_hwmod_33xx_43xx_interconnect_data.c       |   20 -
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c         |   29 -
 arch/arm/mach-omap2/omap_hwmod_44xx_data.c         |   10 -
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c         |    3 +-
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c          |   30 -
 arch/arm/mach-omap2/pm44xx.c                       |    2 +-
 arch/arm/mach-omap2/powerdomains3xxx_data.c        |    2 +-
 arch/arm/mach-omap2/soc.h                          |  195 +--
 arch/arm/mach-omap2/sram.c                         |   25 -
 arch/arm/mach-omap2/sram.h                         |   14 -
 arch/arm/mach-omap2/sram34xx.S                     |  346 -----
 arch/arm/mach-omap2/timer.c                        |  162 +-
 arch/arm/mach-omap2/vc.c                           |    4 -
 arch/arm/mach-orion5x/Kconfig                      |    3 +
 arch/arm/mach-orion5x/dns323-setup.c               |   53 +-
 arch/arm/mach-orion5x/tsx09-common.c               |   49 +-
 arch/arm/mach-prima2/hotplug.c                     |    2 +-
 arch/arm/mach-pxa/cm-x300.c                        |    9 +-
 arch/arm/mach-pxa/colibri-pxa270-income.c          |    9 +-
 arch/arm/mach-pxa/devices.c                        |   20 +
 arch/arm/mach-pxa/ezx.c                            |    9 +-
 arch/arm/mach-pxa/hx4700.c                         |    3 -
 arch/arm/mach-pxa/icontrol.c                       |    2 -
 arch/arm/mach-pxa/include/mach/magician.h          |   70 +-
 arch/arm/mach-pxa/include/mach/pxa27x.h            |    2 +-
 arch/arm/mach-pxa/lpd270.c                         |    9 +-
 arch/arm/mach-pxa/magician.c                       |  680 +++++----
 arch/arm/mach-pxa/mainstone.c                      |   19 +-
 arch/arm/mach-pxa/mioa701.c                        |   11 +-
 arch/arm/mach-pxa/palm27x.c                        |    9 +-
 arch/arm/mach-pxa/palmtc.c                         |    9 +-
 arch/arm/mach-pxa/palmte2.c                        |    9 +-
 arch/arm/mach-pxa/pcm990-baseboard.c               |    9 +-
 arch/arm/mach-pxa/pxa27x.c                         |    2 +-
 arch/arm/mach-pxa/raumfeld.c                       |   21 +-
 arch/arm/mach-pxa/tavorevb.c                       |   13 +-
 arch/arm/mach-pxa/viper.c                          |    9 +-
 arch/arm/mach-pxa/z2.c                             |   15 +-
 arch/arm/mach-pxa/zylonite.c                       |    9 +-
 arch/arm/mach-qcom/platsmp.c                       |    2 +-
 arch/arm/mach-realview/hotplug.c                   |    2 +-
 arch/arm/mach-s3c24xx/mach-h1940.c                 |   10 +-
 arch/arm/mach-s3c24xx/mach-rx1950.c                |    8 +-
 arch/arm/mach-s3c64xx/dev-backlight.c              |    4 -
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    9 +-
 arch/arm/mach-s3c64xx/mach-hmt.c                   |    9 +-
 arch/arm/mach-s3c64xx/mach-smartq.c                |    9 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    8 +-
 arch/arm/mach-shmobile/Kconfig                     |   73 -
 arch/arm/mach-shmobile/Makefile                    |   14 +-
 arch/arm/mach-shmobile/Makefile.boot               |   12 -
 arch/arm/mach-shmobile/board-bockw-reference.c     |   86 --
 arch/arm/mach-shmobile/board-bockw.c               |  737 ---------
 arch/arm/mach-shmobile/clock-r8a7778.c             |  342 -----
 arch/arm/mach-shmobile/clock.c                     |   47 -
 arch/arm/mach-shmobile/clock.h                     |   42 -
 arch/arm/mach-shmobile/common.h                    |    5 -
 arch/arm/mach-shmobile/console.c                   |   27 -
 arch/arm/mach-shmobile/intc.h                      |  295 ----
 arch/arm/mach-shmobile/platsmp-apmu.c              |    4 +-
 arch/arm/mach-shmobile/pm-r8a7779.c                |   99 --
 arch/arm/mach-shmobile/pm-rmobile.c                |   39 +-
 arch/arm/mach-shmobile/pm-rmobile.h                |    9 -
 arch/arm/mach-shmobile/r8a7778.h                   |   78 -
 arch/arm/mach-shmobile/r8a7779.h                   |    8 -
 arch/arm/mach-shmobile/setup-r8a7778.c             |  563 +------
 arch/arm/mach-shmobile/sh-gpio.h                   |   29 -
 arch/arm/mach-shmobile/timer.c                     |   21 -
 arch/arm/mach-spear/hotplug.c                      |    2 +-
 arch/arm/mach-sunxi/sunxi.c                        |    3 +-
 arch/arm/mach-tegra/board-paz00.c                  |    4 +-
 arch/arm/mach-tegra/hotplug.c                      |    2 +-
 arch/arm/mach-uniphier/Makefile                    |    2 +-
 arch/arm/mach-uniphier/headsmp.S                   |   43 +
 arch/arm/mach-uniphier/platsmp.c                   |  185 ++-
 arch/arm/mach-ux500/hotplug.c                      |    2 +-
 arch/arm/mach-vexpress/hotplug.c                   |    2 +-
 arch/arm/mm/Kconfig                                |   10 +
 arch/arm/mm/Makefile                               |    1 +
 arch/arm/mm/cache-uniphier.c                       |  555 +++++++
 arch/arm64/Kconfig.platforms                       |   12 +-
 arch/arm64/boot/dts/Makefile                       |    1 +
 arch/arm64/boot/dts/altera/Makefile                |    5 +
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi  |  358 +++++
 .../boot/dts/altera/socfpga_stratix10_socdk.dts    |   39 +
 arch/arm64/boot/dts/apm/Makefile                   |    1 +
 arch/arm64/boot/dts/apm/apm-merlin.dts             |   72 +
 arch/arm64/boot/dts/apm/apm-mustang.dts            |   12 +
 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi         |  271 ++++
 arch/arm64/boot/dts/apm/apm-storm.dtsi             |   17 +
 arch/arm64/boot/dts/arm/juno-base.dtsi             |   59 +
 arch/arm64/boot/dts/arm/juno-motherboard.dtsi      |   15 +
 arch/arm64/boot/dts/arm/juno-r1.dts                |   52 +
 arch/arm64/boot/dts/arm/juno.dts                   |   32 +
 .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts      |    2 +-
 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi      |    1 +
 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi    |  103 ++
 arch/arm64/boot/dts/exynos/exynos7.dtsi            |    7 +
 arch/arm64/boot/dts/freescale/Makefile             |    4 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts  |  204 +++
 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts  |  166 +++
 .../{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} |   25 +-
 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi     |  515 +++++++
 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi     |  163 --
 arch/arm64/boot/dts/hisilicon/Makefile             |    2 +-
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts     |    7 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi          |   43 +-
 arch/arm64/boot/dts/hisilicon/hip05-d02.dts        |   36 +
 arch/arm64/boot/dts/hisilicon/hip05.dtsi           |  271 ++++
 arch/arm64/boot/dts/marvell/Makefile               |    1 +
 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts      |   66 +
 arch/arm64/boot/dts/marvell/berlin4ct.dtsi         |  120 ++
 arch/arm64/boot/dts/mediatek/mt8173-evb.dts        |   18 +
 arch/arm64/boot/dts/mediatek/mt8173.dtsi           |   62 +-
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |   30 +
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |   76 +-
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |   47 +
 arch/arm64/configs/defconfig                       |   14 +-
 arch/arm64/kernel/psci.c                           |   14 -
 drivers/base/power/clock_ops.c                     |    6 +-
 drivers/bus/Kconfig                                |   11 +
 drivers/bus/Makefile                               |    1 +
 drivers/bus/sunxi-rsb.c                            |  783 ++++++++++
 drivers/clk/Kconfig                                |   10 +
 drivers/clk/Makefile                               |    3 +-
 drivers/clk/bcm/Makefile                           |    1 +
 drivers/clk/bcm/clk-bcm2835.c                      | 1575 ++++++++++++++++++++
 drivers/clk/berlin/bg2q.c                          |   14 +-
 drivers/clk/clk-bcm2835.c                          |   55 -
 drivers/clk/clk-multiplier.c                       |  181 +++
 drivers/clk/clk-scpi.c                             |  325 ++++
 drivers/clk/imx/clk-imx25.c                        |   12 +
 drivers/clk/imx/clk-imx27.c                        |   13 +
 drivers/clk/imx/clk-imx31.c                        |   35 +-
 drivers/clk/imx/clk-imx35.c                        |   59 +-
 drivers/clk/imx/clk-imx51-imx53.c                  |   16 +
 drivers/clk/imx/clk-imx6q.c                        |   12 +-
 drivers/clk/imx/clk-imx6sl.c                       |   12 +-
 drivers/clk/imx/clk-imx6sx.c                       |    9 +
 drivers/clk/imx/clk-imx6ul.c                       |   18 +
 drivers/clk/imx/clk-imx7d.c                        |   14 +
 drivers/clk/imx/clk-vf610.c                        |    1 +
 drivers/clk/imx/clk.c                              |   38 +
 drivers/clk/imx/clk.h                              |    1 +
 drivers/clk/samsung/clk-exynos5250.c               |   14 +-
 drivers/clk/shmobile/clk-mstp.c                    |    4 +
 drivers/clk/sunxi/Makefile                         |    3 +
 drivers/clk/sunxi/clk-a10-codec.c                  |   44 +
 drivers/clk/sunxi/clk-a10-mod1.c                   |   81 +
 drivers/clk/sunxi/clk-a10-pll2.c                   |  216 +++
 drivers/clk/sunxi/clk-simple-gates.c               |    2 +
 drivers/clk/sunxi/clk-sunxi.c                      |    1 +
 drivers/clocksource/Kconfig                        |    8 +
 drivers/clocksource/Makefile                       |    1 +
 drivers/clocksource/tcb_clksrc.c                   |   12 +-
 drivers/clocksource/timer-atmel-st.c               |   31 +-
 drivers/clocksource/timer-ti-32k.c                 |  126 ++
 drivers/cpufreq/Kconfig.arm                        |   10 +
 drivers/cpufreq/Makefile                           |    1 +
 drivers/cpufreq/scpi-cpufreq.c                     |  124 ++
 drivers/firmware/Kconfig                           |   26 +
 drivers/firmware/Makefile                          |    4 +-
 drivers/firmware/arm_scpi.c                        |  771 ++++++++++
 drivers/firmware/psci.c                            |  108 +-
 drivers/firmware/qcom_scm-32.c                     |    6 +-
 drivers/firmware/raspberrypi.c                     |  260 ++++
 drivers/hwmon/Kconfig                              |    8 +
 drivers/hwmon/Makefile                             |    1 +
 drivers/hwmon/scpi-hwmon.c                         |  288 ++++
 drivers/memory/pl172.c                             |   26 +-
 drivers/misc/atmel_tclib.c                         |    4 +
 drivers/pwm/pwm-atmel-tcb.c                        |   26 +-
 drivers/soc/Kconfig                                |    2 +
 drivers/soc/Makefile                               |    2 +
 drivers/soc/brcmstb/Kconfig                        |    9 +
 drivers/soc/brcmstb/Makefile                       |    1 +
 drivers/soc/brcmstb/biuctrl.c                      |  116 ++
 drivers/soc/brcmstb/common.c                       |   33 +
 drivers/soc/mediatek/mtk-pmic-wrap.c               |   10 +-
 drivers/soc/mediatek/mtk-scpsys.c                  |   83 +-
 drivers/soc/qcom/Kconfig                           |   17 +-
 drivers/soc/qcom/smd-rpm.c                         |   68 +-
 drivers/soc/qcom/smd.c                             |  296 ++--
 drivers/soc/qcom/smem.c                            |  368 ++---
 drivers/soc/rockchip/Kconfig                       |   18 +
 drivers/soc/rockchip/Makefile                      |    4 +
 drivers/soc/rockchip/pm_domains.c                  |  490 ++++++
 drivers/soc/ti/knav_qmss.h                         |    3 +-
 drivers/soc/ti/knav_qmss_acc.c                     |   14 +-
 drivers/soc/ti/knav_qmss_queue.c                   |   67 +-
 include/dt-bindings/clock/bcm2835.h                |   47 +
 include/dt-bindings/clock/berlin2q.h               |    1 +
 include/dt-bindings/clock/exynos5250.h             |    4 +-
 include/dt-bindings/clock/imx6qdl-clock.h          |    3 +-
 include/dt-bindings/clock/imx6sl-clock.h           |    3 +-
 include/dt-bindings/clock/imx6sx-clock.h           |    3 +-
 include/dt-bindings/clock/imx7d-clock.h            |    3 +-
 include/dt-bindings/clock/sun4i-a10-pll2.h         |   53 +
 include/dt-bindings/clock/vf610-clock.h            |    3 +-
 include/dt-bindings/power/rk3288-power.h           |   31 +
 include/linux/atmel_tc.h                           |    1 +
 include/linux/clk-provider.h                       |   42 +
 include/linux/mfd/syscon/imx7-iomuxc-gpr.h         |   47 +
 include/linux/platform_data/atmel.h                |    8 -
 include/linux/psci.h                               |    2 +
 include/linux/qcom_scm.h                           |    2 +
 include/linux/scpi_protocol.h                      |   78 +
 include/linux/soc/brcmstb/brcmstb.h                |   10 +
 include/linux/soc/qcom/smd.h                       |   11 +
 include/linux/soc/qcom/smem.h                      |    2 +-
 include/linux/spi/pxa2xx_spi.h                     |    1 -
 include/linux/sunxi-rsb.h                          |  105 ++
 include/soc/bcm2835/raspberrypi-firmware.h         |  120 ++
 include/soc/brcmstb/common.h                       |   15 +
 include/uapi/linux/psci.h                          |   18 +
 692 files changed, 31260 insertions(+), 8762 deletions(-)
 create mode 100644 Documentation/arm/keystone/knav-qmss.txt
 create mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt
 create mode 100644 Documentation/devicetree/bindings/arm/arm,scpi.txt
 create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mvebu-cpu-config.txt
 delete mode 100644 Documentation/devicetree/bindings/arm/samsung-boards.txt
 create mode 100644 Documentation/devicetree/bindings/arm/samsung/samsung-boards.txt
 create mode 100644 Documentation/devicetree/bindings/arm/uniphier/cache-uniphier.txt
 rename Documentation/devicetree/bindings/{powerpc/fsl/board.txt => board/fsl-board.txt} (90%)
 create mode 100644 Documentation/devicetree/bindings/bus/sunxi-rsb.txt
 create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt
 create mode 100644 Documentation/devicetree/bindings/pci/arm,juno-r1-pcie.txt
 create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich3-axi.txt
 rename Documentation/devicetree/bindings/{arm/exynos/power_domain.txt => power/pd-samsung.txt} (93%)
 create mode 100644 Documentation/devicetree/bindings/power_supply/qcom_smbb.txt
 create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smem.txt
 create mode 100644 Documentation/devicetree/bindings/soc/rockchip/power_domain.txt
 create mode 100644 Documentation/hwmon/scpi-hwmon
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
 create mode 100644 arch/arm/boot/dts/am335x-bonegreen.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-4bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud-2bay.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dts
 create mode 100644 arch/arm/boot/dts/armada-370-seagate-personal-cloud.dtsi
 create mode 100644 arch/arm/boot/dts/axp22x.dtsi
 create mode 100644 arch/arm/boot/dts/bcm-nsp.dtsi
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a-plus.dts
 create mode 100644 arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts
 create mode 100644 arch/arm/boot/dts/bcm4709-netgear-r7000.dts
 create mode 100644 arch/arm/boot/dts/bcm958625k.dts
 create mode 100644 arch/arm/boot/dts/bcm9hmidc.dtsi
 create mode 100644 arch/arm/boot/dts/exynos5250-snow-common.dtsi
 create mode 100644 arch/arm/boot/dts/exynos5250-snow-rev5.dts
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi
 create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu4.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-nit6xlite.dts
 create mode 100644 arch/arm/boot/dts/imx6q-nitrogen6_max.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi
 create mode 100644 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
 create mode 100644 arch/arm/boot/dts/meson8b-mxq.dts
 create mode 100644 arch/arm/boot/dts/meson8b-odroidc1.dts
 create mode 100644 arch/arm/boot/dts/meson8b.dtsi
 create mode 100644 arch/arm/boot/dts/omap5-board-common.dtsi
 create mode 100644 arch/arm/boot/dts/omap5-igep0050.dts
 delete mode 100644 arch/arm/boot/dts/r8a7778-bockw-reference.dts
 create mode 100644 arch/arm/boot/dts/r8a7791-porter.dts
 create mode 100644 arch/arm/boot/dts/r8a77xx-aa121td01-panel.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-rock2-som.dtsi
 create mode 100644 arch/arm/boot/dts/rk3288-rock2-square.dts
 create mode 100644 arch/arm/boot/dts/rk3288-veyron-jaq.dts
 create mode 100644 arch/arm/boot/dts/sama5d2-pinfunc.h
 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet1.dts
 create mode 100644 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
 create mode 100644 arch/arm/boot/dts/sun4i-a10-pcduino2.dts
 create mode 100644 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts
 create mode 100644 arch/arm/boot/dts/sun5i-a13-q8-tablet.dts
 create mode 100644 arch/arm/boot/dts/sun5i-q8-common.dtsi
 create mode 100644 arch/arm/boot/dts/sun5i-r8-chip.dts
 create mode 100644 arch/arm/boot/dts/sun5i-r8.dtsi
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-primo81.dts
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sina31s.dts
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
 create mode 100644 arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
 create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
 create mode 100644 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-et-q8-v1.6.dts
 mode change 100644 => 120000 arch/arm/boot/dts/sun8i-a33-ippo-q8h-v1.2.dts
 create mode 100644 arch/arm/boot/dts/sun8i-a33-q8-tablet.dts
 create mode 100644 arch/arm/boot/dts/sun8i-q8-common.dtsi
 create mode 100644 arch/arm/boot/dts/sunxi-q8-common.dtsi
 create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-gentil.dts
 create mode 100644 arch/arm/boot/dts/uniphier-proxstream2-vodka.dts
 delete mode 100644 arch/arm/configs/bockw_defconfig
 create mode 100644 arch/arm/include/asm/hardware/cache-uniphier.h
 create mode 100644 arch/arm/mach-bcm/bcm_nsp.c
 create mode 100644 arch/arm/mach-mediatek/platsmp.c
 delete mode 100644 arch/arm/mach-omap1/board-voiceblue.c
 delete mode 100644 arch/arm/mach-omap1/include/mach/board-voiceblue.h
 delete mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c
 delete mode 100644 arch/arm/mach-omap2/devices.h
 delete mode 100644 arch/arm/mach-omap2/sram34xx.S
 delete mode 100644 arch/arm/mach-shmobile/Makefile.boot
 delete mode 100644 arch/arm/mach-shmobile/board-bockw-reference.c
 delete mode 100644 arch/arm/mach-shmobile/board-bockw.c
 delete mode 100644 arch/arm/mach-shmobile/clock-r8a7778.c
 delete mode 100644 arch/arm/mach-shmobile/clock.c
 delete mode 100644 arch/arm/mach-shmobile/clock.h
 delete mode 100644 arch/arm/mach-shmobile/console.c
 delete mode 100644 arch/arm/mach-shmobile/intc.h
 delete mode 100644 arch/arm/mach-shmobile/r8a7778.h
 delete mode 100644 arch/arm/mach-shmobile/sh-gpio.h
 create mode 100644 arch/arm/mach-uniphier/headsmp.S
 create mode 100644 arch/arm/mm/cache-uniphier.c
 create mode 100644 arch/arm64/boot/dts/altera/Makefile
 create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
 create mode 100644 arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts
 create mode 100644 arch/arm64/boot/dts/apm/apm-merlin.dts
 create mode 100644 arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
 create mode 120000 arch/arm64/boot/dts/arm/vexpress-v2m-rs1.dtsi
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts
 rename arch/arm64/boot/dts/freescale/{fsl-ls2085a-simu.dts => fsl-ls2080a-simu.dts} (81%)
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
 delete mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2085a.dtsi
 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05-d02.dts
 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05.dtsi
 create mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts
 create mode 100644 drivers/bus/sunxi-rsb.c
 create mode 100644 drivers/clk/bcm/clk-bcm2835.c
 delete mode 100644 drivers/clk/clk-bcm2835.c
 create mode 100644 drivers/clk/clk-multiplier.c
 create mode 100644 drivers/clk/clk-scpi.c
 create mode 100644 drivers/clk/sunxi/clk-a10-codec.c
 create mode 100644 drivers/clk/sunxi/clk-a10-mod1.c
 create mode 100644 drivers/clk/sunxi/clk-a10-pll2.c
 create mode 100644 drivers/clocksource/timer-ti-32k.c
 create mode 100644 drivers/cpufreq/scpi-cpufreq.c
 create mode 100644 drivers/firmware/arm_scpi.c
 create mode 100644 drivers/firmware/raspberrypi.c
 create mode 100644 drivers/hwmon/scpi-hwmon.c
 create mode 100644 drivers/soc/brcmstb/Kconfig
 create mode 100644 drivers/soc/brcmstb/Makefile
 create mode 100644 drivers/soc/brcmstb/biuctrl.c
 create mode 100644 drivers/soc/brcmstb/common.c
 create mode 100644 drivers/soc/rockchip/Kconfig
 create mode 100644 drivers/soc/rockchip/Makefile
 create mode 100644 drivers/soc/rockchip/pm_domains.c
 create mode 100644 include/dt-bindings/clock/bcm2835.h
 create mode 100644 include/dt-bindings/clock/sun4i-a10-pll2.h
 create mode 100644 include/dt-bindings/power/rk3288-power.h
 create mode 100644 include/linux/mfd/syscon/imx7-iomuxc-gpr.h
 create mode 100644 include/linux/scpi_protocol.h
 create mode 100644 include/linux/soc/brcmstb/brcmstb.h
 create mode 100644 include/linux/sunxi-rsb.h
 create mode 100644 include/soc/bcm2835/raspberrypi-firmware.h
 create mode 100644 include/soc/brcmstb/common.h
Merging at91/at91-next (c544ee640869 Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
 arch/arm/mach-at91/Kconfig | 1 +
 1 file changed, 1 insertion(+)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
$ git merge bcm2835/for-next
Already up-to-date.
Merging berlin/berlin/for-next (27527ea5f2fd Merge branch 'berlin/soc' into berlin/for-next)
$ git merge berlin/berlin/for-next
Merge made by the 'recursive' strategy.
 arch/arm/mach-berlin/Kconfig               |  3 ---
 arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next)
$ git merge keystone/next
Merge made by the 'recursive' strategy.
 drivers/soc/ti/knav_qmss_queue.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Merging mvebu/for-next (4e91d7a20ccc Merge branch 'mvebu/config' into mvebu/for-next)
$ git merge mvebu/for-next
Resolved 'arch/arm/mach-mvebu/pmsu.c' using previous resolution.
Auto-merging arch/arm/mach-mvebu/pmsu.c
CONFLICT (content): Merge conflict in arch/arm/mach-mvebu/pmsu.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master a6a51090c5d6] Merge remote-tracking branch 'mvebu/for-next'
$ git diff -M --stat --summary HEAD^..
Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next)
$ git merge omap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
$ git merge omap-pending/for-next
Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 122560492bd0] Merge remote-tracking branch 'omap-pending/for-next'
$ git diff -M --stat --summary HEAD^..
Merging qcom/qcom/for-next (fcbba086b456 ARM: dts: msm8974: Add SCM firmware node)
$ git merge qcom/qcom/for-next
Resolved 'drivers/soc/qcom/Kconfig' using previous resolution.
Resolved 'drivers/soc/qcom/smd-rpm.c' using previous resolution.
Auto-merging include/linux/qcom_scm.h
Auto-merging drivers/soc/qcom/smd-rpm.c
CONFLICT (content): Merge conflict in drivers/soc/qcom/smd-rpm.c
Auto-merging drivers/soc/qcom/Kconfig
CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig
Auto-merging drivers/firmware/qcom_scm-32.c
Auto-merging arch/arm/boot/dts/qcom-msm8974.dtsi
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f65388df19cd] Merge remote-tracking branch 'qcom/qcom/for-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/firmware/qcom,scm.txt      |  25 ++
 arch/arm/boot/dts/qcom-msm8974.dtsi                |  11 +
 drivers/firmware/qcom_scm-32.c                     |  82 +++++++
 drivers/firmware/qcom_scm-64.c                     |  25 ++
 drivers/firmware/qcom_scm.c                        | 271 ++++++++++++++++++++-
 drivers/firmware/qcom_scm.h                        |  12 +
 include/linux/qcom_scm.h                           |   6 +
 7 files changed, 424 insertions(+), 8 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
Merging renesas/next (c7aba848d39f Merge branches 'heads/defconfig-for-v4.4' and 'heads/dt-for-v4.4' into next)
$ git merge renesas/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging rockchip/for-next (55e899c44d10 Merge branch 'v4.4-armsoc/drivers' into for-next)
$ git merge rockchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (4ccfae394061 Merge branch 'v4.4-samsung-defconfig' into for-next)
$ git merge samsung/for-next
Resolved 'drivers/soc/Kconfig' using previous resolution.
Resolved 'drivers/soc/Makefile' using previous resolution.
Auto-merging drivers/soc/Makefile
CONFLICT (content): Merge conflict in drivers/soc/Makefile
Auto-merging drivers/soc/Kconfig
CONFLICT (content): Merge conflict in drivers/soc/Kconfig
Auto-merging arch/arm/mach-exynos/suspend.c
Removing arch/arm/mach-exynos/regs-srom.h
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6b184190198b] Merge remote-tracking branch 'samsung/for-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/arm/samsung/exynos-srom.txt           |  12 ++
 MAINTAINERS                                        |   1 +
 arch/arm/boot/dts/exynos4.dtsi                     |   5 +
 arch/arm/boot/dts/exynos5.dtsi                     |   5 +
 arch/arm/mach-exynos/Kconfig                       |   2 +
 arch/arm/mach-exynos/exynos.c                      |  22 ---
 arch/arm/mach-exynos/include/mach/map.h            |   8 -
 arch/arm/mach-exynos/regs-srom.h                   |  53 -------
 arch/arm/mach-exynos/suspend.c                     |  20 +--
 arch/arm/plat-samsung/include/plat/map-s5p.h       |   1 -
 drivers/cpufreq/s5pv210-cpufreq.c                  |   2 -
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/samsung/Kconfig                        |  13 ++
 drivers/soc/samsung/Makefile                       |   1 +
 drivers/soc/samsung/exynos-srom.c                  | 175 +++++++++++++++++++++
 drivers/soc/samsung/exynos-srom.h                  |  51 ++++++
 17 files changed, 269 insertions(+), 104 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt
 delete mode 100644 arch/arm/mach-exynos/regs-srom.h
 create mode 100644 drivers/soc/samsung/Kconfig
 create mode 100644 drivers/soc/samsung/Makefile
 create mode 100644 drivers/soc/samsung/exynos-srom.c
 create mode 100644 drivers/soc/samsung/exynos-srom.h
Merging samsung-krzk/for-next (6ff33f3902c3 Linux 4.3-rc1)
$ git merge samsung-krzk/for-next
Already up-to-date.
Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tegra/for-next (2d37df587e3c Merge branch for-4.4/defconfig into for-next)
$ git merge tegra/for-next
Auto-merging drivers/clk/tegra/clk-dfll.c
Merge made by the 'recursive' strategy.
 drivers/clk/tegra/clk-dfll.c        | 114 ++++++++++++++++++------------------
 drivers/clk/tegra/clk-tegra-audio.c |  25 +++++---
 drivers/clk/tegra/clk-tegra114.c    |   8 ++-
 drivers/clk/tegra/clk-tegra124.c    |   8 ++-
 drivers/clk/tegra/clk-tegra30.c     |   8 ++-
 drivers/clk/tegra/clk.h             | 106 +++++++++++++++++++++------------
 drivers/clk/tegra/cvb.c             |   7 ---
 7 files changed, 163 insertions(+), 113 deletions(-)
Merging arm64/for-next/core (aa644fa64c25 ARM64: Enable multi-core scheduler support by default)
$ git merge arm64/for-next/core
Resolved 'arch/arm64/kernel/suspend.c' using previous resolution.
Auto-merging arch/arm64/mm/fault.c
Auto-merging arch/arm64/kernel/suspend.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/suspend.c
Auto-merging arch/arm64/kernel/setup.c
Auto-merging arch/arm64/kernel/debug-monitors.c
Removing arch/arm64/include/asm/pmu.h
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm64/boot/dts/arm/juno.dts
Auto-merging arch/arm64/boot/dts/arm/juno-r1.dts
Auto-merging arch/arm64/Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/arm/pmu.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 6da402b18161] Merge remote-tracking branch 'arm64/for-next/core'
$ git diff -M --stat --summary HEAD^..
 Documentation/arm/uefi.txt                         |    2 -
 Documentation/arm64/booting.txt                    |    7 +-
 Documentation/devicetree/bindings/arm/pmu.txt      |    2 +
 .../features/debug/KASAN/arch-support.txt          |    2 +-
 MAINTAINERS                                        |    9 +-
 arch/arm64/Kconfig                                 |   69 +-
 arch/arm64/Kconfig.debug                           |    2 +-
 arch/arm64/Makefile                                |    7 +
 arch/arm64/boot/dts/arm/juno-r1.dts                |   18 +-
 arch/arm64/boot/dts/arm/juno.dts                   |   18 +-
 arch/arm64/configs/defconfig                       |    9 +
 arch/arm64/include/asm/assembler.h                 |   11 +
 arch/arm64/include/asm/atomic.h                    |   63 +-
 arch/arm64/include/asm/atomic_ll_sc.h              |   98 +-
 arch/arm64/include/asm/atomic_lse.h                |  193 ++--
 arch/arm64/include/asm/cache.h                     |    2 +-
 arch/arm64/include/asm/cacheflush.h                |    7 +
 arch/arm64/include/asm/cachetype.h                 |    4 +-
 arch/arm64/include/asm/cmpxchg.h                   |  279 +++--
 arch/arm64/include/asm/cpu.h                       |    4 +
 arch/arm64/include/asm/cpufeature.h                |   91 +-
 arch/arm64/include/asm/cputype.h                   |   15 -
 arch/arm64/include/asm/fixmap.h                    |    7 +-
 arch/arm64/include/asm/hw_breakpoint.h             |    9 +-
 arch/arm64/include/asm/hwcap.h                     |    8 +
 arch/arm64/include/asm/irq.h                       |    1 -
 arch/arm64/include/asm/kasan.h                     |   38 +
 arch/arm64/include/asm/kernel-pgtable.h            |   83 ++
 arch/arm64/include/asm/memory.h                    |    6 +-
 arch/arm64/include/asm/mmu.h                       |   15 +-
 arch/arm64/include/asm/mmu_context.h               |  113 +--
 arch/arm64/include/asm/page.h                      |   27 +-
 arch/arm64/include/asm/pgalloc.h                   |    1 +
 arch/arm64/include/asm/pgtable-hwdef.h             |   48 +-
 arch/arm64/include/asm/pgtable.h                   |   30 +-
 arch/arm64/include/asm/pmu.h                       |   83 --
 arch/arm64/include/asm/processor.h                 |    2 +-
 arch/arm64/include/asm/ptrace.h                    |   16 +-
 arch/arm64/include/asm/string.h                    |   16 +
 arch/arm64/include/asm/sysreg.h                    |  157 ++-
 arch/arm64/include/asm/thread_info.h               |    5 +-
 arch/arm64/include/asm/tlb.h                       |   26 +-
 arch/arm64/include/asm/tlbflush.h                  |   18 +-
 arch/arm64/kernel/Makefile                         |   11 +-
 arch/arm64/kernel/arm64ksyms.c                     |    3 +
 arch/arm64/kernel/asm-offsets.c                    |    2 +-
 arch/arm64/kernel/cpu_errata.c                     |    2 +-
 arch/arm64/kernel/cpufeature.c                     |  851 +++++++++++++++-
 arch/arm64/kernel/cpuinfo.c                        |  254 +++--
 arch/arm64/kernel/debug-monitors.c                 |    6 +-
 arch/arm64/kernel/efi-entry.S                      |   10 +-
 arch/arm64/kernel/efi.c                            |    5 +-
 arch/arm64/kernel/entry.S                          |    2 +
 arch/arm64/kernel/fpsimd.c                         |   16 +-
 arch/arm64/kernel/head.S                           |   76 +-
 arch/arm64/kernel/hw_breakpoint.c                  |   19 +-
 arch/arm64/kernel/image.h                          |   38 +-
 arch/arm64/kernel/irq.c                            |   62 --
 arch/arm64/kernel/module.c                         |   16 +-
 arch/arm64/kernel/perf_event.c                     | 1066 ++++----------------
 arch/arm64/kernel/process.c                        |    3 +
 arch/arm64/kernel/setup.c                          |  245 +----
 arch/arm64/kernel/smp.c                            |   22 +-
 arch/arm64/kernel/suspend.c                        |    2 +-
 arch/arm64/kernel/traps.c                          |   15 +-
 arch/arm64/kernel/vmlinux.lds.S                    |    6 +-
 arch/arm64/kvm/Kconfig                             |    3 +
 arch/arm64/kvm/reset.c                             |    2 +-
 arch/arm64/kvm/sys_regs.c                          |   12 +-
 arch/arm64/lib/copy_from_user.S                    |   78 +-
 arch/arm64/lib/copy_in_user.S                      |   67 +-
 arch/arm64/lib/copy_template.S                     |  193 ++++
 arch/arm64/lib/copy_to_user.S                      |   67 +-
 arch/arm64/lib/memchr.S                            |    2 +-
 arch/arm64/lib/memcmp.S                            |    2 +-
 arch/arm64/lib/memcpy.S                            |  184 +---
 arch/arm64/lib/memmove.S                           |    9 +-
 arch/arm64/lib/memset.S                            |    5 +-
 arch/arm64/lib/strcmp.S                            |    2 +-
 arch/arm64/lib/strlen.S                            |    2 +-
 arch/arm64/lib/strncmp.S                           |    2 +-
 arch/arm64/mm/Makefile                             |    3 +
 arch/arm64/mm/cache.S                              |   10 +-
 arch/arm64/mm/context.c                            |  236 +++--
 arch/arm64/mm/dump.c                               |   18 +-
 arch/arm64/mm/fault.c                              |    2 +-
 arch/arm64/mm/init.c                               |   19 +-
 arch/arm64/mm/kasan_init.c                         |  165 +++
 arch/arm64/mm/mmu.c                                |  145 ++-
 arch/arm64/mm/pageattr.c                           |    2 +-
 arch/arm64/mm/pgd.c                                |    2 -
 arch/arm64/mm/proc.S                               |   10 +-
 drivers/firmware/efi/Makefile                      |    8 +
 drivers/firmware/efi/libstub/Makefile              |   42 +-
 .../firmware/efi/libstub/arm64-stub.c              |    0
 drivers/firmware/efi/libstub/fdt.c                 |    9 -
 drivers/firmware/efi/libstub/string.c              |   57 ++
 drivers/perf/Kconfig                               |    2 +-
 include/linux/irq.h                                |    2 +
 kernel/irq/Kconfig                                 |    4 +
 kernel/irq/Makefile                                |    1 +
 kernel/irq/cpuhotplug.c                            |   82 ++
 scripts/Makefile.kasan                             |    4 +-
 103 files changed, 3385 insertions(+), 2421 deletions(-)
 create mode 100644 arch/arm64/include/asm/kasan.h
 create mode 100644 arch/arm64/include/asm/kernel-pgtable.h
 delete mode 100644 arch/arm64/include/asm/pmu.h
 create mode 100644 arch/arm64/lib/copy_template.S
 create mode 100644 arch/arm64/mm/kasan_init.c
 rename arch/arm64/kernel/efi-stub.c => drivers/firmware/efi/libstub/arm64-stub.c (100%)
 create mode 100644 drivers/firmware/efi/libstub/string.c
 create mode 100644 kernel/irq/cpuhotplug.c
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Removing arch/c6x/include/asm/clkdev.h
Auto-merging arch/c6x/include/asm/Kbuild
Merge made by the 'recursive' strategy.
 arch/c6x/include/asm/Kbuild   |  1 +
 arch/c6x/include/asm/clkdev.h | 22 ----------------------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 arch/c6x/include/asm/clkdev.h
Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time())
$ git merge cris/for-next
Removing arch/cris/include/arch-v32/arch/io.h
Removing arch/cris/arch-v32/mach-fs/io.c
Removing arch/cris/arch-v32/mach-a3/io.c
Removing arch/cris/arch-v32/drivers/mach-fs/gpio.c
Removing arch/cris/arch-v32/drivers/mach-a3/gpio.c
Removing arch/cris/arch-v32/drivers/i2c.h
Removing arch/cris/arch-v32/drivers/i2c.c
Merge made by the 'recursive' strategy.
 arch/cris/Kconfig                           |   1 -
 arch/cris/arch-v10/kernel/head.S            | 106 ---
 arch/cris/arch-v10/kernel/kgdb.c            |  89 +--
 arch/cris/arch-v10/mm/init.c                |  14 +-
 arch/cris/arch-v32/Kconfig                  |  89 ---
 arch/cris/arch-v32/drivers/Kconfig          | 167 -----
 arch/cris/arch-v32/drivers/Makefile         |   1 -
 arch/cris/arch-v32/drivers/axisflashmap.c   |  40 +-
 arch/cris/arch-v32/drivers/i2c.c            | 751 ---------------------
 arch/cris/arch-v32/drivers/i2c.h            |  16 -
 arch/cris/arch-v32/drivers/mach-a3/Makefile |   1 -
 arch/cris/arch-v32/drivers/mach-a3/gpio.c   | 999 ----------------------------
 arch/cris/arch-v32/drivers/mach-fs/Makefile |   1 -
 arch/cris/arch-v32/drivers/mach-fs/gpio.c   | 978 ---------------------------
 arch/cris/arch-v32/kernel/crisksyms.c       |   3 -
 arch/cris/arch-v32/kernel/debugport.c       |   2 -
 arch/cris/arch-v32/kernel/head.S            |   4 -
 arch/cris/arch-v32/kernel/irq.c             |   6 +-
 arch/cris/arch-v32/kernel/kgdb.c            |  96 ++-
 arch/cris/arch-v32/kernel/setup.c           |   8 -
 arch/cris/arch-v32/mach-a3/Makefile         |   2 +-
 arch/cris/arch-v32/mach-a3/io.c             | 149 -----
 arch/cris/arch-v32/mach-fs/Kconfig          |  19 -
 arch/cris/arch-v32/mach-fs/Makefile         |   2 +-
 arch/cris/arch-v32/mach-fs/io.c             | 191 ------
 arch/cris/boot/dts/artpec3.dtsi             |  46 ++
 arch/cris/boot/dts/dev88.dts                |  49 ++
 arch/cris/boot/dts/etraxfs.dtsi             |   8 +
 arch/cris/boot/dts/include/dt-bindings      |   1 +
 arch/cris/boot/dts/p1343.dts                |  76 +++
 arch/cris/boot/rescue/head_v10.S            |   3 -
 arch/cris/include/arch-v32/arch/io.h        | 140 ----
 arch/cris/include/arch-v32/arch/irq.h       |   2 +-
 arch/cris/include/asm/eshlibld.h            |   3 +-
 arch/cris/include/asm/io.h                  |   2 +
 arch/cris/include/uapi/asm/etraxgpio.h      | 157 -----
 arch/cris/kernel/crisksyms.c                |   2 -
 arch/cris/kernel/time.c                     |  25 -
 38 files changed, 272 insertions(+), 3977 deletions(-)
 delete mode 100644 arch/cris/arch-v32/drivers/i2c.c
 delete mode 100644 arch/cris/arch-v32/drivers/i2c.h
 delete mode 100644 arch/cris/arch-v32/drivers/mach-a3/gpio.c
 delete mode 100644 arch/cris/arch-v32/drivers/mach-fs/gpio.c
 delete mode 100644 arch/cris/arch-v32/mach-a3/io.c
 delete mode 100644 arch/cris/arch-v32/mach-fs/io.c
 create mode 100644 arch/cris/boot/dts/artpec3.dtsi
 create mode 120000 arch/cris/boot/dts/include/dt-bindings
 create mode 100644 arch/cris/boot/dts/p1343.dts
 delete mode 100644 arch/cris/include/arch-v32/arch/io.h
Merging h8300/h8300-next (6829bca19fa4 h8300: Don't set CROSS_COMPILE unconditionally)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
 arch/h8300/Makefile                    |  2 ++
 arch/h8300/boot/compressed/Makefile    |  5 +++--
 arch/h8300/boot/compressed/head.S      |  4 ++--
 arch/h8300/boot/compressed/misc.c      |  7 +------
 arch/h8300/boot/compressed/vmlinux.lds |  2 +-
 arch/h8300/boot/dts/edosk2674.dts      |  6 +++---
 arch/h8300/include/asm/io.h            | 12 ++++++------
 arch/h8300/include/asm/thread_info.h   | 14 ++++++--------
 arch/h8300/kernel/vmlinux.lds.S        |  4 ++--
 drivers/clk/h8300/clk-div.c            |  6 +++++-
 drivers/clocksource/h8300_timer8.c     |  5 +++--
 include/asm-generic/uaccess.h          | 10 ++++++----
 12 files changed, 40 insertions(+), 37 deletions(-)
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
$ git merge ia64/next
Merge made by the 'recursive' strategy.
 fs/pstore/Kconfig      |  2 +-
 fs/pstore/Makefile     |  6 +++---
 fs/pstore/ftrace.c     | 25 +++++++++++++++++++------
 fs/pstore/inode.c      | 11 ++++++++++-
 fs/pstore/internal.h   |  6 +++++-
 fs/pstore/platform.c   | 42 +++++++++++++++++++++++++++++++++++++++++-
 fs/pstore/pmsg.c       |  9 +++++++++
 fs/pstore/ram.c        | 19 ++++++++-----------
 include/linux/pstore.h | 14 +-------------
 kernel/printk/printk.c |  1 +
 10 files changed, 98 insertions(+), 37 deletions(-)
Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address)
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
 arch/m68k/sun3/idprom.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Merging m68knommu/for-next (4ac313111018 fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU)
$ git merge m68knommu/for-next
Merge made by the 'recursive' strategy.
 fs/binfmt_elf_fdpic.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
Merging metag/for-next (3dce23eb8878 metag: Turn irq_ctx_* macros into static inlines)
$ git merge metag/for-next
Merge made by the 'recursive' strategy.
 arch/metag/include/asm/irq.h | 8 ++++++--
 arch/metag/kernel/smp.c      | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)
Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (4deb27263d5f Merge branch '4.3-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
 arch/mips/Kbuild                                   |   1 +
 arch/mips/Kconfig                                  |  30 ++-
 arch/mips/Kconfig.debug                            |  72 +++++
 arch/mips/Makefile                                 |   4 +
 arch/mips/bcm47xx/setup.c                          |  19 +-
 arch/mips/bcm47xx/sprom.c                          |  46 ++--
 arch/mips/boot/dts/mti/malta.dts                   |   4 +
 arch/mips/configs/bigsur_defconfig                 |  12 +-
 arch/mips/configs/capcella_defconfig               |   6 +-
 arch/mips/configs/e55_defconfig                    |   6 +-
 arch/mips/configs/fuloong2e_defconfig              |  14 +-
 arch/mips/configs/lasat_defconfig                  |  10 +-
 arch/mips/configs/lemote2f_defconfig               |  11 +-
 arch/mips/configs/malta_defconfig                  |   6 +-
 arch/mips/configs/malta_kvm_defconfig              |  16 +-
 arch/mips/configs/malta_kvm_guest_defconfig        |  16 +-
 arch/mips/configs/malta_qemu_32r6_defconfig        |  11 +-
 arch/mips/configs/maltaaprp_defconfig              |  11 +-
 arch/mips/configs/maltasmvp_eva_defconfig          |  11 +-
 arch/mips/configs/maltaup_defconfig                |  11 +-
 arch/mips/configs/maltaup_xpa_defconfig            |  16 +-
 arch/mips/configs/mpc30x_defconfig                 |   6 +-
 arch/mips/include/asm/abi.h                        |   5 +-
 arch/mips/include/asm/atomic.h                     |   2 +-
 arch/mips/include/asm/bcache.h                     |  27 ++
 arch/mips/include/asm/clocksource.h                |  29 ++
 arch/mips/include/asm/cpu-features.h               |   6 +-
 arch/mips/include/asm/debug.h                      |  22 ++
 arch/mips/include/asm/elf.h                        |   7 +
 arch/mips/include/asm/fw/fw.h                      |  16 --
 arch/mips/include/asm/mach-bcm47xx/bcm47xx.h       |   5 -
 .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h |  14 +
 arch/mips/include/asm/mach-malta/malta-dtshim.h    |  29 ++
 arch/mips/include/asm/mips-cm.h                    |  78 +++++-
 arch/mips/include/asm/mips-cpc.h                   |   3 +-
 arch/mips/include/asm/mipsregs.h                   |  15 +-
 arch/mips/include/asm/processor.h                  |   8 +-
 arch/mips/include/asm/vdso.h                       | 139 ++++++++--
 arch/mips/include/uapi/asm/Kbuild                  |   2 +-
 arch/mips/include/uapi/asm/auxvec.h                |  17 ++
 arch/mips/jz4740/board-qi_lb60.c                   |  13 +-
 arch/mips/kernel/Makefile                          |   1 +
 arch/mips/kernel/cps-vec-ns16550.S                 | 202 ++++++++++++++
 arch/mips/kernel/cps-vec.S                         |  44 +++-
 arch/mips/kernel/cpu-probe.c                       |   3 +-
 arch/mips/kernel/csrc-r4k.c                        |  44 ++++
 arch/mips/kernel/idle.c                            |  11 +-
 arch/mips/kernel/mips-cm.c                         | 114 +++++---
 arch/mips/kernel/mips-cpc.c                        |   6 +
 arch/mips/kernel/mips-r2-to-r6-emul.c              |   2 +-
 arch/mips/kernel/segment.c                         |   2 +-
 arch/mips/kernel/setup.c                           |   1 +
 arch/mips/kernel/signal.c                          |  12 +-
 arch/mips/kernel/signal32.c                        |   7 +-
 arch/mips/kernel/signal_n32.c                      |   5 +-
 arch/mips/kernel/smp-cps.c                         |  35 ++-
 arch/mips/kernel/smp-gic.c                         |   2 +
 arch/mips/kernel/spinlock_test.c                   |   4 +-
 arch/mips/kernel/stacktrace.c                      |  27 +-
 arch/mips/kernel/traps.c                           |   9 +-
 arch/mips/kernel/unaligned.c                       |   2 +-
 arch/mips/kernel/vdso.c                            | 207 +++++++++------
 arch/mips/lantiq/clk.c                             |  17 ++
 arch/mips/lantiq/clk.h                             |  13 +
 arch/mips/lantiq/irq.c                             |   8 +-
 arch/mips/lantiq/xway/clk.c                        | 175 +++++++++++-
 arch/mips/lantiq/xway/prom.c                       |  35 ++-
 arch/mips/lantiq/xway/reset.c                      | 114 ++++++--
 arch/mips/lantiq/xway/sysctrl.c                    | 260 +++++++++++++++---
 arch/mips/lib/Makefile                             |   2 +-
 arch/mips/lib/bswapdi.c                            |  15 ++
 arch/mips/lib/bswapsi.c                            |  11 +
 arch/mips/math-emu/me-debugfs.c                    |   2 +-
 arch/mips/mm/Makefile                              |   1 +
 arch/mips/mm/sc-debugfs.c                          |  81 ++++++
 arch/mips/mm/sc-mips.c                             |  65 ++++-
 arch/mips/mm/tlbex.c                               |  97 ++++---
 arch/mips/mti-malta/Makefile                       |  15 +-
 arch/mips/mti-malta/malta-dtshim.c                 | 162 ++++++++++++
 arch/mips/mti-malta/malta-init.c                   |   1 +
 arch/mips/mti-malta/malta-memory.c                 | 131 +--------
 arch/mips/mti-malta/malta-setup.c                  |   5 +-
 arch/mips/pci/pci-rt3883.c                         |   6 +-
 arch/mips/vdso/.gitignore                          |   4 +
 arch/mips/vdso/Makefile                            | 160 +++++++++++
 arch/mips/vdso/elf.S                               |  68 +++++
 arch/mips/vdso/genvdso.c                           | 293 +++++++++++++++++++++
 arch/mips/vdso/genvdso.h                           | 187 +++++++++++++
 arch/mips/vdso/gettimeofday.c                      | 232 ++++++++++++++++
 arch/mips/vdso/sigreturn.S                         |  49 ++++
 arch/mips/vdso/vdso.h                              |  89 +++++++
 arch/mips/vdso/vdso.lds.S                          | 105 ++++++++
 drivers/clocksource/mips-gic-timer.c               |   7 +-
 drivers/irqchip/irq-mips-gic.c                     |  14 +
 include/linux/irqchip/mips-gic.h                   |  17 ++
 95 files changed, 3350 insertions(+), 607 deletions(-)
 create mode 100644 arch/mips/include/asm/clocksource.h
 create mode 100644 arch/mips/include/asm/debug.h
 create mode 100644 arch/mips/include/asm/mach-malta/malta-dtshim.h
 create mode 100644 arch/mips/include/uapi/asm/auxvec.h
 create mode 100644 arch/mips/kernel/cps-vec-ns16550.S
 create mode 100644 arch/mips/lib/bswapdi.c
 create mode 100644 arch/mips/lib/bswapsi.c
 create mode 100644 arch/mips/mm/sc-debugfs.c
 create mode 100644 arch/mips/mti-malta/malta-dtshim.c
 create mode 100644 arch/mips/vdso/.gitignore
 create mode 100644 arch/mips/vdso/Makefile
 create mode 100644 arch/mips/vdso/elf.S
 create mode 100644 arch/mips/vdso/genvdso.c
 create mode 100644 arch/mips/vdso/genvdso.h
 create mode 100644 arch/mips/vdso/gettimeofday.c
 create mode 100644 arch/mips/vdso/sigreturn.S
 create mode 100644 arch/mips/vdso/vdso.h
 create mode 100644 arch/mips/vdso/vdso.lds.S
Merging nios2/for-next (8840da98bfec nios2: Switch to generic __xchg())
$ git merge nios2/for-next
Merge made by the 'recursive' strategy.
 arch/nios2/include/asm/cmpxchg.h | 47 ----------------------------------------
 arch/nios2/kernel/setup.c        |  2 +-
 2 files changed, 1 insertion(+), 48 deletions(-)
Merging parisc-hd/for-next (a01fece2e418 parisc: Change L1_CACHE_BYTES to 16)
$ git merge parisc-hd/for-next
Auto-merging include/linux/netdevice.h
Merge made by the 'recursive' strategy.
 arch/parisc/include/asm/cache.h       | 18 +++++-------------
 arch/parisc/include/uapi/asm/unistd.h |  4 +++-
 arch/parisc/kernel/syscall_table.S    |  2 ++
 drivers/parisc/lba_pci.c              | 12 ++++++------
 drivers/tty/serial/mux.c              |  9 ++-------
 include/linux/netdevice.h             |  4 ++--
 6 files changed, 20 insertions(+), 29 deletions(-)
Merging powerpc/next (353169acf185 powerpc/eeh: Fix recursive fenced PHB on Broadcom shiner adapter)
$ git merge powerpc/next
Removing arch/powerpc/boot/prpmc2800.c
Removing arch/powerpc/boot/dts/prpmc2800.dts
Merge made by the 'recursive' strategy.
 arch/powerpc/Makefile                              |   6 +-
 arch/powerpc/boot/dts/prpmc2800.dts                | 297 -----------
 arch/powerpc/boot/page.h                           |   4 +-
 arch/powerpc/boot/prpmc2800.c                      | 571 ---------------------
 arch/powerpc/boot/wrapper                          |  25 +-
 arch/powerpc/configs/cell_defconfig                |   2 +-
 arch/powerpc/configs/ps3_defconfig                 |   7 +-
 arch/powerpc/include/asm/mmu-hash64.h              |   1 +
 arch/powerpc/include/asm/msi_bitmap.h              |   1 +
 arch/powerpc/include/asm/page.h                    |  25 +-
 arch/powerpc/include/asm/pgtable-ppc64.h           |  10 +-
 arch/powerpc/include/asm/pgtable.h                 |   6 +-
 arch/powerpc/include/asm/systbl.h                  |  12 +
 arch/powerpc/include/asm/unistd.h                  |   2 +-
 arch/powerpc/include/uapi/asm/unistd.h             |  12 +
 arch/powerpc/kernel/eeh.c                          |   8 +-
 arch/powerpc/kernel/eeh_driver.c                   |  27 +-
 arch/powerpc/kernel/io-workarounds.c               |   2 +-
 arch/powerpc/kernel/nvram_64.c                     |  15 +-
 arch/powerpc/kernel/pci-common.c                   |   1 +
 arch/powerpc/kernel/prom.c                         |  13 +-
 arch/powerpc/kernel/vdso32/Makefile                |   2 +-
 arch/powerpc/kernel/vdso32/datapage.S              |  12 +-
 arch/powerpc/kernel/vdso64/Makefile                |   2 +-
 arch/powerpc/kernel/vdso64/datapage.S              |  12 +-
 arch/powerpc/kernel/vmlinux.lds.S                  |   6 +
 arch/powerpc/kvm/book3s_64_mmu_hv.c                |   2 +-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c                |   8 +-
 arch/powerpc/kvm/e500_mmu_host.c                   |   2 +-
 arch/powerpc/mm/hash_utils_64.c                    |   7 +-
 arch/powerpc/mm/hugetlbpage.c                      |  40 +-
 arch/powerpc/mm/numa.c                             |   5 +-
 arch/powerpc/mm/slb.c                              |  49 +-
 arch/powerpc/mm/tlb_hash64.c                       |   9 +-
 arch/powerpc/perf/callchain.c                      |   2 +-
 arch/powerpc/platforms/Kconfig.cputype             |  11 -
 arch/powerpc/platforms/cell/Kconfig                |   4 +-
 arch/powerpc/platforms/maple/Kconfig               |   2 +-
 arch/powerpc/platforms/pasemi/Kconfig              |   2 +-
 arch/powerpc/platforms/powermac/Kconfig            |   2 +-
 arch/powerpc/platforms/powernv/eeh-powernv.c       |  86 ++--
 arch/powerpc/platforms/powernv/setup.c             |  21 +-
 arch/powerpc/platforms/ps3/Kconfig                 |   2 +-
 arch/powerpc/platforms/pseries/Kconfig             |   7 +-
 arch/powerpc/platforms/pseries/Makefile            |   7 +-
 arch/powerpc/platforms/pseries/dlpar.c             |  31 +-
 arch/powerpc/platforms/pseries/eeh_pseries.c       |  60 +--
 arch/powerpc/platforms/pseries/hvcserver.c         |   2 +-
 arch/powerpc/platforms/pseries/iommu.c             |  10 -
 arch/powerpc/platforms/pseries/of_helpers.c        |  35 ++
 arch/powerpc/platforms/pseries/of_helpers.h        |   8 +
 arch/powerpc/platforms/pseries/reconfig.c          |  34 +-
 arch/powerpc/platforms/pseries/setup.c             |   4 -
 arch/powerpc/sysdev/mpc5xxx_clocks.c               |   5 +-
 arch/powerpc/sysdev/mpc8xx_pic.c                   |   2 +-
 arch/powerpc/sysdev/msi_bitmap.c                   |  16 +-
 arch/powerpc/xmon/nonstdio.c                       |  64 ++-
 arch/powerpc/xmon/nonstdio.h                       |   3 +
 arch/powerpc/xmon/xmon.c                           |  79 ++-
 drivers/char/agp/uninorth-agp.c                    |  16 +-
 drivers/macintosh/Kconfig                          |   5 +-
 drivers/misc/cxl/vphb.c                            |   2 +
 drivers/ps3/ps3-lpm.c                              |   2 +-
 drivers/ps3/ps3-vuart.c                            |   3 +-
 scripts/kconfig/Makefile                           |   5 +-
 tools/testing/selftests/powerpc/Makefile           |  12 +-
 .../selftests/powerpc/benchmarks/.gitignore        |   1 +
 .../testing/selftests/powerpc/benchmarks/Makefile  |  12 +
 .../selftests/powerpc/benchmarks/gettimeofday.c    |  31 ++
 .../powerpc/pmu/ebb/back_to_back_ebbs_test.c       |   2 +
 .../powerpc/pmu/ebb/close_clears_pmcc_test.c       |   2 +
 .../powerpc/pmu/ebb/cpu_event_pinned_vs_ebb_test.c |   2 +
 .../powerpc/pmu/ebb/cpu_event_vs_ebb_test.c        |   2 +
 .../selftests/powerpc/pmu/ebb/cycles_test.c        |   2 +
 .../powerpc/pmu/ebb/cycles_with_freeze_test.c      |   2 +
 .../powerpc/pmu/ebb/cycles_with_mmcr2_test.c       |   2 +
 tools/testing/selftests/powerpc/pmu/ebb/ebb.c      |  11 +
 tools/testing/selftests/powerpc/pmu/ebb/ebb.h      |   1 +
 .../selftests/powerpc/pmu/ebb/ebb_on_child_test.c  |   2 +
 .../powerpc/pmu/ebb/ebb_on_willing_child_test.c    |   2 +
 .../powerpc/pmu/ebb/ebb_vs_cpu_event_test.c        |   2 +
 .../powerpc/pmu/ebb/event_attributes_test.c        |   2 +
 .../selftests/powerpc/pmu/ebb/fork_cleanup_test.c  |   2 +
 .../powerpc/pmu/ebb/instruction_count_test.c       |   2 +
 .../powerpc/pmu/ebb/lost_exception_test.c          |   2 +
 .../selftests/powerpc/pmu/ebb/multi_counter_test.c |   2 +
 .../powerpc/pmu/ebb/multi_ebb_procs_test.c         |   2 +
 .../selftests/powerpc/pmu/ebb/no_handler_test.c    |   2 +
 .../selftests/powerpc/pmu/ebb/pmae_handling_test.c |   2 +
 .../powerpc/pmu/ebb/pmc56_overflow_test.c          |   2 +
 .../selftests/powerpc/pmu/ebb/reg_access_test.c    |   2 +
 .../pmu/ebb/task_event_pinned_vs_ebb_test.c        |   2 +
 .../powerpc/pmu/ebb/task_event_vs_ebb_test.c       |   2 +
 .../testing/selftests/powerpc/syscalls/.gitignore  |   1 +
 tools/testing/selftests/powerpc/syscalls/Makefile  |  12 +
 tools/testing/selftests/powerpc/syscalls/ipc.h     |  47 ++
 .../selftests/powerpc/syscalls/ipc_unmuxed.c       |  61 +++
 tools/testing/selftests/powerpc/tm/tm-syscall.c    |  14 +-
 98 files changed, 788 insertions(+), 1194 deletions(-)
 delete mode 100644 arch/powerpc/boot/dts/prpmc2800.dts
 delete mode 100644 arch/powerpc/boot/prpmc2800.c
 create mode 100644 arch/powerpc/platforms/pseries/of_helpers.c
 create mode 100644 arch/powerpc/platforms/pseries/of_helpers.h
 create mode 100644 tools/testing/selftests/powerpc/benchmarks/.gitignore
 create mode 100644 tools/testing/selftests/powerpc/benchmarks/Makefile
 create mode 100644 tools/testing/selftests/powerpc/benchmarks/gettimeofday.c
 create mode 100644 tools/testing/selftests/powerpc/syscalls/.gitignore
 create mode 100644 tools/testing/selftests/powerpc/syscalls/Makefile
 create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc.h
 create mode 100644 tools/testing/selftests/powerpc/syscalls/ipc_unmuxed.c
Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
$ git merge powerpc-mpe/next
Already up-to-date.
Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry)
$ git merge fsl/next
Auto-merging include/linux/fsl/guts.h
Auto-merging drivers/clk/Kconfig
Auto-merging arch/powerpc/boot/dts/fsl/t4240rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t4240qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t2081qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t2080rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t2080qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t104xd4rdb.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1042rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1042qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1042d4rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1040rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1040qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1040d4rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1024rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1024qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/t1023rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/ppa8548.dts
Auto-merging arch/powerpc/boot/dts/fsl/p5040ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p5020ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p4080ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p3041ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p2041rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p2020rdb-pc.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/p2020ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/p1025twr.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1025rdb_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1024rdb_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1023rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1022rdk.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1022ds_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1022ds.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1021rdb-pc.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/p1021mds.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020utm-pc_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pd.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020rdb-pc_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1020mbg-pc_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/p1010rdb-pa.dts
Auto-merging arch/powerpc/boot/dts/fsl/oca4080.dts
Auto-merging arch/powerpc/boot/dts/fsl/mvme2500.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8572ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8569mds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8568mds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8560ads.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8555cds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8548cds_32b.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8544ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8541cds.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8540ads.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds_36b.dts
Auto-merging arch/powerpc/boot/dts/fsl/mpc8536ds.dts
Auto-merging arch/powerpc/boot/dts/fsl/kmcoge4.dts
Auto-merging arch/powerpc/boot/dts/fsl/ge_imp3a.dts
Auto-merging arch/powerpc/boot/dts/fsl/c293pcie.dts
Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/bsc9132qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/bsc9131rdb.dts
Auto-merging arch/powerpc/boot/dts/fsl/b4qds.dtsi
Auto-merging arch/powerpc/boot/dts/fsl/b4860qds.dts
Auto-merging arch/powerpc/boot/dts/fsl/b4420qds.dts
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/chosen.txt       |    8 +
 .../devicetree/bindings/clock/qoriq-clock.txt      |   61 +-
 .../devicetree/bindings/net/maxim,ds26522.txt      |   13 +
 arch/powerpc/Kconfig                               |    2 +-
 arch/powerpc/boot/Makefile                         |    3 +
 arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/b4420si-post.dtsi        |    4 +-
 arch/powerpc/boot/dts/fsl/b4420si-pre.dtsi         |   13 +-
 arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/b4860si-post.dtsi        |   26 +-
 arch/powerpc/boot/dts/fsl/b4860si-pre.dtsi         |   20 +-
 arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi         |    2 +-
 arch/powerpc/boot/dts/fsl/b4si-post.dtsi           |   33 +-
 arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi    |   12 +
 arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi    |   12 +
 arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/cyrus_p5020.dts          |  155 +++
 arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts        |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts      |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi     |    0
 arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts  |    4 +-
 arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi      |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts     |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts     |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts      |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi     |    0
 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi    |    0
 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts     |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts     |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts      |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi     |    0
 arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts  |    4 +-
 .../boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts    |    0
 .../boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts    |    0
 arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi      |    2 +-
 arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/oca4080.dts        |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts    |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi   |    0
 .../powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts    |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi      |   12 +
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi  |    0
 arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi  |    0
 arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi   |    0
 .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi   |    0
 .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts |    4 +-
 .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts  |    0
 .../boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts  |    0
 arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts    |   16 +-
 arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi      |    0
 arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts   |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi   |    0
 .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi   |   12 +
 .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi       |   12 +
 arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts    |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts    |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi      |    0
 arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts   |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts   |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi      |    0
 arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts   |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts   |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi      |   12 +
 arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts        |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi       |    0
 arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi   |   12 +-
 .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts |    4 +-
 .../powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/p2041si-post.dtsi        |   29 +-
 arch/powerpc/boot/dts/fsl/p2041si-pre.dtsi         |   10 +-
 arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts        |    4 +-
 arch/powerpc/boot/dts/fsl/p3041si-post.dtsi        |   29 +-
 arch/powerpc/boot/dts/fsl/p3041si-pre.dtsi         |   10 +-
 arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts        |    4 +-
 arch/powerpc/boot/dts/fsl/p4080si-post.dtsi        |   48 +-
 arch/powerpc/boot/dts/fsl/p4080si-pre.dtsi         |   15 +-
 arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts        |    4 +-
 arch/powerpc/boot/dts/fsl/p5020si-post.dtsi        |   29 +-
 arch/powerpc/boot/dts/fsl/p5020si-pre.dtsi         |   10 +-
 arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts        |    4 +-
 arch/powerpc/boot/dts/fsl/p5040si-post.dtsi        |   56 +-
 arch/powerpc/boot/dts/fsl/p5040si-pre.dtsi         |   17 +-
 arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts        |    4 +-
 arch/powerpc/boot/dts/fsl/qoriq-clockgen1.dtsi     |    3 +-
 arch/powerpc/boot/dts/fsl/qoriq-clockgen2.dtsi     |    3 +-
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi   |   69 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi        |  101 ++
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi  |   61 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi   |   68 +
 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi        |  101 ++
 .../dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi   |   66 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi |   63 +
 .../dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi   |   66 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi |   63 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi       |  106 ++
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi |   63 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi |   63 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi  |   62 +
 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi       |  106 ++
 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi      |   94 ++
 arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/t1023si-post.dtsi        |   19 +
 arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi         |    6 +
 arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/t1040si-post.dtsi        |   31 +
 arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts     |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts    |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi    |   10 +
 arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi      |    0
 arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi      |    0
 arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi         |    9 +-
 arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/t2081si-post.dtsi        |   43 +
 arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi      |    0
 arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi      |    0
 arch/powerpc/boot/dts/fsl/t208xsi-pre.dtsi         |   11 +
 arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts       |    4 +-
 arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts       |    4 +-
 arch/powerpc/boot/dts/fsl/t4240si-post.dtsi        |   88 +-
 arch/powerpc/boot/dts/fsl/t4240si-pre.dtsi         |   22 +-
 arch/powerpc/include/asm/exception-64e.h           |   15 +-
 arch/powerpc/include/asm/page.h                    |    7 +-
 arch/powerpc/kernel/crash.c                        |    6 +-
 arch/powerpc/kernel/exceptions-64e.S               |   17 +-
 arch/powerpc/kernel/head_64.S                      |   43 +-
 arch/powerpc/kernel/machine_kexec_64.c             |   18 +
 arch/powerpc/kernel/misc_64.S                      |   60 +-
 arch/powerpc/kernel/paca.c                         |    9 +-
 arch/powerpc/kernel/setup_64.c                     |   25 +-
 arch/powerpc/mm/fsl_booke_mmu.c                    |   26 +-
 arch/powerpc/mm/mmu_decl.h                         |    4 +-
 arch/powerpc/mm/tlb_low_64e.S                      |   25 +-
 arch/powerpc/mm/tlb_nohash.c                       |   41 +-
 arch/powerpc/mm/tlb_nohash_low.S                   |   63 +
 arch/powerpc/platforms/85xx/corenet_generic.c      |   11 +
 arch/powerpc/platforms/85xx/mpc85xx_mds.c          |    2 +-
 arch/powerpc/platforms/85xx/mpc85xx_rdb.c          |    2 +-
 arch/powerpc/platforms/85xx/p1022_ds.c             |    2 +-
 arch/powerpc/platforms/85xx/p1022_rdk.c            |    2 +-
 arch/powerpc/platforms/85xx/smp.c                  |   88 +-
 arch/powerpc/platforms/85xx/twr_p102x.c            |    2 +-
 arch/powerpc/platforms/86xx/mpc8610_hpcd.c         |    2 +-
 arch/powerpc/sysdev/cpm_common.c                   |    3 +-
 arch/powerpc/sysdev/fsl_pci.c                      |   86 +-
 arch/powerpc/sysdev/mpic.c                         |   23 +-
 drivers/clk/Kconfig                                |    2 +-
 drivers/clk/clk-qoriq.c                            | 1354 ++++++++++++++++----
 drivers/iommu/fsl_pamu.c                           |    2 +-
 .../asm/fsl_guts.h => include/linux/fsl/guts.h     |    8 +-
 sound/soc/fsl/mpc8610_hpcd.c                       |    2 +-
 sound/soc/fsl/p1022_ds.c                           |    2 +-
 sound/soc/fsl/p1022_rdk.c                          |    2 +-
 203 files changed, 5078 insertions(+), 534 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/maxim,ds26522.txt
 rename arch/powerpc/boot/dts/{ => fsl}/b4420qds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/b4860qds.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/b4qds.dtsi (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dts (91%)
 rename arch/powerpc/boot/dts/{ => fsl}/bsc9131rdb.dtsi (90%)
 rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dts (91%)
 rename arch/powerpc/boot/dts/{ => fsl}/bsc9132qds.dtsi (91%)
 rename arch/powerpc/boot/dts/{ => fsl}/c293pcie.dts (98%)
 create mode 100644 arch/powerpc/boot/dts/fsl/cyrus_p5020.dts
 rename arch/powerpc/boot/dts/{ => fsl}/ge_imp3a.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/kmcoge4.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8536ds_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8540ads.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8541cds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8544ds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_32b.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8548cds_36b.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8555cds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8560ads.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8568mds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8569mds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_36b.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core0.dts (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mpc8572ds_camp_core1.dts (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/mvme2500.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/oca4080.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dts (88%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pa_36b.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb.dts (89%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb-pb_36b.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb.dtsi (94%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_32b.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1010rdb_36b.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020mbg-pc_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core0.dts (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pc_camp_core1.dts (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb-pd.dts (95%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dts (95%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020rdb_36b.dts (95%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1020utm-pc_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1021mds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc.dtsi (95%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1021rdb-pc_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds.dtsi (94%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_32b.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1022ds_36b.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1022rdk.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1023rdb.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1024rdb_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_32b.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1025rdb_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p1025twr.dtsi (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020ds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc.dtsi (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_32b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb-pc_36b.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2020rdb.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p2041rdb.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p3041ds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/p4080ds.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/p5020ds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/p5040ds.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/ppa8548.dts (97%)
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-10g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-2.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-3.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0-1g-4.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-10g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-2.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-3.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1-1g-4.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0-best-effort.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1-best-effort.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-2.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-3.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-4.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0-1g-5.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-10g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-0.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-2.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-3.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-4.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1-1g-5.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3-1.dtsi
 create mode 100644 arch/powerpc/boot/dts/fsl/qoriq-fman3l-0.dtsi
 rename arch/powerpc/boot/dts/{ => fsl}/t1023rdb.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1024qds.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1024rdb.dts (98%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1040d4rdb.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1040qds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1040rdb.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1042d4rdb.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1042qds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t1042rdb_pi.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t104xd4rdb.dtsi (95%)
 rename arch/powerpc/boot/dts/{ => fsl}/t104xqds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/t104xrdb.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/t2080qds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t2080rdb.dts (97%)
 rename arch/powerpc/boot/dts/{ => fsl}/t2081qds.dts (96%)
 rename arch/powerpc/boot/dts/{ => fsl}/t208xqds.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/t208xrdb.dtsi (100%)
 rename arch/powerpc/boot/dts/{ => fsl}/t4240qds.dts (99%)
 rename arch/powerpc/boot/dts/{ => fsl}/t4240rdb.dts (98%)
 rename arch/powerpc/include/asm/fsl_guts.h => include/linux/fsl/guts.h (98%)
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
$ git merge mpc5xxx/next
Merge made by the 'recursive' strategy.
 .../bindings/powerpc/fsl/mpc512x_lpbfifo.txt       |  21 +
 arch/powerpc/boot/dts/mpc5121.dtsi                 |  11 +-
 arch/powerpc/boot/dts/mpc5125twr.dts               |  11 +-
 arch/powerpc/configs/mpc512x_defconfig             |   1 +
 arch/powerpc/include/asm/mpc5121.h                 |  59 +++
 arch/powerpc/include/asm/mpc52xx_psc.h             |   2 -
 arch/powerpc/platforms/512x/Kconfig                |   6 +
 arch/powerpc/platforms/512x/Makefile               |   1 +
 arch/powerpc/platforms/512x/mpc512x_lpbfifo.c      | 540 +++++++++++++++++++++
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c          |   6 +-
 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c      |   1 +
 11 files changed, 650 insertions(+), 9 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/powerpc/fsl/mpc512x_lpbfifo.txt
 create mode 100644 arch/powerpc/platforms/512x/mpc512x_lpbfifo.c
Merging s390/features (ef12cb904e09 s390/cio: move ccw_device_stlck functions)
$ git merge s390/features
Auto-merging include/linux/compiler.h
Auto-merging include/asm-generic/pgtable.h
Removing drivers/s390/crypto/zcrypt_pcicc.h
Removing drivers/s390/crypto/zcrypt_pcicc.c
Removing drivers/s390/crypto/zcrypt_pcica.h
Removing drivers/s390/crypto/zcrypt_pcica.c
Auto-merging arch/s390/include/asm/fpu/internal.h
Merge made by the 'recursive' strategy.
 arch/s390/Kconfig                                  |    1 +
 arch/s390/hypfs/hypfs_diag.c                       |   10 +-
 arch/s390/hypfs/hypfs_diag0c.c                     |    2 +
 arch/s390/hypfs/hypfs_sprp.c                       |    9 +-
 arch/s390/hypfs/hypfs_vm.c                         |    2 +
 arch/s390/include/asm/appldata.h                   |    2 +
 arch/s390/include/asm/atomic.h                     |    2 -
 arch/s390/include/asm/barrier.h                    |    8 +-
 arch/s390/include/asm/bitops.h                     |   55 +-
 arch/s390/include/asm/cio.h                        |   10 +
 arch/s390/include/asm/cmb.h                        |    1 +
 arch/s390/include/asm/cmpxchg.h                    |   30 +-
 arch/s390/include/asm/ctl_reg.h                    |    2 -
 arch/s390/include/asm/diag.h                       |   29 +
 arch/s390/include/asm/etr.h                        |   10 +-
 arch/s390/include/asm/fpu/api.h                    |   30 +
 .../include/asm/{fpu-internal.h => fpu/internal.h} |   51 +-
 arch/s390/include/asm/fpu/types.h                  |   25 +
 arch/s390/include/asm/idle.h                       |    2 +
 arch/s390/include/asm/irq.h                        |   13 +
 arch/s390/include/asm/kvm_host.h                   |    2 +-
 arch/s390/include/asm/kvm_para.h                   |   67 +-
 arch/s390/include/asm/lowcore.h                    |   11 +-
 arch/s390/include/asm/nmi.h                        |   98 +-
 arch/s390/include/asm/pgtable.h                    |   66 +-
 arch/s390/include/asm/processor.h                  |   98 +-
 arch/s390/include/asm/ptrace.h                     |   11 +-
 arch/s390/include/asm/setup.h                      |   50 +-
 arch/s390/include/asm/spinlock.h                   |    3 -
 arch/s390/include/asm/switch_to.h                  |    2 +-
 arch/s390/include/asm/thread_info.h                |   22 +-
 arch/s390/include/asm/trace/diag.h                 |   43 +
 arch/s390/kernel/Makefile                          |    2 +
 arch/s390/kernel/asm-offsets.c                     |  290 +--
 arch/s390/kernel/compat_signal.c                   |    7 +-
 arch/s390/kernel/cpcmd.c                           |    2 +
 arch/s390/kernel/crash_dump.c                      |   16 +-
 arch/s390/kernel/diag.c                            |  134 +-
 arch/s390/kernel/early.c                           |   15 +-
 arch/s390/kernel/entry.S                           |  230 +--
 arch/s390/kernel/entry.h                           |    3 -
 arch/s390/kernel/head64.S                          |    7 +-
 arch/s390/kernel/ipl.c                             |    9 +-
 arch/s390/kernel/nmi.c                             |  120 +-
 arch/s390/kernel/perf_cpum_sf.c                    |   10 +-
 arch/s390/kernel/process.c                         |   36 +-
 arch/s390/kernel/processor.c                       |    5 +-
 arch/s390/kernel/ptrace.c                          |   44 +-
 arch/s390/kernel/s390_ksyms.c                      |    3 +-
 arch/s390/kernel/signal.c                          |    7 +-
 arch/s390/kernel/smp.c                             |   10 +-
 arch/s390/kernel/time.c                            |   31 +-
 arch/s390/kernel/topology.c                        |   28 +-
 arch/s390/kernel/trace.c                           |   29 +
 arch/s390/kernel/traps.c                           |   41 +-
 arch/s390/kernel/vdso.c                            |    2 +-
 arch/s390/kvm/kvm-s390.c                           |    6 -
 arch/s390/lib/delay.c                              |   30 +-
 arch/s390/lib/find.c                               |    4 +-
 arch/s390/lib/spinlock.c                           |    4 +-
 arch/s390/mm/extmem.c                              |    3 +
 arch/s390/mm/fault.c                               |    7 +-
 arch/s390/mm/hugetlbpage.c                         |    2 +
 arch/s390/numa/mode_emu.c                          |   10 +-
 arch/s390/pci/pci_insn.c                           |    6 +-
 arch/x86/include/asm/pgtable.h                     |   10 +
 drivers/s390/block/dasd.c                          |    1 +
 drivers/s390/block/dasd_alias.c                    |    5 +-
 drivers/s390/block/dasd_diag.c                     |    2 +
 drivers/s390/block/dasd_eckd.c                     |   11 +-
 drivers/s390/char/diag_ftp.c                       |    2 +
 drivers/s390/char/sclp_rw.c                        |  136 +-
 drivers/s390/char/sclp_rw.h                        |   17 +-
 drivers/s390/char/sclp_tty.c                       |    8 +-
 drivers/s390/cio/cio.c                             |    6 +-
 drivers/s390/cio/cmf.c                             |  220 ++-
 drivers/s390/cio/css.c                             |    1 +
 drivers/s390/cio/device.c                          |    4 +-
 drivers/s390/cio/device.h                          |    6 +-
 drivers/s390/cio/device_fsm.c                      |   38 +
 drivers/s390/cio/device_ops.c                      |  107 --
 drivers/s390/cio/device_pgid.c                     |   70 +-
 drivers/s390/crypto/Makefile                       |    4 +-
 drivers/s390/crypto/ap_bus.c                       | 1850 +++++++++-----------
 drivers/s390/crypto/ap_bus.h                       |   67 +-
 drivers/s390/crypto/zcrypt_api.c                   |    3 +-
 drivers/s390/crypto/zcrypt_cca_key.h               |    2 +-
 drivers/s390/crypto/zcrypt_msgtype50.c             |   28 +-
 drivers/s390/crypto/zcrypt_msgtype6.c              |   59 +-
 drivers/s390/crypto/zcrypt_pcica.c                 |  420 -----
 drivers/s390/crypto/zcrypt_pcica.h                 |  115 --
 drivers/s390/crypto/zcrypt_pcicc.c                 |  627 -------
 drivers/s390/crypto/zcrypt_pcicc.h                 |  174 --
 drivers/s390/virtio/virtio_ccw.c                   |   15 +-
 drivers/watchdog/diag288_wdt.c                     |    4 +
 fs/proc/task_mmu.c                                 |    4 +-
 include/asm-generic/pgtable.h                      |   10 +
 include/linux/compiler.h                           |    2 +-
 98 files changed, 2374 insertions(+), 3574 deletions(-)
 create mode 100644 arch/s390/include/asm/fpu/api.h
 rename arch/s390/include/asm/{fpu-internal.h => fpu/internal.h} (59%)
 create mode 100644 arch/s390/include/asm/fpu/types.h
 create mode 100644 arch/s390/include/asm/trace/diag.h
 create mode 100644 arch/s390/kernel/trace.c
 delete mode 100644 drivers/s390/crypto/zcrypt_pcica.c
 delete mode 100644 drivers/s390/crypto/zcrypt_pcica.h
 delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.c
 delete mode 100644 drivers/s390/crypto/zcrypt_pcicc.h
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state)
$ git merge tile/master
Merge made by the 'recursive' strategy.
 arch/tile/Kconfig                   |  1 +
 arch/tile/include/asm/insn.h        | 59 +++++++++++++++++++++++++++
 arch/tile/include/asm/jump_label.h  | 58 +++++++++++++++++++++++++++
 arch/tile/include/asm/page.h        | 10 +++++
 arch/tile/include/asm/processor.h   |  2 +-
 arch/tile/include/asm/thread_info.h |  8 +++-
 arch/tile/kernel/Makefile           |  1 +
 arch/tile/kernel/ftrace.c           | 13 +-----
 arch/tile/kernel/intvec_32.S        | 46 +++++++--------------
 arch/tile/kernel/intvec_64.S        | 49 +++++++----------------
 arch/tile/kernel/jump_label.c       | 64 ++++++++++++++++++++++++++++++
 arch/tile/kernel/kgdb.c             |  2 +-
 arch/tile/kernel/kprobes.c          |  4 +-
 arch/tile/kernel/process.c          | 79 +++++++++++++++++++------------------
 arch/tile/kernel/time.c             |  1 +
 15 files changed, 276 insertions(+), 121 deletions(-)
 create mode 100644 arch/tile/include/asm/insn.h
 create mode 100644 arch/tile/include/asm/jump_label.h
 create mode 100644 arch/tile/kernel/jump_label.c
Merging uml/linux-next (56b88a3bf97a um: Fix kernel mode fault condition)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (895fb3159280 xtensa: improve vmlinux.lds.S sed post-processing)
$ git merge xtensa/for_next
Already up-to-date.
Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (8dbd263de1cb ceph: improve readahead for file holes)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
Merging cifs/for-next (5fe43a837f7b [SMB3] Fix build so persistent handles disabled if SMB2 support not configured)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
 fs/cifs/cifsfs.c        |   4 ++
 fs/cifs/cifsglob.h      |  16 ++++--
 fs/cifs/cifsproto.h     |   5 +-
 fs/cifs/connect.c       |  80 ++++++++++++++++++++++++++++-
 fs/cifs/misc.c          |   2 +-
 fs/cifs/smb2file.c      |  19 +++++++
 fs/cifs/smb2misc.c      |  39 +++++++++++---
 fs/cifs/smb2ops.c       |  19 ++++---
 fs/cifs/smb2pdu.c       | 132 +++++++++++++++++++++++++++++++++++++++++++++---
 fs/cifs/smb2pdu.h       |  53 +++++++++++++++++--
 fs/cifs/smb2proto.h     |   3 +-
 fs/cifs/smb2transport.c | 102 ++++++++++++++++++++++++++++++++++---
 fs/cifs/smbfsctl.h      |   2 +-
 13 files changed, 435 insertions(+), 41 deletions(-)
Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
$ git merge ecryptfs/next
Merge made by the 'recursive' strategy.
 fs/ecryptfs/main.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (1a70ea8d47aa ext4: fix abs() usage in ext4_mb_check_group_pa)
$ git merge ext4/dev
Auto-merging fs/ext4/readpage.c
Merge made by the 'recursive' strategy.
 fs/Makefile              |   7 +-
 fs/ext4/Makefile         |   2 +-
 fs/ext4/balloc.c         |  92 ++++---
 fs/ext4/block_validity.c |   2 +-
 fs/ext4/crypto.c         |  52 ++--
 fs/ext4/crypto_fname.c   |   2 -
 fs/ext4/crypto_key.c     |  16 +-
 fs/ext4/crypto_policy.c  |   3 +-
 fs/ext4/dir.c            |   7 +-
 fs/ext4/ext4.h           | 177 ++++++++++--
 fs/ext4/ext4_jbd2.c      |   6 +-
 fs/ext4/ext4_jbd2.h      |  10 +-
 fs/ext4/extents.c        |  82 +++---
 fs/ext4/extents_status.c |  60 +---
 fs/ext4/extents_status.h |   2 +
 fs/ext4/ialloc.c         | 113 +++++---
 fs/ext4/indirect.c       |   5 +-
 fs/ext4/inline.c         |   3 +-
 fs/ext4/inode.c          |  83 ++++--
 fs/ext4/ioctl.c          |  15 +-
 fs/ext4/mballoc.c        |  88 +++---
 fs/ext4/migrate.c        |   9 +-
 fs/ext4/mmp.c            |   8 +-
 fs/ext4/namei.c          |  36 ++-
 fs/ext4/page-io.c        |   5 +-
 fs/ext4/readpage.c       |   2 +-
 fs/ext4/resize.c         |  34 +--
 fs/ext4/super.c          | 695 ++++++++++-------------------------------------
 fs/ext4/symlink.c        |   2 +-
 fs/ext4/sysfs.c          | 448 ++++++++++++++++++++++++++++++
 fs/ext4/xattr.c          |  32 +--
 fs/jbd2/checkpoint.c     |   8 +-
 fs/jbd2/commit.c         |  22 +-
 fs/jbd2/journal.c        |  27 +-
 fs/jbd2/recovery.c       |  26 +-
 fs/jbd2/revoke.c         |   4 +-
 include/linux/jbd2.h     |  84 +++++-
 include/uapi/linux/fs.h  |   1 +
 38 files changed, 1276 insertions(+), 994 deletions(-)
 create mode 100644 fs/ext4/sysfs.c
Merging f2fs/dev (f96999c35f46 f2fs: refactor __find_rev_next_{zero}_bit)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-fs-f2fs |  12 ++
 Documentation/filesystems/f2fs.txt      |   3 +-
 fs/f2fs/checkpoint.c                    |  49 ++++-
 fs/f2fs/data.c                          | 176 +++++++++++-------
 fs/f2fs/debug.c                         |  36 ++--
 fs/f2fs/dir.c                           |  19 +-
 fs/f2fs/extent_cache.c                  | 193 ++++++++-----------
 fs/f2fs/f2fs.h                          |  86 +++++++--
 fs/f2fs/file.c                          | 317 +++++++++++++++++---------------
 fs/f2fs/gc.c                            |  77 +++++---
 fs/f2fs/gc.h                            |   6 -
 fs/f2fs/inline.c                        |  42 ++++-
 fs/f2fs/inode.c                         |   8 +-
 fs/f2fs/namei.c                         |  10 +-
 fs/f2fs/node.c                          |  26 ++-
 fs/f2fs/node.h                          |   4 +-
 fs/f2fs/recovery.c                      |  15 +-
 fs/f2fs/segment.c                       | 203 ++++++++++++--------
 fs/f2fs/segment.h                       |   4 +-
 fs/f2fs/super.c                         |  37 +++-
 include/trace/events/f2fs.h             |  69 ++++++-
 21 files changed, 857 insertions(+), 535 deletions(-)
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
$ git merge fscache/fscache
Merge made by the 'recursive' strategy.
 fs/fscache/netfs.c | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)
Merging fuse/for-next (0a30f612d6cf fuse: update MAINTAINERS entry)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (f3dd1649122b gfs2: Remove gl_spin define)
$ git merge gfs2/for-next
Merge made by the 'recursive' strategy.
 Documentation/filesystems/gfs2-glocks.txt |  6 +--
 fs/gfs2/file.c                            |  2 +-
 fs/gfs2/glock.c                           | 84 +++++++++++++++----------------
 fs/gfs2/glock.h                           |  4 +-
 fs/gfs2/glops.c                           | 10 ++--
 fs/gfs2/incore.h                          |  3 +-
 fs/gfs2/main.c                            |  2 +-
 fs/gfs2/ops_fstype.c                      |  4 +-
 fs/gfs2/rgrp.c                            |  4 +-
 fs/gfs2/trans.c                           |  4 ++
 10 files changed, 64 insertions(+), 59 deletions(-)
Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (a85240d2543e Merge branch 'bugfixes')
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/blocklayout/blocklayout.c |   7 +-
 fs/nfs/callback.h                |  12 --
 fs/nfs/callback_proc.c           |   2 -
 fs/nfs/callback_xdr.c            |  39 +++----
 fs/nfs/client.c                  |   1 +
 fs/nfs/delegation.c              |   6 +-
 fs/nfs/mount_clnt.c              |   4 +-
 fs/nfs/nfs42.h                   |   1 +
 fs/nfs/nfs42proc.c               |  71 ++++++++++++
 fs/nfs/nfs42xdr.c                |  97 +++++++++++++++-
 fs/nfs/nfs4_fs.h                 |   6 +-
 fs/nfs/nfs4file.c                | 136 ++++++++++++++++++++++
 fs/nfs/nfs4proc.c                | 177 ++++++++++++++--------------
 fs/nfs/nfs4xdr.c                 |  26 +++++
 fs/nfs/nfsroot.c                 |   2 +-
 fs/nfs/pnfs.c                    |  12 +-
 fs/nfs/read.c                    |   9 +-
 fs/nfs/super.c                   |   2 -
 fs/nfs/write.c                   |   7 ++
 include/linux/nfs4.h             |   3 +
 include/linux/nfs_fs_sb.h        |   2 +
 include/linux/nfs_xdr.h          |  26 ++++-
 include/linux/sunrpc/xprtsock.h  |   2 +
 include/uapi/linux/nfs.h         |  13 +++
 net/sunrpc/xprtsock.c            | 241 ++++++++++++++++++++++++++-------------
 25 files changed, 677 insertions(+), 227 deletions(-)
Merging nfsd/nfsd-next (1bc483f959c8 SUNRPC: drop stale comment in svc_setup_socket())
$ git merge nfsd/nfsd-next
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 fs/file_table.c                  |  94 ++++--
 fs/lockd/host.c                  |   8 +-
 fs/lockd/mon.c                   | 125 ++-----
 fs/lockd/netns.h                 |   4 +-
 fs/lockd/svc.c                   |   2 +-
 fs/lockd/svc4proc.c              |   2 +-
 fs/lockd/svcproc.c               |   2 +-
 fs/locks.c                       |  37 ++
 fs/namei.c                       |  74 ++++
 fs/nfsd/Kconfig                  |   2 +
 fs/nfsd/Makefile                 |   3 +-
 fs/nfsd/export.c                 |  14 +
 fs/nfsd/filecache.c              | 712 +++++++++++++++++++++++++++++++++++++++
 fs/nfsd/filecache.h              |  44 +++
 fs/nfsd/nfs3proc.c               |   2 +-
 fs/nfsd/nfs3xdr.c                |   6 +-
 fs/nfsd/nfs4layouts.c            |  46 ++-
 fs/nfsd/nfs4proc.c               |  36 +-
 fs/nfsd/nfs4state.c              | 267 ++++++++-------
 fs/nfsd/nfs4xdr.c                |  24 +-
 fs/nfsd/nfscache.c               |   6 +-
 fs/nfsd/nfsctl.c                 |  10 +
 fs/nfsd/nfsfh.c                  |   5 +-
 fs/nfsd/nfsfh.h                  |  20 +-
 fs/nfsd/nfsproc.c                |   2 +-
 fs/nfsd/nfssvc.c                 |  16 +-
 fs/nfsd/state.h                  |  53 ++-
 fs/nfsd/trace.c                  |   2 -
 fs/nfsd/trace.h                  | 137 ++++++++
 fs/nfsd/vfs.c                    | 296 +++++-----------
 fs/nfsd/vfs.h                    |  15 +-
 fs/nfsd/xdr4.h                   |  17 +-
 fs/notify/group.c                |   2 +
 fs/notify/inode_mark.c           |   1 +
 fs/notify/mark.c                 |  70 +---
 include/linux/file.h             |   3 +-
 include/linux/fs.h               |   1 +
 include/linux/fsnotify_backend.h |   5 +-
 include/linux/lockd/lockd.h      |  10 +-
 include/linux/namei.h            |   1 +
 include/linux/sunrpc/cache.h     |  17 +-
 init/main.c                      |   2 +-
 net/sunrpc/auth_gss/auth_gss.c   |  13 +-
 net/sunrpc/cache.c               |  56 ++-
 net/sunrpc/svcsock.c             |  40 ++-
 45 files changed, 1629 insertions(+), 675 deletions(-)
 create mode 100644 fs/nfsd/filecache.c
 create mode 100644 fs/nfsd/filecache.h
Merging orangefs/for-next (548049495cb4 Orangefs: fix some checkpatch.pl complaints that had creeped in.)
$ git merge orangefs/for-next
Auto-merging fs/Makefile
Merge made by the 'recursive' strategy.
 Documentation/ABI/stable/sysfs-fs-orangefs |   87 ++
 Documentation/filesystems/orangefs.txt     |  137 +++
 fs/Kconfig                                 |    1 +
 fs/Makefile                                |    1 +
 fs/orangefs/Kconfig                        |    6 +
 fs/orangefs/Makefile                       |   10 +
 fs/orangefs/acl.c                          |  175 +++
 fs/orangefs/dcache.c                       |  142 +++
 fs/orangefs/devpvfs2-req.c                 | 1004 ++++++++++++++++
 fs/orangefs/dir.c                          |  345 ++++++
 fs/orangefs/downcall.h                     |  138 +++
 fs/orangefs/file.c                         | 1002 ++++++++++++++++
 fs/orangefs/inode.c                        |  469 ++++++++
 fs/orangefs/namei.c                        |  469 ++++++++
 fs/orangefs/protocol.h                     |  443 +++++++
 fs/orangefs/pvfs2-bufmap.c                 |  566 +++++++++
 fs/orangefs/pvfs2-bufmap.h                 |   61 +
 fs/orangefs/pvfs2-cache.c                  |  260 ++++
 fs/orangefs/pvfs2-debug.h                  |  292 +++++
 fs/orangefs/pvfs2-debugfs.c                |  458 +++++++
 fs/orangefs/pvfs2-debugfs.h                |    3 +
 fs/orangefs/pvfs2-dev-proto.h              |  102 ++
 fs/orangefs/pvfs2-kernel.h                 |  861 ++++++++++++++
 fs/orangefs/pvfs2-mod.c                    |  315 +++++
 fs/orangefs/pvfs2-sysfs.c                  | 1787 ++++++++++++++++++++++++++++
 fs/orangefs/pvfs2-sysfs.h                  |    2 +
 fs/orangefs/pvfs2-utils.c                  | 1165 ++++++++++++++++++
 fs/orangefs/super.c                        |  553 +++++++++
 fs/orangefs/symlink.c                      |   31 +
 fs/orangefs/upcall.h                       |  255 ++++
 fs/orangefs/waitqueue.c                    |  529 ++++++++
 fs/orangefs/xattr.c                        |  530 +++++++++
 32 files changed, 12199 insertions(+)
 create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
 create mode 100644 Documentation/filesystems/orangefs.txt
 create mode 100644 fs/orangefs/Kconfig
 create mode 100644 fs/orangefs/Makefile
 create mode 100644 fs/orangefs/acl.c
 create mode 100644 fs/orangefs/dcache.c
 create mode 100644 fs/orangefs/devpvfs2-req.c
 create mode 100644 fs/orangefs/dir.c
 create mode 100644 fs/orangefs/downcall.h
 create mode 100644 fs/orangefs/file.c
 create mode 100644 fs/orangefs/inode.c
 create mode 100644 fs/orangefs/namei.c
 create mode 100644 fs/orangefs/protocol.h
 create mode 100644 fs/orangefs/pvfs2-bufmap.c
 create mode 100644 fs/orangefs/pvfs2-bufmap.h
 create mode 100644 fs/orangefs/pvfs2-cache.c
 create mode 100644 fs/orangefs/pvfs2-debug.h
 create mode 100644 fs/orangefs/pvfs2-debugfs.c
 create mode 100644 fs/orangefs/pvfs2-debugfs.h
 create mode 100644 fs/orangefs/pvfs2-dev-proto.h
 create mode 100644 fs/orangefs/pvfs2-kernel.h
 create mode 100644 fs/orangefs/pvfs2-mod.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.c
 create mode 100644 fs/orangefs/pvfs2-sysfs.h
 create mode 100644 fs/orangefs/pvfs2-utils.c
 create mode 100644 fs/orangefs/super.c
 create mode 100644 fs/orangefs/symlink.c
 create mode 100644 fs/orangefs/upcall.h
 create mode 100644 fs/orangefs/waitqueue.c
 create mode 100644 fs/orangefs/xattr.c
Merging overlayfs/overlayfs-next (8d3095f4ad47 ovl: default permissions)
$ git merge overlayfs/overlayfs-next
Auto-merging fs/overlayfs/super.c
Merge made by the 'recursive' strategy.
 fs/overlayfs/inode.c     | 23 +++++++++++++++++++++++
 fs/overlayfs/overlayfs.h |  3 +++
 fs/overlayfs/super.c     | 28 ++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (46cfbe8e037a 9p: trans_fd, bail out if recv fcall if missing)
$ git merge v9fs/for-next
Merge made by the 'recursive' strategy.
 net/9p/trans_fd.c     | 88 +++++++++++++++++++++++++++------------------------
 net/9p/trans_virtio.c |  2 +-
 2 files changed, 47 insertions(+), 43 deletions(-)
Merging ubifs/linux-next (1cb8f9776c7d ubi: fastmap: Implement produce_free_peb())
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
 drivers/mtd/ubi/attach.c     |  4 +---
 drivers/mtd/ubi/eba.c        |  2 +-
 drivers/mtd/ubi/fastmap-wl.c | 29 +++++++++++++++++++++++++++++
 drivers/mtd/ubi/fastmap.c    |  2 +-
 drivers/mtd/ubi/gluebi.c     |  4 ++--
 drivers/mtd/ubi/ubi-media.h  |  2 +-
 fs/ubifs/debug.c             |  8 ++++----
 fs/ubifs/lpt.c               |  6 ++----
 fs/ubifs/recovery.c          |  2 +-
 fs/ubifs/tnc.c               |  3 +--
 fs/ubifs/ubifs.h             |  4 ++--
 11 files changed, 45 insertions(+), 21 deletions(-)
Merging xfs/for-next (fcd8a399a9d4 Merge branch 'xfs-stats-fixes' into for-next)
$ git merge xfs/for-next
Merge made by the 'recursive' strategy.
 fs/xfs/Makefile                    |   2 +-
 fs/xfs/kmem.c                      |  10 +-
 fs/xfs/libxfs/xfs_alloc.c          |  20 ++--
 fs/xfs/libxfs/xfs_attr.c           |   6 +-
 fs/xfs/libxfs/xfs_attr_leaf.c      |   3 +
 fs/xfs/libxfs/xfs_attr_remote.c    |   2 +-
 fs/xfs/libxfs/xfs_bmap.c           |  30 +++---
 fs/xfs/libxfs/xfs_btree.c          |  21 ++++-
 fs/xfs/libxfs/xfs_btree.h          |  39 ++++----
 fs/xfs/libxfs/xfs_da_btree.c       |   4 +
 fs/xfs/libxfs/xfs_dir2.c           |   6 +-
 fs/xfs/libxfs/xfs_dir2_block.c     |   3 +
 fs/xfs/libxfs/xfs_dir2_data.c      |   3 +
 fs/xfs/libxfs/xfs_dir2_leaf.c      |   3 +
 fs/xfs/libxfs/xfs_dir2_node.c      |   3 +
 fs/xfs/libxfs/xfs_format.h         |  10 +-
 fs/xfs/libxfs/xfs_fs.h             |  10 ++
 fs/xfs/libxfs/xfs_ialloc.c         |  10 +-
 fs/xfs/libxfs/xfs_sb.c             |  10 ++
 fs/xfs/libxfs/xfs_symlink_remote.c |   7 ++
 fs/xfs/xfs_aops.c                  |  23 +++--
 fs/xfs/xfs_attr_list.c             |   2 +-
 fs/xfs/xfs_bmap_util.c             |   2 +-
 fs/xfs/xfs_buf.c                   |  21 +++--
 fs/xfs/xfs_dir2_readdir.c          |   2 +-
 fs/xfs/xfs_dquot.c                 |  14 +--
 fs/xfs/xfs_file.c                  |  29 +++---
 fs/xfs/xfs_icache.c                |  18 ++--
 fs/xfs/xfs_inode.c                 |   6 +-
 fs/xfs/xfs_ioctl.c                 |   8 +-
 fs/xfs/xfs_ioctl32.c               |   2 +-
 fs/xfs/xfs_iomap.c                 |  51 ++++++----
 fs/xfs/xfs_iops.c                  |   4 +-
 fs/xfs/xfs_linux.h                 |   7 ++
 fs/xfs/xfs_log.c                   |  93 +++++++++++++++----
 fs/xfs/xfs_log.h                   |   1 +
 fs/xfs/xfs_log_priv.h              |  51 ++++++++++
 fs/xfs/xfs_log_recover.c           |  12 ++-
 fs/xfs/xfs_message.c               |   7 ++
 fs/xfs/xfs_mount.c                 |  11 ++-
 fs/xfs/xfs_mount.h                 |   1 +
 fs/xfs/xfs_pnfs.c                  |   5 +
 fs/xfs/xfs_qm.c                    |  14 +--
 fs/xfs/xfs_stats.c                 |  93 +++++++++----------
 fs/xfs/xfs_stats.h                 |  36 +++++---
 fs/xfs/xfs_super.c                 |  49 ++++++++--
 fs/xfs/xfs_sysctl.c                |  15 +--
 fs/xfs/xfs_sysfs.c                 | 185 ++++++++++++++++++++++---------------
 fs/xfs/xfs_sysfs.h                 |   1 +
 fs/xfs/xfs_trace.h                 |   1 +
 fs/xfs/xfs_trans.c                 |   6 +-
 fs/xfs/xfs_trans_ail.c             |  12 +--
 52 files changed, 658 insertions(+), 326 deletions(-)
Merging file-locks/linux-next (616fb38fa7a9 locks: cleanup posix_lock_inode_wait and flock_lock_inode_wait)
$ git merge file-locks/linux-next
Auto-merging include/linux/fs.h
Auto-merging fs/nfs/nfs4proc.c
Auto-merging fs/locks.c
Auto-merging fs/gfs2/file.c
Auto-merging fs/cifs/file.c
Merge made by the 'recursive' strategy.
 drivers/staging/lustre/lustre/llite/file.c |   8 +--
 fs/9p/vfs_file.c                           |   4 +-
 fs/ceph/locks.c                            |   4 +-
 fs/cifs/file.c                             |   2 +-
 fs/dlm/plock.c                             |   4 +-
 fs/fuse/file.c                             |   2 +-
 fs/gfs2/file.c                             |   8 +--
 fs/lockd/clntproc.c                        |  13 +---
 fs/locks.c                                 | 106 ++++++++++++++++++-----------
 fs/nfs/file.c                              |  13 +---
 fs/nfs/nfs4proc.c                          |  13 +---
 fs/ocfs2/locks.c                           |   8 +--
 include/linux/fs.h                         |  21 ++----
 include/trace/events/filelock.h            |  38 ++++++++++-
 14 files changed, 127 insertions(+), 117 deletions(-)
Merging vfs/for-next (397d425dc26d vfs: Test for and handle paths that are unreachable from their mnt_root)
$ git merge vfs/for-next
Already up-to-date.
Merging pci/next (92034b73a1aa Merge branch 'pci/host-rcar' into next)
$ git merge pci/next
Auto-merging drivers/pci/quirks.c
Auto-merging drivers/pci/probe.c
Auto-merging drivers/pci/pci-driver.c
Auto-merging drivers/pci/msi.c
Auto-merging arch/x86/pci/common.c
Auto-merging arch/powerpc/platforms/pseries/setup.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt
Merge made by the 'recursive' strategy.
 .../bindings/arm/hisilicon/hisilicon.txt           |  17 +
 .../devicetree/bindings/pci/altera-pcie-msi.txt    |  28 +
 .../devicetree/bindings/pci/altera-pcie.txt        |  49 ++
 .../devicetree/bindings/pci/brcm,iproc-pcie.txt    |  20 +
 .../devicetree/bindings/pci/designware-pcie.txt    |   3 +-
 .../devicetree/bindings/pci/hisilicon-pcie.txt     |  44 ++
 .../devicetree/bindings/pci/host-generic-pci.txt   |   5 +-
 MAINTAINERS                                        |  23 +
 arch/arm/include/asm/Kbuild                        |   1 +
 arch/arm/include/asm/mach/pci.h                    |   6 -
 arch/arm/kernel/bios32.c                           |  12 +-
 arch/arm64/boot/dts/amd/amd-overdrive.dts          |   1 -
 arch/powerpc/platforms/pseries/setup.c             |  14 +-
 arch/sparc/kernel/pci.c                            |   7 +-
 arch/sparc/kernel/pci_common.c                     |  17 +-
 arch/sparc/kernel/pci_impl.h                       |   1 +
 arch/x86/pci/common.c                              |   8 +
 arch/x86/pci/legacy.c                              |   2 +-
 drivers/of/of_pci.c                                |  26 +
 drivers/pci/host/Kconfig                           |  30 +-
 drivers/pci/host/Makefile                          |   3 +
 drivers/pci/host/pci-dra7xx.c                      |   7 +
 drivers/pci/host/pci-exynos.c                      |   5 +-
 drivers/pci/host/pci-host-generic.c                |  41 +-
 drivers/pci/host/pci-imx6.c                        |   5 +-
 drivers/pci/host/pci-keystone-dw.c                 |   8 +-
 drivers/pci/host/pci-keystone.h                    |   2 +-
 drivers/pci/host/pci-mvebu.c                       | 473 ++++++++++++-----
 drivers/pci/host/pci-tegra.c                       |   4 +-
 drivers/pci/host/pci-xgene.c                       |  22 -
 drivers/pci/host/pcie-altera-msi.c                 | 312 +++++++++++
 drivers/pci/host/pcie-altera.c                     | 579 +++++++++++++++++++++
 drivers/pci/host/pcie-designware.c                 | 375 ++++++-------
 drivers/pci/host/pcie-designware.h                 |  20 +-
 drivers/pci/host/pcie-hisi.c                       | 198 +++++++
 drivers/pci/host/pcie-iproc-platform.c             |  27 +
 drivers/pci/host/pcie-iproc.c                      | 163 +++++-
 drivers/pci/host/pcie-iproc.h                      |  20 +-
 drivers/pci/host/pcie-rcar.c                       |  86 +--
 drivers/pci/host/pcie-spear13xx.c                  |  24 +-
 drivers/pci/hotplug/pciehp_ctrl.c                  |  75 +--
 drivers/pci/iov.c                                  | 101 ++--
 drivers/pci/msi.c                                  |  34 +-
 drivers/pci/pci-driver.c                           |   8 +-
 drivers/pci/pci.c                                  | 225 +++++++-
 drivers/pci/pci.h                                  |   1 +
 drivers/pci/pcie/aer/aerdrv_core.c                 |  28 +
 drivers/pci/probe.c                                |   6 +
 drivers/pci/quirks.c                               |  58 +++
 drivers/pci/setup-bus.c                            |  50 +-
 drivers/pci/setup-res.c                            |   7 +
 include/linux/aer.h                                |   5 +
 include/linux/msi.h                                |   2 +
 include/linux/of_pci.h                             |   3 +
 include/linux/pci.h                                |  12 +
 include/uapi/linux/pci_regs.h                      |  43 +-
 56 files changed, 2727 insertions(+), 619 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt
 create mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt
 create mode 100644 Documentation/devicetree/bindings/pci/hisilicon-pcie.txt
 create mode 100644 drivers/pci/host/pcie-altera-msi.c
 create mode 100644 drivers/pci/host/pcie-altera.c
 create mode 100644 drivers/pci/host/pcie-hisi.c
$ git am -3 ../patches/0001-PCI-altera-disable-MSI-driver-for-now.patch
Applying: PCI: altera: disable MSI driver for now
$ git reset HEAD^
Unstaged changes after reset:
M       drivers/pci/host/Kconfig
$ git add -A .
$ git commit -v -a --amend
[master 782b52e186d5] Merge remote-tracking branch 'pci/next'
 Date: Mon Nov 2 10:39:29 2015 +1100
Merging hid/for-next (a34ab1fb2bb1 Merge branch 'for-4.4/upstream' into for-next)
$ git merge hid/for-next
Auto-merging drivers/hid/hid-core.c
Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
Removing Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
Merge made by the 'recursive' strategy.
 .../sysfs-driver-hid-roccat-arvo                   |   0
 .../sysfs-driver-hid-roccat-isku                   |   0
 .../ABI/obsolete/sysfs-driver-hid-roccat-koneplus  |  99 ++-
 .../sysfs-driver-hid-roccat-konepure               |   0
 .../ABI/obsolete/sysfs-driver-hid-roccat-kovaplus  |  50 ++
 .../sysfs-driver-hid-roccat-lua                    |   0
 .../ABI/obsolete/sysfs-driver-hid-roccat-pyra      |  50 ++
 .../sysfs-driver-hid-roccat-ryos                   |   0
 .../sysfs-driver-hid-roccat-savu                   |   0
 Documentation/ABI/testing/sysfs-driver-hid-corsair |  15 +
 .../ABI/testing/sysfs-driver-hid-roccat-koneplus   |  96 ---
 .../ABI/testing/sysfs-driver-hid-roccat-kovaplus   |  49 --
 .../ABI/testing/sysfs-driver-hid-roccat-pyra       |  49 --
 drivers/hid/Kconfig                                |  15 +-
 drivers/hid/Makefile                               |   1 +
 drivers/hid/hid-appleir.c                          |   4 +-
 drivers/hid/hid-aureal.c                           |   3 +-
 drivers/hid/hid-core.c                             |   9 +-
 drivers/hid/hid-corsair.c                          | 673 +++++++++++++++++++++
 drivers/hid/hid-dr.c                               |  58 ++
 drivers/hid/hid-elecom.c                           |   2 +-
 drivers/hid/hid-elo.c                              |   4 +-
 drivers/hid/hid-ids.h                              |   7 +
 drivers/hid/hid-input.c                            |  10 +-
 drivers/hid/hid-lenovo.c                           |   4 +-
 drivers/hid/hid-logitech-hidpp.c                   | 163 ++++-
 drivers/hid/hid-magicmouse.c                       |   8 +-
 drivers/hid/hid-microsoft.c                        |   2 +
 drivers/hid/hid-multitouch.c                       |  68 ++-
 drivers/hid/hid-ntrig.c                            |   6 +-
 drivers/hid/hid-prodikeys.c                        |   4 +-
 drivers/hid/hid-rmi.c                              |  11 +-
 drivers/hid/hid-saitek.c                           |   2 +
 drivers/hid/hid-sensor-hub.c                       |  25 +-
 drivers/hid/hid-sony.c                             |  13 +-
 drivers/hid/hid-uclogic.c                          |   6 +-
 drivers/hid/i2c-hid/i2c-hid.c                      |   1 +
 drivers/hid/usbhid/hid-quirks.c                    |   2 +
 drivers/hid/wacom_sys.c                            |  62 +-
 drivers/hid/wacom_wac.c                            | 192 ++++--
 drivers/hid/wacom_wac.h                            |   8 +-
 include/linux/hid.h                                |   4 +-
 42 files changed, 1469 insertions(+), 306 deletions(-)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-arvo (100%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-isku (100%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-konepure (100%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-lua (100%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-ryos (100%)
 rename Documentation/ABI/{testing => obsolete}/sysfs-driver-hid-roccat-savu (100%)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-corsair
 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus
 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus
 delete mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-pyra
 create mode 100644 drivers/hid/hid-corsair.c
Merging i2c/i2c/for-next (121c7794864c Merge branch 'i2c/for-4.4' into i2c/for-next)
$ git merge i2c/i2c/for-next
Resolved 'MAINTAINERS' using previous resolution.
Removing include/linux/i2c/i2c-rcar.h
Auto-merging drivers/i2c/busses/i2c-ismt.c
Auto-merging MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master cdf10298a443] Merge remote-tracking branch 'i2c/i2c/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/acpi/enumeration.txt                 |  11 +-
 Documentation/acpi/i2c-muxes.txt                   |  58 ++
 .../devicetree/bindings/i2c/i2c-davinci.txt        |   6 +-
 Documentation/devicetree/bindings/i2c/i2c-imx.txt  |   9 +
 Documentation/devicetree/bindings/i2c/i2c-rcar.txt |   1 +
 .../devicetree/bindings/i2c/i2c-sh_mobile.txt      |   1 +
 .../devicetree/bindings/i2c/i2c-uniphier-f.txt     |  25 +
 .../devicetree/bindings/i2c/i2c-uniphier.txt       |  25 +
 Documentation/i2c/busses/i2c-i801                  |   2 +
 MAINTAINERS                                        |   8 +-
 drivers/i2c/busses/Kconfig                         |  24 +-
 drivers/i2c/busses/Makefile                        |   2 +
 drivers/i2c/busses/i2c-at91.c                      |  82 ++-
 drivers/i2c/busses/i2c-au1550.c                    |  60 +--
 drivers/i2c/busses/i2c-davinci.c                   |   8 +
 drivers/i2c/busses/i2c-designware-core.c           |  74 ++-
 drivers/i2c/busses/i2c-designware-core.h           |  10 +-
 drivers/i2c/busses/i2c-designware-pcidrv.c         |  33 +-
 drivers/i2c/busses/i2c-designware-platdrv.c        |  81 +--
 drivers/i2c/busses/i2c-i801.c                      |  16 +-
 drivers/i2c/busses/i2c-ibm_iic.c                   |   1 +
 drivers/i2c/busses/i2c-img-scb.c                   |  73 +--
 drivers/i2c/busses/i2c-imx.c                       |  73 ++-
 drivers/i2c/busses/i2c-ismt.c                      |  80 +--
 drivers/i2c/busses/i2c-meson.c                     |   1 +
 drivers/i2c/busses/i2c-mt65xx.c                    |  16 +
 drivers/i2c/busses/i2c-ocores.c                    |  31 +-
 drivers/i2c/busses/i2c-pnx.c                       |   7 +-
 drivers/i2c/busses/i2c-pxa.c                       |  41 +-
 drivers/i2c/busses/i2c-rcar.c                      |  24 +-
 drivers/i2c/busses/i2c-rk3x.c                      |   1 +
 drivers/i2c/busses/i2c-sh_mobile.c                 |   1 +
 drivers/i2c/busses/i2c-sirf.c                      |  26 +-
 drivers/i2c/busses/i2c-stu300.c                    |   1 +
 drivers/i2c/busses/i2c-tegra.c                     |   1 -
 drivers/i2c/busses/i2c-uniphier-f.c                | 584 +++++++++++++++++++++
 drivers/i2c/busses/i2c-uniphier.c                  | 441 ++++++++++++++++
 drivers/i2c/i2c-core.c                             |  82 ++-
 drivers/i2c/i2c-dev.c                              |  23 +-
 drivers/i2c/i2c-mux.c                              |   8 +
 drivers/mfd/intel_quark_i2c_gpio.c                 |  33 +-
 drivers/mfd/mfd-core.c                             |  52 +-
 drivers/misc/eeprom/at24.c                         |  22 +-
 fs/compat_ioctl.c                                  |   2 +-
 include/linux/acpi.h                               |   5 +
 include/linux/i2c-ocores.h                         |   1 +
 include/linux/i2c/i2c-rcar.h                       |  10 -
 include/linux/mfd/core.h                           |  10 +-
 include/uapi/linux/i2c-dev.h                       |   4 +-
 49 files changed, 1777 insertions(+), 413 deletions(-)
 create mode 100644 Documentation/acpi/i2c-muxes.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier-f.txt
 create mode 100644 Documentation/devicetree/bindings/i2c/i2c-uniphier.txt
 create mode 100644 drivers/i2c/busses/i2c-uniphier-f.c
 create mode 100644 drivers/i2c/busses/i2c-uniphier.c
 delete mode 100644 include/linux/i2c/i2c-rcar.h
Merging jdelvare-hwmon/master (902fd32b7711 hwmon: (k10temp) Remove duplicate pci-id define)
$ git merge jdelvare-hwmon/master
Merge made by the 'recursive' strategy.
 drivers/hwmon/k10temp.c | 1 -
 1 file changed, 1 deletion(-)
Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge dmi/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (3b5ea47dbff0 hwmon: (fam15h_power) Add max compute unit accumulated power)
$ git merge hwmon-staging/hwmon-next
Auto-merging drivers/hwmon/Makefile
Auto-merging drivers/hwmon/Kconfig
Merge made by the 'recursive' strategy.
 Documentation/hwmon/lm75     |   5 +-
 Documentation/hwmon/max31790 |  37 +++
 drivers/hwmon/Kconfig        |  10 +
 drivers/hwmon/Makefile       |   1 +
 drivers/hwmon/abx500.c       |   2 +-
 drivers/hwmon/coretemp.c     |   2 +-
 drivers/hwmon/fam15h_power.c |  87 +++++--
 drivers/hwmon/ibmpowernv.c   |   7 +
 drivers/hwmon/ina2xx.c       | 243 +++++++----------
 drivers/hwmon/lm75.c         |   7 +
 drivers/hwmon/max31790.c     | 603 +++++++++++++++++++++++++++++++++++++++++++
 drivers/hwmon/nct6775.c      | 101 +++++++-
 12 files changed, 926 insertions(+), 179 deletions(-)
 create mode 100644 Documentation/hwmon/max31790
 create mode 100644 drivers/hwmon/max31790.c
Merging v4l-dvb/master (8132ccfb864a Merge branch 'v4l_for_linus' into to_next)
$ git merge v4l-dvb/master
Auto-merging drivers/media/usb/dvb-usb-v2/rtl28xxu.c
Auto-merging drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
Auto-merging drivers/media/platform/soc_camera/atmel-isi.h
Auto-merging drivers/media/pci/netup_unidvb/netup_unidvb_spi.c
Auto-merging MAINTAINERS
Removing Documentation/DocBook/media/dvb/kdapi.xml
Merge made by the 'recursive' strategy.
 Documentation/DocBook/device-drivers.tmpl          |   81 +-
 Documentation/DocBook/media/dvb/dvbapi.xml         |    3 -
 Documentation/DocBook/media/dvb/kdapi.xml          | 2309 --------------------
 Documentation/DocBook/media/v4l/biblio.xml         |   18 +
 Documentation/DocBook/media/v4l/compat.xml         |   20 +
 Documentation/DocBook/media/v4l/controls.xml       |   14 +
 Documentation/DocBook/media/v4l/dev-sdr.xml        |   32 +-
 Documentation/DocBook/media/v4l/io.xml             |   10 +-
 Documentation/DocBook/media/v4l/pixfmt.xml         |  111 +-
 Documentation/DocBook/media/v4l/v4l2.xml           |   13 +-
 .../DocBook/media/v4l/vidioc-encoder-cmd.xml       |    2 +-
 .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml       |    7 +
 Documentation/DocBook/media/v4l/vidioc-g-fmt.xml   |    2 +-
 .../DocBook/media/v4l/vidioc-g-modulator.xml       |   14 +-
 Documentation/DocBook/media/v4l/vidioc-g-tuner.xml |   16 +
 .../DocBook/media/v4l/vidioc-querycap.xml          |    6 +
 .../DocBook/media/v4l/vidioc-queryctrl.xml         |   21 +-
 Documentation/DocBook/media_api.tmpl               |    2 +-
 .../bindings/media/exynos-jpeg-codec.txt           |    3 +-
 Documentation/video4linux/CARDLIST.saa7134         |    1 +
 Documentation/video4linux/v4l2-pci-skeleton.c      |    4 +-
 MAINTAINERS                                        |    8 +
 drivers/input/touchscreen/sur40.c                  |   20 +-
 drivers/media/dvb-core/demux.h                     |  619 ++++--
 drivers/media/dvb-core/dmxdev.c                    |   10 +-
 drivers/media/dvb-core/dvb-usb-ids.h               |    1 +
 drivers/media/dvb-core/dvb_ca_en50221.h            |   99 +-
 drivers/media/dvb-core/dvb_demux.c                 |   11 +-
 drivers/media/dvb-core/dvb_net.c                   |    5 +-
 drivers/media/dvb-core/dvbdev.h                    |    4 -
 drivers/media/dvb-frontends/drxd_hard.c            |    3 +-
 drivers/media/dvb-frontends/rtl2832_sdr.c          |   23 +-
 drivers/media/i2c/ml86v7667.c                      |   11 +-
 drivers/media/i2c/s5c73m3/s5c73m3-core.c           |    2 +-
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |    1 +
 drivers/media/i2c/smiapp/smiapp-core.c             |    1 +
 drivers/media/i2c/tvp5150.c                        |   14 +-
 drivers/media/media-entity.c                       |    4 +-
 drivers/media/pci/bt8xx/bttv-driver.c              |    5 +-
 drivers/media/pci/cobalt/Kconfig                   |    2 +-
 drivers/media/pci/cobalt/cobalt-cpld.c             |    8 +-
 drivers/media/pci/cobalt/cobalt-driver.h           |    6 +-
 drivers/media/pci/cobalt/cobalt-irq.c              |    7 +-
 drivers/media/pci/cobalt/cobalt-v4l2.c             |   24 +-
 drivers/media/pci/cx18/cx18-mailbox.c              |    2 +-
 drivers/media/pci/cx23885/cx23885-417.c            |   13 +-
 drivers/media/pci/cx23885/cx23885-core.c           |   24 +-
 drivers/media/pci/cx23885/cx23885-dvb.c            |   11 +-
 drivers/media/pci/cx23885/cx23885-vbi.c            |   18 +-
 drivers/media/pci/cx23885/cx23885-video.c          |   29 +-
 drivers/media/pci/cx23885/cx23885.h                |    2 +-
 drivers/media/pci/cx25821/cx25821-alsa.c           |    2 +-
 drivers/media/pci/cx25821/cx25821-video.c          |   24 +-
 drivers/media/pci/cx25821/cx25821.h                |    3 +-
 drivers/media/pci/cx88/cx88-alsa.c                 |    2 +-
 drivers/media/pci/cx88/cx88-blackbird.c            |   15 +-
 drivers/media/pci/cx88/cx88-core.c                 |    8 +-
 drivers/media/pci/cx88/cx88-dvb.c                  |   13 +-
 drivers/media/pci/cx88/cx88-mpeg.c                 |   14 +-
 drivers/media/pci/cx88/cx88-vbi.c                  |   19 +-
 drivers/media/pci/cx88/cx88-video.c                |   21 +-
 drivers/media/pci/cx88/cx88.h                      |    2 +-
 drivers/media/pci/dt3155/dt3155.c                  |   20 +-
 drivers/media/pci/dt3155/dt3155.h                  |    3 +-
 drivers/media/pci/ivtv/ivtv-alsa-main.c            |   14 +-
 drivers/media/pci/ivtv/ivtv-yuv.c                  |   12 +-
 drivers/media/pci/netup_unidvb/netup_unidvb.h      |    4 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_ci.c   |   10 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c |   35 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c  |    2 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_spi.c  |    4 +-
 drivers/media/pci/saa7134/saa7134-cards.c          |   43 +
 drivers/media/pci/saa7134/saa7134-core.c           |   14 +-
 drivers/media/pci/saa7134/saa7134-input.c          |    7 +
 drivers/media/pci/saa7134/saa7134-ts.c             |   16 +-
 drivers/media/pci/saa7134/saa7134-vbi.c            |   12 +-
 drivers/media/pci/saa7134/saa7134-video.c          |   23 +-
 drivers/media/pci/saa7134/saa7134.h                |    5 +-
 drivers/media/pci/saa7164/Kconfig                  |    1 -
 drivers/media/pci/saa7164/saa7164-encoder.c        |  653 ++----
 drivers/media/pci/saa7164/saa7164-vbi.c            |  629 +-----
 drivers/media/pci/saa7164/saa7164.h                |   26 +-
 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |   48 +-
 drivers/media/pci/solo6x10/solo6x10-v4l2.c         |   21 +-
 drivers/media/pci/solo6x10/solo6x10.h              |    4 +-
 drivers/media/pci/sta2x11/sta2x11_vip.c            |   28 +-
 drivers/media/pci/ttpci/av7110.c                   |    9 +-
 drivers/media/pci/ttpci/av7110_av.c                |    6 +-
 drivers/media/pci/tw68/tw68-video.c                |   22 +-
 drivers/media/pci/tw68/tw68.h                      |    3 +-
 drivers/media/platform/Kconfig                     |    2 +-
 drivers/media/platform/am437x/am437x-vpfe.c        |   43 +-
 drivers/media/platform/am437x/am437x-vpfe.h        |    3 +-
 drivers/media/platform/blackfin/bfin_capture.c     |   37 +-
 drivers/media/platform/coda/coda-bit.c             |  135 +-
 drivers/media/platform/coda/coda-common.c          |   26 +-
 drivers/media/platform/coda/coda-jpeg.c            |    6 +-
 drivers/media/platform/coda/coda.h                 |    8 +-
 drivers/media/platform/coda/trace.h                |   18 +-
 drivers/media/platform/davinci/vpbe_display.c      |   34 +-
 drivers/media/platform/davinci/vpif_capture.c      |   33 +-
 drivers/media/platform/davinci/vpif_capture.h      |    2 +-
 drivers/media/platform/davinci/vpif_display.c      |   42 +-
 drivers/media/platform/davinci/vpif_display.h      |    2 +-
 drivers/media/platform/exynos-gsc/gsc-core.h       |    4 +-
 drivers/media/platform/exynos-gsc/gsc-m2m.c        |   25 +-
 drivers/media/platform/exynos4-is/fimc-capture.c   |   33 +-
 drivers/media/platform/exynos4-is/fimc-core.c      |    2 +-
 drivers/media/platform/exynos4-is/fimc-core.h      |    4 +-
 drivers/media/platform/exynos4-is/fimc-is.h        |    2 +-
 drivers/media/platform/exynos4-is/fimc-isp-video.c |   18 +-
 drivers/media/platform/exynos4-is/fimc-isp-video.h |    2 +-
 drivers/media/platform/exynos4-is/fimc-isp.h       |    4 +-
 drivers/media/platform/exynos4-is/fimc-lite.c      |   25 +-
 drivers/media/platform/exynos4-is/fimc-lite.h      |    4 +-
 drivers/media/platform/exynos4-is/fimc-m2m.c       |   23 +-
 drivers/media/platform/exynos4-is/mipi-csis.c      |    3 +-
 drivers/media/platform/m2m-deinterlace.c           |   25 +-
 drivers/media/platform/marvell-ccic/mcam-core.c    |   46 +-
 drivers/media/platform/marvell-ccic/mcam-core.h    |    2 +-
 drivers/media/platform/mx2_emmaprp.c               |   17 +-
 drivers/media/platform/omap3isp/ispstat.c          |    5 +-
 drivers/media/platform/omap3isp/ispstat.h          |    2 +-
 drivers/media/platform/omap3isp/ispvideo.c         |   27 +-
 drivers/media/platform/omap3isp/ispvideo.h         |    4 +-
 drivers/media/platform/rcar_jpu.c                  |   68 +-
 drivers/media/platform/s3c-camif/camif-capture.c   |   26 +-
 drivers/media/platform/s3c-camif/camif-core.c      |    2 +-
 drivers/media/platform/s3c-camif/camif-core.h      |    4 +-
 drivers/media/platform/s5p-g2d/g2d.c               |   19 +-
 drivers/media/platform/s5p-jpeg/jpeg-core.c        |  475 +++-
 drivers/media/platform/s5p-jpeg/jpeg-core.h        |   41 +-
 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c  |   80 +-
 drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.h  |   11 +-
 drivers/media/platform/s5p-jpeg/jpeg-regs.h        |   85 +-
 drivers/media/platform/s5p-mfc/s5p_mfc.c           |  106 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_common.h    |    4 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_dec.c       |   40 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_enc.c       |   75 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c    |   46 +-
 drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c    |   68 +-
 drivers/media/platform/s5p-tv/mixer.h              |    4 +-
 drivers/media/platform/s5p-tv/mixer_grp_layer.c    |    2 +-
 drivers/media/platform/s5p-tv/mixer_reg.c          |    2 +-
 drivers/media/platform/s5p-tv/mixer_video.c        |   13 +-
 drivers/media/platform/s5p-tv/mixer_vp_layer.c     |    5 +-
 drivers/media/platform/sh_veu.c                    |   22 +-
 drivers/media/platform/sh_vou.c                    |   29 +-
 drivers/media/platform/soc_camera/atmel-isi.c      |  153 +-
 .../media/platform/soc_camera}/atmel-isi.h         |    7 +-
 drivers/media/platform/soc_camera/mx2_camera.c     |   24 +-
 drivers/media/platform/soc_camera/mx3_camera.c     |   30 +-
 drivers/media/platform/soc_camera/rcar_vin.c       |   64 +-
 .../platform/soc_camera/sh_mobile_ceu_camera.c     |   63 +-
 drivers/media/platform/soc_camera/soc_camera.c     |    4 +-
 drivers/media/platform/sti/bdisp/bdisp-v4l2.c      |   26 +-
 drivers/media/platform/sti/c8sectpfe/Kconfig       |    1 -
 .../media/platform/sti/c8sectpfe/c8sectpfe-core.c  |    4 +-
 drivers/media/platform/ti-vpe/vpe.c                |   44 +-
 drivers/media/platform/vim2m.c                     |   57 +-
 drivers/media/platform/vivid/Kconfig               |    8 +
 drivers/media/platform/vivid/vivid-core.c          |    7 +-
 drivers/media/platform/vivid/vivid-core.h          |    6 +-
 drivers/media/platform/vivid/vivid-ctrls.c         |   55 +-
 drivers/media/platform/vivid/vivid-kthread-cap.c   |   73 +-
 drivers/media/platform/vivid/vivid-kthread-out.c   |   34 +-
 drivers/media/platform/vivid/vivid-osd.c           |    1 +
 drivers/media/platform/vivid/vivid-sdr-cap.c       |   83 +-
 drivers/media/platform/vivid/vivid-tpg-colors.c    |  328 ++-
 drivers/media/platform/vivid/vivid-tpg-colors.h    |    4 +-
 drivers/media/platform/vivid/vivid-tpg.c           |   91 +
 drivers/media/platform/vivid/vivid-vbi-cap.c       |   40 +-
 drivers/media/platform/vivid/vivid-vbi-out.c       |   20 +-
 drivers/media/platform/vivid/vivid-vid-cap.c       |   18 +-
 drivers/media/platform/vivid/vivid-vid-common.c    |   56 +
 drivers/media/platform/vivid/vivid-vid-out.c       |   18 +-
 drivers/media/platform/vsp1/vsp1_rpf.c             |    4 +-
 drivers/media/platform/vsp1/vsp1_video.c           |   23 +-
 drivers/media/platform/vsp1/vsp1_video.h           |    8 +-
 drivers/media/platform/vsp1/vsp1_wpf.c             |    4 +-
 drivers/media/platform/xilinx/xilinx-dma.c         |   29 +-
 drivers/media/platform/xilinx/xilinx-dma.h         |    2 +-
 drivers/media/usb/airspy/airspy.c                  |   26 +-
 drivers/media/usb/au0828/au0828-vbi.c              |   10 +-
 drivers/media/usb/au0828/au0828-video.c            |   48 +-
 drivers/media/usb/au0828/au0828.h                  |    3 +-
 drivers/media/usb/cx231xx/cx231xx-video.c          |    3 +-
 drivers/media/usb/dvb-usb-v2/dvbsky.c              |    4 +
 drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    2 +
 drivers/media/usb/em28xx/em28xx-vbi.c              |   10 +-
 drivers/media/usb/em28xx/em28xx-video.c            |   37 +-
 drivers/media/usb/em28xx/em28xx.h                  |    3 +-
 drivers/media/usb/go7007/go7007-driver.c           |   29 +-
 drivers/media/usb/go7007/go7007-fw.c               |    6 +-
 drivers/media/usb/go7007/go7007-priv.h             |    4 +-
 drivers/media/usb/go7007/go7007-v4l2.c             |   22 +-
 drivers/media/usb/gspca/gspca.c                    |    4 +-
 drivers/media/usb/hackrf/hackrf.c                  | 1086 ++++++---
 drivers/media/usb/msi2500/msi2500.c                |   19 +-
 drivers/media/usb/pwc/pwc-if.c                     |   35 +-
 drivers/media/usb/pwc/pwc-uncompress.c             |    6 +-
 drivers/media/usb/pwc/pwc.h                        |    4 +-
 drivers/media/usb/s2255/s2255drv.c                 |   29 +-
 drivers/media/usb/stk1160/stk1160-v4l.c            |   17 +-
 drivers/media/usb/stk1160/stk1160-video.c          |   12 +-
 drivers/media/usb/stk1160/stk1160.h                |    4 +-
 drivers/media/usb/tm6000/tm6000-alsa.c             |    2 +-
 drivers/media/usb/ttusb-dec/ttusb_dec.c            |   12 +-
 drivers/media/usb/usbtv/usbtv-video.c              |   24 +-
 drivers/media/usb/usbtv/usbtv.h                    |    3 +-
 drivers/media/usb/uvc/uvc_driver.c                 |    3 +
 drivers/media/usb/uvc/uvc_queue.c                  |   29 +-
 drivers/media/usb/uvc/uvc_video.c                  |   23 +-
 drivers/media/usb/uvc/uvcvideo.h                   |    7 +-
 drivers/media/v4l2-core/Makefile                   |    4 +-
 drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |   51 +-
 drivers/media/v4l2-core/v4l2-ctrls.c               |   14 +-
 drivers/media/v4l2-core/v4l2-dev.c                 |   14 +-
 drivers/media/v4l2-core/v4l2-ioctl.c               |   51 +-
 drivers/media/v4l2-core/v4l2-mem2mem.c             |   33 +-
 drivers/media/v4l2-core/v4l2-trace.c               |   10 +-
 drivers/media/v4l2-core/vb2-trace.c                |    9 +
 drivers/media/v4l2-core/videobuf-core.c            |    4 +-
 drivers/media/v4l2-core/videobuf2-core.c           | 2038 +++--------------
 drivers/media/v4l2-core/videobuf2-dma-contig.c     |    7 +-
 drivers/media/v4l2-core/videobuf2-dma-sg.c         |    7 +-
 drivers/media/v4l2-core/videobuf2-internal.h       |  161 ++
 drivers/media/v4l2-core/videobuf2-memops.c         |    2 +-
 drivers/media/v4l2-core/videobuf2-v4l2.c           | 1661 ++++++++++++++
 drivers/media/v4l2-core/videobuf2-vmalloc.c        |    2 +-
 drivers/staging/media/bcm2048/radio-bcm2048.c      |   20 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.c    |   45 +-
 drivers/staging/media/davinci_vpfe/vpfe_video.h    |    3 +-
 drivers/staging/media/lirc/lirc_sasem.c            |    2 +-
 drivers/staging/media/lirc/lirc_serial.c           |   32 +-
 drivers/staging/media/omap4iss/iss.c               |    5 +-
 drivers/staging/media/omap4iss/iss_video.c         |   26 +-
 drivers/staging/media/omap4iss/iss_video.h         |    6 +-
 drivers/usb/gadget/function/uvc_queue.c            |   28 +-
 drivers/usb/gadget/function/uvc_queue.h            |    4 +-
 include/media/davinci/vpbe_display.h               |    3 +-
 include/media/lirc_dev.h                           |  120 +-
 include/media/media-entity.h                       |    7 +
 include/media/soc_camera.h                         |    2 +-
 include/media/tuner-types.h                        |  182 +-
 include/media/tuner.h                              |  152 +-
 include/media/tveeprom.h                           |   83 +-
 include/media/v4l2-dv-timings.h                    |   34 +-
 include/media/v4l2-ioctl.h                         |    8 +
 include/media/v4l2-mem2mem.h                       |   11 +-
 include/media/videobuf2-core.h                     |  235 +-
 include/media/videobuf2-dma-contig.h               |    2 +-
 include/media/videobuf2-dma-sg.h                   |    2 +-
 include/media/videobuf2-dvb.h                      |    8 +-
 include/media/videobuf2-memops.h                   |    2 +-
 include/media/videobuf2-v4l2.h                     |  149 ++
 include/media/videobuf2-vmalloc.h                  |    2 +-
 include/trace/events/v4l2.h                        |   63 +-
 include/trace/events/vb2.h                         |   65 +
 include/uapi/linux/v4l2-controls.h                 |    1 +
 include/uapi/linux/videodev2.h                     |   34 +-
 scripts/kernel-doc                                 |   25 +
 262 files changed, 7846 insertions(+), 7866 deletions(-)
 delete mode 100644 Documentation/DocBook/media/dvb/kdapi.xml
 rename {include/media => drivers/media/platform/soc_camera}/atmel-isi.h (95%)
 create mode 100644 drivers/media/v4l2-core/vb2-trace.c
 create mode 100644 drivers/media/v4l2-core/videobuf2-internal.h
 create mode 100644 drivers/media/v4l2-core/videobuf2-v4l2.c
 create mode 100644 include/media/videobuf2-v4l2.h
 create mode 100644 include/trace/events/vb2.h
Merging kbuild/for-next (bc036b590fd1 Merge branch 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging scripts/package/builddeb
Auto-merging scripts/kconfig/Makefile
Removing scripts/coccinelle/misc/simple_return.cocci
Auto-merging lib/Kconfig.debug
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Merge made by the 'recursive' strategy.
 Documentation/kbuild/Kconfig.recursion-issue-01    |  57 ++
 Documentation/kbuild/Kconfig.recursion-issue-02    |  63 ++
 Documentation/kbuild/Kconfig.select-break          |  33 +
 Documentation/kbuild/kconfig-language.txt          | 161 +++++
 Documentation/lto-build                            | 173 ++++++
 Makefile                                           |  23 +-
 arch/x86/Kconfig                                   |   2 +-
 init/Kconfig                                       |  73 +++
 kernel/gcov/Kconfig                                |   2 +-
 lib/Kconfig.debug                                  |   2 +-
 scripts/Makefile.lto                               |  84 +++
 scripts/Makefile.modpost                           |   7 +-
 scripts/coccicheck                                 |   2 +-
 scripts/coccinelle/free/ifnullfree.cocci           |  26 +-
 .../iterators/device_node_continue.cocci           | 100 +++
 scripts/coccinelle/misc/compare_const_fl.cocci     | 171 ++++++
 scripts/coccinelle/misc/of_table.cocci             |  33 +-
 scripts/coccinelle/misc/simple_return.cocci        | 180 ------
 scripts/coccinelle/null/deref_null.cocci           |   4 +-
 scripts/coccinelle/tests/odd_ptr_err.cocci         | 120 +++-
 scripts/kconfig/Makefile                           |  73 +--
 scripts/kconfig/expr.c                             |   2 +-
 scripts/kconfig/merge_config.sh                    |  18 +-
 scripts/kconfig/qconf.cc                           | 681 +++++++++++----------
 scripts/kconfig/qconf.h                            | 150 +++--
 scripts/kconfig/symbol.c                           |   2 +
 scripts/link-vmlinux.sh                            |   2 +-
 scripts/package/builddeb                           |  11 +-
 scripts/tags.sh                                    |   2 +
 29 files changed, 1576 insertions(+), 681 deletions(-)
 create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-01
 create mode 100644 Documentation/kbuild/Kconfig.recursion-issue-02
 create mode 100644 Documentation/kbuild/Kconfig.select-break
 create mode 100644 Documentation/lto-build
 create mode 100644 scripts/Makefile.lto
 create mode 100644 scripts/coccinelle/iterators/device_node_continue.cocci
 create mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci
 delete mode 100644 scripts/coccinelle/misc/simple_return.cocci
Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (f0ae0dfa91b0 Merge branch 'for-4.4' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/ata/ahci-fsl-qoriq.txt     |  21 ++
 .../devicetree/bindings/ata/ahci-platform.txt      |   2 -
 drivers/ata/Kconfig                                |   9 +
 drivers/ata/Makefile                               |   1 +
 drivers/ata/ahci.c                                 |   2 +
 drivers/ata/ahci.h                                 |   2 +
 drivers/ata/ahci_platform.c                        |   1 -
 drivers/ata/ahci_qoriq.c                           | 279 +++++++++++++++++++++
 drivers/ata/libahci.c                              |  30 +--
 drivers/ata/libata-scsi.c                          |  59 +++--
 drivers/ata/pata_it821x.c                          |   6 +-
 drivers/ata/pata_macio.c                           |   1 +
 drivers/ata/pata_pxa.c                             | 171 +++++--------
 drivers/ata/pata_samsung_cf.c                      |   2 +-
 include/linux/libata.h                             |   1 +
 15 files changed, 423 insertions(+), 164 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt
 create mode 100644 drivers/ata/ahci_qoriq.c
Merging pm/linux-next (ed8daa4024ff Merge branches 'acpi-processor' and 'acpi-assorted' into linux-next)
$ git merge pm/linux-next
Resolved 'arch/arm/mach-omap2/timer.c' using previous resolution.
Removing include/linux/irqchip/arm-gic-acpi.h
Removing include/linux/acpi_irq.h
Auto-merging include/linux/acpi.h
Auto-merging drivers/pci/pci.h
Auto-merging drivers/pci/pci.c
Auto-merging drivers/pci/pci-driver.c
Removing drivers/cpufreq/cpufreq_opp.c
Auto-merging drivers/cpufreq/Makefile
Auto-merging drivers/cpufreq/Kconfig.arm
Auto-merging drivers/clocksource/clksrc-probe.c
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
Auto-merging drivers/base/power/opp/core.c
Auto-merging drivers/acpi/osl.c
Auto-merging drivers/acpi/nfit.c
Auto-merging arch/arm64/include/asm/irq.h
Auto-merging arch/arm/mach-sunxi/sunxi.c
Auto-merging arch/arm/mach-omap2/timer.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/timer.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 99682c69513c] Merge remote-tracking branch 'pm/linux-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-power              |   12 +
 Documentation/kernel-parameters.txt                |    6 +-
 arch/arm/kernel/time.c                             |    2 +-
 arch/arm/mach-imx/mach-imx6q.c                     |    2 +-
 arch/arm/mach-omap2/timer.c                        |    6 +-
 arch/arm/mach-rockchip/rockchip.c                  |    2 +-
 arch/arm/mach-shmobile/setup-r8a7779.c             |    2 +-
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |    2 +-
 arch/arm/mach-spear/spear13xx.c                    |    2 +-
 arch/arm/mach-sunxi/sunxi.c                        |    2 +-
 arch/arm/mach-u300/core.c                          |    2 +-
 arch/arm/mach-ux500/timer.c                        |    2 +-
 arch/arm/mach-zynq/common.c                        |    2 +-
 arch/arm64/include/asm/acpi.h                      |    1 -
 arch/arm64/include/asm/irq.h                       |   13 -
 arch/arm64/kernel/acpi.c                           |   25 -
 arch/arm64/kernel/time.c                           |    8 +-
 arch/ia64/include/asm/pci.h                        |    5 -
 arch/ia64/pci/pci.c                                |  368 ++----
 arch/microblaze/kernel/setup.c                     |    2 +-
 arch/mips/pistachio/time.c                         |    2 +-
 arch/mips/ralink/clk.c                             |    2 +-
 arch/nios2/kernel/time.c                           |    2 +-
 arch/x86/include/asm/msr-index.h                   |    7 +
 arch/x86/kernel/acpi/boot.c                        |   22 +-
 arch/x86/pci/acpi.c                                |  296 ++---
 arch/xtensa/kernel/time.c                          |    2 +-
 drivers/acpi/Kconfig                               |   29 +-
 drivers/acpi/Makefile                              |    1 +
 drivers/acpi/acpi_lpss.c                           |    2 +-
 drivers/acpi/acpi_pad.c                            |    2 -
 drivers/acpi/acpi_pnp.c                            |    4 +-
 drivers/acpi/acpi_processor.c                      |   18 +
 drivers/acpi/acpica/Makefile                       |   18 +-
 drivers/acpi/acpica/acapps.h                       |    2 +-
 drivers/acpi/acpica/acdebug.h                      |    6 +
 drivers/acpi/acpica/acglobal.h                     |    7 +-
 drivers/acpi/acpica/acinterp.h                     |    2 -
 drivers/acpi/acpica/aclocal.h                      |   22 +-
 drivers/acpi/acpica/acnamesp.h                     |    4 -
 drivers/acpi/acpica/acopcode.h                     |    4 +-
 drivers/acpi/acpica/acparser.h                     |    4 -
 drivers/acpi/acpica/acutils.h                      |    2 -
 drivers/acpi/acpica/amlcode.h                      |   11 +-
 drivers/acpi/acpica/dbcmds.c                       | 1187 ++++++++++++++++++
 drivers/acpi/acpica/dbconvert.c                    |  484 ++++++++
 drivers/acpi/acpica/dbdisply.c                     | 1108 +++++++++++++++++
 drivers/acpi/acpica/dbexec.c                       |  764 ++++++++++++
 drivers/acpi/acpica/dbfileio.c                     |  256 ++++
 drivers/acpi/acpica/dbhistry.c                     |  239 ++++
 drivers/acpi/acpica/dbinput.c                      | 1267 ++++++++++++++++++++
 drivers/acpi/acpica/dbmethod.c                     |  369 ++++++
 drivers/acpi/acpica/dbnames.c                      |  947 +++++++++++++++
 drivers/acpi/acpica/dbobject.c                     |  533 ++++++++
 drivers/acpi/acpica/dbstats.c                      |  546 +++++++++
 drivers/acpi/acpica/dbtest.c                       | 1057 ++++++++++++++++
 drivers/acpi/acpica/dbutils.c                      |  457 +++++++
 drivers/acpi/acpica/dbxface.c                      |  513 ++++++++
 drivers/acpi/acpica/evxface.c                      |    2 +-
 drivers/acpi/acpica/exconvrt.c                     |    1 +
 drivers/acpi/acpica/exresolv.c                     |    1 -
 drivers/acpi/acpica/exresop.c                      |    2 +
 drivers/acpi/acpica/exstore.c                      |  120 +-
 drivers/acpi/acpica/exstoren.c                     |    5 +-
 drivers/acpi/acpica/nsdump.c                       |    6 -
 drivers/acpi/acpica/nspredef.c                     |    2 +-
 drivers/acpi/acpica/pstree.c                       |    2 -
 drivers/acpi/acpica/psutils.c                      |    2 -
 drivers/acpi/acpica/rsdump.c                       |    3 -
 drivers/acpi/acpica/rsutils.c                      |    2 -
 drivers/acpi/acpica/rsxface.c                      |    4 +-
 drivers/acpi/acpica/utdecode.c                     |   21 +-
 drivers/acpi/acpica/utfileio.c                     |    6 +
 drivers/acpi/acpica/utinit.c                       |   15 +-
 drivers/acpi/acpica/utmutex.c                      |   21 +
 drivers/acpi/acpica/utxface.c                      |   19 +-
 drivers/acpi/cppc_acpi.c                           |  733 +++++++++++
 drivers/acpi/device_pm.c                           |   19 +-
 drivers/acpi/device_sysfs.c                        |  120 +-
 drivers/acpi/ec.c                                  |  115 +-
 drivers/acpi/glue.c                                |    5 +-
 drivers/acpi/internal.h                            |    6 +-
 drivers/acpi/nfit.c                                |    6 +-
 drivers/acpi/nfit.h                                |    2 +-
 drivers/acpi/osl.c                                 |   24 +-
 drivers/acpi/pci_root.c                            |  204 ++++
 drivers/acpi/proc.c                                |    4 +-
 drivers/acpi/processor_driver.c                    |    6 +
 drivers/acpi/property.c                            |  427 +++++--
 drivers/acpi/resource.c                            |    9 +-
 drivers/acpi/scan.c                                |   67 +-
 drivers/acpi/sleep.c                               |    9 +-
 drivers/acpi/sysfs.c                               |    3 +
 drivers/acpi/tables.c                              |   94 +-
 drivers/acpi/video_detect.c                        |    9 +
 drivers/base/power/Makefile                        |    2 +-
 drivers/base/power/domain.c                        |  280 +----
 drivers/base/power/generic_ops.c                   |   23 +-
 drivers/base/power/opp/Makefile                    |    2 +
 drivers/base/power/{opp.c => opp/core.c}           |  363 +-----
 drivers/base/power/opp/cpu.c                       |  267 +++++
 drivers/base/power/opp/opp.h                       |  143 +++
 drivers/base/power/wakeup.c                        |   16 +-
 drivers/base/property.c                            |   88 +-
 drivers/clocksource/Kconfig                        |    9 +
 drivers/clocksource/Makefile                       |    2 +-
 drivers/clocksource/arm_arch_timer.c               |   10 +-
 .../clocksource/{clksrc-of.c => clksrc-probe.c}    |    6 +-
 drivers/cpufreq/Kconfig.arm                        |   17 +
 drivers/cpufreq/Kconfig.x86                        |    1 +
 drivers/cpufreq/Makefile                           |    3 +-
 drivers/cpufreq/arm_big_little.h                   |    2 +-
 drivers/cpufreq/arm_big_little_dt.c                |    4 +-
 drivers/cpufreq/cppc_cpufreq.c                     |  176 +++
 drivers/cpufreq/cpufreq-dt.c                       |   10 +-
 drivers/cpufreq/cpufreq.c                          |    7 -
 drivers/cpufreq/cpufreq_conservative.c             |   31 +-
 drivers/cpufreq/cpufreq_governor.c                 |   12 +-
 drivers/cpufreq/cpufreq_governor.h                 |    1 -
 drivers/cpufreq/cpufreq_opp.c                      |  114 --
 drivers/cpufreq/exynos5440-cpufreq.c               |    6 +-
 drivers/cpufreq/imx6q-cpufreq.c                    |   56 +-
 drivers/cpufreq/integrator-cpufreq.c               |    2 +
 drivers/cpufreq/intel_pstate.c                     |  390 +++++-
 drivers/cpufreq/mt8173-cpufreq.c                   |    6 +-
 drivers/cpufreq/powernv-cpufreq.c                  |   10 +-
 drivers/cpufreq/tegra20-cpufreq.c                  |    2 -
 drivers/dma/acpi-dma.c                             |   25 +-
 drivers/gpio/gpiolib-acpi.c                        |  153 ++-
 drivers/gpio/gpiolib.c                             |    3 +-
 drivers/gpio/gpiolib.h                             |   10 +-
 drivers/input/serio/i8042.c                        |   32 +-
 drivers/irqchip/irq-gic.c                          |   69 +-
 drivers/irqchip/irqchip.c                          |    5 +-
 drivers/pci/pci-driver.c                           |    7 +
 drivers/pci/pci.c                                  |   70 +-
 drivers/pci/pci.h                                  |    1 +
 drivers/pnp/pnpacpi/core.c                         |    4 +-
 drivers/power/avs/rockchip-io-domain.c             |    1 +
 drivers/powercap/intel_rapl.c                      |    1 +
 drivers/soc/dove/pmu.c                             |    1 -
 include/acpi/acexcep.h                             |    7 +-
 include/acpi/acpi_bus.h                            |   37 +-
 include/acpi/acpiosxf.h                            |    3 +-
 include/acpi/acpixf.h                              |   14 +-
 include/acpi/actbl1.h                              |    2 +-
 include/acpi/cppc_acpi.h                           |  138 +++
 include/acpi/platform/acenv.h                      |    8 +-
 include/acpi/platform/aclinux.h                    |    7 +-
 include/acpi/platform/aclinuxex.h                  |    5 +
 include/acpi/processor.h                           |   14 +
 include/asm-generic/vmlinux.lds.h                  |   12 +
 include/linux/acpi.h                               |  159 ++-
 include/linux/acpi_irq.h                           |   10 -
 include/linux/clocksource.h                        |   13 +-
 include/linux/fwnode.h                             |    1 +
 include/linux/ioport.h                             |    1 +
 include/linux/irqchip.h                            |   17 +
 include/linux/irqchip/arm-gic-acpi.h               |   31 -
 include/linux/pci-acpi.h                           |   24 +
 include/linux/pm.h                                 |    1 +
 include/linux/pm_domain.h                          |   64 -
 include/linux/pm_opp.h                             |   24 +-
 include/linux/property.h                           |    4 +
 include/linux/suspend.h                            |   39 +
 kernel/irq/pm.c                                    |    2 +-
 kernel/power/hibernate.c                           |    2 +-
 kernel/power/main.c                                |   17 +
 kernel/power/suspend.c                             |    4 +
 tools/power/acpi/tools/acpidump/apfiles.c          |    2 +-
 170 files changed, 13858 insertions(+), 2007 deletions(-)
 create mode 100644 drivers/acpi/acpica/dbcmds.c
 create mode 100644 drivers/acpi/acpica/dbconvert.c
 create mode 100644 drivers/acpi/acpica/dbdisply.c
 create mode 100644 drivers/acpi/acpica/dbexec.c
 create mode 100644 drivers/acpi/acpica/dbfileio.c
 create mode 100644 drivers/acpi/acpica/dbhistry.c
 create mode 100644 drivers/acpi/acpica/dbinput.c
 create mode 100644 drivers/acpi/acpica/dbmethod.c
 create mode 100644 drivers/acpi/acpica/dbnames.c
 create mode 100644 drivers/acpi/acpica/dbobject.c
 create mode 100644 drivers/acpi/acpica/dbstats.c
 create mode 100644 drivers/acpi/acpica/dbtest.c
 create mode 100644 drivers/acpi/acpica/dbutils.c
 create mode 100644 drivers/acpi/acpica/dbxface.c
 create mode 100644 drivers/acpi/cppc_acpi.c
 create mode 100644 drivers/base/power/opp/Makefile
 rename drivers/base/power/{opp.c => opp/core.c} (79%)
 create mode 100644 drivers/base/power/opp/cpu.c
 create mode 100644 drivers/base/power/opp/opp.h
 rename drivers/clocksource/{clksrc-of.c => clksrc-probe.c} (91%)
 create mode 100644 drivers/cpufreq/cppc_cpufreq.c
 delete mode 100644 drivers/cpufreq/cpufreq_opp.c
 create mode 100644 include/acpi/cppc_acpi.h
 delete mode 100644 include/linux/acpi_irq.h
 delete mode 100644 include/linux/irqchip/arm-gic-acpi.h
$ git am -3 ../patches/0001-ARM-mediatek-fixup-for-clocksource_of_init-API-chang.patch
Applying: ARM: mediatek: fixup for clocksource_of_init API change
$ git reset HEAD^
Unstaged changes after reset:
M       arch/arm/mach-mediatek/mediatek.c
$ git add -A .
$ git commit -v -a --amend
[master 44ace0fbf1ac] Merge remote-tracking branch 'pm/linux-next'
 Date: Mon Nov 2 10:53:48 2015 +1100
Merging idle/next (f05bd12f0e9c Merge branch 'cpuidle' into release)
$ git merge idle/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ git merge apm/for-next
Already up-to-date.
Merging thermal/next (a353d85dc365 Merge branches 'thermal-core' and 'thermal-intel' of .git into next)
$ git merge thermal/next
Merge made by the 'recursive' strategy.
 drivers/acpi/thermal.c              | 12 ++++++------
 drivers/platform/x86/asus-wmi.c     |  2 +-
 drivers/platform/x86/intel_menlow.c |  8 ++++----
 drivers/thermal/Kconfig             |  3 +++
 drivers/thermal/cpu_cooling.c       |  8 +++-----
 include/linux/thermal.h             |  8 +++++---
 tools/thermal/tmon/Makefile         |  3 +++
 7 files changed, 25 insertions(+), 19 deletions(-)
Merging thermal-soc/next (8fb2b9ac2aad thermal: underflow bug in imx_set_trip_temp())
$ git merge thermal-soc/next
Auto-merging drivers/thermal/Kconfig
Auto-merging drivers/base/power/opp/core.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/thermal/ti_soc_thermal.txt |  14 +
 drivers/base/power/opp/core.c                      |   4 +-
 drivers/thermal/Kconfig                            |  14 +
 drivers/thermal/Makefile                           |   3 +
 drivers/thermal/armada_thermal.c                   |   6 +-
 drivers/thermal/devfreq_cooling.c                  | 569 +++++++++++++++++++++
 drivers/thermal/imx_thermal.c                      |  21 +-
 drivers/thermal/rockchip_thermal.c                 |  38 +-
 drivers/thermal/ti-soc-thermal/Kconfig             |  15 +
 drivers/thermal/ti-soc-thermal/Makefile            |   1 +
 .../thermal/ti-soc-thermal/omap3-thermal-data.c    | 176 +++++++
 drivers/thermal/ti-soc-thermal/ti-bandgap.c        |  14 +
 drivers/thermal/ti-soc-thermal/ti-bandgap.h        |  11 +
 include/linux/devfreq_cooling.h                    |  81 +++
 include/trace/events/thermal.h                     |  53 ++
 15 files changed, 985 insertions(+), 35 deletions(-)
 create mode 100644 drivers/thermal/devfreq_cooling.c
 create mode 100644 drivers/thermal/ti-soc-thermal/omap3-thermal-data.c
 create mode 100644 include/linux/devfreq_cooling.h
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (b3a5bbfd780d dlm: print error from kernel_sendpage)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (6782af4b4071 Merge branch 'for-linus' into next)
$ git merge slave-dma/next
Auto-merging drivers/dma/acpi-dma.c
Auto-merging arch/arm/mach-omap2/Kconfig
Removing arch/arm/common/edma.c
Auto-merging arch/arm/boot/dts/am437x-gp-evm.dts
Auto-merging arch/arm/boot/dts/am335x-evm.dts
Auto-merging arch/arm/Kconfig
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/dma/ti-dma-crossbar.txt    |   15 +-
 Documentation/devicetree/bindings/dma/ti-edma.txt  |  117 +-
 arch/arm/Kconfig                                   |    1 -
 arch/arm/boot/dts/am335x-evm.dts                   |    9 +-
 arch/arm/boot/dts/am335x-pepper.dts                |   11 +-
 arch/arm/boot/dts/am33xx.dtsi                      |   96 +-
 arch/arm/boot/dts/am4372.dtsi                      |   82 +-
 arch/arm/boot/dts/am437x-gp-evm.dts                |    9 +-
 arch/arm/common/Kconfig                            |    3 -
 arch/arm/common/Makefile                           |    1 -
 arch/arm/common/edma.c                             | 1876 --------------------
 arch/arm/mach-davinci/devices-da8xx.c              |  122 +-
 arch/arm/mach-davinci/dm355.c                      |   40 +-
 arch/arm/mach-davinci/dm365.c                      |   25 +-
 arch/arm/mach-davinci/dm644x.c                     |   40 +-
 arch/arm/mach-davinci/dm646x.c                     |   44 +-
 arch/arm/mach-omap2/Kconfig                        |    1 -
 arch/avr32/mach-at32ap/at32ap700x.c                |    9 +-
 drivers/dma/Kconfig                                |    4 +-
 drivers/dma/Makefile                               |    2 +-
 drivers/dma/acpi-dma.c                             |   11 +-
 drivers/dma/at_hdmac.c                             |  168 +-
 drivers/dma/at_hdmac_regs.h                        |    2 +-
 drivers/dma/at_xdmac.c                             |  106 +-
 drivers/dma/dmaengine.c                            |    6 +-
 drivers/dma/dw/core.c                              |   75 +-
 drivers/dma/dw/pci.c                               |   20 +-
 drivers/dma/dw/platform.c                          |   17 +-
 drivers/dma/edma.c                                 | 1839 ++++++++++++++++---
 drivers/dma/fsldma.c                               |    1 +
 drivers/dma/idma64.c                               |   22 +-
 drivers/dma/idma64.h                               |   14 +-
 drivers/dma/imx-sdma.c                             |    5 +-
 drivers/dma/ioat/dma.c                             |    3 +-
 drivers/dma/ioat/dma.h                             |    6 +-
 drivers/dma/ioat/init.c                            |  114 +-
 drivers/dma/ioat/prep.c                            |   34 +
 drivers/dma/moxart-dma.c                           |    1 +
 drivers/dma/mpc512x_dma.c                          |    1 +
 drivers/dma/omap-dma.c                             |    6 +-
 drivers/dma/sh/usb-dmac.c                          |   11 +-
 drivers/dma/sirf-dma.c                             |    1 +
 drivers/dma/ste_dma40.c                            |    2 +-
 drivers/dma/sun6i-dma.c                            |    1 +
 drivers/dma/ti-dma-crossbar.c                      |  251 ++-
 drivers/dma/virt-dma.h                             |   18 +-
 drivers/dma/xgene-dma.c                            |   63 +-
 drivers/dma/xilinx/xilinx_vdma.c                   |    1 +
 drivers/dma/zx296702_dma.c                         |    2 +-
 include/linux/of_dma.h                             |    2 +-
 include/linux/platform_data/dma-dw.h               |    2 +
 include/linux/platform_data/edma.h                 |  104 +-
 52 files changed, 2659 insertions(+), 2757 deletions(-)
 delete mode 100644 arch/arm/common/edma.c
Merging net-next/master (1cf7d8dda2bd net: hisilicon: Remove .owner assignment from platform_driver)
$ git merge net-next/master
Auto-merging net/tipc/udp_media.c
Removing net/netfilter/nfnetlink_queue_ct.c
Auto-merging net/netfilter/nfnetlink_queue.c
Removing net/mac80211/event.c
Removing net/mac80211/cfg.h
Removing include/net/vrf.h
Removing include/net/netfilter/nfnetlink_queue.h
Auto-merging include/linux/platform_data/atmel.h
Auto-merging include/linux/netdevice.h
Removing drivers/nfc/st21nfca/st21nfca_se.h
Removing drivers/nfc/st21nfca/st21nfca_dep.h
Auto-merging drivers/nfc/st21nfca/se.c
Auto-merging drivers/nfc/st21nfca/dep.c
Auto-merging drivers/nfc/st21nfca/core.c
Removing drivers/nfc/st-nci/st-nci_se.h
Auto-merging drivers/nfc/st-nci/se.c
Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8192cu/hw.c
Auto-merging drivers/net/wireless/realtek/rtlwifi/core.c
Auto-merging drivers/net/wireless/realtek/rtl818x/rtl8187/Makefile
Auto-merging drivers/net/wireless/realtek/rtl818x/rtl8180/Makefile
Removing drivers/net/wireless/b43/pcmcia.h
Removing drivers/net/wireless/b43/pcmcia.c
Auto-merging drivers/net/ethernet/rocker/rocker.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c
Removing drivers/net/ethernet/hisilicon/hip04_mdio.c
Auto-merging drivers/net/ethernet/freescale/fec_main.c
Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.h
Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c
Auto-merging drivers/net/arcnet/com20020.h
Auto-merging drivers/net/arcnet/arcdevice.h
Auto-merging drivers/irqchip/irq-armada-370-xp.c
Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
Auto-merging arch/arm/boot/dts/dra7.dtsi
Auto-merging arch/arm/boot/dts/am4372.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/DocBook/80211.tmpl                   |    5 +-
 .../devicetree/bindings/net/apm-xgene-enet.txt     |   10 +
 .../devicetree/bindings/net/brcm,iproc-mdio.txt    |   23 +
 .../devicetree/bindings/net/can/sun4i_can.txt      |   36 +
 Documentation/devicetree/bindings/net/cpsw.txt     |    7 +
 .../devicetree/bindings/net/fsl-tsec-phy.txt       |    4 +
 .../bindings/net/hisilicon-hip04-net.txt           |    4 +-
 .../devicetree/bindings/net/hisilicon-hns-dsaf.txt |   49 +
 .../devicetree/bindings/net/hisilicon-hns-mdio.txt |   22 +
 .../devicetree/bindings/net/hisilicon-hns-nic.txt  |   47 +
 .../bindings/net/ieee802154/mrf24j40.txt           |   20 +
 .../devicetree/bindings/net/nfc/nfcmrvl.txt        |   61 +-
 .../devicetree/bindings/net/nfc/st-nci-i2c.txt     |    7 +
 .../devicetree/bindings/net/nfc/st-nci-spi.txt     |    9 +-
 .../devicetree/bindings/net/renesas,ravb.txt       |   69 +-
 Documentation/filesystems/nfs/nfsroot.txt          |    3 +
 Documentation/networking/ieee802154.txt            |    8 +-
 Documentation/networking/ip-sysctl.txt             |   23 +-
 Documentation/networking/ipvs-sysctl.txt           |   10 +
 Documentation/networking/l2tp.txt                  |    7 +-
 Documentation/networking/switchdev.txt             |   65 +-
 Documentation/networking/vrf.txt                   |  301 +-
 MAINTAINERS                                        |   29 +-
 arch/arm/boot/dts/am4372.dtsi                      |    1 +
 arch/arm/boot/dts/dra7.dtsi                        |    1 +
 arch/arm/mach-gemini/board-nas4220b.c              |    1 -
 arch/arm/mach-gemini/board-wbd111.c                |    1 -
 arch/arm/mach-gemini/board-wbd222.c                |    1 -
 arch/arm/net/bpf_jit_32.c                          |   40 +-
 arch/arm/net/bpf_jit_32.h                          |    5 +
 arch/arm64/boot/dts/apm/apm-storm.dtsi             |   28 +
 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi       |  191 +
 arch/arm64/net/bpf_jit_comp.c                      |    2 +-
 arch/m68k/mac/psc.c                                |    1 +
 arch/mips/bcm47xx/Kconfig                          |    1 +
 arch/mips/net/bpf_jit.c                            |    2 +-
 arch/powerpc/boot/dts/fsl/p1022si-post.dtsi        |    2 +
 arch/powerpc/net/bpf_jit_comp.c                    |    2 +-
 arch/s390/net/bpf_jit_comp.c                       |    2 +-
 arch/sparc/net/bpf_jit_comp.c                      |    2 +-
 arch/x86/net/bpf_jit_comp.c                        |    2 +-
 drivers/atm/iphase.c                               |    5 +-
 drivers/base/regmap/internal.h                     |    2 +
 drivers/base/regmap/regmap.c                       |   29 +-
 drivers/bcma/main.c                                |    9 +-
 drivers/bluetooth/Kconfig                          |    8 +-
 drivers/bluetooth/ath3k.c                          |    4 +
 drivers/bluetooth/bfusb.c                          |   11 -
 drivers/bluetooth/bluecard_cs.c                    |    8 +-
 drivers/bluetooth/bpa10x.c                         |  186 +-
 drivers/bluetooth/bt3c_cs.c                        |   20 +-
 drivers/bluetooth/btbcm.c                          |   71 +-
 drivers/bluetooth/btintel.c                        |  369 ++
 drivers/bluetooth/btintel.h                        |   43 +-
 drivers/bluetooth/btmrvl_main.c                    |   33 +-
 drivers/bluetooth/btmrvl_sdio.c                    |   54 +-
 drivers/bluetooth/btsdio.c                         |   14 +-
 drivers/bluetooth/btuart_cs.c                      |   10 +-
 drivers/bluetooth/btusb.c                          |  366 +-
 drivers/bluetooth/btwilink.c                       |   13 -
 drivers/bluetooth/dtl1_cs.c                        |    5 -
 drivers/bluetooth/hci_ath.c                        |    1 +
 drivers/bluetooth/hci_bcm.c                        |  446 +-
 drivers/bluetooth/hci_h4.c                         |    1 +
 drivers/bluetooth/hci_h5.c                         |   10 +-
 drivers/bluetooth/hci_intel.c                      |  600 +-
 drivers/bluetooth/hci_ldisc.c                      |   24 +-
 drivers/bluetooth/hci_qca.c                        |   17 +-
 drivers/bluetooth/hci_uart.h                       |    2 +-
 drivers/bluetooth/hci_vhci.c                       |    8 -
 drivers/infiniband/hw/nes/nes_nic.c                |    3 -
 drivers/irqchip/irq-armada-370-xp.c                |   14 +-
 drivers/isdn/hisax/hfc4s8s_l1.c                    |   10 +-
 drivers/isdn/mISDN/dsp_pipeline.c                  |   12 +-
 drivers/net/Kconfig                                |    5 +-
 drivers/net/arcnet/arc-rawmode.c                   |  142 +-
 drivers/net/arcnet/arc-rimi.c                      |  145 +-
 {include/linux => drivers/net/arcnet}/arcdevice.h  |  167 +-
 drivers/net/arcnet/arcnet.c                        |  700 +--
 drivers/net/arcnet/capmode.c                       |  138 +-
 drivers/net/arcnet/com20020-isa.c                  |   54 +-
 drivers/net/arcnet/com20020-pci.c                  |  175 +-
 drivers/net/arcnet/com20020.c                      |  263 +-
 {include/linux => drivers/net/arcnet}/com20020.h   |   89 +-
 drivers/net/arcnet/com20020_cs.c                   |  325 +-
 drivers/net/arcnet/com9026.h                       |   17 +
 drivers/net/arcnet/com90io.c                       |  209 +-
 drivers/net/arcnet/com90xx.c                       |  323 +-
 drivers/net/arcnet/rfc1051.c                       |   77 +-
 drivers/net/arcnet/rfc1201.c                       |  238 +-
 drivers/net/bonding/bond_main.c                    |    6 +-
 drivers/net/can/Kconfig                            |   10 +
 drivers/net/can/Makefile                           |    1 +
 drivers/net/can/at91_can.c                         |   21 -
 drivers/net/can/flexcan.c                          |  197 +-
 drivers/net/can/sun4i_can.c                        |  857 +++
 drivers/net/dsa/bcm_sf2.c                          |  338 +-
 drivers/net/dsa/bcm_sf2.h                          |   62 +
 drivers/net/dsa/bcm_sf2_regs.h                     |   43 +
 drivers/net/dsa/mv88e6060.c                        |    4 +-
 drivers/net/dsa/mv88e6123_61_65.c                  |    1 -
 drivers/net/dsa/mv88e6131.c                        |    1 -
 drivers/net/dsa/mv88e6171.c                        |    8 +-
 drivers/net/dsa/mv88e6352.c                        |    8 +-
 drivers/net/dsa/mv88e6xxx.c                        |  977 +---
 drivers/net/dsa/mv88e6xxx.h                        |   44 +-
 drivers/net/dummy.c                                |    6 +-
 drivers/net/ethernet/8390/Kconfig                  |    2 +-
 drivers/net/ethernet/8390/mac8390.c                |   32 +-
 drivers/net/ethernet/aeroflex/greth.c              |    2 -
 drivers/net/ethernet/amd/7990.c                    |    1 +
 drivers/net/ethernet/amd/Kconfig                   |    2 +-
 drivers/net/ethernet/amd/au1000_eth.c              |    1 -
 drivers/net/ethernet/amd/xgbe/xgbe-dev.c           |   83 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |   10 +-
 drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c       |  107 +-
 drivers/net/ethernet/amd/xgbe/xgbe-main.c          |    2 +-
 drivers/net/ethernet/amd/xgbe/xgbe-mdio.c          |   16 +-
 drivers/net/ethernet/amd/xgbe/xgbe.h               |   18 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.c     |   11 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_hw.h     |    1 +
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |   65 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.h   |    7 +
 drivers/net/ethernet/apple/Kconfig                 |    2 +-
 drivers/net/ethernet/atheros/atl1c/atl1c_ethtool.c |    4 -
 drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c |    4 -
 drivers/net/ethernet/atheros/atlx/atl1.c           |    1 -
 drivers/net/ethernet/atheros/atlx/atl2.c           |    4 -
 drivers/net/ethernet/broadcom/Kconfig              |   19 +
 drivers/net/ethernet/broadcom/Makefile             |    1 +
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |    2 -
 drivers/net/ethernet/broadcom/bcmsysport.c         |    1 -
 drivers/net/ethernet/broadcom/bnx2.c               |   81 +-
 drivers/net/ethernet/broadcom/bnx2.h               |    1 +
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    |    4 -
 drivers/net/ethernet/broadcom/bnxt/Makefile        |    3 +
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          | 5728 +++++++++++++++++++
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          | 1086 ++++
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  | 1149 ++++
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h  |   17 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h   |  104 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h      | 4046 +++++++++++++
 drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h |   59 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |  816 +++
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h    |   23 +
 drivers/net/ethernet/broadcom/genet/bcmgenet.c     |  150 +-
 drivers/net/ethernet/broadcom/genet/bcmgenet.h     |    9 +-
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |    1 -
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |    4 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |   21 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c |  206 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   39 +-
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |   36 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         | 1470 +++--
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.h         |    5 +
 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |    2 +-
 drivers/net/ethernet/cisco/enic/enic.h             |    1 +
 drivers/net/ethernet/cisco/enic/enic_main.c        |   50 +-
 drivers/net/ethernet/cisco/enic/vnic_dev.c         |    4 +-
 drivers/net/ethernet/cisco/enic/vnic_dev.h         |    2 +
 drivers/net/ethernet/dec/tulip/de2104x.c           |    1 -
 drivers/net/ethernet/emulex/benet/be_ethtool.c     |    3 -
 drivers/net/ethernet/ethoc.c                       |   14 +-
 drivers/net/ethernet/freescale/fec_main.c          |    3 +-
 drivers/net/ethernet/freescale/fec_ptp.c           |    6 +-
 drivers/net/ethernet/freescale/gianfar.c           |  157 +-
 drivers/net/ethernet/freescale/gianfar.h           |   12 +-
 drivers/net/ethernet/freescale/gianfar_ethtool.c   |   45 +-
 drivers/net/ethernet/freescale/ucc_geth_ethtool.c  |    2 -
 drivers/net/ethernet/hisilicon/Kconfig             |   35 +-
 drivers/net/ethernet/hisilicon/Makefile            |    4 +-
 drivers/net/ethernet/hisilicon/hip04_mdio.c        |  185 -
 drivers/net/ethernet/hisilicon/hix5hd2_gmac.c      |    2 +-
 drivers/net/ethernet/hisilicon/hns/Makefile        |   12 +
 drivers/net/ethernet/hisilicon/hns/hnae.c          |  457 ++
 drivers/net/ethernet/hisilicon/hns/hnae.h          |  585 ++
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c  |  783 +++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c |  704 +++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h |   45 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c  |  902 +++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h  |  456 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2474 ++++++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h |  428 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c |  310 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h |   43 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c  |  583 ++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h  |  105 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c  | 1021 ++++
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h  |  139 +
 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h  |  972 ++++
 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c    |  837 +++
 .../net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h    |   15 +
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      | 1642 ++++++
 drivers/net/ethernet/hisilicon/hns/hns_enet.h      |   84 +
 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c   | 1214 ++++
 drivers/net/ethernet/hisilicon/hns_mdio.c          |  521 ++
 drivers/net/ethernet/ibm/emac/core.c               |    1 -
 drivers/net/ethernet/ibm/emac/core.h               |    2 +-
 drivers/net/ethernet/intel/e1000/e1000_ethtool.c   |    2 -
 drivers/net/ethernet/intel/e1000/e1000_hw.c        |    8 -
 drivers/net/ethernet/intel/e1000/e1000_main.c      |    2 +-
 drivers/net/ethernet/intel/e1000e/ethtool.c        |    2 -
 drivers/net/ethernet/intel/e1000e/netdev.c         |    3 +-
 drivers/net/ethernet/intel/fm10k/fm10k.h           |   19 +
 drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c   |   11 +-
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   |  220 +-
 drivers/net/ethernet/intel/fm10k/fm10k_iov.c       |    8 +-
 drivers/net/ethernet/intel/fm10k/fm10k_main.c      |   50 +-
 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       |   48 +-
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    |   39 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |  198 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pf.c        |  105 +-
 drivers/net/ethernet/intel/fm10k/fm10k_type.h      |    7 +-
 drivers/net/ethernet/intel/fm10k/fm10k_vf.c        |   14 -
 drivers/net/ethernet/intel/i40e/i40e.h             |   70 +-
 drivers/net/ethernet/intel/i40e/i40e_adminq.c      |   79 +-
 drivers/net/ethernet/intel/i40e/i40e_adminq.h      |    9 +-
 drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  |   27 +-
 drivers/net/ethernet/intel/i40e/i40e_common.c      |  119 +-
 drivers/net/ethernet/intel/i40e/i40e_dcb.c         |  292 +-
 drivers/net/ethernet/intel/i40e/i40e_dcb.h         |   39 +
 drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c      |    9 +-
 drivers/net/ethernet/intel/i40e/i40e_debugfs.c     |  168 +-
 drivers/net/ethernet/intel/i40e/i40e_devids.h      |   55 +
 drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  406 +-
 drivers/net/ethernet/intel/i40e/i40e_fcoe.c        |   13 +-
 drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c     |    3 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        | 1159 ++--
 drivers/net/ethernet/intel/i40e/i40e_nvm.c         |  430 +-
 drivers/net/ethernet/intel/i40e/i40e_prototype.h   |    9 +-
 drivers/net/ethernet/intel/i40e/i40e_ptp.c         |    7 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.c        |  426 +-
 drivers/net/ethernet/intel/i40e/i40e_txrx.h        |   57 +-
 drivers/net/ethernet/intel/i40e/i40e_type.h        |  124 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h    |    2 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |   91 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h |    5 +-
 drivers/net/ethernet/intel/i40evf/i40e_adminq.c    |   57 +-
 drivers/net/ethernet/intel/i40evf/i40e_adminq.h    |    9 +-
 .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    |    4 +-
 drivers/net/ethernet/intel/i40evf/i40e_common.c    |   41 +-
 drivers/net/ethernet/intel/i40evf/i40e_devids.h    |   55 +
 drivers/net/ethernet/intel/i40evf/i40e_prototype.h |    6 +-
 drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |  293 +-
 drivers/net/ethernet/intel/i40evf/i40e_txrx.h      |   41 +-
 drivers/net/ethernet/intel/i40evf/i40e_type.h      |  116 +-
 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h  |    2 +-
 drivers/net/ethernet/intel/i40evf/i40evf.h         |   12 +-
 drivers/net/ethernet/intel/i40evf/i40evf_main.c    |  195 +-
 .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |   64 +-
 drivers/net/ethernet/intel/igb/igb.h               |    4 +-
 drivers/net/ethernet/intel/igb/igb_ethtool.c       |    4 -
 drivers/net/ethernet/intel/igb/igb_main.c          |   35 +-
 drivers/net/ethernet/intel/igb/igb_ptp.c           |    8 +-
 drivers/net/ethernet/intel/igbvf/ethtool.c         |    2 -
 drivers/net/ethernet/intel/igbvf/netdev.c          |    3 +-
 drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c     |    3 -
 drivers/net/ethernet/intel/ixgbe/ixgbe.h           |   13 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |  202 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |  226 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    5 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c |    8 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |    5 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |    2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |  136 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       |    2 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |  291 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       |   35 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   96 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h     |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |   13 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      |  102 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |  503 +-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    6 +
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   23 +-
 drivers/net/ethernet/intel/ixgbevf/mbx.h           |    2 +
 drivers/net/ethernet/intel/ixgbevf/vf.c            |   41 +
 drivers/net/ethernet/intel/ixgbevf/vf.h            |    1 +
 drivers/net/ethernet/marvell/mv643xx_eth.c         |   44 +-
 drivers/net/ethernet/marvell/mvneta.c              |  433 +-
 drivers/net/ethernet/marvell/sky2.c                |   12 +
 drivers/net/ethernet/mellanox/mlx4/en_ethtool.c    |    3 -
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |  167 +-
 drivers/net/ethernet/mellanox/mlx4/fw.c            |   16 +
 drivers/net/ethernet/mellanox/mlx4/main.c          |    2 +
 drivers/net/ethernet/mellanox/mlx4/mlx4.h          |    2 +
 drivers/net/ethernet/mellanox/mlx4/mr.c            |    2 +-
 drivers/net/ethernet/mellanox/mlx4/qp.c            |    6 +-
 .../net/ethernet/mellanox/mlx4/resource_tracker.c  |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/cmd.c      |  192 +-
 drivers/net/ethernet/mellanox/mlx5/core/cq.c       |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |    8 +-
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/health.c   |  224 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |  571 +-
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |   26 +-
 drivers/net/ethernet/mellanox/mlx5/core/mr.c       |    1 +
 .../net/ethernet/mellanox/mlx5/core/pagealloc.c    |   76 +-
 drivers/net/ethernet/mellanox/mlx5/core/port.c     |   35 +-
 drivers/net/ethernet/mellanox/mlx5/core/qp.c       |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/srq.c      |    1 +
 drivers/net/ethernet/mellanox/mlx5/core/transobj.c |    4 +-
 drivers/net/ethernet/mellanox/mlxsw/Kconfig        |   11 +
 drivers/net/ethernet/mellanox/mlxsw/Makefile       |    3 +
 drivers/net/ethernet/mellanox/mlxsw/cmd.h          |   51 +-
 drivers/net/ethernet/mellanox/mlxsw/core.c         |    7 +-
 drivers/net/ethernet/mellanox/mlxsw/core.h         |    5 +
 drivers/net/ethernet/mellanox/mlxsw/item.h         |   50 +-
 drivers/net/ethernet/mellanox/mlxsw/pci.c          |   63 +-
 drivers/net/ethernet/mellanox/mlxsw/pci.h          |    5 +-
 drivers/net/ethernet/mellanox/mlxsw/reg.h          | 1263 ++++-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     | 1949 +++++++
 drivers/net/ethernet/mellanox/mlxsw/spectrum.h     |  122 +
 .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c |  422 ++
 .../ethernet/mellanox/mlxsw/spectrum_switchdev.c   |  903 +++
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |   41 +-
 drivers/net/ethernet/mellanox/mlxsw/txheader.h     |    1 +
 drivers/net/ethernet/microchip/Kconfig             |    9 +
 drivers/net/ethernet/microchip/Makefile            |    1 +
 drivers/net/ethernet/microchip/encx24j600-regmap.c |  513 ++
 drivers/net/ethernet/microchip/encx24j600.c        | 1127 ++++
 drivers/net/ethernet/microchip/encx24j600_hw.h     |  437 ++
 drivers/net/ethernet/neterion/s2io.c               |    2 -
 drivers/net/ethernet/neterion/vxge/vxge-ethtool.c  |    4 -
 drivers/net/ethernet/octeon/octeon_mgmt.c          |    4 -
 .../ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c    |    1 -
 drivers/net/ethernet/qlogic/Kconfig                |   11 +
 drivers/net/ethernet/qlogic/Makefile               |    2 +
 .../ethernet/qlogic/netxen/netxen_nic_ethtool.c    |    2 -
 drivers/net/ethernet/qlogic/qed/Makefile           |    4 +
 drivers/net/ethernet/qlogic/qed/qed.h              |  496 ++
 drivers/net/ethernet/qlogic/qed/qed_cxt.c          |  847 +++
 drivers/net/ethernet/qlogic/qed/qed_cxt.h          |  139 +
 drivers/net/ethernet/qlogic/qed/qed_dev.c          | 1797 ++++++
 drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |  283 +
 drivers/net/ethernet/qlogic/qed/qed_hsi.h          | 5291 +++++++++++++++++
 drivers/net/ethernet/qlogic/qed/qed_hw.c           |  776 +++
 drivers/net/ethernet/qlogic/qed/qed_hw.h           |  263 +
 .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c    |  798 +++
 drivers/net/ethernet/qlogic/qed/qed_init_ops.c     |  531 ++
 drivers/net/ethernet/qlogic/qed/qed_init_ops.h     |  110 +
 drivers/net/ethernet/qlogic/qed/qed_int.c          | 1134 ++++
 drivers/net/ethernet/qlogic/qed/qed_int.h          |  391 ++
 drivers/net/ethernet/qlogic/qed/qed_l2.c           | 1704 ++++++
 drivers/net/ethernet/qlogic/qed/qed_main.c         | 1169 ++++
 drivers/net/ethernet/qlogic/qed/qed_mcp.c          |  860 +++
 drivers/net/ethernet/qlogic/qed/qed_mcp.h          |  369 ++
 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h     |  366 ++
 drivers/net/ethernet/qlogic/qed/qed_sp.h           |  360 ++
 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c  |  170 +
 drivers/net/ethernet/qlogic/qed/qed_spq.c          |  860 +++
 drivers/net/ethernet/qlogic/qede/Makefile          |    3 +
 drivers/net/ethernet/qlogic/qede/qede.h            |  285 +
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |  385 ++
 drivers/net/ethernet/qlogic/qede/qede_main.c       | 2584 +++++++++
 drivers/net/ethernet/qlogic/qla3xxx.c              |    2 -
 drivers/net/ethernet/qlogic/qlcnic/qlcnic.h        |    2 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |    4 +-
 drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c    |    7 -
 drivers/net/ethernet/realtek/8139cp.c              |   24 +-
 drivers/net/ethernet/realtek/8139too.c             |    1 -
 drivers/net/ethernet/renesas/ravb.h                |    7 +
 drivers/net/ethernet/renesas/ravb_main.c           |  101 +-
 drivers/net/ethernet/rocker/rocker.c               |  467 +-
 drivers/net/ethernet/sfc/ef10.c                    |   30 +-
 drivers/net/ethernet/sfc/efx.c                     |    4 +-
 drivers/net/ethernet/sfc/mcdi.c                    |   13 +-
 drivers/net/ethernet/sfc/net_driver.h              |  130 +-
 drivers/net/ethernet/smsc/smc91x.c                 |   29 +-
 drivers/net/ethernet/smsc/smc91x.h                 |   99 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |   10 +-
 drivers/net/ethernet/sun/cassini.c                 |    3 -
 drivers/net/ethernet/tehuti/tehuti.c               |    5 -
 drivers/net/ethernet/ti/cpmac.c                    |    1 -
 drivers/net/ethernet/ti/cpsw-common.c              |   64 +-
 drivers/net/ethernet/ti/cpsw-phy-sel.c             |   10 +-
 drivers/net/ethernet/ti/cpsw.c                     |   33 +-
 drivers/net/ethernet/ti/cpsw.h                     |    3 +-
 drivers/net/ethernet/ti/davinci_emac.c             |   52 +-
 drivers/net/ethernet/ti/tlan.c                     |    1 -
 drivers/net/ethernet/xilinx/ll_temac_mdio.c        |    9 +-
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    1 -
 drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c  |    5 +-
 drivers/net/fjes/fjes_ethtool.c                    |    2 -
 drivers/net/geneve.c                               |  515 +-
 drivers/net/ieee802154/Kconfig                     |    8 +
 drivers/net/ieee802154/at86rf230.c                 |  369 +-
 drivers/net/ieee802154/at86rf230.h                 |    8 +
 drivers/net/ieee802154/atusb.c                     |   13 +-
 drivers/net/ieee802154/mrf24j40.c                  | 1424 +++--
 drivers/net/ipvlan/ipvlan_core.c                   |   14 +-
 drivers/net/irda/pxaficp_ir.c                      |  370 +-
 drivers/net/macvlan.c                              |    2 +-
 drivers/net/phy/Kconfig                            |   28 +
 drivers/net/phy/Makefile                           |    3 +
 drivers/net/phy/aquantia.c                         |   15 +-
 drivers/net/phy/bcm-cygnus.c                       |  158 +
 drivers/net/phy/bcm-phy-lib.c                      |  213 +
 drivers/net/phy/bcm-phy-lib.h                      |   37 +
 drivers/net/phy/bcm63xx.c                          |   38 +-
 drivers/net/phy/bcm7xxx.c                          |  136 +-
 drivers/net/phy/broadcom.c                         |  149 +-
 drivers/net/phy/mdio-bcm-iproc.c                   |  213 +
 drivers/net/phy/mdio-gpio.c                        |    2 +-
 drivers/net/phy/mdio_bus.c                         |   55 +
 drivers/net/phy/phy_device.c                       |   59 +-
 drivers/net/phy/teranetics.c                       |   15 +-
 drivers/net/ppp/pptp.c                             |    7 +-
 drivers/net/tun.c                                  |    2 +-
 drivers/net/usb/Kconfig                            |    4 +-
 drivers/net/usb/asix.h                             |    2 +-
 drivers/net/usb/asix_common.c                      |  115 +-
 drivers/net/usb/cdc-phonet.c                       |   27 +-
 drivers/net/usb/cdc_ether.c                        |  230 +-
 drivers/net/usb/cdc_mbim.c                         |    2 +-
 drivers/net/usb/cdc_ncm.c                          |   69 +-
 drivers/net/usb/dm9601.c                           |    1 -
 drivers/net/usb/lan78xx.c                          |  672 +--
 drivers/net/usb/lan78xx.h                          |  193 -
 drivers/net/usb/mcs7830.c                          |    1 -
 drivers/net/usb/qmi_wwan.c                         |   66 +-
 drivers/net/usb/smsc75xx.c                         |    5 -
 drivers/net/usb/smsc95xx.c                         |    5 -
 drivers/net/usb/sr9800.c                           |    4 -
 drivers/net/usb/usbnet.c                           |  138 +
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |  122 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |    4 +-
 drivers/net/vrf.c                                  |  415 +-
 drivers/net/vxlan.c                                |  167 +-
 drivers/net/wireless/Kconfig                       |    7 +-
 drivers/net/wireless/Makefile                      |    4 +-
 drivers/net/wireless/airo.c                        |  139 +-
 drivers/net/wireless/ath/ath10k/bmi.h              |   10 +
 drivers/net/wireless/ath/ath10k/ce.c               |   67 +-
 drivers/net/wireless/ath/ath10k/ce.h               |   23 +-
 drivers/net/wireless/ath/ath10k/core.c             |  387 +-
 drivers/net/wireless/ath/ath10k/core.h             |   69 +-
 drivers/net/wireless/ath/ath10k/debug.c            |  516 +-
 drivers/net/wireless/ath/ath10k/debug.h            |   11 +
 drivers/net/wireless/ath/ath10k/hif.h              |   26 +-
 drivers/net/wireless/ath/ath10k/htc.c              |   51 +-
 drivers/net/wireless/ath/ath10k/htc.h              |    4 +-
 drivers/net/wireless/ath/ath10k/htt.h              |   10 +-
 drivers/net/wireless/ath/ath10k/htt_rx.c           |   48 +-
 drivers/net/wireless/ath/ath10k/htt_tx.c           |  112 +-
 drivers/net/wireless/ath/ath10k/hw.h               |   35 +-
 drivers/net/wireless/ath/ath10k/mac.c              |  640 ++-
 drivers/net/wireless/ath/ath10k/pci.c              |  333 +-
 drivers/net/wireless/ath/ath10k/pci.h              |   11 +-
 drivers/net/wireless/ath/ath10k/targaddrs.h        |    3 +
 drivers/net/wireless/ath/ath10k/testmode.c         |  202 +-
 drivers/net/wireless/ath/ath10k/thermal.c          |    2 +-
 drivers/net/wireless/ath/ath10k/txrx.c             |   19 +-
 drivers/net/wireless/ath/ath10k/wmi-ops.h          |   57 +
 drivers/net/wireless/ath/ath10k/wmi-tlv.c          |   15 +
 drivers/net/wireless/ath/ath10k/wmi.c              |  979 +++-
 drivers/net/wireless/ath/ath10k/wmi.h              |  195 +-
 drivers/net/wireless/ath/ath6kl/cfg80211.c         |  149 +-
 drivers/net/wireless/ath/ath6kl/core.h             |    2 +
 drivers/net/wireless/ath/ath6kl/debug.c            |   55 +-
 drivers/net/wireless/ath/ath6kl/debug.h            |    2 +
 drivers/net/wireless/ath/ath6kl/htc_mbox.c         |    4 +-
 drivers/net/wireless/ath/ath6kl/init.c             |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_phy.h        |    4 +-
 drivers/net/wireless/ath/ath9k/ar9003_calib.c      |    6 +-
 drivers/net/wireless/ath/ath9k/ar9003_hw.c         |   10 +-
 drivers/net/wireless/ath/ath9k/ar9003_phy.c        |    9 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |    1 +
 drivers/net/wireless/ath/ath9k/common-debug.c      |   14 +-
 drivers/net/wireless/ath/ath9k/debug.c             |    4 +-
 drivers/net/wireless/ath/ath9k/hif_usb.c           |  106 +-
 drivers/net/wireless/ath/ath9k/hif_usb.h           |   21 +-
 drivers/net/wireless/ath/ath9k/htc_drv_init.c      |    7 +-
 drivers/net/wireless/ath/ath9k/htc_drv_main.c      |    2 +-
 drivers/net/wireless/ath/ath9k/hw.c                |    1 +
 drivers/net/wireless/ath/ath9k/hw.h                |    2 +-
 drivers/net/wireless/ath/ath9k/init.c              |    3 +-
 drivers/net/wireless/ath/ath9k/mac.h               |   18 +-
 drivers/net/wireless/ath/ath9k/main.c              |   10 +-
 drivers/net/wireless/ath/ath9k/recv.c              |    2 +-
 drivers/net/wireless/ath/carl9170/main.c           |    2 +-
 drivers/net/wireless/ath/carl9170/rx.c             |    2 +-
 drivers/net/wireless/ath/dfs_pattern_detector.c    |   10 +-
 drivers/net/wireless/ath/dfs_pattern_detector.h    |    5 +
 drivers/net/wireless/ath/dfs_pri_detector.c        |    6 +-
 drivers/net/wireless/ath/wcn36xx/dxe.c             |   61 +-
 drivers/net/wireless/ath/wcn36xx/dxe.h             |    1 +
 drivers/net/wireless/ath/wcn36xx/main.c            |    2 +-
 drivers/net/wireless/ath/wil6210/Kconfig           |    1 +
 drivers/net/wireless/ath/wil6210/Makefile          |    1 +
 drivers/net/wireless/ath/wil6210/debugfs.c         |    6 +
 drivers/net/wireless/ath/wil6210/interrupt.c       |   16 +-
 drivers/net/wireless/ath/wil6210/main.c            |   16 +-
 drivers/net/wireless/ath/wil6210/pcie_bus.c        |    2 +-
 drivers/net/wireless/ath/wil6210/pmc.c             |    2 +-
 drivers/net/wireless/ath/wil6210/rx_reorder.c      |   26 +
 drivers/net/wireless/ath/wil6210/txrx.c            |   92 +-
 drivers/net/wireless/ath/wil6210/txrx.h            |    7 +
 drivers/net/wireless/ath/wil6210/wil6210.h         |   14 +-
 drivers/net/wireless/ath/wil6210/wil_crash_dump.c  |  115 +
 drivers/net/wireless/ath/wil6210/wmi.c             |   22 +-
 drivers/net/wireless/b43/Kconfig                   |   20 -
 drivers/net/wireless/b43/Makefile                  |    1 -
 drivers/net/wireless/b43/main.c                    |    9 +-
 drivers/net/wireless/b43/pcmcia.c                  |  145 -
 drivers/net/wireless/b43/pcmcia.h                  |   20 -
 drivers/net/wireless/brcm80211/Kconfig             |    1 +
 drivers/net/wireless/brcm80211/brcmfmac/bcdc.c     |   28 +-
 drivers/net/wireless/brcm80211/brcmfmac/btcoex.c   |    4 +-
 drivers/net/wireless/brcm80211/brcmfmac/bus.h      |   21 +
 drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c |  279 +-
 drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h |    6 +-
 drivers/net/wireless/brcm80211/brcmfmac/chip.c     |  130 +-
 drivers/net/wireless/brcm80211/brcmfmac/chip.h     |    1 +
 drivers/net/wireless/brcm80211/brcmfmac/common.h   |    3 +
 drivers/net/wireless/brcm80211/brcmfmac/core.c     |  179 +-
 drivers/net/wireless/brcm80211/brcmfmac/core.h     |   21 +-
 drivers/net/wireless/brcm80211/brcmfmac/debug.c    |   42 +-
 drivers/net/wireless/brcm80211/brcmfmac/debug.h    |   11 +-
 drivers/net/wireless/brcm80211/brcmfmac/feature.c  |   15 +-
 drivers/net/wireless/brcm80211/brcmfmac/firmware.c |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/flowring.c |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/flowring.h |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/fweh.c     |   42 +-
 drivers/net/wireless/brcm80211/brcmfmac/fweh.h     |    3 +
 drivers/net/wireless/brcm80211/brcmfmac/fwil.h     |    1 +
 .../net/wireless/brcm80211/brcmfmac/fwil_types.h   |   13 +
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c |   57 +-
 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h |    3 +-
 drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c   |   15 +-
 drivers/net/wireless/brcm80211/brcmfmac/p2p.c      |  145 +-
 drivers/net/wireless/brcm80211/brcmfmac/p2p.h      |    5 +-
 drivers/net/wireless/brcm80211/brcmfmac/pcie.c     |  178 +-
 drivers/net/wireless/brcm80211/brcmfmac/proto.h    |   18 +-
 drivers/net/wireless/brcm80211/brcmfmac/sdio.c     |   55 +-
 drivers/net/wireless/brcm80211/brcmfmac/usb.c      |   29 +-
 .../net/wireless/brcm80211/brcmsmac/mac80211_if.c  |    2 +-
 drivers/net/wireless/brcm80211/brcmsmac/main.c     |    2 +-
 .../net/wireless/brcm80211/include/brcm_hw_ids.h   |   13 +
 drivers/net/wireless/cw1200/sta.c                  |    2 +-
 drivers/net/wireless/cw1200/sta.h                  |    2 +-
 drivers/net/wireless/ipw2x00/ipw2200.c             |    1 -
 drivers/net/wireless/ipw2x00/libipw_rx.c           |    2 -
 drivers/net/wireless/iwlegacy/4965-mac.c           |    2 +-
 drivers/net/wireless/iwlegacy/4965.h               |    2 +-
 drivers/net/wireless/iwlwifi/Kconfig               |    1 +
 drivers/net/wireless/iwlwifi/dvm/mac80211.c        |    2 +-
 drivers/net/wireless/iwlwifi/iwl-7000.c            |   13 +-
 drivers/net/wireless/iwlwifi/iwl-8000.c            |    6 +-
 drivers/net/wireless/iwlwifi/iwl-config.h          |   12 +-
 drivers/net/wireless/iwlwifi/iwl-drv.c             |    4 +-
 drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h   |   16 +
 drivers/net/wireless/iwlwifi/iwl-fw-file.h         |   36 +-
 drivers/net/wireless/iwlwifi/iwl-fw.h              |    4 +-
 drivers/net/wireless/iwlwifi/iwl-io.c              |   23 +
 drivers/net/wireless/iwlwifi/iwl-io.h              |   21 +-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c       |   15 +-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.h       |    2 +-
 drivers/net/wireless/iwlwifi/iwl-op-mode.h         |   19 +-
 drivers/net/wireless/iwlwifi/iwl-trans.c           |    1 +
 drivers/net/wireless/iwlwifi/iwl-trans.h           |    7 +
 drivers/net/wireless/iwlwifi/mvm/constants.h       |    5 +-
 drivers/net/wireless/iwlwifi/mvm/d3.c              |    3 +
 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c     |  100 +-
 drivers/net/wireless/iwlwifi/mvm/debugfs.c         |  134 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h    |    8 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h       |  238 +
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h     |    5 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h    |   41 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api.h          |  259 +-
 drivers/net/wireless/iwlwifi/mvm/fw.c              |   24 +-
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c        |   39 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c        |   95 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h             |   70 +-
 drivers/net/wireless/iwlwifi/mvm/nvm.c             |    8 +-
 drivers/net/wireless/iwlwifi/mvm/ops.c             |  179 +-
 drivers/net/wireless/iwlwifi/mvm/power.c           |  109 +-
 drivers/net/wireless/iwlwifi/mvm/rs.c              |  122 +-
 drivers/net/wireless/iwlwifi/mvm/rx.c              |   67 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c            |  122 +-
 drivers/net/wireless/iwlwifi/mvm/sta.c             |   88 +-
 drivers/net/wireless/iwlwifi/mvm/time-event.c      |    2 +-
 drivers/net/wireless/iwlwifi/mvm/tof.c             |    4 +-
 drivers/net/wireless/iwlwifi/mvm/tof.h             |    2 +-
 drivers/net/wireless/iwlwifi/mvm/tt.c              |   23 +-
 drivers/net/wireless/iwlwifi/mvm/tx.c              |   15 +-
 drivers/net/wireless/iwlwifi/mvm/utils.c           |  141 +-
 drivers/net/wireless/iwlwifi/pcie/trans.c          |   10 +-
 drivers/net/wireless/mac80211_hwsim.c              |    7 +-
 drivers/net/wireless/mediatek/mt7601u/main.c       |    3 +-
 drivers/net/wireless/mwifiex/11n_aggr.c            |   12 +-
 drivers/net/wireless/mwifiex/11n_rxreorder.c       |    4 +-
 drivers/net/wireless/mwifiex/Kconfig               |    4 +-
 drivers/net/wireless/mwifiex/cfg80211.c            |   22 +-
 drivers/net/wireless/mwifiex/debugfs.c             |   66 +-
 drivers/net/wireless/mwifiex/fw.h                  |   34 +
 drivers/net/wireless/mwifiex/init.c                |    1 +
 drivers/net/wireless/mwifiex/main.c                |   81 +-
 drivers/net/wireless/mwifiex/main.h                |   25 +-
 drivers/net/wireless/mwifiex/pcie.c                |    1 -
 drivers/net/wireless/mwifiex/scan.c                |   22 +-
 drivers/net/wireless/mwifiex/sdio.c                |   29 +-
 drivers/net/wireless/mwifiex/sta_cmd.c             |   34 +-
 drivers/net/wireless/mwifiex/sta_cmdresp.c         |   36 +
 drivers/net/wireless/mwifiex/sta_event.c           |   78 +-
 drivers/net/wireless/mwifiex/sta_tx.c              |    7 +-
 drivers/net/wireless/mwifiex/tdls.c                |   12 +
 drivers/net/wireless/mwifiex/txrx.c                |   19 +-
 drivers/net/wireless/mwifiex/uap_cmd.c             |   16 -
 drivers/net/wireless/mwifiex/uap_event.c           |   11 +-
 drivers/net/wireless/mwifiex/uap_txrx.c            |   10 +-
 drivers/net/wireless/mwifiex/usb.c                 |  238 +-
 drivers/net/wireless/mwifiex/usb.h                 |   20 +-
 drivers/net/wireless/mwifiex/wmm.c                 |   69 +-
 drivers/net/wireless/mwl8k.c                       |    2 +-
 drivers/net/wireless/orinoco/cfg.c                 |    6 +-
 drivers/net/wireless/orinoco/orinoco_usb.c         |    1 +
 drivers/net/wireless/realtek/Makefile              |    9 +
 drivers/net/wireless/{ => realtek}/rtl818x/Kconfig |    0
 .../net/wireless/{ => realtek}/rtl818x/Makefile    |    0
 .../{ => realtek}/rtl818x/rtl8180/Makefile         |    2 +-
 .../wireless/{ => realtek}/rtl818x/rtl8180/dev.c   |    0
 .../{ => realtek}/rtl818x/rtl8180/grf5101.c        |    0
 .../{ => realtek}/rtl818x/rtl8180/grf5101.h        |    0
 .../{ => realtek}/rtl818x/rtl8180/max2820.c        |    0
 .../{ => realtek}/rtl818x/rtl8180/max2820.h        |    0
 .../{ => realtek}/rtl818x/rtl8180/rtl8180.h        |    0
 .../{ => realtek}/rtl818x/rtl8180/rtl8225.c        |    0
 .../{ => realtek}/rtl818x/rtl8180/rtl8225.h        |    0
 .../{ => realtek}/rtl818x/rtl8180/rtl8225se.c      |    0
 .../{ => realtek}/rtl818x/rtl8180/rtl8225se.h      |    0
 .../{ => realtek}/rtl818x/rtl8180/sa2400.c         |    0
 .../{ => realtek}/rtl818x/rtl8180/sa2400.h         |    0
 .../{ => realtek}/rtl818x/rtl8187/Makefile         |    2 +-
 .../wireless/{ => realtek}/rtl818x/rtl8187/dev.c   |    0
 .../wireless/{ => realtek}/rtl818x/rtl8187/leds.c  |    0
 .../wireless/{ => realtek}/rtl818x/rtl8187/leds.h  |    0
 .../{ => realtek}/rtl818x/rtl8187/rfkill.c         |    0
 .../{ => realtek}/rtl818x/rtl8187/rfkill.h         |    0
 .../{ => realtek}/rtl818x/rtl8187/rtl8187.h        |    0
 .../{ => realtek}/rtl818x/rtl8187/rtl8225.c        |    0
 .../{ => realtek}/rtl818x/rtl8187/rtl8225.h        |    0
 .../net/wireless/{ => realtek}/rtl818x/rtl818x.h   |    0
 drivers/net/wireless/realtek/rtl8xxxu/Kconfig      |   34 +
 drivers/net/wireless/realtek/rtl8xxxu/Makefile     |    1 +
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c   | 5993 ++++++++++++++++++++
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h   |  676 +++
 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h  |  981 ++++
 drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig |    0
 .../net/wireless/{ => realtek}/rtlwifi/Makefile    |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/base.c  |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/base.h  |    0
 .../{ => realtek}/rtlwifi/btcoexist/Makefile       |    0
 .../rtlwifi/btcoexist/halbt_precomp.h              |    0
 .../rtlwifi/btcoexist/halbtc8192e2ant.c            |    0
 .../rtlwifi/btcoexist/halbtc8192e2ant.h            |    0
 .../rtlwifi/btcoexist/halbtc8723b1ant.c            |    0
 .../rtlwifi/btcoexist/halbtc8723b1ant.h            |    0
 .../rtlwifi/btcoexist/halbtc8723b2ant.c            |    0
 .../rtlwifi/btcoexist/halbtc8723b2ant.h            |    0
 .../rtlwifi/btcoexist/halbtc8821a1ant.c            |    0
 .../rtlwifi/btcoexist/halbtc8821a1ant.h            |    0
 .../rtlwifi/btcoexist/halbtc8821a2ant.c            |    0
 .../rtlwifi/btcoexist/halbtc8821a2ant.h            |    0
 .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c |    0
 .../{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h |    0
 .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.c      |    0
 .../{ => realtek}/rtlwifi/btcoexist/rtl_btc.h      |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/cam.c   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/cam.h   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/core.c  |    2 +-
 drivers/net/wireless/{ => realtek}/rtlwifi/core.h  |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/debug.c |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/debug.h |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/pci.c   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/pci.h   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/ps.c    |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/ps.h    |    0
 .../net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/rc.c    |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/rc.h    |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/regd.c  |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/regd.h  |    0
 .../{ => realtek}/rtlwifi/rtl8188ee/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h |    0
 .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c       |    0
 .../{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8188ee/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8188ee/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8192c/Makefile        |    0
 .../{ => realtek}/rtlwifi/rtl8192c/dm_common.c     |    0
 .../{ => realtek}/rtlwifi/rtl8192c/dm_common.h     |    0
 .../{ => realtek}/rtlwifi/rtl8192c/fw_common.c     |    0
 .../{ => realtek}/rtlwifi/rtl8192c/fw_common.h     |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192c/main.c |    0
 .../{ => realtek}/rtlwifi/rtl8192c/phy_common.c    |    0
 .../{ => realtek}/rtlwifi/rtl8192c/phy_common.h    |    0
 .../{ => realtek}/rtlwifi/rtl8192ce/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8192ce/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8192ce/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8192cu/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c  |    8 +
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8192cu/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8192cu/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8192de/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8192de/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8192de/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8192ee/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h |    0
 .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c       |    0
 .../{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8192ee/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8192ee/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8192se/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8192se/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8192se/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h  |    0
 .../rtlwifi/rtl8723ae/hal_bt_coexist.c             |    0
 .../rtlwifi/rtl8723ae/hal_bt_coexist.h             |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c      |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h      |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c       |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8723ae/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8723be/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h |    0
 .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.c       |    0
 .../{ => realtek}/rtlwifi/rtl8723be/pwrseq.h       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8723be/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8723be/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h |    0
 .../{ => realtek}/rtlwifi/rtl8723com/Makefile      |    0
 .../{ => realtek}/rtlwifi/rtl8723com/dm_common.c   |    0
 .../{ => realtek}/rtlwifi/rtl8723com/dm_common.h   |    0
 .../{ => realtek}/rtlwifi/rtl8723com/fw_common.c   |    0
 .../{ => realtek}/rtlwifi/rtl8723com/fw_common.h   |    0
 .../{ => realtek}/rtlwifi/rtl8723com/main.c        |    0
 .../{ => realtek}/rtlwifi/rtl8723com/phy_common.c  |    0
 .../{ => realtek}/rtlwifi/rtl8723com/phy_common.h  |    0
 .../{ => realtek}/rtlwifi/rtl8821ae/Makefile       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h |    0
 .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c       |    0
 .../{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h       |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c  |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h  |    0
 .../{ => realtek}/rtlwifi/rtl8821ae/table.c        |    0
 .../{ => realtek}/rtlwifi/rtl8821ae/table.h        |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c |    0
 .../wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/stats.c |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/stats.h |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/usb.c   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/usb.h   |    0
 drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h  |    0
 drivers/net/wireless/rndis_wlan.c                  |    2 +-
 drivers/net/wireless/rsi/rsi_91x_mac80211.c        |    4 +-
 drivers/net/wireless/rt2x00/rt2800lib.c            |    2 +-
 drivers/net/wireless/rt2x00/rt2800lib.h            |    2 +-
 drivers/net/wireless/rt2x00/rt2x00config.c         |    2 +-
 drivers/net/wireless/ti/wl12xx/scan.c              |    3 +-
 drivers/net/wireless/ti/wl18xx/main.c              |    1 +
 drivers/net/wireless/ti/wl18xx/scan.c              |    8 +-
 drivers/net/wireless/ti/wlcore/main.c              |    2 +-
 drivers/net/wireless/ti/wlcore/wlcore.h            |    2 +-
 drivers/net/xen-netfront.c                         |   17 +-
 drivers/nfc/Kconfig                                |    1 +
 drivers/nfc/Makefile                               |    1 +
 drivers/nfc/fdp/Kconfig                            |   23 +
 drivers/nfc/fdp/Makefile                           |    9 +
 drivers/nfc/fdp/fdp.c                              |  817 +++
 drivers/nfc/fdp/fdp.h                              |   38 +
 drivers/nfc/fdp/i2c.c                              |  388 ++
 drivers/nfc/microread/Kconfig                      |   18 +-
 drivers/nfc/nfcmrvl/Kconfig                        |   34 +-
 drivers/nfc/nfcmrvl/Makefile                       |    8 +-
 drivers/nfc/nfcmrvl/fw_dnld.c                      |  553 ++
 drivers/nfc/nfcmrvl/fw_dnld.h                      |   98 +
 drivers/nfc/nfcmrvl/i2c.c                          |  290 +
 drivers/nfc/nfcmrvl/main.c                         |   75 +-
 drivers/nfc/nfcmrvl/nfcmrvl.h                      |   23 +-
 drivers/nfc/nfcmrvl/spi.c                          |  228 +
 drivers/nfc/nfcmrvl/uart.c                         |   26 +-
 drivers/nfc/nfcmrvl/usb.c                          |   10 +-
 drivers/nfc/nfcsim.c                               |    2 +-
 drivers/nfc/nfcwilink.c                            |    2 +-
 drivers/nfc/nxp-nci/core.c                         |    3 +-
 drivers/nfc/nxp-nci/i2c.c                          |    2 +-
 drivers/nfc/nxp-nci/nxp-nci.h                      |    5 +-
 drivers/nfc/pn533.c                                |    2 +-
 drivers/nfc/pn544/Kconfig                          |   18 +-
 drivers/nfc/s3fwrn5/Kconfig                        |    1 +
 drivers/nfc/s3fwrn5/Makefile                       |    2 -
 drivers/nfc/s3fwrn5/i2c.c                          |    2 +-
 drivers/nfc/s3fwrn5/nci.c                          |    4 +-
 drivers/nfc/s3fwrn5/nci.h                          |    2 +-
 drivers/nfc/st-nci/Makefile                        |    4 +-
 drivers/nfc/st-nci/core.c                          |   20 +-
 drivers/nfc/st-nci/i2c.c                           |   35 +-
 drivers/nfc/st-nci/ndlc.c                          |    7 +-
 drivers/nfc/st-nci/ndlc.h                          |    5 +-
 drivers/nfc/st-nci/{st-nci_se.c => se.c}           |  166 +-
 drivers/nfc/st-nci/spi.c                           |   37 +-
 drivers/nfc/st-nci/st-nci.h                        |  117 +-
 drivers/nfc/st-nci/st-nci_se.h                     |   61 -
 drivers/nfc/st-nci/vendor_cmds.c                   |  516 ++
 drivers/nfc/st21nfca/Makefile                      |    2 +-
 drivers/nfc/st21nfca/{st21nfca.c => core.c}        |   48 +-
 drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c}     |    2 +-
 drivers/nfc/st21nfca/i2c.c                         |    1 +
 drivers/nfc/st21nfca/{st21nfca_se.c => se.c}       |   18 +-
 drivers/nfc/st21nfca/st21nfca.h                    |  148 +-
 drivers/nfc/st21nfca/st21nfca_dep.h                |   43 -
 drivers/nfc/st21nfca/st21nfca_se.h                 |   63 -
 drivers/nfc/st21nfca/vendor_cmds.c                 |  375 ++
 drivers/nfc/trf7970a.c                             |    7 +
 drivers/s390/char/monreader.c                      |    4 +-
 drivers/s390/char/vmlogrdr.c                       |    8 +-
 drivers/s390/cio/qdio_main.c                       |    4 +-
 drivers/s390/net/netiucv.c                         |   21 +-
 drivers/s390/net/qeth_core.h                       |   30 +-
 drivers/s390/net/qeth_core_main.c                  |  241 +-
 drivers/s390/net/qeth_core_sys.c                   |   43 +-
 drivers/s390/net/qeth_l2_main.c                    |  228 +-
 drivers/s390/net/qeth_l2_sys.c                     |    2 +-
 drivers/s390/net/qeth_l3_main.c                    |  158 +-
 drivers/s390/net/smsgiucv.c                        |    5 +-
 drivers/scsi/cxgbi/cxgb4i/cxgb4i.c                 |    2 +-
 drivers/ssb/Kconfig                                |    9 +
 drivers/ssb/Makefile                               |    3 +-
 drivers/ssb/bridge_pcmcia_80211.c                  |  128 +
 drivers/ssb/host_soc.c                             |  173 +
 drivers/ssb/main.c                                 |  173 +-
 drivers/ssb/pcmcia.c                               |    3 +-
 drivers/ssb/sdio.c                                 |    2 +-
 drivers/ssb/ssb_private.h                          |   34 +-
 drivers/tty/hvc/hvc_iucv.c                         |   10 +-
 include/linux/bcma/bcma.h                          |    2 +
 include/linux/bpf.h                                |   17 +-
 include/linux/brcmphy.h                            |   29 +-
 include/linux/can/dev.h                            |    9 +-
 include/linux/can/led.h                            |    1 +
 include/linux/dccp.h                               |    6 +-
 include/linux/filter.h                             |   48 +-
 include/linux/genetlink.h                          |    2 +-
 include/linux/ieee80211.h                          |   85 +-
 include/linux/ieee802154.h                         |   47 +-
 include/linux/if_bridge.h                          |    6 +
 include/linux/if_link.h                            |    1 +
 include/linux/igmp.h                               |    2 +-
 include/linux/inetdevice.h                         |   10 +-
 include/linux/ipv6.h                               |    4 +-
 include/linux/leds.h                               |    7 +
 include/linux/mlx4/device.h                        |    1 +
 include/linux/mlx5/device.h                        |    5 +-
 include/linux/mlx5/driver.h                        |   41 +-
 include/linux/net.h                                |   21 +-
 include/linux/netdevice.h                          |   61 +-
 include/linux/netfilter.h                          |  100 +-
 include/linux/netfilter/nfnetlink.h                |    6 +-
 include/linux/netfilter/x_tables.h                 |    3 +-
 include/linux/netfilter_arp/arp_tables.h           |    1 -
 include/linux/netfilter_bridge.h                   |    2 +-
 include/linux/netfilter_bridge/ebtables.h          |    6 +-
 include/linux/netfilter_ingress.h                  |    2 +-
 include/linux/netfilter_ipv4.h                     |    2 +-
 include/linux/netfilter_ipv4/ip_tables.h           |    1 -
 include/linux/netfilter_ipv6.h                     |    6 +-
 include/linux/netfilter_ipv6/ip6_tables.h          |    1 -
 include/linux/once.h                               |   57 +
 include/linux/phy.h                                |    3 +
 include/linux/platform_data/atmel.h                |    5 -
 include/linux/{ => platform_data}/mdio-gpio.h      |    0
 include/linux/platform_data/nfcmrvl.h              |    8 +
 include/linux/platform_data/st-nci.h               |    2 +
 include/linux/qed/common_hsi.h                     |  607 ++
 include/linux/qed/eth_common.h                     |  279 +
 include/linux/qed/qed_chain.h                      |  539 ++
 include/linux/qed/qed_eth_if.h                     |  165 +
 include/linux/qed/qed_if.h                         |  498 ++
 include/linux/random.h                             |    6 +
 include/linux/regmap.h                             |    3 +
 include/linux/rtnetlink.h                          |    6 +-
 include/linux/sched.h                              |    2 +-
 include/linux/seccomp.h                            |   11 +
 include/linux/skbuff.h                             |    9 +
 include/linux/tcp.h                                |   41 +-
 include/linux/usb/cdc.h                            |   51 +
 include/net/6lowpan.h                              |  360 +-
 include/net/addrconf.h                             |    3 +-
 include/net/af_ieee802154.h                        |    2 +-
 include/net/af_vsock.h                             |    3 +
 include/net/bluetooth/bluetooth.h                  |   30 +-
 include/net/bluetooth/hci.h                        |   14 +
 include/net/bluetooth/hci_core.h                   |   37 +-
 include/net/bluetooth/hci_mon.h                    |   10 +
 include/net/cfg80211.h                             |  138 +-
 include/net/cfg802154.h                            |  164 +
 include/net/dn_neigh.h                             |    6 +-
 include/net/dsa.h                                  |   31 +-
 include/net/dst.h                                  |   23 +-
 include/net/dst_ops.h                              |    3 +-
 include/net/ethoc.h                                |    1 +
 include/net/flow.h                                 |    2 +-
 include/net/genetlink.h                            |    5 +-
 include/net/ieee802154_netdev.h                    |   86 +-
 include/net/inet6_connection_sock.h                |   13 +-
 include/net/inet_connection_sock.h                 |   35 +-
 include/net/inet_hashtables.h                      |    5 +-
 include/net/inet_sock.h                            |    3 +-
 include/net/inet_timewait_sock.h                   |    2 +-
 include/net/ip.h                                   |   41 +-
 include/net/ip6_route.h                            |    4 +-
 include/net/ip6_tunnel.h                           |    2 +-
 include/net/ip_fib.h                               |   16 +-
 include/net/ip_vs.h                                |  299 +-
 include/net/ipv6.h                                 |   13 +-
 include/net/iucv/iucv.h                            |   20 +-
 include/net/l3mdev.h                               |  222 +
 include/net/lwtunnel.h                             |    8 +-
 include/net/mac80211.h                             |   39 +-
 include/net/mac802154.h                            |   33 +-
 include/net/mpls_iptunnel.h                        |    2 +-
 include/net/ndisc.h                                |    6 +-
 include/net/netfilter/br_netfilter.h               |    8 +-
 include/net/netfilter/ipv4/nf_dup_ipv4.h           |    2 +-
 include/net/netfilter/ipv4/nf_reject.h             |    2 +-
 include/net/netfilter/ipv6/nf_defrag_ipv6.h        |    2 +-
 include/net/netfilter/ipv6/nf_dup_ipv6.h           |    2 +-
 include/net/netfilter/nf_conntrack.h               |    7 +-
 include/net/netfilter/nf_conntrack_core.h          |    1 +
 include/net/netfilter/nf_conntrack_l4proto.h       |    2 +-
 include/net/netfilter/nf_conntrack_timeout.h       |   25 +-
 include/net/netfilter/nf_nat_core.h                |    2 +-
 include/net/netfilter/nf_nat_l3proto.h             |   32 +-
 include/net/netfilter/nf_queue.h                   |    2 +-
 include/net/netfilter/nf_tables.h                  |   14 +-
 include/net/netfilter/nf_tables_ipv4.h             |    3 +-
 include/net/netfilter/nf_tables_ipv6.h             |    3 +-
 include/net/netfilter/nfnetlink_queue.h            |   51 -
 include/net/netlink.h                              |   18 +
 include/net/nfc/nci.h                              |    8 +
 include/net/nfc/nci_core.h                         |   24 +-
 include/net/nfc/nfc.h                              |    2 +-
 include/net/nl802154.h                             |  191 +
 include/net/request_sock.h                         |  186 +-
 include/net/route.h                                |   23 +-
 include/net/rtnetlink.h                            |    6 +-
 include/net/sch_generic.h                          |    3 +-
 include/net/sock.h                                 |   70 +-
 include/net/switchdev.h                            |  161 +-
 include/net/tc_act/tc_connmark.h                   |    1 +
 include/net/tcp.h                                  |   94 +-
 include/net/tso.h                                  |    1 +
 include/net/vrf.h                                  |  178 -
 include/net/vxlan.h                                |   14 +-
 include/net/xfrm.h                                 |    8 +-
 include/uapi/linux/Kbuild                          |    1 +
 include/uapi/linux/atm_zatm.h                      |    6 -
 include/uapi/linux/bpf.h                           |   27 +
 include/uapi/linux/can/bcm.h                       |    7 +-
 include/uapi/linux/if_arcnet.h                     |   55 +-
 include/uapi/linux/if_bridge.h                     |    1 +
 include/uapi/linux/if_link.h                       |   56 +
 include/uapi/linux/netfilter/nfnetlink_log.h       |    3 +
 include/uapi/linux/netlink.h                       |    1 +
 include/uapi/linux/nfc.h                           |    2 +
 include/uapi/linux/nl80211.h                       |   57 +-
 include/uapi/linux/openvswitch.h                   |    2 +
 include/uapi/linux/perf_event.h                    |    1 +
 include/uapi/linux/pkt_cls.h                       |    4 +
 include/uapi/linux/ptrace.h                        |    2 +
 include/uapi/linux/rtnetlink.h                     |    2 +
 include/uapi/linux/usb/cdc.h                       |    6 +-
 kernel/bpf/arraymap.c                              |   26 +-
 kernel/bpf/core.c                                  |   30 +
 kernel/bpf/hashtab.c                               |    4 +
 kernel/bpf/helpers.c                               |    7 +-
 kernel/bpf/syscall.c                               |   83 +-
 kernel/bpf/verifier.c                              |  111 +-
 kernel/events/core.c                               |   15 +-
 kernel/irq/manage.c                                |    9 +-
 kernel/ptrace.c                                    |    5 +
 kernel/seccomp.c                                   |   78 +-
 kernel/sysctl.c                                    |   13 +
 kernel/trace/bpf_trace.c                           |   55 +-
 lib/Makefile                                       |    3 +-
 lib/once.c                                         |   62 +
 lib/random32.c                                     |   37 +-
 net/6lowpan/core.c                                 |    5 +
 net/6lowpan/iphc.c                                 |  690 ++-
 net/6lowpan/nhc.c                                  |   16 +-
 net/6lowpan/nhc.h                                  |   14 +-
 net/6lowpan/nhc_udp.c                              |   35 +-
 net/Kconfig                                        |    1 +
 net/Makefile                                       |    3 +
 net/bluetooth/6lowpan.c                            |  162 +-
 net/bluetooth/af_bluetooth.c                       |    4 +-
 net/bluetooth/hci_conn.c                           |  167 +-
 net/bluetooth/hci_core.c                           |  228 +-
 net/bluetooth/hci_event.c                          |   28 +-
 net/bluetooth/hci_request.c                        |  103 +-
 net/bluetooth/hci_request.h                        |    4 +
 net/bluetooth/hci_sock.c                           |  109 +-
 net/bluetooth/hidp/core.c                          |   14 +
 net/bluetooth/l2cap_sock.c                         |   71 +-
 net/bluetooth/lib.c                                |   32 +
 net/bluetooth/mgmt.c                               |  178 +-
 net/bluetooth/sco.c                                |   44 +-
 net/bluetooth/smp.c                                |   62 +-
 net/bluetooth/smp.h                                |    1 +
 net/bridge/br_device.c                             |    4 +-
 net/bridge/br_fdb.c                                |  216 +-
 net/bridge/br_forward.c                            |   33 +-
 net/bridge/br_if.c                                 |    3 +
 net/bridge/br_input.c                              |   35 +-
 net/bridge/br_ioctl.c                              |    3 +-
 net/bridge/br_mdb.c                                |   24 +-
 net/bridge/br_multicast.c                          |    4 +-
 net/bridge/br_netfilter_hooks.c                    |  107 +-
 net/bridge/br_netfilter_ipv6.c                     |   21 +-
 net/bridge/br_netlink.c                            |  522 +-
 net/bridge/br_private.h                            |  208 +-
 net/bridge/br_stp.c                                |   41 +-
 net/bridge/br_stp_bpdu.c                           |   12 +-
 net/bridge/br_stp_if.c                             |   12 +
 net/bridge/br_sysfs_br.c                           |   11 +-
 net/bridge/br_vlan.c                               |  772 ++-
 net/bridge/netfilter/ebt_log.c                     |    2 +-
 net/bridge/netfilter/ebt_nflog.c                   |    2 +-
 net/bridge/netfilter/ebtable_broute.c              |    8 +-
 net/bridge/netfilter/ebtable_filter.c              |   13 +-
 net/bridge/netfilter/ebtable_nat.c                 |   13 +-
 net/bridge/netfilter/ebtables.c                    |   14 +-
 net/bridge/netfilter/nf_tables_bridge.c            |   20 +-
 net/bridge/netfilter/nft_reject_bridge.c           |   19 +-
 net/can/bcm.c                                      |   15 +-
 net/core/dev.c                                     |   45 +-
 net/core/dst.c                                     |   14 +-
 net/core/filter.c                                  |  135 +-
 net/core/lwtunnel.c                                |    4 +-
 net/core/neighbour.c                               |   45 +-
 net/core/net-sysfs.c                               |   11 +-
 net/core/netpoll.c                                 |   23 +-
 net/core/request_sock.c                            |   88 +-
 net/core/rtnetlink.c                               |   38 +-
 net/core/sock.c                                    |   53 +-
 net/core/sock_diag.c                               |   14 +-
 net/core/tso.c                                     |   18 +-
 net/core/utils.c                                   |   49 -
 net/dcb/dcbnl.c                                    |   30 +-
 net/dccp/dccp.h                                    |   16 +-
 net/dccp/ipv4.c                                    |   94 +-
 net/dccp/ipv6.c                                    |  122 +-
 net/dccp/minisocks.c                               |   18 +-
 net/dccp/output.c                                  |   17 +-
 net/decnet/dn_neigh.c                              |   23 +-
 net/decnet/dn_nsp_in.c                             |    7 +-
 net/decnet/dn_nsp_out.c                            |    4 +-
 net/decnet/dn_route.c                              |   38 +-
 net/decnet/netfilter/dn_rtmsg.c                    |    2 +-
 net/dsa/dsa.c                                      |    4 +-
 net/dsa/slave.c                                    |  184 +-
 net/ethernet/eth.c                                 |    2 +-
 net/ieee802154/6lowpan/6lowpan_i.h                 |   14 +-
 net/ieee802154/6lowpan/core.c                      |  126 +-
 net/ieee802154/6lowpan/reassembly.c                |  157 +-
 net/ieee802154/6lowpan/rx.c                        |  357 +-
 net/ieee802154/6lowpan/tx.c                        |   95 +-
 net/ieee802154/Kconfig                             |    5 +
 net/ieee802154/core.c                              |   12 +
 net/ieee802154/core.h                              |    1 +
 net/ieee802154/header_ops.c                        |   20 +-
 net/ieee802154/nl802154.c                          | 1321 ++++-
 net/ieee802154/rdev-ops.h                          |  109 +
 net/ieee802154/socket.c                            |    8 +-
 net/ipv4/Makefile                                  |    1 +
 net/ipv4/af_inet.c                                 |   30 +-
 net/ipv4/arp.c                                     |   20 +-
 net/ipv4/devinet.c                                 |    7 +-
 net/ipv4/fib_frontend.c                            |   26 +-
 net/ipv4/fib_semantics.c                           |  161 +-
 net/ipv4/icmp.c                                    |   27 +-
 net/ipv4/igmp.c                                    |    6 +-
 net/ipv4/inet_connection_sock.c                    |  271 +-
 net/ipv4/inet_diag.c                               |   96 +-
 net/ipv4/inet_hashtables.c                         |   53 +-
 net/ipv4/ip_forward.c                              |   19 +-
 net/ipv4/ip_fragment.c                             |   13 +-
 net/ipv4/ip_input.c                                |   47 +-
 net/ipv4/ip_output.c                               |  148 +-
 net/ipv4/ip_tunnel_core.c                          |    6 +-
 net/ipv4/ip_vti.c                                  |    2 +-
 net/ipv4/ipconfig.c                                |   32 +-
 net/ipv4/ipmr.c                                    |   15 +-
 net/ipv4/netfilter.c                               |    7 +-
 net/ipv4/netfilter/arp_tables.c                    |   15 +-
 net/ipv4/netfilter/arptable_filter.c               |    7 +-
 net/ipv4/netfilter/ip_tables.c                     |   31 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c                 |   12 +-
 net/ipv4/netfilter/ipt_REJECT.c                    |    2 +-
 net/ipv4/netfilter/ipt_SYNPROXY.c                  |   32 +-
 net/ipv4/netfilter/ipt_ah.c                        |    2 +-
 net/ipv4/netfilter/ipt_rpfilter.c                  |    5 +-
 net/ipv4/netfilter/iptable_filter.c                |    9 +-
 net/ipv4/netfilter/iptable_mangle.c                |   19 +-
 net/ipv4/netfilter/iptable_nat.c                   |   26 +-
 net/ipv4/netfilter/iptable_raw.c                   |    9 +-
 net/ipv4/netfilter/iptable_security.c              |   12 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |   18 +-
 net/ipv4/netfilter/nf_conntrack_proto_icmp.c       |    4 +-
 net/ipv4/netfilter/nf_defrag_ipv4.c                |   13 +-
 net/ipv4/netfilter/nf_dup_ipv4.c                   |   25 +-
 net/ipv4/netfilter/nf_nat_l3proto_ipv4.c           |   44 +-
 net/ipv4/netfilter/nf_nat_snmp_basic.c             |    2 +-
 net/ipv4/netfilter/nf_reject_ipv4.c                |    6 +-
 net/ipv4/netfilter/nf_tables_arp.c                 |    6 +-
 net/ipv4/netfilter/nf_tables_ipv4.c                |   10 +-
 net/ipv4/netfilter/nft_chain_nat_ipv4.c            |   22 +-
 net/ipv4/netfilter/nft_chain_route_ipv4.c          |    8 +-
 net/ipv4/netfilter/nft_dup_ipv4.c                  |    2 +-
 net/ipv4/netfilter/nft_masq_ipv4.c                 |    2 +-
 net/ipv4/netfilter/nft_redir_ipv4.c                |    2 +-
 net/ipv4/netfilter/nft_reject_ipv4.c               |    5 +-
 net/ipv4/raw.c                                     |   13 +-
 net/ipv4/route.c                                   |  216 +-
 net/ipv4/syncookies.c                              |   23 +-
 net/ipv4/sysctl_net_ipv4.c                         |   14 +
 net/ipv4/tcp.c                                     |   39 +-
 net/ipv4/tcp_cong.c                                |   12 +-
 net/ipv4/tcp_fastopen.c                            |   75 +-
 net/ipv4/tcp_input.c                               |  280 +-
 net/ipv4/tcp_ipv4.c                                |  203 +-
 net/ipv4/tcp_minisocks.c                           |   68 +-
 net/ipv4/tcp_output.c                              |   86 +-
 net/ipv4/tcp_recovery.c                            |  109 +
 net/ipv4/tcp_timer.c                               |    6 +-
 net/ipv4/udp.c                                     |   28 +-
 net/ipv4/xfrm4_input.c                             |    7 +-
 net/ipv4/xfrm4_output.c                            |   11 +-
 net/ipv4/xfrm4_policy.c                            |   59 +-
 net/ipv6/addrconf.c                                |   76 +-
 net/ipv6/datagram.c                                |    2 +-
 net/ipv6/icmp.c                                    |   18 +-
 net/ipv6/ila.c                                     |    4 +-
 net/ipv6/inet6_connection_sock.c                   |   77 +-
 net/ipv6/inet6_hashtables.c                        |    2 +
 net/ipv6/ip6_fib.c                                 |    1 +
 net/ipv6/ip6_input.c                               |   15 +-
 net/ipv6/ip6_offload.c                             |   12 +
 net/ipv6/ip6_output.c                              |  164 +-
 net/ipv6/ip6_vti.c                                 |    2 +-
 net/ipv6/ip6mr.c                                   |   12 +-
 net/ipv6/mcast.c                                   |    9 +-
 net/ipv6/mip6.c                                    |   16 +-
 net/ipv6/ndisc.c                                   |   50 +-
 net/ipv6/netfilter.c                               |    7 +-
 net/ipv6/netfilter/ip6_tables.c                    |   33 +-
 net/ipv6/netfilter/ip6t_REJECT.c                   |    2 +-
 net/ipv6/netfilter/ip6t_SYNPROXY.c                 |   12 +-
 net/ipv6/netfilter/ip6t_rpfilter.c                 |    6 +-
 net/ipv6/netfilter/ip6table_filter.c               |    6 +-
 net/ipv6/netfilter/ip6table_mangle.c               |   18 +-
 net/ipv6/netfilter/ip6table_nat.c                  |   26 +-
 net/ipv6/netfilter/ip6table_raw.c                  |    6 +-
 net/ipv6/netfilter/ip6table_security.c             |    7 +-
 net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c     |   18 +-
 net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c     |    7 +-
 net/ipv6/netfilter/nf_conntrack_reasm.c            |    8 +-
 net/ipv6/netfilter/nf_defrag_ipv6_hooks.c          |    9 +-
 net/ipv6/netfilter/nf_dup_ipv6.c                   |   25 +-
 net/ipv6/netfilter/nf_nat_l3proto_ipv6.c           |   44 +-
 net/ipv6/netfilter/nf_nat_masquerade_ipv6.c        |    2 +-
 net/ipv6/netfilter/nf_reject_ipv6.c                |    6 +-
 net/ipv6/netfilter/nf_tables_ipv6.c                |   10 +-
 net/ipv6/netfilter/nft_chain_nat_ipv6.c            |   22 +-
 net/ipv6/netfilter/nft_chain_route_ipv6.c          |   14 +-
 net/ipv6/netfilter/nft_dup_ipv6.c                  |    2 +-
 net/ipv6/netfilter/nft_redir_ipv6.c                |    3 +-
 net/ipv6/netfilter/nft_reject_ipv6.c               |    7 +-
 net/ipv6/output_core.c                             |   24 +-
 net/ipv6/raw.c                                     |    9 +-
 net/ipv6/route.c                                   |  104 +-
 net/ipv6/syncookies.c                              |   13 +-
 net/ipv6/tcp_ipv6.c                                |  187 +-
 net/ipv6/udp.c                                     |   11 +-
 net/ipv6/xfrm6_input.c                             |    4 +-
 net/ipv6/xfrm6_output.c                            |   22 +-
 net/ipv6/xfrm6_policy.c                            |   10 +-
 net/iucv/af_iucv.c                                 |    9 +-
 net/iucv/iucv.c                                    |   12 +-
 net/l2tp/l2tp_core.h                               |    3 +
 net/l2tp/l2tp_eth.c                                |    1 +
 net/l2tp/l2tp_ip.c                                 |    1 +
 net/l2tp/l2tp_ip6.c                                |    1 +
 net/l2tp/l2tp_netlink.c                            |    7 +
 net/l2tp/l2tp_ppp.c                                |    1 +
 net/l3mdev/Kconfig                                 |   10 +
 net/l3mdev/Makefile                                |    5 +
 net/l3mdev/l3mdev.c                                |   92 +
 net/mac80211/Makefile                              |    1 -
 net/mac80211/agg-rx.c                              |    8 +-
 net/mac80211/agg-tx.c                              |   15 +-
 net/mac80211/cfg.c                                 |  101 +-
 net/mac80211/cfg.h                                 |    9 -
 net/mac80211/debugfs.c                             |    2 +
 net/mac80211/debugfs_key.c                         |   51 +-
 net/mac80211/debugfs_netdev.c                      |   41 +-
 net/mac80211/debugfs_sta.c                         |    8 +-
 net/mac80211/driver-ops.c                          |  222 +
 net/mac80211/driver-ops.h                          |  259 +-
 net/mac80211/ethtool.c                             |   29 +-
 net/mac80211/event.c                               |   27 -
 net/mac80211/ibss.c                                |   24 +-
 net/mac80211/ieee80211_i.h                         |   32 +-
 net/mac80211/iface.c                               |    6 +-
 net/mac80211/main.c                                |   17 +-
 net/mac80211/mesh.c                                |   82 +-
 net/mac80211/mesh.h                                |   10 +-
 net/mac80211/mesh_hwmp.c                           |    2 +-
 net/mac80211/mesh_plink.c                          |   15 +-
 net/mac80211/mlme.c                                |  240 +-
 net/mac80211/ocb.c                                 |    2 +-
 net/mac80211/offchannel.c                          |    6 +-
 net/mac80211/pm.c                                  |    3 +-
 net/mac80211/rate.c                                |    5 +-
 net/mac80211/rc80211_minstrel_debugfs.c            |   12 +-
 net/mac80211/rc80211_minstrel_ht_debugfs.c         |   12 +-
 net/mac80211/rx.c                                  |   81 +-
 net/mac80211/scan.c                                |   20 +-
 net/mac80211/sta_info.c                            |  109 +-
 net/mac80211/sta_info.h                            |  105 +-
 net/mac80211/status.c                              |  161 +-
 net/mac80211/tdls.c                                |    8 +-
 net/mac80211/trace.h                               |   42 +-
 net/mac80211/tx.c                                  |   42 +-
 net/mac80211/util.c                                |   23 +-
 net/mac80211/wpa.c                                 |    9 +-
 net/mac802154/cfg.c                                |  205 +
 net/mac802154/iface.c                              |  118 +-
 net/mac802154/llsec.c                              |   21 +-
 net/mac802154/rx.c                                 |    4 +
 net/mac802154/tx.c                                 |    7 +-
 net/mpls/af_mpls.c                                 |  636 ++-
 net/mpls/internal.h                                |   74 +-
 net/mpls/mpls_iptunnel.c                           |    2 +-
 net/netfilter/Kconfig                              |   15 +-
 net/netfilter/Makefile                             |    2 -
 net/netfilter/core.c                               |   13 +-
 net/netfilter/ipset/ip_set_core.c                  |    9 +-
 net/netfilter/ipvs/ip_vs_app.c                     |   36 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |   91 +-
 net/netfilter/ipvs/ip_vs_core.c                    |  534 +-
 net/netfilter/ipvs/ip_vs_ctl.c                     |  291 +-
 net/netfilter/ipvs/ip_vs_est.c                     |   20 +-
 net/netfilter/ipvs/ip_vs_ftp.c                     |   27 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |    3 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |    3 +-
 net/netfilter/ipvs/ip_vs_nfct.c                    |    5 +-
 net/netfilter/ipvs/ip_vs_pe_sip.c                  |    2 +-
 net/netfilter/ipvs/ip_vs_proto.c                   |   33 +-
 net/netfilter/ipvs/ip_vs_proto_ah_esp.c            |   32 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c              |   58 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c               |   61 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c               |   49 +-
 net/netfilter/ipvs/ip_vs_sh.c                      |   45 +-
 net/netfilter/ipvs/ip_vs_sync.c                    |   87 +-
 net/netfilter/ipvs/ip_vs_xmit.c                    |   85 +-
 net/netfilter/nf_conntrack_core.c                  |   22 +-
 net/netfilter/nf_conntrack_netlink.c               |   98 +-
 net/netfilter/nf_conntrack_proto_dccp.c            |    2 +-
 net/netfilter/nf_conntrack_proto_generic.c         |    2 +-
 net/netfilter/nf_conntrack_proto_gre.c             |    3 +-
 net/netfilter/nf_conntrack_proto_sctp.c            |    2 +-
 net/netfilter/nf_conntrack_proto_tcp.c             |    2 +-
 net/netfilter/nf_conntrack_proto_udp.c             |    1 +
 net/netfilter/nf_conntrack_proto_udplite.c         |    1 +
 net/netfilter/nf_nat_core.c                        |    4 +-
 net/netfilter/nf_queue.c                           |   42 +-
 net/netfilter/nf_tables_api.c                      |    1 -
 net/netfilter/nf_tables_core.c                     |   10 +-
 net/netfilter/nf_tables_netdev.c                   |   20 +-
 net/netfilter/nfnetlink.c                          |    2 +-
 net/netfilter/nfnetlink_cttimeout.c                |   34 +
 net/netfilter/nfnetlink_log.c                      |   89 +-
 .../{nfnetlink_queue_core.c => nfnetlink_queue.c}  |   73 +-
 net/netfilter/nfnetlink_queue_ct.c                 |  113 -
 net/netfilter/nft_log.c                            |    3 +-
 net/netfilter/nft_meta.c                           |    4 +-
 net/netfilter/nft_queue.c                          |    2 +-
 net/netfilter/nft_reject_inet.c                    |   19 +-
 net/netfilter/x_tables.c                           |    1 -
 net/netfilter/xt_CT.c                              |    7 +-
 net/netfilter/xt_LOG.c                             |    2 +-
 net/netfilter/xt_NFLOG.c                           |    2 +-
 net/netfilter/xt_TCPMSS.c                          |    2 +-
 net/netfilter/xt_TEE.c                             |    4 +-
 net/netfilter/xt_TPROXY.c                          |   24 +-
 net/netfilter/xt_addrtype.c                        |    4 +-
 net/netfilter/xt_connlimit.c                       |    4 +-
 net/netfilter/xt_ipvs.c                            |    5 +-
 net/netfilter/xt_osf.c                             |    2 +-
 net/netfilter/xt_recent.c                          |    2 +-
 net/netfilter/xt_socket.c                          |   14 +-
 net/netlink/genetlink.c                            |   14 +-
 net/nfc/core.c                                     |    4 +-
 net/nfc/digital_core.c                             |    3 +-
 net/nfc/hci/core.c                                 |    3 +-
 net/nfc/hci/llc.c                                  |    2 +
 net/nfc/nci/Kconfig                                |    2 +-
 net/nfc/nci/Makefile                               |    3 +-
 net/nfc/nci/core.c                                 |  150 +-
 net/nfc/nci/data.c                                 |   13 +
 net/nfc/nci/hci.c                                  |  167 +-
 net/nfc/nci/ntf.c                                  |    3 +-
 net/nfc/nci/rsp.c                                  |    1 +
 net/nfc/nci/spi.c                                  |   11 +-
 net/nfc/netlink.c                                  |    8 +-
 net/nfc/nfc.h                                      |    5 +-
 net/nfc/rawsock.c                                  |    3 +-
 net/openvswitch/actions.c                          |   13 +-
 net/openvswitch/conntrack.c                        |    6 +-
 net/openvswitch/datapath.c                         |    3 +-
 net/openvswitch/flow.c                             |    4 +-
 net/openvswitch/flow.h                             |    1 +
 net/openvswitch/flow_netlink.c                     |  126 +-
 net/openvswitch/flow_table.c                       |    2 +-
 net/openvswitch/vport-geneve.c                     |    2 +-
 net/openvswitch/vport-gre.c                        |    2 +-
 net/openvswitch/vport-internal_dev.c               |    8 +-
 net/openvswitch/vport-netdev.c                     |   33 +-
 net/openvswitch/vport-netdev.h                     |    1 -
 net/openvswitch/vport-vxlan.c                      |    2 +-
 net/openvswitch/vport.c                            |   30 +
 net/openvswitch/vport.h                            |   22 +-
 net/packet/af_packet.c                             |   34 +-
 net/rds/af_rds.c                                   |    8 +-
 net/rds/bind.c                                     |   85 +-
 net/rds/connection.c                               |   22 +-
 net/rds/ib.c                                       |   47 +-
 net/rds/ib.h                                       |   78 +-
 net/rds/ib_cm.c                                    |  114 +-
 net/rds/ib_rdma.c                                  |  116 +-
 net/rds/ib_recv.c                                  |  136 +-
 net/rds/ib_send.c                                  |  110 +-
 net/rds/ib_stats.c                                 |   22 +-
 net/rds/rds.h                                      |    5 +-
 net/rds/send.c                                     |   19 +-
 net/rds/tcp.c                                      |   16 +-
 net/rds/tcp_listen.c                               |   25 +-
 net/rds/tcp_send.c                                 |    8 +-
 net/rds/threads.c                                  |    2 +
 net/rxrpc/ar-connection.c                          |    4 +-
 net/rxrpc/ar-internal.h                            |    4 +-
 net/rxrpc/ar-transport.c                           |    4 +-
 net/sched/act_bpf.c                                |    1 +
 net/sched/act_connmark.c                           |    5 +-
 net/sched/act_ipt.c                                |    1 +
 net/sched/cls_bpf.c                                |   82 +-
 net/sched/em_ipset.c                               |    1 +
 net/sched/sch_blackhole.c                          |   15 +-
 net/sched/sch_dsmark.c                             |   63 +-
 net/sched/sch_fq.c                                 |   13 +-
 net/sctp/sm_make_chunk.c                           |    2 +-
 net/sctp/sm_statefuns.c                            |    2 +-
 net/switchdev/switchdev.c                          |  637 ++-
 net/tipc/bcast.c                                   |  988 +---
 net/tipc/bcast.h                                   |  122 +-
 net/tipc/bearer.c                                  |  102 +-
 net/tipc/bearer.h                                  |    9 +-
 net/tipc/core.c                                    |    9 +
 net/tipc/core.h                                    |   12 +-
 net/tipc/discover.c                                |   28 +-
 net/tipc/link.c                                    |  933 +--
 net/tipc/link.h                                    |   81 +-
 net/tipc/msg.c                                     |   51 +-
 net/tipc/msg.h                                     |   42 +-
 net/tipc/name_distr.c                              |    4 +-
 net/tipc/net.c                                     |    6 +-
 net/tipc/node.c                                    |  227 +-
 net/tipc/node.h                                    |   41 +-
 net/tipc/socket.c                                  |    4 +-
 net/tipc/udp_media.c                               |   13 +-
 net/unix/af_unix.c                                 |    5 +-
 net/vmw_vsock/af_vsock.c                           |   37 +-
 net/vmw_vsock/vmci_transport.c                     |    4 +-
 net/wireless/Kconfig                               |   10 +
 net/wireless/core.c                                |    6 +-
 net/wireless/core.h                                |    1 +
 net/wireless/nl80211.c                             |  497 +-
 net/wireless/reg.c                                 |  295 +-
 net/wireless/scan.c                                |   61 +-
 net/wireless/trace.h                               |   22 +-
 net/xfrm/xfrm_input.c                              |    4 +-
 net/xfrm/xfrm_output.c                             |   20 +-
 net/xfrm/xfrm_policy.c                             |   19 +-
 net/xfrm/xfrm_user.c                               |    5 +-
 samples/bpf/Makefile                               |    7 +
 samples/bpf/bpf_helpers.h                          |    6 +
 samples/bpf/libbpf.h                               |    8 +
 samples/bpf/tcbpf1_kern.c                          |   24 +-
 samples/bpf/test_verifier.c                        |  357 +-
 samples/bpf/trace_output_kern.c                    |   31 +
 samples/bpf/trace_output_user.c                    |  196 +
 security/selinux/hooks.c                           |   27 +-
 security/smack/smack_netfilter.c                   |    6 +-
 tools/net/bpf_jit_disasm.c                         |    4 +-
 1560 files changed, 113326 insertions(+), 23307 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/brcm,iproc-mdio.txt
 create mode 100644 Documentation/devicetree/bindings/net/can/sun4i_can.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt
 create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt
 create mode 100644 Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt
 create mode 100644 arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi
 rename {include/linux => drivers/net/arcnet}/arcdevice.h (75%)
 rename {include/linux => drivers/net/arcnet}/com20020.h (61%)
 create mode 100644 drivers/net/arcnet/com9026.h
 create mode 100644 drivers/net/can/sun4i_can.c
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/Makefile
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.c
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt.h
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
 create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h
 delete mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/Makefile
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hnae.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_dsaf_xgmac.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_enet.h
 create mode 100644 drivers/net/ethernet/hisilicon/hns/hns_ethtool.c
 create mode 100644 drivers/net/ethernet/hisilicon/hns_mdio.c
 create mode 100644 drivers/net/ethernet/intel/i40e/i40e_devids.h
 create mode 100644 drivers/net/ethernet/intel/i40evf/i40e_devids.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.c
 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum.h
 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_buffers.c
 create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
 create mode 100644 drivers/net/ethernet/microchip/encx24j600-regmap.c
 create mode 100644 drivers/net/ethernet/microchip/encx24j600.c
 create mode 100644 drivers/net/ethernet/microchip/encx24j600_hw.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/Makefile
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_cxt.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dev_api.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hsi.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_hw.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_fw_funcs.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_init_ops.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_int.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_l2.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_main.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mcp.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp.h
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c
 create mode 100644 drivers/net/ethernet/qlogic/qed/qed_spq.c
 create mode 100644 drivers/net/ethernet/qlogic/qede/Makefile
 create mode 100644 drivers/net/ethernet/qlogic/qede/qede.h
 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_ethtool.c
 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_main.c
 create mode 100644 drivers/net/phy/bcm-cygnus.c
 create mode 100644 drivers/net/phy/bcm-phy-lib.c
 create mode 100644 drivers/net/phy/bcm-phy-lib.h
 create mode 100644 drivers/net/phy/mdio-bcm-iproc.c
 create mode 100644 drivers/net/wireless/ath/wil6210/wil_crash_dump.c
 delete mode 100644 drivers/net/wireless/b43/pcmcia.c
 delete mode 100644 drivers/net/wireless/b43/pcmcia.h
 create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-rx.h
 create mode 100644 drivers/net/wireless/realtek/Makefile
 rename drivers/net/wireless/{ => realtek}/rtl818x/Kconfig (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/Makefile (69%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/dev.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/grf5101.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/max2820.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8180.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/rtl8225se.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8180/sa2400.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/Makefile (62%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/dev.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/leds.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rfkill.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8187.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl8187/rtl8225.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtl818x/rtl818x.h (100%)
 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Kconfig
 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/Makefile
 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c
 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
 create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h
 rename drivers/net/wireless/{ => realtek}/rtlwifi/Kconfig (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/base.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/base.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbt_precomp.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8192e2ant.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b1ant.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8723b2ant.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a1ant.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtc8821a2ant.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/halbtcoutsrc.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/btcoexist/rtl_btc.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/cam.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/core.c (99%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/core.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/debug.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/efuse.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/pci.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/ps.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/pwrseqcmd.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rc.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/regd.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/pwrseq.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8188ee/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/dm_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/fw_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/main.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192c/phy_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ce/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.c (99%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/mac.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192cu/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192de/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/pwrseq.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192ee/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8192se/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/btc.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_bt_coexist.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hal_btc.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/pwrseq.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723ae/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/pwrseq.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723be/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/dm_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/fw_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/main.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8723com/phy_common.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/Makefile (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/def.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/dm.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/fw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/hw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/led.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/phy.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/pwrseq.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/reg.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/rf.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/sw.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/table.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/rtl8821ae/trx.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/stats.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.c (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/usb.h (100%)
 rename drivers/net/wireless/{ => realtek}/rtlwifi/wifi.h (100%)
 create mode 100644 drivers/nfc/fdp/Kconfig
 create mode 100644 drivers/nfc/fdp/Makefile
 create mode 100644 drivers/nfc/fdp/fdp.c
 create mode 100644 drivers/nfc/fdp/fdp.h
 create mode 100644 drivers/nfc/fdp/i2c.c
 create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.c
 create mode 100644 drivers/nfc/nfcmrvl/fw_dnld.h
 create mode 100644 drivers/nfc/nfcmrvl/i2c.c
 create mode 100644 drivers/nfc/nfcmrvl/spi.c
 rename drivers/nfc/st-nci/{st-nci_se.c => se.c} (82%)
 delete mode 100644 drivers/nfc/st-nci/st-nci_se.h
 create mode 100644 drivers/nfc/st-nci/vendor_cmds.c
 rename drivers/nfc/st21nfca/{st21nfca.c => core.c} (97%)
 rename drivers/nfc/st21nfca/{st21nfca_dep.c => dep.c} (99%)
 rename drivers/nfc/st21nfca/{st21nfca_se.c => se.c} (96%)
 delete mode 100644 drivers/nfc/st21nfca/st21nfca_dep.h
 delete mode 100644 drivers/nfc/st21nfca/st21nfca_se.h
 create mode 100644 drivers/nfc/st21nfca/vendor_cmds.c
 create mode 100644 drivers/ssb/bridge_pcmcia_80211.c
 create mode 100644 drivers/ssb/host_soc.c
 create mode 100644 include/linux/once.h
 rename include/linux/{ => platform_data}/mdio-gpio.h (100%)
 create mode 100644 include/linux/qed/common_hsi.h
 create mode 100644 include/linux/qed/eth_common.h
 create mode 100644 include/linux/qed/qed_chain.h
 create mode 100644 include/linux/qed/qed_eth_if.h
 create mode 100644 include/linux/qed/qed_if.h
 create mode 100644 include/linux/usb/cdc.h
 create mode 100644 include/net/l3mdev.h
 delete mode 100644 include/net/netfilter/nfnetlink_queue.h
 delete mode 100644 include/net/vrf.h
 create mode 100644 lib/once.c
 create mode 100644 net/ipv4/tcp_recovery.c
 create mode 100644 net/l3mdev/Kconfig
 create mode 100644 net/l3mdev/Makefile
 create mode 100644 net/l3mdev/l3mdev.c
 delete mode 100644 net/mac80211/cfg.h
 delete mode 100644 net/mac80211/event.c
 rename net/netfilter/{nfnetlink_queue_core.c => nfnetlink_queue.c} (95%)
 delete mode 100644 net/netfilter/nfnetlink_queue_ct.c
 create mode 100644 samples/bpf/trace_output_kern.c
 create mode 100644 samples/bpf/trace_output_user.c
Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
$ git merge ipsec-next/master
Already up-to-date.
Merging ipvs-next/master (92240e8dc0d1 ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup})
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git)
$ git merge wireless-drivers-next/master
Already up-to-date.
Merging bluetooth/master (58ef0dee40a9 Bluetooth: Fix issue with HCI_QUIRK_FIXUP_INQUIRY_MODE and event mask)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
 drivers/bluetooth/btusb.c |  6 +++--
 net/bluetooth/hci_core.c  | 61 +++++++++++++++++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 14 deletions(-)
Merging rdma/for-next (39bfc271bd68 IB/core: Remove old fast registration API)
$ git merge rdma/for-next
Resolved 'net/sunrpc/xprtrdma/svc_rdma_recvfrom.c' using previous resolution.
Auto-merging net/sunrpc/xprtrdma/verbs.c
Auto-merging net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
Auto-merging net/rds/ib_send.c
Auto-merging net/rds/ib_cm.c
Auto-merging net/rds/ib.h
Auto-merging net/rds/ib.c
Auto-merging include/linux/mlx4/device.h
Auto-merging drivers/net/ethernet/mellanox/mlx4/resource_tracker.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c
Auto-merging drivers/net/ethernet/mellanox/mlx4/fw.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Auto-merging drivers/infiniband/hw/mlx5/main.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 71ccd7bf956d] Merge remote-tracking branch 'rdma/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS                                        |   5 +-
 drivers/infiniband/core/addr.c                     |  20 +-
 drivers/infiniband/core/agent.c                    |   2 +-
 drivers/infiniband/core/cache.c                    | 112 +++++-
 drivers/infiniband/core/cm.c                       |  40 +-
 drivers/infiniband/core/cma.c                      | 171 ++++++---
 drivers/infiniband/core/core_priv.h                |   9 +-
 drivers/infiniband/core/device.c                   |  19 +-
 drivers/infiniband/core/mad.c                      |  42 +--
 drivers/infiniband/core/mad_priv.h                 |   2 +-
 drivers/infiniband/core/multicast.c                |   3 +-
 drivers/infiniband/core/sa_query.c                 |  19 +-
 drivers/infiniband/core/sysfs.c                    |   2 +-
 drivers/infiniband/core/ucma.c                     |   5 +-
 drivers/infiniband/core/uverbs.h                   |   1 +
 drivers/infiniband/core/uverbs_cmd.c               | 402 ++++++++++++++-------
 drivers/infiniband/core/uverbs_main.c              |   1 +
 drivers/infiniband/core/uverbs_marshall.c          |   4 +-
 drivers/infiniband/core/verbs.c                    | 291 ++++++++++-----
 drivers/infiniband/hw/cxgb3/iwch_cq.c              |   2 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.c        |  39 +-
 drivers/infiniband/hw/cxgb3/iwch_provider.h        |   2 +
 drivers/infiniband/hw/cxgb3/iwch_qp.c              |  43 +--
 drivers/infiniband/hw/cxgb4/cm.c                   | 331 ++++++++++-------
 drivers/infiniband/hw/cxgb4/cq.c                   |   2 +-
 drivers/infiniband/hw/cxgb4/device.c               |  10 +-
 drivers/infiniband/hw/cxgb4/iw_cxgb4.h             |  25 +-
 drivers/infiniband/hw/cxgb4/mem.c                  |  63 ++--
 drivers/infiniband/hw/cxgb4/provider.c             |   5 +-
 drivers/infiniband/hw/cxgb4/qp.c                   |  73 ++--
 drivers/infiniband/hw/cxgb4/t4.h                   |   5 +-
 drivers/infiniband/hw/mlx4/ah.c                    |  17 +-
 drivers/infiniband/hw/mlx4/cq.c                    |   2 +-
 drivers/infiniband/hw/mlx4/mad.c                   |  91 +++--
 drivers/infiniband/hw/mlx4/main.c                  |  75 +++-
 drivers/infiniband/hw/mlx4/mcg.c                   |   2 +-
 drivers/infiniband/hw/mlx4/mlx4_ib.h               |  37 +-
 drivers/infiniband/hw/mlx4/mr.c                    | 169 +++++----
 drivers/infiniband/hw/mlx4/qp.c                    | 330 +++++++++++------
 drivers/infiniband/hw/mlx5/cq.c                    |   4 +-
 drivers/infiniband/hw/mlx5/main.c                  |   3 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |  54 +--
 drivers/infiniband/hw/mlx5/mr.c                    | 187 ++++++----
 drivers/infiniband/hw/mlx5/qp.c                    | 227 ++++++------
 drivers/infiniband/hw/mthca/mthca_av.c             |   2 +-
 drivers/infiniband/hw/mthca/mthca_qp.c             |  84 ++---
 drivers/infiniband/hw/nes/nes_hw.h                 |   6 -
 drivers/infiniband/hw/nes/nes_verbs.c              | 170 ++++-----
 drivers/infiniband/hw/nes/nes_verbs.h              |   4 +
 drivers/infiniband/hw/ocrdma/ocrdma.h              |   5 +-
 drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |  22 +-
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c           |  60 ++-
 drivers/infiniband/hw/ocrdma/ocrdma_main.c         |  19 +-
 drivers/infiniband/hw/ocrdma/ocrdma_stats.c        |   2 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        | 184 +++++-----
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.h        |   7 +-
 drivers/infiniband/hw/qib/qib_keys.c               |  41 ++-
 drivers/infiniband/hw/qib/qib_mr.c                 |  46 +--
 drivers/infiniband/hw/qib/qib_qp.c                 |   2 +-
 drivers/infiniband/hw/qib/qib_rc.c                 |  38 +-
 drivers/infiniband/hw/qib/qib_ruc.c                |  20 +-
 drivers/infiniband/hw/qib/qib_uc.c                 |   4 +-
 drivers/infiniband/hw/qib/qib_ud.c                 |  20 +-
 drivers/infiniband/hw/qib/qib_verbs.c              |  29 +-
 drivers/infiniband/hw/qib/qib_verbs.h              |  19 +-
 drivers/infiniband/hw/usnic/usnic_ib_main.c        |   9 +-
 drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c      |   8 +-
 drivers/infiniband/ulp/ipoib/ipoib.h               |   4 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |   4 +-
 drivers/infiniband/ulp/ipoib/ipoib_ib.c            |  22 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |   4 +-
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |   4 +-
 drivers/infiniband/ulp/ipoib/ipoib_verbs.c         |   6 +-
 drivers/infiniband/ulp/iser/iscsi_iser.c           |  20 +-
 drivers/infiniband/ulp/iser/iscsi_iser.h           |  25 +-
 drivers/infiniband/ulp/iser/iser_initiator.c       |  51 +--
 drivers/infiniband/ulp/iser/iser_memory.c          | 370 +++----------------
 drivers/infiniband/ulp/iser/iser_verbs.c           |  20 +-
 drivers/infiniband/ulp/isert/ib_isert.c            | 269 +++++---------
 drivers/infiniband/ulp/isert/ib_isert.h            |   8 +-
 drivers/infiniband/ulp/srp/ib_srp.c                | 262 ++++++++------
 drivers/infiniband/ulp/srp/ib_srp.h                |  11 +-
 drivers/infiniband/ulp/srpt/ib_srpt.c              |  35 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |  41 +--
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |  22 ++
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h     |   2 +
 drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h  |  85 +++++
 drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |  48 +++
 drivers/net/ethernet/mellanox/mlx4/en_main.c       |  22 ++
 drivers/net/ethernet/mellanox/mlx4/en_resources.c  |  25 ++
 drivers/net/ethernet/mellanox/mlx4/fw.c            |   6 +
 drivers/net/ethernet/mellanox/mlx4/mlx4_en.h       |   3 +-
 drivers/net/ethernet/mellanox/mlx4/qp.c            |  19 +-
 .../net/ethernet/mellanox/mlx4/resource_tracker.c  |  30 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |   6 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |  35 +-
 drivers/staging/rdma/amso1100/c2_qp.c              |   8 +-
 drivers/staging/rdma/ehca/ehca_reqs.c              |  53 +--
 drivers/staging/rdma/hfi1/keys.c                   |  55 ---
 drivers/staging/rdma/hfi1/mr.c                     |  33 +-
 drivers/staging/rdma/hfi1/qp.c                     |   2 +-
 drivers/staging/rdma/hfi1/rc.c                     |  24 +-
 drivers/staging/rdma/hfi1/ruc.c                    |  18 +-
 drivers/staging/rdma/hfi1/uc.c                     |   4 +-
 drivers/staging/rdma/hfi1/ud.c                     |  20 +-
 drivers/staging/rdma/hfi1/verbs.c                  |  26 +-
 drivers/staging/rdma/hfi1/verbs.h                  |  14 +-
 drivers/staging/rdma/ipath/ipath_rc.c              |  24 +-
 drivers/staging/rdma/ipath/ipath_ruc.c             |  16 +-
 drivers/staging/rdma/ipath/ipath_uc.c              |   4 +-
 drivers/staging/rdma/ipath/ipath_ud.c              |  26 +-
 drivers/staging/rdma/ipath/ipath_verbs.c           |  17 +-
 drivers/staging/rdma/ipath/ipath_verbs.h           |   8 +-
 include/linux/mlx4/device.h                        |   2 +
 include/linux/mlx4/qp.h                            |  24 +-
 include/linux/sunrpc/svc_rdma.h                    |   6 +-
 include/rdma/ib_addr.h                             |  18 +-
 include/rdma/ib_cache.h                            |  40 +-
 include/rdma/ib_pack.h                             |   2 +-
 include/rdma/ib_sa.h                               |  12 +-
 include/rdma/ib_verbs.h                            | 218 ++++++-----
 include/rdma/rdma_cm.h                             |   6 +-
 include/uapi/rdma/ib_user_verbs.h                  |  26 ++
 net/9p/trans_rdma.c                                |   4 +-
 net/rds/ib.c                                       |   2 +-
 net/rds/ib.h                                       |   6 +-
 net/rds/ib_cm.c                                    |   2 +-
 net/rds/ib_send.c                                  |  71 ++--
 net/rds/iw.c                                       |   2 +-
 net/rds/iw.h                                       |   9 +-
 net/rds/iw_cm.c                                    |   2 +-
 net/rds/iw_rdma.c                                  | 129 +++----
 net/rds/iw_send.c                                  | 154 ++++----
 net/rds/rdma_transport.c                           |   4 +-
 net/sunrpc/xprtrdma/frwr_ops.c                     | 119 +++---
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c            | 123 ++++---
 net/sunrpc/xprtrdma/svc_rdma_sendto.c              |  18 +-
 net/sunrpc/xprtrdma/svc_rdma_transport.c           |  38 +-
 net/sunrpc/xprtrdma/verbs.c                        |   3 +-
 net/sunrpc/xprtrdma/xprt_rdma.h                    |   3 +-
 140 files changed, 3594 insertions(+), 3009 deletions(-)
 create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h
Merging mtd/master (e5a5d92d9dc3 mxc_nand: fix copy_spare)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (f3c63795e90f mtd: blkdevs: fix potential deadlock + lockdep warnings)
$ git merge l2-mtd/master
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mtd/fsmc-nand.txt          |   6 +
 .../devicetree/bindings/mtd/partition.txt          |  71 +-
 .../devicetree/bindings/mtd/vf610-nfc.txt          |  59 ++
 MAINTAINERS                                        |   6 +
 arch/sh/boards/mach-rsk/setup.c                    |   3 -
 drivers/mtd/cmdlinepart.c                          |  28 +-
 drivers/mtd/devices/bcm47xxsflash.c                |   7 +-
 drivers/mtd/devices/docg3.c                        |  24 +-
 drivers/mtd/devices/m25p80.c                       |  15 +-
 drivers/mtd/devices/mtd_dataflash.c                |   1 -
 drivers/mtd/devices/mtdram.c                       |  21 +
 drivers/mtd/devices/spear_smi.c                    |   1 +
 drivers/mtd/devices/sst25l.c                       |   3 +-
 drivers/mtd/lpddr/lpddr2_nvm.c                     |   1 +
 drivers/mtd/maps/gpio-addr-flash.c                 |   2 +-
 drivers/mtd/maps/intel_vr_nor.c                    |   2 +-
 drivers/mtd/maps/ixp4xx.c                          |   2 +-
 drivers/mtd/maps/lantiq-flash.c                    |   2 +-
 drivers/mtd/maps/latch-addr-flash.c                |   2 +-
 drivers/mtd/maps/pcmciamtd.c                       |   1 +
 drivers/mtd/maps/physmap.c                         |   1 -
 drivers/mtd/maps/physmap_of.c                      |   1 -
 drivers/mtd/maps/plat-ram.c                        |   1 -
 drivers/mtd/maps/pxa2xx-flash.c                    |   8 +-
 drivers/mtd/maps/rbtx4939-flash.c                  |   2 +-
 drivers/mtd/maps/sa1100-flash.c                    |   2 +-
 drivers/mtd/mtd_blkdevs.c                          |  12 +-
 drivers/mtd/mtdchar.c                              |  42 +-
 drivers/mtd/mtdcore.c                              |  34 +-
 drivers/mtd/mtdpart.c                              |  23 +-
 drivers/mtd/nand/Kconfig                           |  13 +-
 drivers/mtd/nand/Makefile                          |   1 +
 drivers/mtd/nand/atmel_nand.c                      |   8 +-
 drivers/mtd/nand/au1550nd.c                        |   2 +-
 drivers/mtd/nand/bcm47xxnflash/main.c              |   2 +-
 drivers/mtd/nand/bf5xx_nand.c                      |   5 +-
 drivers/mtd/nand/brcmnand/bcm63138_nand.c          |  18 +-
 drivers/mtd/nand/brcmnand/brcmnand.c               |  61 +-
 drivers/mtd/nand/brcmnand/brcmnand.h               |   2 -
 drivers/mtd/nand/brcmnand/iproc_nand.c             |  22 +-
 drivers/mtd/nand/cafe_nand.c                       |   4 +-
 drivers/mtd/nand/davinci_nand.c                    |   3 -
 drivers/mtd/nand/denali.c                          |  19 +-
 drivers/mtd/nand/denali.h                          |   2 +
 drivers/mtd/nand/docg4.c                           |   8 +-
 drivers/mtd/nand/fsl_elbc_nand.c                   |   7 +-
 drivers/mtd/nand/fsl_ifc_nand.c                    |   5 +-
 drivers/mtd/nand/fsl_upm.c                         |   2 +-
 drivers/mtd/nand/fsmc_nand.c                       |  67 +-
 drivers/mtd/nand/gpio.c                            |   2 +-
 drivers/mtd/nand/gpmi-nand/gpmi-nand.c             |  10 +-
 drivers/mtd/nand/hisi504_nand.c                    |   4 +-
 drivers/mtd/nand/jz4740_nand.c                     |   2 +-
 drivers/mtd/nand/lpc32xx_mlc.c                     |  14 +-
 drivers/mtd/nand/lpc32xx_slc.c                     |  42 +-
 drivers/mtd/nand/mpc5121_nfc.c                     |   2 +
 drivers/mtd/nand/mxc_nand.c                        |   2 +-
 drivers/mtd/nand/nand_base.c                       | 201 ++++-
 drivers/mtd/nand/nand_bbt.c                        |   2 +-
 drivers/mtd/nand/nandsim.c                         |   3 +-
 drivers/mtd/nand/ndfc.c                            |   2 +-
 drivers/mtd/nand/nuc900_nand.c                     |   2 +-
 drivers/mtd/nand/omap2.c                           |   6 +-
 drivers/mtd/nand/orion_nand.c                      |   3 +-
 drivers/mtd/nand/pasemi_nand.c                     |   2 +-
 drivers/mtd/nand/plat_nand.c                       |   3 +-
 drivers/mtd/nand/pxa3xx_nand.c                     | 570 +++++++------
 drivers/mtd/nand/r852.c                            |   1 -
 drivers/mtd/nand/s3c2410.c                         |   2 +-
 drivers/mtd/nand/sh_flctl.c                        |   4 +-
 drivers/mtd/nand/sharpsl.c                         |   2 +-
 drivers/mtd/nand/socrates_nand.c                   |   1 -
 drivers/mtd/nand/sunxi_nand.c                      | 540 +++++++------
 drivers/mtd/nand/tmio_nand.c                       |   1 +
 drivers/mtd/nand/txx9ndfmc.c                       |   2 +-
 drivers/mtd/nand/vf610_nfc.c                       | 878 +++++++++++++++++++++
 drivers/mtd/ofpart.c                               |  63 +-
 drivers/mtd/onenand/generic.c                      |   3 +-
 drivers/mtd/onenand/omap2.c                        |   2 -
 drivers/mtd/onenand/samsung.c                      |   1 -
 drivers/mtd/spi-nor/Kconfig                        |   3 +-
 drivers/mtd/spi-nor/fsl-quadspi.c                  |  46 +-
 drivers/mtd/spi-nor/nxp-spifi.c                    |  11 +-
 drivers/mtd/spi-nor/spi-nor.c                      | 319 ++++++--
 drivers/mtd/tests/speedtest.c                      |  10 +-
 drivers/mtd/tests/torturetest.c                    |  10 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |   6 +-
 fs/jffs2/dir.c                                     |   3 -
 fs/jffs2/malloc.c                                  |  27 +-
 fs/jffs2/readinode.c                               |   6 +-
 fs/jffs2/wbuf.c                                    |   1 -
 include/linux/blkpg.h                              |  21 +
 include/linux/mtd/nand.h                           |  21 +-
 include/linux/mtd/spi-nor.h                        |  88 +--
 include/linux/platform_data/mtd-nand-pxa3xx.h      |  27 -
 include/uapi/linux/blkpg.h                         |   6 +-
 include/uapi/mtd/mtd-user.h                        |   2 -
 97 files changed, 2566 insertions(+), 1047 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mtd/vf610-nfc.txt
 create mode 100644 drivers/mtd/nand/vf610_nfc.c
 create mode 100644 include/linux/blkpg.h
Merging crypto/master (271817a3e92c crypto: asymmetric_keys - Fix unaligned access in x509_get_sig_params())
$ git merge crypto/master
Auto-merging lib/mpi/mpicoder.c
Removing drivers/crypto/qat/qat_common/qat_rsakey.asn1
Auto-merging drivers/crypto/marvell/hash.c
Auto-merging drivers/crypto/marvell/cipher.c
Auto-merging drivers/crypto/marvell/cesa.h
Removing crypto/rsakey.asn1
Auto-merging crypto/asymmetric_keys/x509_public_key.c
Auto-merging arch/arm/boot/dts/stih407-family.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/rng/samsung,exynos-rng4.txt           |  17 +
 Documentation/devicetree/bindings/rng/st,rng.txt   |  15 +
 .../devicetree/bindings/rng/st,stm32-rng.txt       |  21 +
 Documentation/hw_random.txt                        |   8 +-
 MAINTAINERS                                        |   8 +
 arch/arm/boot/dts/stih407-family.dtsi              |  14 +
 arch/arm/boot/dts/stm32f429.dtsi                   |   7 +
 arch/s390/crypto/sha.h                             |   2 +-
 arch/x86/Makefile                                  |   6 +-
 arch/x86/crypto/Makefile                           |   8 +
 arch/x86/crypto/crc32c-pcl-intel-asm_64.S          |   2 +-
 arch/x86/crypto/sha1_ni_asm.S                      | 302 +++++++++++++
 arch/x86/crypto/sha1_ssse3_glue.c                  | 314 +++++++++++---
 arch/x86/crypto/sha256_ni_asm.S                    | 353 +++++++++++++++
 arch/x86/crypto/sha256_ssse3_glue.c                | 329 ++++++++++++--
 arch/x86/crypto/sha512_ssse3_glue.c                | 249 +++++++++--
 crypto/Kconfig                                     |  17 +-
 crypto/Makefile                                    |  10 +-
 crypto/akcipher.c                                  |   1 -
 crypto/asymmetric_keys/pkcs7_verify.c              |   5 +-
 crypto/asymmetric_keys/x509_cert_parser.c          |   6 +-
 crypto/asymmetric_keys/x509_public_key.c           |   5 +-
 crypto/jitterentropy-kcapi.c                       |   4 -
 crypto/keywrap.c                                   | 419 ++++++++++++++++++
 crypto/rsa.c                                       |  83 ++--
 crypto/rsa_helper.c                                |  42 +-
 crypto/rsakey.asn1                                 |   5 -
 crypto/rsaprivkey.asn1                             |  11 +
 crypto/rsapubkey.asn1                              |   4 +
 crypto/skcipher.c                                  |   4 +-
 crypto/tcrypt.c                                    |  17 +-
 crypto/testmgr.c                                   |  83 ++--
 crypto/testmgr.h                                   |  77 +++-
 drivers/char/hw_random/Kconfig                     |  24 +-
 drivers/char/hw_random/Makefile                    |   2 +
 drivers/char/hw_random/core.c                      |   2 +-
 drivers/char/hw_random/exynos-rng.c                |  58 ++-
 drivers/char/hw_random/mxc-rnga.c                  |  14 +-
 drivers/char/hw_random/octeon-rng.c                |  12 +-
 drivers/char/hw_random/pasemi-rng.c                |   1 +
 drivers/char/hw_random/ppc4xx-rng.c                |   1 +
 drivers/char/hw_random/st-rng.c                    | 151 +++++++
 drivers/char/hw_random/stm32-rng.c                 | 202 +++++++++
 drivers/crypto/Kconfig                             |   5 +-
 drivers/crypto/amcc/crypto4xx_core.c               |  23 +-
 drivers/crypto/atmel-aes.c                         |  44 +-
 drivers/crypto/atmel-sha.c                         |  33 +-
 drivers/crypto/atmel-tdes.c                        |  35 +-
 drivers/crypto/bfin_crc.c                          |  25 +-
 drivers/crypto/caam/caamalg.c                      | 232 +++++++---
 drivers/crypto/caam/caamhash.c                     | 131 +++---
 drivers/crypto/caam/desc.h                         |   1 -
 drivers/crypto/caam/sg_sw_sec4.h                   |  72 +---
 drivers/crypto/ccp/Kconfig                         |  13 +-
 drivers/crypto/ccp/ccp-crypto-aes-cmac.c           |  20 +-
 drivers/crypto/ccp/ccp-crypto-main.c               |   6 +-
 drivers/crypto/ccp/ccp-crypto-sha.c                |  13 +
 drivers/crypto/ccp/ccp-ops.c                       | 108 +++--
 drivers/crypto/ccp/ccp-pci.c                       |   2 +-
 drivers/crypto/ccp/ccp-platform.c                  |   6 +-
 drivers/crypto/marvell/cesa.h                      |  55 +--
 drivers/crypto/marvell/cipher.c                    |  13 +-
 drivers/crypto/marvell/hash.c                      | 471 ++++++++++-----------
 drivers/crypto/marvell/tdma.c                      |  42 +-
 drivers/crypto/n2_core.c                           |   2 +-
 drivers/crypto/nx/nx-842-powernv.c                 |   4 +-
 drivers/crypto/nx/nx-842-pseries.c                 |   8 +-
 drivers/crypto/picoxcell_crypto.c                  |   1 +
 drivers/crypto/qat/qat_common/Makefile             |  12 +-
 drivers/crypto/qat/qat_common/adf_common_drv.h     |   4 +-
 drivers/crypto/qat/qat_common/adf_ctl_drv.c        |   6 -
 drivers/crypto/qat/qat_common/adf_init.c           |   8 +-
 drivers/crypto/qat/qat_common/adf_sriov.c          |   7 +-
 drivers/crypto/qat/qat_common/qat_algs.c           | 178 +++++---
 drivers/crypto/qat/qat_common/qat_asym_algs.c      | 213 +++++++---
 drivers/crypto/qat/qat_common/qat_crypto.c         |  79 ++--
 drivers/crypto/qat/qat_common/qat_hal.c            |   5 +-
 drivers/crypto/qat/qat_common/qat_rsakey.asn1      |   5 -
 drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1  |  11 +
 drivers/crypto/qat/qat_common/qat_rsapubkey.asn1   |   4 +
 drivers/crypto/qce/ablkcipher.c                    |  30 +-
 drivers/crypto/qce/cipher.h                        |   4 -
 drivers/crypto/qce/dma.c                           |  52 ---
 drivers/crypto/qce/dma.h                           |   5 -
 drivers/crypto/qce/sha.c                           |  18 +-
 drivers/crypto/qce/sha.h                           |   2 -
 drivers/crypto/sahara.c                            | 108 +----
 drivers/crypto/talitos.c                           | 104 +----
 drivers/crypto/ux500/cryp/cryp_core.c              |  71 +---
 drivers/crypto/ux500/hash/hash_core.c              |  50 +--
 include/crypto/akcipher.h                          |  90 +++-
 include/crypto/hash.h                              |  14 +
 include/crypto/internal/rsa.h                      |   7 +-
 include/linux/mpi.h                                |  10 +-
 lib/842/842.h                                      |   2 +
 lib/842/842_compress.c                             |  13 +
 lib/842/842_decompress.c                           |  17 +
 lib/mpi/mpicoder.c                                 | 199 +++++++++
 98 files changed, 4070 insertions(+), 1538 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rng/samsung,exynos-rng4.txt
 create mode 100644 Documentation/devicetree/bindings/rng/st,rng.txt
 create mode 100644 Documentation/devicetree/bindings/rng/st,stm32-rng.txt
 create mode 100644 arch/x86/crypto/sha1_ni_asm.S
 create mode 100644 arch/x86/crypto/sha256_ni_asm.S
 create mode 100644 crypto/keywrap.c
 delete mode 100644 crypto/rsakey.asn1
 create mode 100644 crypto/rsaprivkey.asn1
 create mode 100644 crypto/rsapubkey.asn1
 create mode 100644 drivers/char/hw_random/st-rng.c
 create mode 100644 drivers/char/hw_random/stm32-rng.c
 delete mode 100644 drivers/crypto/qat/qat_common/qat_rsakey.asn1
 create mode 100644 drivers/crypto/qat/qat_common/qat_rsaprivkey.asn1
 create mode 100644 drivers/crypto/qat/qat_common/qat_rsapubkey.asn1
Merging drm/drm-next (a76edb8cec0c Merge tag 'topic/drm-misc-2015-10-22' of git://anongit.freedesktop.org/drm-intel into drm-next)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v10_0.c' using previous resolution.
Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v11_0.c' using previous resolution.
Resolved 'drivers/gpu/drm/amd/amdgpu/dce_v8_0.c' using previous resolution.
Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution.
Auto-merging sound/pci/hda/hda_intel.c
Auto-merging drivers/gpu/drm/virtio/virtgpu_fence.c
Auto-merging drivers/gpu/drm/radeon/radeon_pm.c
Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/intel_lrc.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
Auto-merging drivers/gpu/drm/i915/i915_gem_shrinker.c
Auto-merging drivers/gpu/drm/drm_crtc.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/DocBook/gpu.tmpl
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 8bbe9cc5bdd8] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/DocBook/Makefile                     |   2 +-
 Documentation/DocBook/{drm.tmpl => gpu.tmpl}       | 209 +++--
 .../devicetree/bindings/display/brcm,bcm-vc4.txt   |  65 ++
 Documentation/devicetree/bindings/drm/msm/hdmi.txt |   3 +
 Documentation/devicetree/bindings/drm/msm/mdp.txt  |   3 +-
 .../devicetree/bindings/video/renesas,du.txt       |  14 +-
 Documentation/kernel-parameters.txt                |  15 +-
 MAINTAINERS                                        |   1 +
 drivers/gpu/drm/Kconfig                            |   2 +
 drivers/gpu/drm/Makefile                           |   6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |  48 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c           |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c  |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c  |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c   |   4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c           |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c             |  42 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_device.c         |  47 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |  25 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c            |  22 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c          |  64 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c            |  29 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c             |   1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |  72 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |  12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_object.c         |   2 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c           |  47 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c             |   2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h          |  12 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |   5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c            |   5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c            |   5 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c             |  47 +-
 drivers/gpu/drm/amd/amdgpu/atom.c                  |  53 +-
 drivers/gpu/drm/amd/amdgpu/atom.h                  |   2 +-
 drivers/gpu/drm/amd/amdgpu/cik_sdma.c              | 149 ++--
 drivers/gpu/drm/amd/amdgpu/cz_dpm.c                |  21 +-
 drivers/gpu/drm/amd/amdgpu/cz_smc.c                |  60 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             | 235 +++--
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             | 256 +++---
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              | 235 +++--
 drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c              |  20 -
 drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c              | 861 ++++++++++++------
 drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c              |  40 +-
 drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c              |  48 +
 drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c             | 175 ++--
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             | 213 ++---
 drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c              |   1 -
 drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c              |   1 -
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c              |   1 -
 drivers/gpu/drm/amd/amdgpu/vce_v2_0.c              |   1 -
 drivers/gpu/drm/amd/amdgpu/vce_v3_0.c              |   6 +-
 drivers/gpu/drm/amd/amdgpu/vi.c                    |  36 +-
 drivers/gpu/drm/amd/include/amd_shared.h           |   1 +
 drivers/gpu/drm/amd/include/atombios.h             |   2 +-
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.c      |  43 +-
 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h      |   7 +-
 drivers/gpu/drm/armada/armada_drv.c                |  87 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c       |   8 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   6 +-
 drivers/gpu/drm/drm_agpsupport.c                   |   4 -
 drivers/gpu/drm/drm_atomic.c                       |  28 +-
 drivers/gpu/drm/drm_atomic_helper.c                | 325 +++++--
 drivers/gpu/drm/drm_bufs.c                         |   6 +-
 drivers/gpu/drm/drm_crtc.c                         | 148 ++--
 drivers/gpu/drm/drm_dp_helper.c                    |  44 +-
 drivers/gpu/drm/drm_drv.c                          |  67 +-
 drivers/gpu/drm/drm_edid.c                         |  60 +-
 drivers/gpu/drm/drm_edid_load.c                    |  43 +-
 drivers/gpu/drm/drm_fb_helper.c                    | 212 ++++-
 drivers/gpu/drm/drm_gem.c                          |  47 +-
 drivers/gpu/drm/drm_gem_cma_helper.c               |   2 -
 drivers/gpu/drm/drm_internal.h                     |   2 +-
 drivers/gpu/drm/drm_ioc32.c                        |   6 +-
 drivers/gpu/drm/drm_ioctl.c                        |  93 +-
 drivers/gpu/drm/drm_irq.c                          | 367 ++++----
 drivers/gpu/drm/drm_memory.c                       |   6 +-
 drivers/gpu/drm/drm_mm.c                           |   6 +-
 drivers/gpu/drm/drm_modeset_lock.c                 |   2 +
 drivers/gpu/drm/drm_of.c                           |  88 ++
 drivers/gpu/drm/drm_pci.c                          |  11 +
 drivers/gpu/drm/drm_plane_helper.c                 |   6 +-
 drivers/gpu/drm/drm_platform.c                     |   3 +
 drivers/gpu/drm/drm_rect.c                         |   4 +-
 drivers/gpu/drm/drm_sysfs.c                        |  49 +-
 drivers/gpu/drm/drm_vm.c                           |   8 +-
 drivers/gpu/drm/drm_vma_manager.c                  |  40 +-
 drivers/gpu/drm/exynos/exynos_drm_crtc.c           |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_crtc.h           |   4 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |  24 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |   7 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |   2 -
 drivers/gpu/drm/gma500/cdv_intel_dp.c              |   1 -
 drivers/gpu/drm/gma500/psb_drv.h                   |   6 +-
 drivers/gpu/drm/gma500/psb_irq.c                   |   8 +-
 drivers/gpu/drm/gma500/psb_irq.h                   |   6 +-
 drivers/gpu/drm/i2c/ch7006_drv.c                   |   6 +-
 drivers/gpu/drm/i2c/ch7006_mode.c                  |  26 +-
 drivers/gpu/drm/i2c/ch7006_priv.h                  |  12 +-
 drivers/gpu/drm/i915/Makefile                      |   4 +
 drivers/gpu/drm/i915/dvo.h                         |   4 +-
 drivers/gpu/drm/i915/dvo_ch7017.c                  |   4 +-
 drivers/gpu/drm/i915/dvo_ch7xxx.c                  |   4 +-
 drivers/gpu/drm/i915/dvo_ivch.c                    |  12 +-
 drivers/gpu/drm/i915/dvo_ns2501.c                  |   4 +-
 drivers/gpu/drm/i915/dvo_sil164.c                  |   4 +-
 drivers/gpu/drm/i915/dvo_tfp410.c                  |   4 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c             |  17 +-
 drivers/gpu/drm/i915/i915_debugfs.c                | 264 +++++-
 drivers/gpu/drm/i915/i915_dma.c                    | 251 ++++--
 drivers/gpu/drm/i915/i915_drv.c                    |  83 +-
 drivers/gpu/drm/i915/i915_drv.h                    | 154 ++--
 drivers/gpu/drm/i915/i915_gem.c                    | 272 ++++--
 drivers/gpu/drm/i915/i915_gem_context.c            |  31 +
 drivers/gpu/drm/i915/i915_gem_evict.c              |  45 -
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         | 167 +---
 drivers/gpu/drm/i915/i915_gem_fence.c              |  47 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                | 878 +++++++++++++++----
 drivers/gpu/drm/i915/i915_gem_gtt.h                |  77 +-
 drivers/gpu/drm/i915/i915_gem_shrinker.c           |  19 +-
 drivers/gpu/drm/i915/i915_gem_stolen.c             | 181 +++-
 drivers/gpu/drm/i915/i915_gem_userptr.c            | 333 +++----
 drivers/gpu/drm/i915/i915_gpu_error.c              |  78 +-
 drivers/gpu/drm/i915/i915_guc_reg.h                |  21 +-
 drivers/gpu/drm/i915/i915_guc_submission.c         | 975 +++++++++++++++++++++
 drivers/gpu/drm/i915/i915_irq.c                    | 683 ++++++++++-----
 drivers/gpu/drm/i915/i915_params.c                 |  38 +-
 drivers/gpu/drm/i915/i915_reg.h                    | 593 ++++++++-----
 drivers/gpu/drm/i915/i915_suspend.c                |  45 +-
 drivers/gpu/drm/i915/i915_sysfs.c                  |  34 +-
 drivers/gpu/drm/i915/i915_trace.h                  |  78 +-
 drivers/gpu/drm/i915/i915_vgpu.h                   |  34 +-
 drivers/gpu/drm/i915/intel_acpi.c                  |   3 +-
 drivers/gpu/drm/i915/intel_atomic.c                |  13 +-
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   6 +-
 drivers/gpu/drm/i915/intel_audio.c                 | 220 ++++-
 drivers/gpu/drm/i915/intel_bios.c                  |  43 +-
 drivers/gpu/drm/i915/intel_bios.h                  |   3 -
 drivers/gpu/drm/i915/intel_crt.c                   |  15 +-
 drivers/gpu/drm/i915/intel_csr.c                   |  41 +-
 drivers/gpu/drm/i915/intel_ddi.c                   | 182 ++--
 drivers/gpu/drm/i915/intel_display.c               | 890 ++++++++++---------
 drivers/gpu/drm/i915/intel_dp.c                    | 838 +++++++++++-------
 drivers/gpu/drm/i915/intel_dp_mst.c                |  26 +-
 drivers/gpu/drm/i915/intel_drv.h                   | 101 ++-
 drivers/gpu/drm/i915/intel_dsi.c                   | 323 ++++---
 drivers/gpu/drm/i915/intel_dsi.h                   |   7 +-
 drivers/gpu/drm/i915/intel_dsi_pll.c               | 243 ++++-
 drivers/gpu/drm/i915/intel_dvo.c                   |  64 +-
 drivers/gpu/drm/i915/intel_fbc.c                   | 264 +++++-
 drivers/gpu/drm/i915/intel_fbdev.c                 |  23 +-
 drivers/gpu/drm/i915/intel_guc.h                   | 124 +++
 drivers/gpu/drm/i915/intel_guc_fwif.h              |  31 +-
 drivers/gpu/drm/i915/intel_guc_loader.c            | 606 +++++++++++++
 drivers/gpu/drm/i915/intel_hdmi.c                  | 306 ++++---
 drivers/gpu/drm/i915/intel_i2c.c                   |  54 +-
 drivers/gpu/drm/i915/intel_lrc.c                   | 427 +++++----
 drivers/gpu/drm/i915/intel_lrc.h                   |  18 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |  50 +-
 drivers/gpu/drm/i915/intel_modes.c                 |   9 +
 drivers/gpu/drm/i915/intel_opregion.c              |  92 +-
 drivers/gpu/drm/i915/intel_panel.c                 | 511 ++++++++---
 drivers/gpu/drm/i915/intel_pm.c                    | 562 ++++++------
 drivers/gpu/drm/i915/intel_psr.c                   |  18 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            | 262 +++---
 drivers/gpu/drm/i915/intel_ringbuffer.h            |  15 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            | 474 ++++++++--
 drivers/gpu/drm/i915/intel_sdvo.c                  |  51 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  59 +-
 drivers/gpu/drm/i915/intel_tv.c                    |  14 +-
 drivers/gpu/drm/i915/intel_uncore.c                |  38 +-
 drivers/gpu/drm/imx/imx-drm-core.c                 |  65 +-
 drivers/gpu/drm/mga/mga_dma.c                      |   4 +-
 drivers/gpu/drm/mga/mga_drv.h                      |   6 +-
 drivers/gpu/drm/mga/mga_irq.c                      |  20 +-
 drivers/gpu/drm/msm/Kconfig                        |  14 -
 drivers/gpu/drm/msm/Makefile                       |   2 +-
 drivers/gpu/drm/msm/adreno/a2xx.xml.h              |   9 +-
 drivers/gpu/drm/msm/adreno/a3xx.xml.h              |  27 +-
 drivers/gpu/drm/msm/adreno/a4xx.xml.h              |  15 +-
 drivers/gpu/drm/msm/adreno/adreno_common.xml.h     |  13 +-
 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h        |   9 +-
 drivers/gpu/drm/msm/dsi/dsi.xml.h                  | 238 +++--
 drivers/gpu/drm/msm/dsi/dsi_host.c                 |   2 +-
 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h              |   8 +-
 drivers/gpu/drm/msm/dsi/phy/dsi_phy.c              |   2 +-
 drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c         |   6 +-
 drivers/gpu/drm/msm/dsi/sfpb.xml.h                 |  21 +-
 drivers/gpu/drm/msm/edp/edp.xml.h                  |   8 +-
 drivers/gpu/drm/msm/hdmi/hdmi.c                    |  17 +-
 drivers/gpu/drm/msm/hdmi/hdmi.xml.h                |   8 +-
 drivers/gpu/drm/msm/hdmi/qfprom.xml.h              |   8 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4.xml.h            |   8 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |  10 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5.xml.h            |  86 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c            |  95 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h            |  11 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c            |  46 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h            |   2 +
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          | 211 +++--
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c            |   8 +-
 drivers/gpu/drm/msm/mdp/mdp_common.xml.h           |  15 +-
 drivers/gpu/drm/msm/mdp/mdp_kms.h                  |   6 +
 drivers/gpu/drm/msm/msm_atomic.c                   |   2 +-
 drivers/gpu/drm/msm/msm_drv.c                      |  36 +-
 drivers/gpu/drm/msm/msm_fbdev.c                    |   5 -
 drivers/gpu/drm/msm/msm_gem_prime.c                |   2 -
 drivers/gpu/drm/msm/msm_gpu.c                      |   8 +
 drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c     |   2 +-
 drivers/gpu/drm/nouveau/dispnv04/tvnv17.h          |   2 +-
 drivers/gpu/drm/nouveau/nouveau_acpi.c             |   2 +-
 drivers/gpu/drm/nouveau/nouveau_bo.c               |   8 +-
 drivers/gpu/drm/nouveau/nouveau_display.c          |  27 +-
 drivers/gpu/drm/nouveau/nouveau_display.h          |  11 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |  26 +-
 drivers/gpu/drm/omapdrm/omap_crtc.c                |   3 -
 drivers/gpu/drm/omapdrm/omap_drv.c                 |  18 +-
 drivers/gpu/drm/omapdrm/omap_drv.h                 |   4 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |   4 +-
 drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c          |   3 -
 drivers/gpu/drm/omapdrm/omap_irq.c                 |  16 +-
 drivers/gpu/drm/omapdrm/omap_plane.c               |  12 +-
 drivers/gpu/drm/qxl/qxl_drv.c                      |   7 +-
 drivers/gpu/drm/qxl/qxl_ioctl.c                    |  14 +-
 drivers/gpu/drm/r128/r128_cce.c                    |  12 +-
 drivers/gpu/drm/r128/r128_drv.h                    |   6 +-
 drivers/gpu/drm/r128/r128_irq.c                    |  16 +-
 drivers/gpu/drm/radeon/atombios_dp.c               |   1 +
 drivers/gpu/drm/radeon/cayman_blit_shaders.c       |   2 +-
 drivers/gpu/drm/radeon/evergreen_blit_shaders.c    |   2 +-
 drivers/gpu/drm/radeon/evergreen_cs.c              | 104 +--
 drivers/gpu/drm/radeon/r600_blit_shaders.c         |   2 +-
 drivers/gpu/drm/radeon/r600_cp.c                   |  14 +-
 drivers/gpu/drm/radeon/radeon_acpi.c               |   1 -
 drivers/gpu/drm/radeon/radeon_agp.c                |   8 +-
 drivers/gpu/drm/radeon/radeon_asic.c               |   1 -
 drivers/gpu/drm/radeon/radeon_atpx_handler.c       |   4 +-
 drivers/gpu/drm/radeon/radeon_bios.c               |   1 -
 drivers/gpu/drm/radeon/radeon_cp.c                 |  16 +-
 drivers/gpu/drm/radeon/radeon_device.c             |   2 +-
 drivers/gpu/drm/radeon/radeon_display.c            |  37 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |  16 +-
 drivers/gpu/drm/radeon/radeon_drv.h                |   6 +-
 drivers/gpu/drm/radeon/radeon_irq.c                |  38 +-
 drivers/gpu/drm/radeon/radeon_kms.c                | 138 ++-
 drivers/gpu/drm/radeon/radeon_mode.h               |   8 +-
 drivers/gpu/drm/radeon/radeon_pm.c                 |   4 +-
 drivers/gpu/drm/radeon/radeon_ttm.c                |  10 +-
 drivers/gpu/drm/rcar-du/Kconfig                    |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c              |  48 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.c            |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c              |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c            |  45 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |  89 +-
 drivers/gpu/drm/rockchip/rockchip_drm_gem.c        |   3 -
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |   6 +-
 drivers/gpu/drm/sis/sis_drv.h                      |   4 +
 drivers/gpu/drm/sti/sti_crtc.c                     |  16 +-
 drivers/gpu/drm/sti/sti_crtc.h                     |   4 +-
 drivers/gpu/drm/sti/sti_drv.c                      |   4 +-
 drivers/gpu/drm/tegra/dc.c                         |   2 -
 drivers/gpu/drm/tegra/dpaux.c                      |   3 +-
 drivers/gpu/drm/tegra/drm.c                        |  37 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |   6 +-
 drivers/gpu/drm/vc4/Kconfig                        |  13 +
 drivers/gpu/drm/vc4/Makefile                       |  17 +
 drivers/gpu/drm/vc4/vc4_bo.c                       |  52 ++
 drivers/gpu/drm/vc4/vc4_crtc.c                     | 672 ++++++++++++++
 drivers/gpu/drm/vc4/vc4_debugfs.c                  |  39 +
 drivers/gpu/drm/vc4/vc4_drv.c                      | 298 +++++++
 drivers/gpu/drm/vc4/vc4_drv.h                      | 145 +++
 drivers/gpu/drm/vc4/vc4_hdmi.c                     | 590 +++++++++++++
 drivers/gpu/drm/vc4/vc4_hvs.c                      | 163 ++++
 drivers/gpu/drm/vc4/vc4_kms.c                      |  67 ++
 drivers/gpu/drm/vc4/vc4_plane.c                    | 320 +++++++
 drivers/gpu/drm/vc4/vc4_regs.h                     | 570 ++++++++++++
 drivers/gpu/drm/vgem/vgem_drv.c                    |  55 +-
 drivers/gpu/drm/via/via_drv.h                      |  10 +-
 drivers/gpu/drm/via/via_irq.c                      |  17 +-
 drivers/gpu/drm/virtio/Makefile                    |   3 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |  57 +-
 drivers/gpu/drm/virtio/virtgpu_drv.c               |  28 +-
 drivers/gpu/drm/virtio/virtgpu_drv.h               |  72 ++
 drivers/gpu/drm/virtio/virtgpu_fence.c             |   2 +-
 drivers/gpu/drm/virtio/virtgpu_gem.c               |  41 +
 drivers/gpu/drm/virtio/virtgpu_ioctl.c             | 573 ++++++++++++
 drivers/gpu/drm/virtio/virtgpu_kms.c               | 133 ++-
 drivers/gpu/drm/virtio/virtgpu_object.c            |  11 +-
 drivers/gpu/drm/virtio/virtgpu_prime.c             |  71 ++
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |   1 +
 drivers/gpu/drm/virtio/virtgpu_vq.c                | 322 ++++++-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |  62 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.h                |   6 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |   6 +-
 drivers/gpu/vga/vga_switcheroo.c                   | 384 ++++++--
 drivers/gpu/vga/vgaarb.c                           |   4 +-
 drivers/platform/x86/apple-gmux.c                  |   2 +-
 include/drm/drmP.h                                 |  48 +-
 include/drm/drm_agpsupport.h                       |  57 +-
 include/drm/drm_atomic_helper.h                    |  12 +-
 include/drm/drm_crtc.h                             |  18 +-
 include/drm/drm_dp_helper.h                        |   9 +-
 include/drm/drm_edid.h                             |   5 +-
 include/drm/drm_fb_helper.h                        |  31 +-
 include/drm/drm_gem.h                              |   5 +-
 include/drm/drm_modeset_lock.h                     |  10 +-
 include/drm/drm_of.h                               |  13 +
 include/drm/drm_plane_helper.h                     |   2 -
 include/drm/drm_vma_manager.h                      |  24 +-
 include/drm/i915_component.h                       |  64 +-
 include/linux/fb.h                                 |   2 +-
 include/linux/vga_switcheroo.h                     | 103 ++-
 include/uapi/drm/Kbuild                            |   1 +
 include/uapi/drm/amdgpu_drm.h                      |   2 +-
 include/uapi/drm/drm_mode.h                        |  42 +-
 include/uapi/drm/i810_drm.h                        |   2 +
 include/uapi/drm/i915_drm.h                        |   3 +-
 include/uapi/drm/r128_drm.h                        |   2 +
 include/uapi/drm/savage_drm.h                      |   2 +
 include/uapi/drm/sis_drm.h                         |   4 -
 include/uapi/drm/via_drm.h                         |   4 -
 include/uapi/drm/virtgpu_drm.h                     | 167 ++++
 include/uapi/linux/virtio_gpu.h                    | 112 ++-
 sound/pci/hda/hda_controller.h                     |   2 +-
 sound/pci/hda/hda_intel.c                          |  15 +-
 sound/pci/hda/hda_intel.h                          |   2 +-
 sound/pci/hda/patch_hdmi.c                         |  19 +
 327 files changed, 18365 insertions(+), 6796 deletions(-)
 rename Documentation/DocBook/{drm.tmpl => gpu.tmpl} (97%)
 create mode 100644 Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt
 create mode 100644 drivers/gpu/drm/i915/i915_guc_submission.c
 create mode 100644 drivers/gpu/drm/i915/intel_guc.h
 create mode 100644 drivers/gpu/drm/i915/intel_guc_loader.c
 create mode 100644 drivers/gpu/drm/vc4/Kconfig
 create mode 100644 drivers/gpu/drm/vc4/Makefile
 create mode 100644 drivers/gpu/drm/vc4/vc4_bo.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_crtc.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_debugfs.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_drv.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_drv.h
 create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_hvs.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_kms.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_plane.c
 create mode 100644 drivers/gpu/drm/vc4/vc4_regs.h
 create mode 100644 drivers/gpu/drm/virtio/virtgpu_ioctl.c
 create mode 100644 drivers/gpu/drm/virtio/virtgpu_prime.c
 create mode 100644 include/uapi/drm/virtgpu_drm.h
Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings)
$ git merge drm-panel/drm/panel/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/bridge/nxp-ptn3460.c   | 1 -
 drivers/gpu/drm/bridge/parade-ps8622.c | 1 -
 2 files changed, 2 deletions(-)
Merging drm-intel/for-linux-next (6675bce251b6 drm/i915: disable CPU PWM also on LPT/SPT backlight disable)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_pm.c
Auto-merging drivers/gpu/drm/i915/i915_irq.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/i915_irq.c    |  7 ++++---
 drivers/gpu/drm/i915/intel_panel.c | 14 ++++++++++++++
 drivers/gpu/drm/i915/intel_pm.c    |  2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit)
$ git merge drm-tegra/drm/tegra/for-next
Auto-merging drivers/gpu/drm/tegra/dc.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/tegra/dc.c               | 14 +++++++-------
 drivers/gpu/drm/tegra/fb.c               |  1 -
 drivers/gpu/host1x/hw/debug_hw.c         |  2 +-
 drivers/gpu/host1x/hw/hw_host1x01_sync.h |  8 ++++----
 drivers/gpu/host1x/hw/hw_host1x02_sync.h |  8 ++++----
 drivers/gpu/host1x/hw/hw_host1x04_sync.h |  8 ++++----
 6 files changed, 20 insertions(+), 21 deletions(-)
Merging drm-misc/topic/drm-misc (364b19868ecd drm/dp: add eDP DPCD backlight control bit definitions)
$ git merge drm-misc/topic/drm-misc
Auto-merging drivers/gpu/drm/tegra/fb.c
Merge made by the 'recursive' strategy.
 Documentation/DocBook/gpu.tmpl     |  48 +++++------------
 drivers/gpu/drm/drm_gem.c          |  35 ++++++++++--
 drivers/gpu/drm/imx/Kconfig        |   9 ----
 drivers/gpu/drm/imx/imx-drm-core.c |  12 ++---
 drivers/gpu/drm/sti/Kconfig        |   6 ---
 drivers/gpu/drm/sti/sti_drv.c      |   2 +-
 drivers/gpu/drm/tegra/Kconfig      |  12 -----
 drivers/gpu/drm/tegra/drm.c        |   4 +-
 drivers/gpu/drm/tegra/drm.h        |   6 +--
 drivers/gpu/drm/tegra/fb.c         |  12 ++---
 include/drm/drm_dp_helper.h        |  36 +++++++++++++
 include/drm/drm_gem.h              | 106 ++++++++++++++++++++++++++++++++-----
 12 files changed, 187 insertions(+), 101 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d9071a09502 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging sound/for-next (d1482fb335b8 ALSA: firewire-digi00x: add another rawmidi character device for MIDI control ports)
$ git merge sound/for-next
Auto-merging sound/soc/sh/rcar/rcar_snd.h
Removing sound/soc/codecs/hdmi.c
Auto-merging sound/pci/hda/patch_realtek.c
Auto-merging sound/firewire/amdtp-stream.h
Auto-merging sound/firewire/amdtp-stream.c
Auto-merging MAINTAINERS
Removing Documentation/sound/alsa/hda_codec.txt
Merge made by the 'recursive' strategy.
 Documentation/DocBook/alsa-driver-api.tmpl         |    2 +
 Documentation/DocBook/writing-an-alsa-driver.tmpl  |   19 +-
 Documentation/devicetree/bindings/sound/ak4613.txt |   17 +
 Documentation/devicetree/bindings/sound/ak4642.txt |   22 +-
 .../devicetree/bindings/sound/atmel-classd.txt     |   52 +
 Documentation/devicetree/bindings/sound/da7213.txt |   41 +
 Documentation/devicetree/bindings/sound/da7219.txt |  106 ++
 .../devicetree/bindings/sound/fsl-asoc-card.txt    |   10 +-
 .../devicetree/bindings/sound/nau8825.txt          |  102 +
 .../devicetree/bindings/sound/renesas,rsnd.txt     |    7 +
 .../devicetree/bindings/sound/rockchip-i2s.txt     |    6 +-
 .../devicetree/bindings/sound/rockchip-spdif.txt   |   40 +
 Documentation/devicetree/bindings/sound/rt5640.txt |    9 +-
 .../devicetree/bindings/sound/sun4i-codec.txt      |   27 +
 .../devicetree/bindings/sound/tdm-slot.txt         |   11 +-
 Documentation/sound/alsa/hda_codec.txt             |  322 ----
 MAINTAINERS                                        |    1 +
 drivers/spi/spi-atmel.c                            |   21 +-
 include/linux/mod_devicetable.h                    |    8 +
 include/sound/da7213.h                             |    3 -
 include/sound/da7219-aad.h                         |   99 +
 include/sound/da7219.h                             |   55 +
 include/sound/designware_i2s.h                     |    2 +
 include/sound/hda_regmap.h                         |    4 +-
 include/sound/hdaudio.h                            |   19 +-
 include/sound/hdaudio_ext.h                        |    7 +
 include/sound/pcm.h                                |   44 +-
 include/sound/pxa2xx-lib.h                         |    1 -
 include/sound/rt5640.h                             |    3 +-
 include/sound/rt5645.h                             |    2 +
 include/sound/simple_card.h                        |    2 +
 include/sound/soc-dai.h                            |   19 +-
 include/sound/soc-dapm.h                           |    3 +
 include/sound/soc.h                                |   27 +-
 include/uapi/sound/asoc.h                          |   76 +-
 include/uapi/sound/asound.h                        |    4 +-
 include/uapi/sound/emu10k1.h                       |   14 +-
 include/uapi/sound/firewire.h                      |    9 +
 include/uapi/sound/hdspm.h                         |   40 +-
 scripts/mod/devicetable-offsets.c                  |    5 +
 scripts/mod/file2alias.c                           |   17 +
 sound/arm/pxa2xx-ac97.c                            |   13 +-
 sound/arm/pxa2xx-pcm-lib.c                         |  201 +-
 sound/arm/pxa2xx-pcm.c                             |   12 +-
 sound/arm/pxa2xx-pcm.h                             |    2 -
 sound/core/Kconfig                                 |   13 +-
 sound/core/Makefile                                |    3 +-
 sound/core/oss/mixer_oss.c                         |    3 +-
 sound/core/pcm.c                                   |    3 -
 sound/core/pcm_lib.c                               |   24 +-
 sound/core/pcm_native.c                            |   42 +-
 sound/core/seq/oss/seq_oss_readq.c                 |    6 +-
 sound/core/seq/oss/seq_oss_writeq.c                |    4 +-
 sound/firewire/Kconfig                             |   27 +
 sound/firewire/Makefile                            |    5 +-
 sound/firewire/amdtp-am824.c                       |  465 +++++
 sound/firewire/amdtp-am824.h                       |   52 +
 sound/firewire/{amdtp.c => amdtp-stream.c}         |  379 +---
 sound/firewire/{amdtp.h => amdtp-stream.h}         |  116 +-
 sound/firewire/bebob/Makefile                      |    2 +-
 sound/firewire/bebob/bebob.c                       |    9 +-
 sound/firewire/bebob/bebob.h                       |   34 +-
 sound/firewire/bebob/bebob_focusrite.c             |   26 +-
 sound/firewire/bebob/bebob_maudio.c                |   34 +-
 sound/firewire/bebob/bebob_midi.c                  |   16 +-
 sound/firewire/bebob/bebob_pcm.c                   |   16 +-
 sound/firewire/bebob/bebob_proc.c                  |    6 +-
 sound/firewire/bebob/bebob_stream.c                |   40 +-
 sound/firewire/bebob/bebob_terratec.c              |   10 +-
 sound/firewire/bebob/bebob_yamaha.c                |    6 +-
 sound/firewire/dice/Makefile                       |    2 +-
 sound/firewire/dice/dice-midi.c                    |   12 +-
 sound/firewire/dice/dice-pcm.c                     |   12 +-
 sound/firewire/dice/dice-stream.c                  |   34 +-
 sound/firewire/dice/dice.c                         |    3 +-
 sound/firewire/dice/dice.h                         |    2 +-
 sound/firewire/digi00x/Makefile                    |    4 +
 sound/firewire/digi00x/amdtp-dot.c                 |  442 +++++
 sound/firewire/digi00x/digi00x-hwdep.c             |  200 ++
 sound/firewire/digi00x/digi00x-midi.c              |  223 +++
 sound/firewire/digi00x/digi00x-pcm.c               |  373 ++++
 sound/firewire/digi00x/digi00x-proc.c              |   99 +
 sound/firewire/digi00x/digi00x-stream.c            |  422 +++++
 sound/firewire/digi00x/digi00x-transaction.c       |  137 ++
 sound/firewire/digi00x/digi00x.c                   |  170 ++
 sound/firewire/digi00x/digi00x.h                   |  157 ++
 sound/firewire/fcp.c                               |    2 +-
 sound/firewire/fireworks/Makefile                  |    2 +-
 sound/firewire/fireworks/fireworks.c               |   12 +-
 sound/firewire/fireworks/fireworks.h               |    2 +-
 sound/firewire/fireworks/fireworks_command.c       |    2 +-
 sound/firewire/fireworks/fireworks_midi.c          |   12 +-
 sound/firewire/fireworks/fireworks_pcm.c           |   12 +-
 sound/firewire/fireworks/fireworks_stream.c        |    8 +-
 sound/firewire/lib.c                               |  142 ++
 sound/firewire/lib.h                               |   56 +
 sound/firewire/oxfw/Makefile                       |    2 +-
 sound/firewire/oxfw/oxfw-midi.c                    |   40 +-
 sound/firewire/oxfw/oxfw-pcm.c                     |   10 +-
 sound/firewire/oxfw/oxfw-stream.c                  |   53 +-
 sound/firewire/oxfw/oxfw.c                         |   46 +
 sound/firewire/oxfw/oxfw.h                         |    3 +-
 sound/firewire/tascam/Makefile                     |    4 +
 sound/firewire/tascam/amdtp-tascam.c               |  243 +++
 sound/firewire/tascam/tascam-hwdep.c               |  201 ++
 sound/firewire/tascam/tascam-midi.c                |  135 ++
 sound/firewire/tascam/tascam-pcm.c                 |  312 ++++
 sound/firewire/tascam/tascam-proc.c                |   88 +
 sound/firewire/tascam/tascam-stream.c              |  496 +++++
 sound/firewire/tascam/tascam-transaction.c         |  302 +++
 sound/firewire/tascam/tascam.c                     |  209 +++
 sound/firewire/tascam/tascam.h                     |  147 ++
 sound/hda/ext/hdac_ext_stream.c                    |    9 +-
 sound/hda/hda_bus_type.c                           |   13 +
 sound/hda/hdac_bus.c                               |   14 +
 sound/hda/hdac_device.c                            |  124 +-
 sound/hda/hdac_i915.c                              |   70 +
 sound/hda/hdac_regmap.c                            |   10 +
 sound/hda/hdac_stream.c                            |    3 +-
 sound/hda/hdac_sysfs.c                             |    8 +
 sound/pci/cs46xx/cs46xx_lib.c                      |    9 +-
 sound/pci/hda/hda_bind.c                           |   69 +-
 sound/pci/hda/hda_codec.c                          |   44 -
 sound/pci/hda/hda_codec.h                          |   44 +-
 sound/pci/hda/hda_controller.c                     |    1 +
 sound/pci/hda/hda_generic.c                        |    7 +-
 sound/pci/hda/hda_local.h                          |    7 +-
 sound/pci/hda/hda_sysfs.c                          |    3 +-
 sound/pci/hda/patch_analog.c                       |   37 +-
 sound/pci/hda/patch_ca0110.c                       |   15 +-
 sound/pci/hda/patch_ca0132.c                       |   15 +-
 sound/pci/hda/patch_cirrus.c                       |   22 +-
 sound/pci/hda/patch_cmedia.c                       |   15 +-
 sound/pci/hda/patch_conexant.c                     |  118 +-
 sound/pci/hda/patch_hdmi.c                         |  201 +-
 sound/pci/hda/patch_realtek.c                      |  134 +-
 sound/pci/hda/patch_si3054.c                       |   39 +-
 sound/pci/hda/patch_sigmatel.c                     |  214 ++-
 sound/pci/hda/patch_via.c                          |  171 +-
 sound/pci/korg1212/korg1212.c                      |    8 +-
 sound/pci/lx6464es/lx6464es.c                      |    4 +-
 sound/pci/rme32.c                                  |    4 +-
 sound/pci/rme96.c                                  |    8 +-
 sound/pci/rme9652/hdsp.c                           |    1 +
 sound/pci/rme9652/hdspm.c                          |    9 +-
 sound/soc/Kconfig                                  |    6 +-
 sound/soc/Makefile                                 |    4 +-
 sound/soc/atmel/Kconfig                            |    9 +
 sound/soc/atmel/Makefile                           |    2 +
 sound/soc/atmel/atmel-classd.c                     |  679 +++++++
 sound/soc/atmel/atmel-classd.h                     |  120 ++
 sound/soc/atmel/atmel_wm8904.c                     |    1 +
 sound/soc/au1x/db1000.c                            |   10 +-
 sound/soc/au1x/db1200.c                            |   10 +-
 sound/soc/blackfin/bf5xx-ad1836.c                  |   11 +-
 sound/soc/blackfin/bfin-eval-adau1373.c            |   12 +-
 sound/soc/blackfin/bfin-eval-adau1701.c            |   12 +-
 sound/soc/blackfin/bfin-eval-adav80x.c             |   12 +-
 sound/soc/codecs/Kconfig                           |   23 +-
 sound/soc/codecs/Makefile                          |   10 +-
 sound/soc/codecs/ad193x-i2c.c                      |    8 +-
 sound/soc/codecs/ad193x-spi.c                      |   16 +-
 sound/soc/codecs/ad193x.c                          |  128 +-
 sound/soc/codecs/ad193x.h                          |    9 +-
 sound/soc/codecs/adav80x.c                         |    4 +-
 sound/soc/codecs/ak4613.c                          |  497 +++++
 sound/soc/codecs/ak4642.c                          |  153 +-
 sound/soc/codecs/arizona.c                         |   49 +
 sound/soc/codecs/arizona.h                         |   14 +-
 sound/soc/codecs/da7213.c                          |  190 +-
 sound/soc/codecs/da7213.h                          |    8 +-
 sound/soc/codecs/da7219-aad.c                      |  823 ++++++++
 sound/soc/codecs/da7219-aad.h                      |  212 +++
 sound/soc/codecs/da7219.c                          | 1955 ++++++++++++++++++++
 sound/soc/codecs/da7219.h                          |  820 ++++++++
 sound/soc/codecs/es8328.c                          |    2 +-
 sound/soc/codecs/hdmi.c                            |  109 --
 sound/soc/codecs/nau8825.c                         | 1309 +++++++++++++
 sound/soc/codecs/nau8825.h                         |  341 ++++
 sound/soc/codecs/rl6347a.c                         |   19 +-
 sound/soc/codecs/rl6347a.h                         |    2 +
 sound/soc/codecs/rt286.c                           |    9 +-
 sound/soc/codecs/rt298.c                           |   11 +-
 sound/soc/codecs/rt5640.c                          |   22 +-
 sound/soc/codecs/rt5645.c                          |  172 +-
 sound/soc/codecs/rt5645.h                          |   30 +-
 sound/soc/codecs/ssm2518.c                         |    6 -
 sound/soc/codecs/tlv320aic3x.c                     |   30 +-
 sound/soc/codecs/twl4030.c                         |   13 +-
 sound/soc/codecs/uda134x.c                         |    6 +-
 sound/soc/codecs/wl1273.c                          |    9 +-
 sound/soc/codecs/wm2000.c                          |    4 +-
 sound/soc/codecs/wm5110.c                          |  187 +-
 sound/soc/codecs/wm8731.c                          |    2 +-
 sound/soc/codecs/wm8903.c                          |    2 +-
 sound/soc/codecs/wm8904.c                          |    2 +-
 sound/soc/codecs/wm8955.c                          |    2 +-
 sound/soc/codecs/wm8960.c                          |    2 +-
 sound/soc/codecs/wm8998.c                          | 1430 ++++++++++++++
 sound/soc/codecs/wm8998.h                          |   23 +
 sound/soc/davinci/davinci-mcasp.c                  |  305 +--
 sound/soc/dwc/designware_i2s.c                     |  123 +-
 sound/soc/fsl/fsl-asoc-card.c                      |  141 +-
 sound/soc/fsl/fsl_esai.c                           |   88 +
 sound/soc/fsl/fsl_sai.c                            |   38 +-
 sound/soc/fsl/fsl_spdif.c                          |   73 +
 sound/soc/fsl/fsl_ssi.c                            |  102 +
 sound/soc/fsl/imx-spdif.c                          |    1 +
 sound/soc/generic/simple-card.c                    |    8 +-
 sound/soc/intel/Kconfig                            |   15 +
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   19 +-
 sound/soc/intel/boards/Makefile                    |    2 +
 sound/soc/intel/boards/broadwell.c                 |    9 +-
 sound/soc/intel/boards/bytcr_rt5640.c              |   14 +-
 sound/soc/intel/boards/cht_bsw_max98090_ti.c       |   14 +-
 sound/soc/intel/boards/cht_bsw_rt5645.c            |   14 +-
 sound/soc/intel/boards/cht_bsw_rt5672.c            |   14 +-
 sound/soc/intel/boards/skl_rt286.c                 |  259 +++
 sound/soc/intel/common/Makefile                    |    6 +-
 sound/soc/intel/common/sst-dsp-priv.h              |    1 +
 sound/soc/intel/common/sst-dsp.c                   |    2 +
 sound/soc/intel/common/sst-dsp.h                   |    2 +
 sound/soc/intel/common/sst-firmware.c              |   10 +-
 sound/soc/intel/skylake/Makefile                   |    3 +-
 sound/soc/intel/skylake/skl-messages.c             |   44 +-
 sound/soc/intel/skylake/skl-nhlt.c                 |   10 +-
 sound/soc/intel/skylake/skl-pcm.c                  |  176 +-
 sound/soc/intel/skylake/skl-sst-dsp.c              |    7 +-
 sound/soc/intel/skylake/skl-sst-ipc.c              |   12 +
 sound/soc/intel/skylake/skl-sst-ipc.h              |    1 +
 sound/soc/intel/skylake/skl-sst.c                  |   56 +-
 sound/soc/intel/skylake/skl-topology.c             | 1252 +++++++++++++
 sound/soc/intel/skylake/skl-topology.h             |   36 +-
 sound/soc/intel/skylake/skl-tplg-interface.h       |   83 +
 sound/soc/intel/skylake/skl.c                      |   32 +-
 sound/soc/intel/skylake/skl.h                      |   17 +-
 sound/soc/jz4740/jz4740-i2s.c                      |    1 +
 sound/soc/kirkwood/armada-370-db.c                 |    1 +
 sound/soc/mediatek/mt8173-max98090.c               |   11 +-
 sound/soc/mediatek/mt8173-rt5650-rt5676.c          |   11 +-
 sound/soc/mxs/mxs-sgtl5000.c                       |    6 +-
 sound/soc/omap/n810.c                              |    3 +-
 sound/soc/omap/rx51.c                              |    5 +-
 sound/soc/pxa/brownstone.c                         |    9 +-
 sound/soc/pxa/corgi.c                              |   11 +-
 sound/soc/pxa/e740_wm9705.c                        |    5 +-
 sound/soc/pxa/e750_wm9705.c                        |    5 +-
 sound/soc/pxa/e800_wm9712.c                        |    5 +-
 sound/soc/pxa/hx4700.c                             |    4 +-
 sound/soc/pxa/imote2.c                             |   11 +-
 sound/soc/pxa/mioa701_wm9713.c                     |   11 +-
 sound/soc/pxa/palm27x.c                            |    9 +-
 sound/soc/pxa/poodle.c                             |   11 +-
 sound/soc/pxa/pxa-ssp.c                            |    1 +
 sound/soc/pxa/pxa2xx-ac97.c                        |   49 +-
 sound/soc/pxa/pxa2xx-i2s.c                         |    3 +
 sound/soc/pxa/pxa2xx-pcm.c                         |   33 +-
 sound/soc/pxa/spitz.c                              |    5 +-
 sound/soc/pxa/tosa.c                               |    5 +-
 sound/soc/pxa/ttc-dkb.c                            |   12 +-
 sound/soc/qcom/lpass-cpu.c                         |    3 +-
 sound/soc/rockchip/Kconfig                         |   12 +-
 sound/soc/rockchip/Makefile                        |    6 +-
 sound/soc/rockchip/rockchip_i2s.c                  |   48 +-
 sound/soc/rockchip/rockchip_i2s.h                  |   16 +
 sound/soc/rockchip/rockchip_spdif.c                |  405 ++++
 sound/soc/rockchip/rockchip_spdif.h                |   63 +
 sound/soc/samsung/h1940_uda1380.c                  |    5 +-
 sound/soc/samsung/rx1950_uda1380.c                 |    5 +-
 sound/soc/sh/Kconfig                               |    3 +-
 sound/soc/sh/rcar/adg.c                            |  306 ++-
 sound/soc/sh/rcar/core.c                           |   66 +-
 sound/soc/sh/rcar/ctu.c                            |   16 +-
 sound/soc/sh/rcar/dma.c                            |    2 +-
 sound/soc/sh/rcar/dvc.c                            |   16 +-
 sound/soc/sh/rcar/gen.c                            |   14 +-
 sound/soc/sh/rcar/mix.c                            |   16 +-
 {include/sound => sound/soc/sh/rcar}/rcar_snd.h    |    1 -
 sound/soc/sh/rcar/rsnd.h                           |   29 +-
 sound/soc/sh/rcar/src.c                            |   27 +-
 sound/soc/sh/rcar/ssi.c                            |  113 +-
 sound/soc/sh/siu_dai.c                             |   85 +-
 sound/soc/soc-compress.c                           |   12 +-
 sound/soc/soc-core.c                               |   29 +-
 sound/soc/soc-dapm.c                               |   59 +-
 sound/soc/soc-ops.c                                |    8 +-
 sound/soc/soc-pcm.c                                |   59 +-
 sound/soc/soc-topology.c                           |    4 +-
 sound/soc/sunxi/Kconfig                            |   11 +
 sound/soc/sunxi/Makefile                           |    2 +
 sound/soc/sunxi/sun4i-codec.c                      |  712 +++++++
 sound/soc/ux500/mop500.c                           |    1 +
 sound/soc/ux500/ux500_msp_dai.c                    |    5 +-
 sound/usb/card.h                                   |    1 +
 sound/usb/endpoint.c                               |   92 +-
 sound/usb/midi.c                                   |   11 +-
 sound/usb/mixer_quirks.c                           |    2 +-
 sound/usb/pcm.c                                    |   74 +-
 sound/usb/quirks-table.h                           |   23 +-
 sound/usb/quirks.c                                 |    3 +
 sound/usb/stream.c                                 |    1 +
 sound/usb/usbaudio.h                               |    1 +
 302 files changed, 20961 insertions(+), 3303 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/sound/ak4613.txt
 create mode 100644 Documentation/devicetree/bindings/sound/atmel-classd.txt
 create mode 100644 Documentation/devicetree/bindings/sound/da7213.txt
 create mode 100644 Documentation/devicetree/bindings/sound/da7219.txt
 create mode 100644 Documentation/devicetree/bindings/sound/nau8825.txt
 create mode 100644 Documentation/devicetree/bindings/sound/rockchip-spdif.txt
 create mode 100644 Documentation/devicetree/bindings/sound/sun4i-codec.txt
 delete mode 100644 Documentation/sound/alsa/hda_codec.txt
 create mode 100644 include/sound/da7219-aad.h
 create mode 100644 include/sound/da7219.h
 create mode 100644 sound/firewire/amdtp-am824.c
 create mode 100644 sound/firewire/amdtp-am824.h
 rename sound/firewire/{amdtp.c => amdtp-stream.c} (70%)
 rename sound/firewire/{amdtp.h => amdtp-stream.h} (78%)
 create mode 100644 sound/firewire/digi00x/Makefile
 create mode 100644 sound/firewire/digi00x/amdtp-dot.c
 create mode 100644 sound/firewire/digi00x/digi00x-hwdep.c
 create mode 100644 sound/firewire/digi00x/digi00x-midi.c
 create mode 100644 sound/firewire/digi00x/digi00x-pcm.c
 create mode 100644 sound/firewire/digi00x/digi00x-proc.c
 create mode 100644 sound/firewire/digi00x/digi00x-stream.c
 create mode 100644 sound/firewire/digi00x/digi00x-transaction.c
 create mode 100644 sound/firewire/digi00x/digi00x.c
 create mode 100644 sound/firewire/digi00x/digi00x.h
 create mode 100644 sound/firewire/tascam/Makefile
 create mode 100644 sound/firewire/tascam/amdtp-tascam.c
 create mode 100644 sound/firewire/tascam/tascam-hwdep.c
 create mode 100644 sound/firewire/tascam/tascam-midi.c
 create mode 100644 sound/firewire/tascam/tascam-pcm.c
 create mode 100644 sound/firewire/tascam/tascam-proc.c
 create mode 100644 sound/firewire/tascam/tascam-stream.c
 create mode 100644 sound/firewire/tascam/tascam-transaction.c
 create mode 100644 sound/firewire/tascam/tascam.c
 create mode 100644 sound/firewire/tascam/tascam.h
 create mode 100644 sound/soc/atmel/atmel-classd.c
 create mode 100644 sound/soc/atmel/atmel-classd.h
 create mode 100644 sound/soc/codecs/ak4613.c
 create mode 100644 sound/soc/codecs/da7219-aad.c
 create mode 100644 sound/soc/codecs/da7219-aad.h
 create mode 100644 sound/soc/codecs/da7219.c
 create mode 100644 sound/soc/codecs/da7219.h
 delete mode 100644 sound/soc/codecs/hdmi.c
 create mode 100644 sound/soc/codecs/nau8825.c
 create mode 100644 sound/soc/codecs/nau8825.h
 create mode 100644 sound/soc/codecs/wm8998.c
 create mode 100644 sound/soc/codecs/wm8998.h
 create mode 100644 sound/soc/intel/boards/skl_rt286.c
 create mode 100644 sound/soc/intel/skylake/skl-topology.c
 create mode 100644 sound/soc/rockchip/rockchip_spdif.c
 create mode 100644 sound/soc/rockchip/rockchip_spdif.h
 rename {include/sound => sound/soc/sh/rcar}/rcar_snd.h (98%)
 create mode 100644 sound/soc/sunxi/Kconfig
 create mode 100644 sound/soc/sunxi/Makefile
 create mode 100644 sound/soc/sunxi/sun4i-codec.c
Merging sound-asoc/for-next (053940a66b99 Merge remote-tracking branch 'asoc/topic/wm8962' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging sound/soc/soc-pcm.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/sound/renesas,rsnd.txt     |   2 +
 .../bindings/sound/renesas,rsrc-card.txt           |   4 +-
 Documentation/devicetree/bindings/sound/rt5677.txt |   2 +-
 sound/soc/codecs/da7219.c                          |   2 +-
 sound/soc/codecs/rt5677.c                          |   8 +-
 sound/soc/codecs/wm8962.c                          |   3 +-
 sound/soc/fsl/fsl_esai.c                           |  44 +--
 sound/soc/fsl/fsl_sai.c                            |  23 +-
 sound/soc/fsl/fsl_spdif.c                          |  16 +-
 sound/soc/fsl/fsl_ssi.c                            |  22 +-
 sound/soc/intel/boards/skl_rt286.c                 |   5 +-
 sound/soc/intel/skylake/skl-messages.c             | 189 ++++-----
 sound/soc/intel/skylake/skl-nhlt.c                 |  19 +-
 sound/soc/intel/skylake/skl-pcm.c                  | 139 ++++---
 sound/soc/intel/skylake/skl-sst-ipc.c              |   2 +-
 sound/soc/intel/skylake/skl-topology.c             | 387 ++++++++++---------
 sound/soc/intel/skylake/skl-topology.h             |  35 +-
 sound/soc/intel/skylake/skl-tplg-interface.h       |  90 ++++-
 sound/soc/intel/skylake/skl.c                      |  63 +--
 sound/soc/intel/skylake/skl.h                      |   1 -
 sound/soc/sh/rcar/Makefile                         |   2 +-
 sound/soc/sh/rcar/adg.c                            |   2 +-
 sound/soc/sh/rcar/cmd.c                            | 153 ++++++++
 sound/soc/sh/rcar/core.c                           | 155 ++------
 sound/soc/sh/rcar/ctu.c                            |   8 +
 sound/soc/sh/rcar/dma.c                            | 240 +++++++-----
 sound/soc/sh/rcar/dvc.c                            |  18 +-
 sound/soc/sh/rcar/mix.c                            |  10 +-
 sound/soc/sh/rcar/rsnd.h                           |  88 +++--
 sound/soc/sh/rcar/src.c                            | 179 ++-------
 sound/soc/sh/rcar/ssi.c                            | 423 +++++++++++----------
 sound/soc/sh/rcar/ssiu.c                           | 181 +++++++++
 sound/soc/soc-ops.c                                |   2 +-
 sound/soc/soc-pcm.c                                |   3 +-
 34 files changed, 1424 insertions(+), 1096 deletions(-)
 create mode 100644 sound/soc/sh/rcar/cmd.c
 create mode 100644 sound/soc/sh/rcar/ssiu.c
Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list)
$ git merge modules/modules-next
Resolved 'scripts/Makefile.modpost' using previous resolution.
Auto-merging scripts/Makefile.modpost
CONFLICT (content): Merge conflict in scripts/Makefile.modpost
Auto-merging lib/Kconfig.debug
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 69070d4dd486] Merge remote-tracking branch 'modules/modules-next'
$ git diff -M --stat --summary HEAD^..
 kernel/params.c          | 17 +++++++++--------
 lib/Kconfig.debug        |  9 +++++++++
 scripts/Makefile.modpost |  1 +
 scripts/mod/modpost.c    | 37 ++++++++++++++++++++++++++++++-------
 4 files changed, 49 insertions(+), 15 deletions(-)
Merging input/next (bf5f18d70880 Input: evdev - fix bug in checking duplicate clock change request)
$ git merge input/next
Auto-merging include/uapi/linux/Kbuild
Removing include/linux/input/edt-ft5x06.h
Auto-merging drivers/input/touchscreen/ads7846.c
Auto-merging drivers/input/touchscreen/Kconfig
Auto-merging drivers/hid/Makefile
Auto-merging drivers/hid/Kconfig
Auto-merging arch/arm/boot/dts/am437x-sk-evm.dts
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/da9062-onkey.txt     |   32 +
 .../devicetree/bindings/input/gpio-keys-polled.txt |    9 +-
 .../devicetree/bindings/input/rotary-encoder.txt   |   10 +
 .../bindings/input/touchscreen/edt-ft5x06.txt      |    8 +-
 .../input/touchscreen/focaltech-ft6236.txt         |   35 +
 .../devicetree/bindings/vendor-prefixes.txt        |    1 +
 Documentation/input/rotary-encoder.txt             |    9 +-
 Documentation/input/userio.txt                     |   70 ++
 MAINTAINERS                                        |    6 +
 arch/arm/boot/dts/am437x-sk-evm.dts                |    2 +-
 arch/arm/boot/dts/imx28-tx28.dts                   |    3 +-
 arch/arm/boot/dts/imx53-tx53-x03x.dts              |    3 +-
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |    3 +-
 drivers/hid/Kconfig                                |    6 +
 drivers/hid/Makefile                               |    1 +
 drivers/hid/hid-gfrm.c                             |  158 +++
 drivers/input/evdev.c                              |  270 ++++-
 drivers/input/ff-core.c                            |    9 +-
 drivers/input/input.c                              |   25 +-
 drivers/input/joydev.c                             |   22 +-
 drivers/input/joystick/db9.c                       |  113 +-
 drivers/input/joystick/gamecon.c                   |  103 +-
 drivers/input/joystick/turbografx.c                |  104 +-
 drivers/input/joystick/walkera0701.c               |   64 +-
 drivers/input/joystick/xpad.c                      |  534 +++++----
 drivers/input/keyboard/Kconfig                     |    2 +-
 drivers/input/keyboard/gpio_keys.c                 |    8 +-
 drivers/input/keyboard/gpio_keys_polled.c          |   88 +-
 drivers/input/keyboard/nomadik-ske-keypad.c        |    2 +-
 drivers/input/keyboard/snvs_pwrkey.c               |    3 +-
 drivers/input/keyboard/tegra-kbc.c                 |    5 +-
 drivers/input/misc/Kconfig                         |   12 +-
 drivers/input/misc/ad714x-i2c.c                    |   10 -
 drivers/input/misc/ad714x-spi.c                    |   10 -
 drivers/input/misc/ad714x.c                        |  214 ++--
 drivers/input/misc/ad714x.h                        |    1 -
 drivers/input/misc/da9063_onkey.c                  |  129 ++-
 drivers/input/misc/hp_sdc_rtc.c                    |   52 +-
 drivers/input/misc/kxtj9.c                         |    3 +-
 drivers/input/misc/rotary_encoder.c                |  129 ++-
 drivers/input/misc/xen-kbdfront.c                  |   10 +-
 drivers/input/serio/Kconfig                        |   14 +
 drivers/input/serio/Makefile                       |    1 +
 drivers/input/serio/parkbd.c                       |   55 +-
 drivers/input/serio/userio.c                       |  285 +++++
 drivers/input/touchscreen/Kconfig                  |   24 +
 drivers/input/touchscreen/Makefile                 |    2 +
 drivers/input/touchscreen/ads7846.c                |    4 +-
 drivers/input/touchscreen/auo-pixcir-ts.c          |    7 +-
 drivers/input/touchscreen/cyttsp4_i2c.c            |    5 +-
 drivers/input/touchscreen/edt-ft5x06.c             |  246 ++--
 drivers/input/touchscreen/ft6236.c                 |  326 ++++++
 drivers/input/touchscreen/pixcir_i2c_ts.c          |   12 -
 drivers/input/touchscreen/rohm_bu21023.c           | 1218 ++++++++++++++++++++
 drivers/input/touchscreen/tps6507x-ts.c            |    9 +-
 drivers/input/touchscreen/zforce_ts.c              |    7 +-
 include/dt-bindings/input/input.h                  |  510 +-------
 include/dt-bindings/input/linux-event-codes.h      |    1 +
 include/linux/input.h                              |    2 +
 include/linux/input/edt-ft5x06.h                   |   24 -
 include/linux/miscdevice.h                         |    1 +
 include/linux/rotary_encoder.h                     |    3 +-
 include/uapi/linux/Kbuild                          |    1 +
 include/uapi/linux/input-event-codes.h             |  805 +++++++++++++
 include/uapi/linux/input.h                         |  850 ++------------
 include/uapi/linux/userio.h                        |   44 +
 66 files changed, 4480 insertions(+), 2254 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/da9062-onkey.txt
 create mode 100644 Documentation/devicetree/bindings/input/touchscreen/focaltech-ft6236.txt
 create mode 100644 Documentation/input/userio.txt
 create mode 100644 drivers/hid/hid-gfrm.c
 create mode 100644 drivers/input/serio/userio.c
 create mode 100644 drivers/input/touchscreen/ft6236.c
 create mode 100644 drivers/input/touchscreen/rohm_bu21023.c
 create mode 120000 include/dt-bindings/input/linux-event-codes.h
 delete mode 100644 include/linux/input/edt-ft5x06.h
 create mode 100644 include/uapi/linux/input-event-codes.h
 create mode 100644 include/uapi/linux/userio.h
Merging block/for-next (7c06c5a6bee7 Merge branch 'for-4.4/core' into for-next)
$ git merge block/for-next
Resolved 'drivers/nvme/host/pci.c' using previous resolution.
Removing include/uapi/linux/nvme.h
Auto-merging fs/mpage.c
Auto-merging drivers/nvme/host/scsi.c
Auto-merging drivers/nvme/host/pci.c
CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c
Auto-merging drivers/md/raid10.c
Auto-merging drivers/md/raid1.c
Auto-merging drivers/md/md.c
Auto-merging drivers/md/dm.c
Auto-merging block/blk-sysfs.c
Auto-merging block/blk-mq.c
Auto-merging block/blk-mq-tag.c
Auto-merging block/blk-core.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3486b0477150] Merge remote-tracking branch 'block/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-block           |    7 +
 Documentation/block/pr.txt                      |  119 ++
 Documentation/ioctl/ioctl-number.txt            |    1 +
 MAINTAINERS                                     |   16 +-
 block/bio-integrity.c                           |   17 +-
 block/blk-core.c                                |  106 +-
 block/blk-integrity.c                           |  192 ++--
 block/blk-merge.c                               |   32 +-
 block/blk-mq-sysfs.c                            |    6 -
 block/blk-mq-tag.c                              |    4 +
 block/blk-mq.c                                  |  122 +--
 block/blk-mq.h                                  |    2 -
 block/blk-sysfs.c                               |    3 +-
 block/blk.h                                     |   23 +
 block/elevator.c                                |    2 +-
 block/genhd.c                                   |    2 +
 block/ioctl.c                                   |  330 ++++--
 block/partition-generic.c                       |    1 +
 block/t10-pi.c                                  |   16 +-
 drivers/Kconfig                                 |    4 +
 drivers/Makefile                                |    2 +
 drivers/block/Kconfig                           |   11 -
 drivers/block/Makefile                          |    2 -
 drivers/block/loop.c                            |  274 ++++-
 drivers/block/loop.h                            |   13 +-
 drivers/cdrom/cdrom.c                           |    1 +
 drivers/lightnvm/Kconfig                        |   42 +
 drivers/lightnvm/Makefile                       |    7 +
 drivers/lightnvm/core.c                         |  826 ++++++++++++++
 drivers/lightnvm/gennvm.c                       |  485 +++++++++
 drivers/lightnvm/gennvm.h                       |   46 +
 drivers/lightnvm/rrpc.c                         | 1324 +++++++++++++++++++++++
 drivers/lightnvm/rrpc.h                         |  239 ++++
 drivers/md/dm-table.c                           |   88 +-
 drivers/md/dm.c                                 |    2 -
 drivers/md/md.c                                 |   11 +-
 drivers/md/multipath.c                          |    2 +
 drivers/md/raid1.c                              |    2 +
 drivers/md/raid10.c                             |    2 +
 drivers/nvdimm/btt.c                            |    1 -
 drivers/nvdimm/core.c                           |   21 +-
 drivers/nvme/Kconfig                            |    1 +
 drivers/nvme/Makefile                           |    2 +
 drivers/nvme/host/Kconfig                       |   10 +
 drivers/nvme/host/Makefile                      |    4 +
 drivers/nvme/host/lightnvm.c                    |  526 +++++++++
 drivers/nvme/host/nvme.h                        |  143 +++
 drivers/{block/nvme-core.c => nvme/host/pci.c}  |  379 ++++---
 drivers/{block/nvme-scsi.c => nvme/host/scsi.c} |    2 +-
 drivers/scsi/sd.c                               |   97 +-
 drivers/scsi/sd_dif.c                           |   31 +-
 drivers/target/target_core_iblock.c             |   10 +-
 fs/block_dev.c                                  |    2 +-
 fs/direct-io.c                                  |    9 +-
 fs/mpage.c                                      |   23 +-
 include/linux/blk-mq.h                          |    1 -
 include/linux/blkdev.h                          |   50 +-
 include/linux/genhd.h                           |   26 +-
 include/linux/lightnvm.h                        |  522 +++++++++
 include/linux/nvme.h                            |  624 +++++++++--
 include/linux/pr.h                              |   18 +
 include/linux/t10-pi.h                          |    8 +-
 include/uapi/linux/lightnvm.h                   |  130 +++
 include/uapi/linux/loop.h                       |    2 +
 include/uapi/linux/nvme.h                       |  589 ----------
 include/uapi/linux/nvme_ioctl.h                 |   65 ++
 include/uapi/linux/pr.h                         |   48 +
 kernel/trace/blktrace.c                         |   16 +-
 68 files changed, 6346 insertions(+), 1398 deletions(-)
 create mode 100644 Documentation/block/pr.txt
 create mode 100644 drivers/lightnvm/Kconfig
 create mode 100644 drivers/lightnvm/Makefile
 create mode 100644 drivers/lightnvm/core.c
 create mode 100644 drivers/lightnvm/gennvm.c
 create mode 100644 drivers/lightnvm/gennvm.h
 create mode 100644 drivers/lightnvm/rrpc.c
 create mode 100644 drivers/lightnvm/rrpc.h
 create mode 100644 drivers/nvme/Kconfig
 create mode 100644 drivers/nvme/Makefile
 create mode 100644 drivers/nvme/host/Kconfig
 create mode 100644 drivers/nvme/host/Makefile
 create mode 100644 drivers/nvme/host/lightnvm.c
 create mode 100644 drivers/nvme/host/nvme.h
 rename drivers/{block/nvme-core.c => nvme/host/pci.c} (93%)
 rename drivers/{block/nvme-scsi.c => nvme/host/scsi.c} (99%)
 create mode 100644 include/linux/lightnvm.h
 create mode 100644 include/linux/pr.h
 create mode 100644 include/uapi/linux/lightnvm.h
 delete mode 100644 include/uapi/linux/nvme.h
 create mode 100644 include/uapi/linux/nvme_ioctl.h
 create mode 100644 include/uapi/linux/pr.h
Merging device-mapper/for-next (aad9ae455075 dm switch: simplify conditional in alloc_region_table())
$ git merge device-mapper/for-next
Auto-merging drivers/md/persistent-data/dm-btree.c
Auto-merging drivers/md/persistent-data/dm-btree-remove.c
Auto-merging drivers/md/dm.c
Auto-merging drivers/md/dm-snap-persistent.c
Auto-merging drivers/md/dm-exception-store.c
Auto-merging drivers/md/dm-cache-policy-cleaner.c
Auto-merging drivers/md/dm-cache-metadata.c
Merge made by the 'recursive' strategy.
 Documentation/device-mapper/delay.txt              |   1 +
 drivers/md/dm-bufio.c                              |  18 +-
 drivers/md/dm-cache-metadata.c                     |   8 +-
 drivers/md/dm-cache-policy-cleaner.c               |   2 +-
 drivers/md/dm-cache-policy-mq.c                    |   2 +-
 drivers/md/dm-cache-policy-smq.c                   |   2 +-
 drivers/md/dm-cache-target.c                       |   3 +-
 drivers/md/dm-crypt.c                              |   6 +-
 drivers/md/dm-delay.c                              |   7 +-
 drivers/md/dm-era-target.c                         |  15 +-
 drivers/md/dm-exception-store.c                    |   2 +-
 drivers/md/dm-flakey.c                             |  16 +-
 drivers/md/dm-io.c                                 |   3 +-
 drivers/md/dm-linear.c                             |  20 +-
 drivers/md/dm-log-userspace-base.c                 |   3 +-
 drivers/md/dm-log-writes.c                         |  13 +-
 drivers/md/dm-mpath.c                              |  34 ++--
 drivers/md/dm-region-hash.c                        |   6 +-
 drivers/md/dm-snap-persistent.c                    |   2 +-
 drivers/md/dm-switch.c                             |  25 ++-
 drivers/md/dm-thin-metadata.c                      |  16 +-
 drivers/md/dm-verity.c                             |  15 +-
 drivers/md/dm.c                                    | 209 ++++++++++++++++++---
 drivers/md/persistent-data/dm-array.c              |   4 +-
 drivers/md/persistent-data/dm-block-manager.c      |   4 +-
 drivers/md/persistent-data/dm-block-manager.h      |   2 +-
 drivers/md/persistent-data/dm-btree-internal.h     |   2 +-
 drivers/md/persistent-data/dm-btree-remove.c       |  36 +---
 drivers/md/persistent-data/dm-btree-spine.c        |  20 +-
 drivers/md/persistent-data/dm-btree.c              |   4 +-
 drivers/md/persistent-data/dm-space-map-common.c   |  32 ++--
 .../md/persistent-data/dm-transaction-manager.c    |   4 +-
 .../md/persistent-data/dm-transaction-manager.h    |   2 +-
 include/linux/device-mapper.h                      |   6 +-
 include/uapi/linux/dm-ioctl.h                      |   4 +-
 35 files changed, 333 insertions(+), 215 deletions(-)
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (7cc8d580228c mmc: dw_mmc: fix the wrong setting for UHS-DDR50 mode)
$ git merge mmc-uh/next
Auto-merging drivers/mmc/host/sdhci-pci-core.c
Auto-merging arch/arm/configs/lpc18xx_defconfig
Auto-merging arch/arm/configs/exynos_defconfig
Auto-merging arch/arm/boot/dts/rk3288.dtsi
Auto-merging arch/arm/boot/dts/rk3288-veyron.dtsi
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/fsl-esdhc.txt          |   2 +
 Documentation/devicetree/bindings/mmc/mmc.txt      |   1 +
 Documentation/devicetree/bindings/mmc/mtk-sd.txt   |  11 +-
 .../devicetree/bindings/mmc/renesas,mmcif.txt      |   5 +-
 .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |  13 +
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |  25 ++
 Documentation/mmc/mmc-dev-attrs.txt                |  10 -
 arch/arc/configs/axs101_defconfig                  |   1 -
 arch/arc/configs/axs103_defconfig                  |   1 -
 arch/arc/configs/axs103_smp_defconfig              |   1 -
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   7 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |   6 +
 arch/arm/boot/dts/rk3288.dtsi                      |  20 +-
 arch/arm/configs/exynos_defconfig                  |   1 -
 arch/arm/configs/hisi_defconfig                    |   1 -
 arch/arm/configs/lpc18xx_defconfig                 |   1 -
 arch/mips/configs/pistachio_defconfig              |   1 -
 drivers/clk/rockchip/clk-mmc-phase.c               |  54 ++-
 drivers/mmc/card/block.c                           | 199 ++++++---
 drivers/mmc/core/Kconfig                           |  10 -
 drivers/mmc/core/core.c                            | 291 ++++++-------
 drivers/mmc/core/core.h                            |   3 -
 drivers/mmc/core/debugfs.c                         |  30 +-
 drivers/mmc/core/host.c                            | 247 +----------
 drivers/mmc/core/mmc.c                             |   5 +-
 drivers/mmc/core/mmc_ops.c                         |   9 +-
 drivers/mmc/core/mmc_ops.h                         |   3 +
 drivers/mmc/core/pwrseq_emmc.c                     |   8 +-
 drivers/mmc/core/pwrseq_simple.c                   |  45 +-
 drivers/mmc/core/quirks.c                          |  18 -
 drivers/mmc/core/sd.c                              |  27 +-
 drivers/mmc/core/sdio.c                            |  27 +-
 drivers/mmc/core/sdio_irq.c                        |  14 +-
 drivers/mmc/core/sdio_ops.h                        |   7 +
 drivers/mmc/host/Kconfig                           |  21 +-
 drivers/mmc/host/Makefile                          |   2 +-
 drivers/mmc/host/dw_mmc-exynos.c                   |   4 +-
 drivers/mmc/host/dw_mmc-pltfm.c                    |   2 +
 drivers/mmc/host/dw_mmc-rockchip.c                 | 162 +++++++
 drivers/mmc/host/dw_mmc.c                          | 290 ++++++++++---
 drivers/mmc/host/dw_mmc.h                          |  13 +-
 drivers/mmc/host/mmc_spi.c                         |   1 +
 drivers/mmc/host/moxart-mmc.c                      |   1 +
 drivers/mmc/host/mtk-sd.c                          | 306 ++++++++++++--
 drivers/mmc/host/omap.c                            |   1 +
 drivers/mmc/host/sdhci-acpi.c                      |  11 +-
 drivers/mmc/host/sdhci-bcm-kona.c                  |   2 +-
 drivers/mmc/host/sdhci-esdhc-imx.c                 |   6 +-
 drivers/mmc/host/sdhci-esdhc.h                     |   2 +
 drivers/mmc/host/sdhci-msm.c                       |   2 +-
 drivers/mmc/host/sdhci-of-at91.c                   |   1 -
 drivers/mmc/host/sdhci-of-esdhc.c                  | 463 ++++++++++++++++-----
 drivers/mmc/host/{sdhci-pci.c => sdhci-pci-core.c} |  62 ++-
 drivers/mmc/host/sdhci-pci-o2micro.c               |   6 +-
 drivers/mmc/host/sdhci-pci-o2micro.h               |   2 -
 drivers/mmc/host/sdhci-pci.h                       |   7 +
 drivers/mmc/host/sdhci-pltfm.c                     |   6 +-
 drivers/mmc/host/sdhci-sirf.c                      |   5 +-
 drivers/mmc/host/sdhci.c                           |  29 +-
 drivers/mmc/host/sunxi-mmc.c                       |   8 +
 drivers/mmc/host/vub300.c                          |   6 +-
 drivers/mmc/host/wbsd.c                            |   2 +-
 include/linux/mmc/card.h                           |   1 -
 include/linux/mmc/core.h                           |   4 +-
 include/linux/mmc/dw_mmc.h                         |  23 +-
 include/linux/mmc/host.h                           |  39 +-
 include/uapi/linux/mmc/ioctl.h                     |  19 +-
 67 files changed, 1703 insertions(+), 910 deletions(-)
 rename drivers/mmc/host/{sdhci-pci.c => sdhci-pci-core.c} (96%)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (339421def582 MD: when RAID journal is missing/faulty, block RESTART_ARRAY_RW)
$ git merge md/for-next
Auto-merging drivers/md/raid5.c
Auto-merging drivers/md/raid10.c
Auto-merging drivers/md/raid1.c
Auto-merging drivers/md/md.c
Merge made by the 'recursive' strategy.
 drivers/md/Makefile            |    2 +-
 drivers/md/bitmap.c            |   14 +-
 drivers/md/bitmap.h            |    4 +-
 drivers/md/md-cluster.c        |  228 ++++----
 drivers/md/md-cluster.h        |   12 +-
 drivers/md/md.c                |  495 ++++++++++++-----
 drivers/md/md.h                |   17 +-
 drivers/md/raid1.c             |   41 +-
 drivers/md/raid1.h             |    7 +
 drivers/md/raid10.c            |    2 +-
 drivers/md/raid5-cache.c       | 1191 ++++++++++++++++++++++++++++++++++++++++
 drivers/md/raid5.c             |  189 +++++--
 drivers/md/raid5.h             |   24 +
 include/uapi/linux/raid/md_p.h |   73 ++-
 14 files changed, 1989 insertions(+), 310 deletions(-)
 create mode 100644 drivers/md/raid5-cache.c
Merging mfd/for-mfd-next (0b8431c65b01 mfd: sec-core: Remove unused s2mpu02-rtc and s2mpu02-clk children)
$ git merge mfd/for-mfd-next
Resolved 'Documentation/devicetree/bindings/mfd/s2mps11.txt' using previous resolution.
Auto-merging include/linux/regmap.h
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/mfd/s2mps11.txt
CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mfd/s2mps11.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ec4e1e59a9b5] Merge remote-tracking branch 'mfd/for-mfd-next'
$ git diff -M --stat --summary HEAD^..
 .../devicetree/bindings/extcon/extcon-arizona.txt  |  15 +
 Documentation/devicetree/bindings/mfd/arizona.txt  |  15 +-
 .../devicetree/bindings/mfd/atmel-flexcom.txt      |  63 +++
 Documentation/devicetree/bindings/mfd/cros-ec.txt  |   4 +
 Documentation/devicetree/bindings/mfd/da9150.txt   |  33 +-
 Documentation/devicetree/bindings/mfd/s2mps11.txt  |   3 +
 .../devicetree/bindings/power/da9150-fg.txt        |  23 +
 MAINTAINERS                                        |   4 +-
 drivers/extcon/extcon-arizona.c                    | 106 +++-
 drivers/mfd/88pm80x.c                              |   2 +
 drivers/mfd/Kconfig                                |  21 +-
 drivers/mfd/Makefile                               |   2 +
 drivers/mfd/arizona-core.c                         | 300 ++++++-----
 drivers/mfd/arizona-i2c.c                          |  33 +-
 drivers/mfd/arizona-irq.c                          |   2 +-
 drivers/mfd/arizona-spi.c                          |  23 +-
 drivers/mfd/atmel-flexcom.c                        | 104 ++++
 drivers/mfd/atmel-hlcdc.c                          |   1 +
 drivers/mfd/axp20x.c                               |  20 +
 drivers/mfd/bcm590xx.c                             |   1 -
 drivers/mfd/cros_ec_i2c.c                          |   7 +
 drivers/mfd/da903x.c                               |   6 +-
 drivers/mfd/da9052-core.c                          |   6 +
 drivers/mfd/da9052-i2c.c                           |   6 +-
 drivers/mfd/da9052-spi.c                           |   6 +-
 drivers/mfd/da9062-core.c                          |   4 +-
 drivers/mfd/da9150-core.c                          | 191 +++++--
 drivers/mfd/hi6421-pmic-core.c                     |   1 +
 drivers/mfd/htc-i2cpld.c                           |   3 +-
 drivers/mfd/intel-lpss-acpi.c                      |  16 +
 drivers/mfd/intel-lpss-pci.c                       |  45 ++
 drivers/mfd/intel-lpss.c                           |  12 +-
 drivers/mfd/intel_soc_pmic_bxtwc.c                 | 477 +++++++++++++++++
 drivers/mfd/kempld-core.c                          |  14 +-
 drivers/mfd/lm3533-core.c                          |  13 +-
 drivers/mfd/lpc_ich.c                              |  42 +-
 drivers/mfd/max8997.c                              |   1 +
 drivers/mfd/pcf50633-irq.c                         |   4 +-
 drivers/mfd/qcom_rpm.c                             |   2 +-
 drivers/mfd/rt5033.c                               |   4 +-
 drivers/mfd/rts5209.c                              |   6 +-
 drivers/mfd/rts5227.c                              |  83 ++-
 drivers/mfd/rts5229.c                              |   6 +-
 drivers/mfd/rts5249.c                              |   6 +-
 drivers/mfd/rtsx_pcr.c                             |  11 +-
 drivers/mfd/rtsx_pcr.h                             |   3 +
 drivers/mfd/sec-core.c                             |  73 ++-
 drivers/mfd/sm501.c                                |   1 +
 drivers/mfd/stmpe.c                                |   1 +
 drivers/mfd/tps6105x.c                             | 150 ++----
 drivers/mfd/tps65217.c                             |   4 +
 drivers/mfd/twl6040.c                              |   2 +
 drivers/mfd/wm5110-tables.c                        | 194 ++++++-
 drivers/mfd/wm831x-core.c                          |   4 +-
 drivers/mfd/wm8998-tables.c                        |  10 +-
 drivers/platform/x86/Kconfig                       |   1 +
 drivers/power/Kconfig                              |  10 +
 drivers/power/Makefile                             |   1 +
 drivers/power/da9150-fg.c                          | 579 +++++++++++++++++++++
 drivers/regulator/tps6105x-regulator.c             |  16 +-
 include/dt-bindings/mfd/arizona.h                  |   2 +
 include/dt-bindings/mfd/atmel-flexcom.h            |  26 +
 include/linux/mfd/88pm80x.h                        |   1 +
 include/linux/mfd/arizona/pdata.h                  |   6 +
 include/linux/mfd/arizona/registers.h              |  84 ++-
 include/linux/mfd/da9052/reg.h                     |   3 +
 include/linux/mfd/da9150/core.h                    |  19 +-
 include/linux/mfd/intel_bxtwc.h                    |  69 +++
 include/linux/mfd/intel_soc_pmic.h                 |   2 +
 include/linux/mfd/rtsx_pci.h                       |   6 +
 include/linux/mfd/samsung/core.h                   |   4 +
 include/linux/mfd/samsung/s2mps11.h                |   1 +
 include/linux/mfd/samsung/s2mps13.h                |   1 +
 include/linux/mfd/tps6105x.h                       |  10 +-
 include/linux/regmap.h                             |   3 +
 75 files changed, 2563 insertions(+), 470 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/extcon/extcon-arizona.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
 create mode 100644 Documentation/devicetree/bindings/power/da9150-fg.txt
 create mode 100644 drivers/mfd/atmel-flexcom.c
 create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
 create mode 100644 drivers/power/da9150-fg.c
 create mode 100644 include/dt-bindings/mfd/atmel-flexcom.h
 create mode 100644 include/linux/mfd/intel_bxtwc.h
Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
 .../bindings/video/backlight/pm8941-wled.txt          |  2 ++
 drivers/video/backlight/88pm860x_bl.c                 |  1 +
 drivers/video/backlight/adp8860_bl.c                  |  1 -
 drivers/video/backlight/adp8870_bl.c                  |  1 -
 drivers/video/backlight/lp855x_bl.c                   |  1 +
 drivers/video/backlight/pm8941-wled.c                 | 13 +++++++++----
 drivers/video/backlight/pwm_bl.c                      | 19 +++++++++----------
 7 files changed, 22 insertions(+), 16 deletions(-)
Merging battery/master (6bd03ce3c12a power: bq27xxx_battery: Remove unneeded dependency in Kconfig)
$ git merge battery/master
Removing include/linux/power/bq27x00_battery.h
Removing drivers/power/bq27x00_battery.c
Auto-merging drivers/power/Makefile
Auto-merging drivers/power/Kconfig
Auto-merging arch/arm/configs/omap2plus_defconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-class-power        |   58 +
 .../devicetree/bindings/power/bq24257.txt          |   53 +-
 .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
 .../bindings/power_supply/tps65217_charger.txt     |   12 +
 MAINTAINERS                                        |    4 +-
 arch/arm/boot/dts/twl4030.dtsi                     |    2 +
 arch/arm/configs/omap2plus_defconfig               |    2 +-
 arch/unicore32/Kconfig                             |    2 +-
 drivers/power/88pm860x_battery.c                   |   37 +-
 drivers/power/Kconfig                              |   56 +-
 drivers/power/Makefile                             |    5 +-
 drivers/power/axp20x_usb_power.c                   |  248 ++++
 drivers/power/bq2415x_charger.c                    |    2 +-
 drivers/power/bq24190_charger.c                    |    1 -
 drivers/power/bq24257_charger.c                    |  492 +++++--
 drivers/power/bq27x00_battery.c                    | 1129 ----------------
 drivers/power/bq27xxx_battery.c                    | 1375 ++++++++++++++++++++
 drivers/power/charger-manager.c                    |    4 +-
 drivers/power/lp8727_charger.c                     |   31 +-
 drivers/power/max17042_battery.c                   |   26 +-
 drivers/power/max8903_charger.c                    |   93 +-
 drivers/power/max8998_charger.c                    |   29 +-
 drivers/power/pm2301_charger.c                     |    1 -
 drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
 drivers/power/reset/Kconfig                        |    4 +-
 drivers/power/reset/at91-poweroff.c                |   33 +-
 drivers/power/reset/at91-reset.c                   |   69 +-
 drivers/power/rt9455_charger.c                     |    1 -
 drivers/power/smb347-charger.c                     |    1 -
 drivers/power/tps65090-charger.c                   |    1 +
 drivers/power/tps65217_charger.c                   |  264 ++++
 drivers/power/twl4030_charger.c                    |   39 +-
 drivers/power/wm831x_power.c                       |   15 +-
 drivers/w1/slaves/w1_bq27000.c                     |    5 +-
 include/linux/mfd/axp20x.h                         |   24 +
 include/linux/power/bq27x00_battery.h              |   19 -
 include/linux/power/bq27xxx_battery.h              |   31 +
 include/linux/power/charger-manager.h              |    8 +-
 38 files changed, 3687 insertions(+), 1474 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
 create mode 100644 drivers/power/axp20x_usb_power.c
 delete mode 100644 drivers/power/bq27x00_battery.c
 create mode 100644 drivers/power/bq27xxx_battery.c
 create mode 100644 drivers/power/qcom_smbb.c
 create mode 100644 drivers/power/tps65217_charger.c
 delete mode 100644 include/linux/power/bq27x00_battery.h
 create mode 100644 include/linux/power/bq27xxx_battery.h
$ git reset --hard HEAD^
HEAD is now at 26fc8e25d5ad Merge remote-tracking branch 'backlight/for-backlight-next'
Merging next-20150925 version of battery
$ git merge -m next-20150925/battery 3636859b280ca595da4556274a509223f47e9a39
Removing include/linux/power/bq27x00_battery.h
Removing drivers/power/bq27x00_battery.c
Auto-merging drivers/power/Makefile
Auto-merging drivers/power/Kconfig
Auto-merging arch/arm/configs/omap2plus_defconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/power_supply/axp20x_usb_power.txt     |   34 +
 .../bindings/power_supply/tps65217_charger.txt     |   12 +
 MAINTAINERS                                        |    4 +-
 arch/arm/configs/omap2plus_defconfig               |    2 +-
 arch/unicore32/Kconfig                             |    2 +-
 drivers/power/88pm860x_battery.c                   |   37 +-
 drivers/power/Kconfig                              |   48 +-
 drivers/power/Makefile                             |    5 +-
 drivers/power/axp20x_usb_power.c                   |  248 ++++
 drivers/power/bq2415x_charger.c                    |    2 +-
 drivers/power/bq24190_charger.c                    |    1 -
 drivers/power/bq27x00_battery.c                    | 1129 ----------------
 drivers/power/bq27xxx_battery.c                    | 1374 ++++++++++++++++++++
 drivers/power/lp8727_charger.c                     |   31 +-
 drivers/power/max17042_battery.c                   |   26 +-
 drivers/power/max8903_charger.c                    |   93 +-
 drivers/power/max8998_charger.c                    |   29 +-
 drivers/power/pm2301_charger.c                     |    1 -
 drivers/power/qcom_smbb.c                          |  951 ++++++++++++++
 drivers/power/reset/Kconfig                        |    4 +-
 drivers/power/reset/at91-poweroff.c                |   33 +-
 drivers/power/reset/at91-reset.c                   |   69 +-
 drivers/power/rt9455_charger.c                     |    1 -
 drivers/power/smb347-charger.c                     |    1 -
 drivers/power/tps65090-charger.c                   |    1 +
 drivers/power/tps65217_charger.c                   |  264 ++++
 drivers/power/wm831x_power.c                       |    9 +-
 drivers/w1/slaves/w1_bq27000.c                     |    5 +-
 include/linux/mfd/axp20x.h                         |   24 +
 include/linux/power/bq27x00_battery.h              |   19 -
 include/linux/power/bq27xxx_battery.h              |   31 +
 include/linux/power/charger-manager.h              |    8 +-
 32 files changed, 3126 insertions(+), 1372 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power_supply/axp20x_usb_power.txt
 create mode 100644 Documentation/devicetree/bindings/power_supply/tps65217_charger.txt
 create mode 100644 drivers/power/axp20x_usb_power.c
 delete mode 100644 drivers/power/bq27x00_battery.c
 create mode 100644 drivers/power/bq27xxx_battery.c
 create mode 100644 drivers/power/qcom_smbb.c
 create mode 100644 drivers/power/tps65217_charger.c
 delete mode 100644 include/linux/power/bq27x00_battery.h
 create mode 100644 include/linux/power/bq27xxx_battery.h
Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions)
$ git merge omap_dss2/for-next
Auto-merging drivers/video/fbdev/tridentfb.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/video/ssd1307fb.txt        |   3 +-
 drivers/video/fbdev/Kconfig                        |   7 +-
 drivers/video/fbdev/aty/radeon_base.c              | 133 ++++++++++++++-
 drivers/video/fbdev/aty/radeonfb.h                 | 144 ++--------------
 drivers/video/fbdev/core/fb_ddc.c                  |  28 ++--
 drivers/video/fbdev/gxt4500.c                      |  25 ++-
 drivers/video/fbdev/omap/omapfb_main.c             |   5 -
 drivers/video/fbdev/omap2/dss/hdmi.h               |   9 +-
 drivers/video/fbdev/omap2/dss/hdmi4.c              |  66 ++++++--
 drivers/video/fbdev/omap2/dss/hdmi5.c              |  75 +++++++--
 drivers/video/fbdev/ssd1307fb.c                    |  21 ++-
 drivers/video/fbdev/tridentfb.c                    | 182 ++++++++++++++++++++-
 12 files changed, 506 insertions(+), 192 deletions(-)
Merging regulator/for-next (fa75190bb576 Merge remote-tracking branches 'regulator/topic/supply', 'regulator/topic/tps6105x' and 'regulator/topic/tps65023' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mfd/axp20x.txt   |   4 +-
 .../bindings/regulator/act8865-regulator.txt       |   3 +
 .../bindings/regulator/anatop-regulator.txt        |   1 +
 .../bindings/regulator/arizona-regulator.txt       |  17 +
 .../devicetree/bindings/regulator/max77802.txt     |  25 +-
 .../devicetree/bindings/regulator/regulator.txt    |   1 +
 .../devicetree/bindings/regulator/tps65023.txt     |  60 +++
 drivers/regulator/Kconfig                          |   2 +-
 drivers/regulator/act8865-regulator.c              |  24 +-
 drivers/regulator/anatop-regulator.c               |   3 +
 drivers/regulator/arizona-ldo1.c                   |  20 +-
 drivers/regulator/axp20x-regulator.c               |  54 ++-
 drivers/regulator/bcm590xx-regulator.c             |   2 +-
 drivers/regulator/core.c                           | 506 ++++++++++++++-------
 drivers/regulator/da9052-regulator.c               |   1 +
 drivers/regulator/da9063-regulator.c               |   2 +-
 drivers/regulator/of_regulator.c                   |   3 +
 drivers/regulator/pwm-regulator.c                  |  35 +-
 drivers/regulator/qcom_smd-regulator.c             |  28 +-
 drivers/regulator/tps65023-regulator.c             | 282 +++++-------
 include/linux/regulator/driver.h                   |   2 +
 21 files changed, 702 insertions(+), 373 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/regulator/arizona-regulator.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt
Merging security/next (ba94c3ff20c9 Merge tag 'keys-next-20151021' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next)
$ git merge security/next
Resolved 'fs/ext4/crypto_key.c' using previous resolution.
Auto-merging security/selinux/hooks.c
Auto-merging security/keys/request_key.c
Auto-merging fs/ext4/crypto_key.c
CONFLICT (content): Merge conflict in fs/ext4/crypto_key.c
Auto-merging fs/cifs/smb2pdu.c
Auto-merging fs/cifs/connect.c
Auto-merging crypto/asymmetric_keys/x509_public_key.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master f91d70babe61] Merge remote-tracking branch 'security/next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-driver-ppi       |  19 +-
 Documentation/crypto/asymmetric-keys.txt         |  27 +--
 Documentation/security/Smack.txt                 |  10 +
 Documentation/security/keys.txt                  |  41 ++--
 MAINTAINERS                                      |   1 +
 arch/powerpc/kernel/prom_init.c                  |  40 +++-
 certs/.gitignore                                 |   4 +
 crypto/asymmetric_keys/asymmetric_keys.h         |   5 -
 crypto/asymmetric_keys/asymmetric_type.c         |  44 ++--
 crypto/asymmetric_keys/public_key.c              |   4 +-
 crypto/asymmetric_keys/signature.c               |   2 +-
 crypto/asymmetric_keys/x509_parser.h             |   1 +
 crypto/asymmetric_keys/x509_public_key.c         |   9 +-
 drivers/char/tpm/st33zp24/Kconfig                |   2 +-
 drivers/char/tpm/st33zp24/i2c.c                  |   1 -
 drivers/char/tpm/tpm-chip.c                      |  24 ++-
 drivers/char/tpm/tpm-interface.c                 |  76 +++++++
 drivers/char/tpm/tpm.h                           | 134 +++++++++++-
 drivers/char/tpm/tpm2-cmd.c                      | 250 ++++++++++++++++++++++-
 drivers/char/tpm/tpm_crb.c                       |  39 ++--
 drivers/char/tpm/tpm_eventlog.c                  |  78 +++++--
 drivers/char/tpm/tpm_eventlog.h                  |   6 +
 drivers/char/tpm/tpm_i2c_atmel.c                 |   1 -
 drivers/char/tpm/tpm_i2c_infineon.c              |   1 -
 drivers/char/tpm/tpm_i2c_nuvoton.c               |   1 -
 drivers/char/tpm/tpm_ibmvtpm.c                   |   2 +-
 drivers/char/tpm/tpm_of.c                        |   6 +-
 drivers/char/tpm/tpm_ppi.c                       |  34 +--
 drivers/char/tpm/tpm_tis.c                       | 192 ++++++++++++++---
 fs/cifs/cifs_spnego.c                            |   6 +-
 fs/cifs/cifsacl.c                                |  25 ++-
 fs/cifs/connect.c                                |   9 +-
 fs/cifs/sess.c                                   |   2 +-
 fs/cifs/smb2pdu.c                                |   2 +-
 fs/ecryptfs/ecryptfs_kernel.h                    |   5 +-
 fs/ext4/crypto_key.c                             |   4 +-
 fs/f2fs/crypto_key.c                             |   4 +-
 fs/fscache/object-list.c                         |   4 +-
 fs/nfs/nfs4idmap.c                               |   4 +-
 fs/sysfs/group.c                                 |  44 ++++
 include/crypto/public_key.h                      |   1 -
 include/keys/asymmetric-subtype.h                |   2 +-
 include/keys/asymmetric-type.h                   |  15 ++
 include/keys/trusted-type.h                      |  14 +-
 include/keys/user-type.h                         |   8 +
 include/linux/key-type.h                         |   3 +-
 include/linux/key.h                              |  33 ++-
 include/linux/sysfs.h                            |  11 +
 include/linux/tpm.h                              |  26 +++
 kernel/.gitignore                                |   1 -
 kernel/module_signing.c                          |   1 +
 lib/digsig.c                                     |   7 +-
 net/ceph/ceph_common.c                           |   2 +-
 net/ceph/crypto.c                                |   6 +-
 net/dns_resolver/dns_key.c                       |  20 +-
 net/dns_resolver/dns_query.c                     |   7 +-
 net/dns_resolver/internal.h                      |   8 +
 net/rxrpc/af_rxrpc.c                             |   2 +-
 net/rxrpc/ar-key.c                               |  32 +--
 net/rxrpc/ar-output.c                            |   2 +-
 net/rxrpc/ar-security.c                          |   4 +-
 net/rxrpc/rxkad.c                                |  16 +-
 scripts/extract-module-sig.pl                    | 136 ++++++++++++
 scripts/extract-sys-certs.pl                     | 144 +++++++++++++
 security/apparmor/Kconfig                        |   2 +-
 security/integrity/digsig.c                      |   2 +-
 security/integrity/evm/evm_crypto.c              |   2 +-
 security/keys/big_key.c                          |  47 +++--
 security/keys/encrypted-keys/encrypted.c         |  18 +-
 security/keys/encrypted-keys/encrypted.h         |   4 +-
 security/keys/encrypted-keys/masterkey_trusted.c |   4 +-
 security/keys/key.c                              |  20 +-
 security/keys/keyctl.c                           |  12 +-
 security/keys/keyring.c                          |  12 +-
 security/keys/process_keys.c                     |   4 +-
 security/keys/request_key.c                      |   4 +-
 security/keys/request_key_auth.c                 |  12 +-
 security/keys/trusted.c                          |  42 +++-
 security/keys/trusted.h                          |  11 -
 security/keys/user_defined.c                     |  14 +-
 security/selinux/Kconfig                         |   4 +-
 security/selinux/hooks.c                         |  27 +--
 security/selinux/include/security.h              |   2 +
 security/selinux/selinuxfs.c                     |  26 +--
 security/selinux/ss/services.c                   |  22 +-
 security/smack/smack.h                           |   4 +-
 security/smack/smack_access.c                    |   6 +-
 security/smack/smack_lsm.c                       |  67 +++++-
 security/smack/smackfs.c                         | 208 +++++++++++++++----
 89 files changed, 1748 insertions(+), 492 deletions(-)
 create mode 100644 certs/.gitignore
 create mode 100755 scripts/extract-module-sig.pl
 create mode 100755 scripts/extract-sys-certs.pl
Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring)
$ git merge integrity/next
Already up-to-date.
Merging selinux/next (63205654c0e0 selinux: Use a kmem_cache for allocation struct file_security_struct)
$ git merge selinux/next
Already up-to-date.
Merging lblnet/next (b2776bf7149b Linux 3.18)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (20b1b6d67176 watchdog: core: propagate ping error code to the user space)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
 .../bindings/watchdog/brcm,bcm7038-wdt.txt         |  19 ++
 drivers/watchdog/Kconfig                           |   8 +
 drivers/watchdog/Makefile                          |   1 +
 drivers/watchdog/bcm7038_wdt.c                     | 237 +++++++++++++++++++++
 drivers/watchdog/imx2_wdt.c                        |   6 +-
 drivers/watchdog/intel-mid_wdt.c                   |   2 +-
 drivers/watchdog/watchdog_core.c                   |  15 +-
 drivers/watchdog/watchdog_dev.c                    | 163 +++++++-------
 include/linux/watchdog.h                           |  11 +-
 9 files changed, 374 insertions(+), 88 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/brcm,bcm7038-wdt.txt
 create mode 100644 drivers/watchdog/bcm7038_wdt.c
Merging iommu/next (593d50b2087e Merge branches 'x86/amd', 'x86/vt-d', 'arm/omap', 'arm/smmu', 'arm/renesas', 's390', 'core' and 'iommu/fixes' into next)
$ git merge iommu/next
Auto-merging arch/s390/Kconfig
Auto-merging arch/arm64/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/iommu/arm,smmu-v3.txt      |  19 +
 .../devicetree/bindings/iommu/ti,omap-iommu.txt    |  27 ++
 MAINTAINERS                                        |   7 +
 arch/arm64/Kconfig                                 |   1 +
 arch/arm64/include/asm/dma-mapping.h               |  15 +-
 arch/arm64/mm/dma-mapping.c                        | 457 ++++++++++++++++++
 arch/s390/Kconfig                                  |   1 +
 arch/s390/include/asm/pci.h                        |   4 +
 arch/s390/include/asm/pci_dma.h                    |   5 +-
 arch/s390/pci/pci_dma.c                            |  37 +-
 drivers/iommu/Kconfig                              |  15 +
 drivers/iommu/Makefile                             |   2 +
 drivers/iommu/amd_iommu.c                          | 173 ++-----
 drivers/iommu/amd_iommu_init.c                     | 120 ++---
 drivers/iommu/amd_iommu_types.h                    |  13 +-
 drivers/iommu/arm-smmu-v3.c                        | 155 ++++--
 drivers/iommu/arm-smmu.c                           | 132 +++---
 drivers/iommu/dma-iommu.c                          | 524 +++++++++++++++++++++
 drivers/iommu/fsl_pamu_domain.c                    |  41 +-
 drivers/iommu/intel-iommu.c                        |  83 ++--
 drivers/iommu/intel_irq_remapping.c                |  64 ++-
 drivers/iommu/iommu.c                              |  46 +-
 drivers/iommu/omap-iommu.c                         |  58 +++
 drivers/iommu/omap-iommu.h                         |   9 +
 drivers/iommu/s390-iommu.c                         | 337 +++++++++++++
 include/linux/dma-iommu.h                          |  85 ++++
 include/linux/iommu.h                              |   8 +-
 27 files changed, 1995 insertions(+), 443 deletions(-)
 create mode 100644 drivers/iommu/dma-iommu.c
 create mode 100644 drivers/iommu/s390-iommu.c
 create mode 100644 include/linux/dma-iommu.h
Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback)
$ git merge dwmw2-iommu/master
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/Makefile
Auto-merging drivers/iommu/Kconfig
Merge made by the 'recursive' strategy.
 drivers/iommu/Kconfig         |  10 +
 drivers/iommu/Makefile        |   1 +
 drivers/iommu/dmar.c          |  42 ++-
 drivers/iommu/intel-iommu.c   | 303 +++++++++++++++++----
 drivers/iommu/intel-svm.c     | 602 ++++++++++++++++++++++++++++++++++++++++++
 include/linux/dma_remapping.h |   8 +
 include/linux/intel-iommu.h   | 139 ++++++++--
 include/linux/intel-svm.h     | 121 +++++++++
 8 files changed, 1152 insertions(+), 74 deletions(-)
 create mode 100644 drivers/iommu/intel-svm.c
 create mode 100644 include/linux/intel-svm.h
Merging vfio/next (a714ea5fa416 MAINTAINERS: Add vfio-platform sub-maintainer)
$ git merge vfio/next
Already up-to-date.
Merging jc_docs/docs-next (334bb79c18eb doc: Clarify that nmi_watchdog param is for hardlockups)
$ git merge jc_docs/docs-next
Resolved 'Documentation/Changes' using previous resolution.
Auto-merging scripts/kernel-doc
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/DocBook/Makefile
Auto-merging Documentation/Changes
CONFLICT (content): Merge conflict in Documentation/Changes
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master d999b3aef288] Merge remote-tracking branch 'jc_docs/docs-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/Changes                       |   1 +
 Documentation/DMA-API-HOWTO.txt             |   5 ++
 Documentation/DMA-API.txt                   |   6 +-
 Documentation/DocBook/.gitignore            |   2 +
 Documentation/DocBook/Makefile              |   6 ++
 Documentation/SubmittingPatches             |   8 +-
 Documentation/blockdev/zram.txt             |  44 +++++++++-
 Documentation/cgroups/blkio-controller.txt  |   2 +-
 Documentation/cgroups/freezer-subsystem.txt |   2 +-
 Documentation/cgroups/unified-hierarchy.txt |   2 +-
 Documentation/email-clients.txt             |   2 +-
 Documentation/filesystems/sysfs-tagging.txt |  14 ++--
 Documentation/filesystems/sysfs.txt         |   9 ++-
 Documentation/gpio/board.txt                |  10 ++-
 Documentation/gpio/sysfs.txt                |   6 +-
 Documentation/kernel-docs.txt               |  14 ++--
 Documentation/kernel-parameters.txt         |  17 ++--
 Documentation/kselftest.txt                 |  16 ++++
 Documentation/locking/lockstat.txt          |   2 +-
 Documentation/misc-devices/apds990x.txt     |   2 +-
 Documentation/misc-devices/isl29003         |   2 +-
 Documentation/misc-devices/max6875          |   2 +-
 Documentation/networking/can.txt            |  97 ++++++++++++++++++-----
 Documentation/rbtree.txt                    |   2 +-
 Documentation/virtual/kvm/api.txt           |   4 +-
 Documentation/virtual/kvm/devices/vm.txt    |   2 +-
 Documentation/virtual/kvm/ppc-pv.txt        |   2 +-
 Documentation/zh_CN/filesystems/sysfs.txt   |   2 +-
 MAINTAINERS                                 |   4 +-
 Makefile                                    |   2 +-
 README                                      |   2 +-
 scripts/.gitignore                          |   1 +
 scripts/Makefile                            |   7 +-
 scripts/check-lc_ctype.c                    |  11 +++
 scripts/kernel-doc                          | 119 ++++++++++++++++------------
 35 files changed, 299 insertions(+), 130 deletions(-)
 create mode 100644 scripts/check-lc_ctype.c
Merging trivial/for-next (0c6cac7ab444 hwmon: applesmc: fix comment typos)
$ git merge trivial/for-next
Auto-merging net/openvswitch/datapath.c
Auto-merging mm/huge_memory.c
Auto-merging fs/namei.c
Auto-merging fs/ext4/namei.c
Auto-merging fs/ext4/extents.c
Auto-merging drivers/scsi/Kconfig
Auto-merging drivers/net/ethernet/ti/netcp_core.c
Auto-merging drivers/block/pktcdvd.c
Merge made by the 'recursive' strategy.
 drivers/base/class.c                 | 2 +-
 drivers/block/pktcdvd.c              | 3 +--
 drivers/hwmon/applesmc.c             | 4 ++--
 drivers/misc/c2port/core.c           | 2 +-
 drivers/net/ethernet/ti/netcp_core.c | 4 ++--
 drivers/scsi/Kconfig                 | 7 -------
 fs/cifs/readdir.c                    | 2 +-
 fs/debugfs/inode.c                   | 6 ++++--
 fs/ecryptfs/inode.c                  | 2 +-
 fs/ext4/extents.c                    | 6 +++---
 fs/ext4/namei.c                      | 2 +-
 fs/namei.c                           | 4 ++--
 fs/ncpfs/dir.c                       | 2 +-
 fs/nfs/objlayout/objio_osd.c         | 2 +-
 fs/proc/proc_sysctl.c                | 2 +-
 mm/huge_memory.c                     | 2 +-
 net/openvswitch/datapath.c           | 2 +-
 net/sctp/socket.c                    | 2 +-
 net/socket.c                         | 6 +++---
 19 files changed, 28 insertions(+), 34 deletions(-)
Merging audit/next (a4416687e957 audit: make audit_log_common_recv_msg() a void function)
$ git merge audit/next
Auto-merging kernel/audit_tree.c
Auto-merging kernel/audit.h
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 include/linux/audit.h |  8 ++++----
 kernel/audit.c        | 42 ++++++++++++++++++++++++++++--------------
 kernel/audit.h        |  2 +-
 kernel/audit_tree.c   |  6 +++---
 kernel/auditfilter.c  | 14 +++++++-------
 5 files changed, 43 insertions(+), 29 deletions(-)
Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (25fff6aa3213 Merge branch 'all-dtbs-v2' into for-next)
$ git merge dt-rh/for-next
Auto-merging drivers/of/of_pci.c
Auto-merging arch/arm64/boot/dts/Makefile
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Removing Documentation/devicetree/bindings/usb/samsung-usbphy.txt
Removing Documentation/devicetree/bindings/hwmon/ina209.txt
Auto-merging Documentation/devicetree/bindings/display/tilcdc/panel.txt
Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt
Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt
Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt
Auto-merging Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt
Auto-merging Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt
Auto-merging Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt
Auto-merging Documentation/devicetree/bindings/display/st,stih4xx.txt
Auto-merging Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt
Auto-merging Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt
Auto-merging Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt
Auto-merging Documentation/devicetree/bindings/display/panel/panel-dpi.txt
Auto-merging Documentation/devicetree/bindings/display/msm/dsi.txt
Auto-merging Documentation/devicetree/bindings/display/imx/ldb.txt
Auto-merging Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt
Auto-merging Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt
Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt
Auto-merging Documentation/devicetree/bindings/display/exynos/exynos_dp.txt
Auto-merging Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt
Auto-merging Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt
Auto-merging Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt
Merge made by the 'recursive' strategy.
 .../bindings/{nvec => arm/tegra}/nvidia,nvec.txt   |   0
 .../bindings/{video => display}/arm,pl11x.txt      |   0
 .../{drm => display}/armada/marvell,dove-lcd.txt   |   0
 .../bindings/{video => display}/atmel,lcdc.txt     |   0
 .../bindings/{drm => display}/atmel/hlcdc-dc.txt   |   0
 .../{video => display/bridge}/adi,adv7123.txt      |   0
 .../{video => display/bridge}/adi,adv7511.txt      |   0
 .../bindings/{drm => display}/bridge/dw_hdmi.txt   |   4 +-
 .../bindings/{video => display}/bridge/ps8622.txt  |   0
 .../bindings/{video => display}/bridge/ptn3460.txt |   0
 .../{drm/i2c => display/bridge}/tda998x.txt        |   0
 .../bridge/thine,thc63lvdm83d.txt}                 |   0
 .../{video => display}/cirrus,clps711x-fb.txt      |   2 +-
 .../connector}/analog-tv-connector.txt             |   0
 .../{video => display/connector}/dvi-connector.txt |   0
 .../connector}/hdmi-connector.txt                  |   0
 .../{video => display/connector}/vga-connector.txt |   0
 .../{video => display/exynos}/exynos-mic.txt       |   0
 .../{video => display/exynos}/exynos5433-decon.txt |   0
 .../{video => display/exynos}/exynos7-decon.txt    |   2 +-
 .../{video => display/exynos}/exynos_dp.txt        |   2 +-
 .../{video => display/exynos}/exynos_dsim.txt      |   2 +-
 .../{video => display/exynos}/exynos_hdmi.txt      |   0
 .../{video => display/exynos}/exynos_hdmiddc.txt   |   0
 .../{video => display/exynos}/exynos_hdmiphy.txt   |   0
 .../{video => display/exynos}/exynos_mixer.txt     |   0
 .../{video => display/exynos}/samsung-fimd.txt     |   2 +-
 .../bindings/{video => display}/fsl,dcu.txt        |   0
 .../bindings/{video => display/imx}/fsl,imx-fb.txt |   2 +-
 .../bindings/{drm => display}/imx/fsl-imx-drm.txt  |   0
 .../bindings/{drm => display}/imx/hdmi.txt         |   0
 .../bindings/{drm => display}/imx/ldb.txt          |   2 +-
 .../bindings/display/marvell,pxa2xx-lcdc.txt       |  34 ++++++
 .../{mipi/dsi => display}/mipi-dsi-bus.txt         |   0
 .../bindings/{drm => display}/msm/dsi.txt          |   2 +-
 .../bindings/{drm => display}/msm/edp.txt          |   0
 .../bindings/{drm => display}/msm/gpu.txt          |   0
 .../bindings/{drm => display}/msm/hdmi.txt         |   0
 .../bindings/{drm => display}/msm/mdp.txt          |   0
 .../devicetree/bindings/{fb => display}/mxsfb.txt  |   0
 .../panel/ampire,am800480r3tmqwa1h.txt             |   0
 .../bindings/{ => display}/panel/auo,b080uan01.txt |   0
 .../bindings/{ => display}/panel/auo,b101aw03.txt  |   0
 .../bindings/{ => display}/panel/auo,b101ean01.txt |   0
 .../bindings/{ => display}/panel/auo,b101xtn01.txt |   0
 .../bindings/{ => display}/panel/auo,b116xw03.txt  |   0
 .../bindings/{ => display}/panel/auo,b133htn01.txt |   0
 .../bindings/{ => display}/panel/auo,b133xtn01.txt |   0
 .../{ => display}/panel/avic,tm070ddh03.txt        |   0
 .../{ => display}/panel/chunghwa,claa101wa01a.txt  |   0
 .../{ => display}/panel/chunghwa,claa101wb03.txt   |   0
 .../{video => display/panel}/display-timing.txt    |   0
 .../{ => display}/panel/edt,et057090dhu.txt        |   0
 .../{ => display}/panel/edt,et070080dh6.txt        |   0
 .../{ => display}/panel/edt,etm0700g0dh6.txt       |   0
 .../{ => display}/panel/foxlink,fl500wvr00-a0t.txt |   0
 .../{ => display}/panel/giantplus,gpg482739qs5.txt |   0
 .../{ => display}/panel/hannstar,hsd070pww1.txt    |   0
 .../{ => display}/panel/hannstar,hsd100pxn1.txt    |   0
 .../{ => display}/panel/hit,tx23d38vm0caa.txt      |   0
 .../{ => display}/panel/innolux,at043tn24.txt      |   0
 .../{ => display}/panel/innolux,g121i1-l01.txt     |   0
 .../{ => display}/panel/innolux,n116bge.txt        |   0
 .../{ => display}/panel/innolux,n156bge-l21.txt    |   0
 .../{ => display}/panel/innolux,zj070na-01p.txt    |   0
 .../bindings/{ => display}/panel/lg,lb070wv8.txt   |   0
 .../{ => display}/panel/lg,ld070wx3-sl01.txt       |   0
 .../bindings/{ => display}/panel/lg,lg4573.txt     |   0
 .../{ => display}/panel/lg,lh500wx1-sd03.txt       |   0
 .../bindings/{ => display}/panel/lg,lp129qe.txt    |   0
 .../panel}/lgphilips,lb035q02.txt                  |   0
 .../{ => display}/panel/nec,nl4827hc19-05b.txt     |   0
 .../{ => display}/panel/okaya,rs800480t-7x0gp.txt  |   0
 .../panel/ortustech,com43h4m85ulc.txt              |   0
 .../{ => display}/panel/panasonic,vvx10f004b00.txt |   0
 .../{video => display/panel}/panel-dpi.txt         |   2 +-
 .../{video => display/panel}/panel-dsi-cm.txt      |   0
 .../{ => display}/panel/samsung,ld9040.txt         |   2 +-
 .../{ => display}/panel/samsung,ltn101nt05.txt     |   0
 .../{ => display}/panel/samsung,ltn140at29-301.txt |   0
 .../{ => display}/panel/samsung,s6e8aa0.txt        |   2 +-
 .../{ => display}/panel/sharp,lq101r1sx01.txt      |   0
 .../{video => display/panel}/sharp,ls037v7dw01.txt |   0
 .../panel/shelly,sca07010-bfn-lnn.txt              |   0
 .../bindings/{ => display}/panel/simple-panel.txt  |   0
 .../{video => display/panel}/sony,acx565akm.txt    |   0
 .../panel}/toppoly,td028ttec1.txt                  |   0
 .../{video => display/panel}/tpo,td043mtea1.txt    |   0
 .../bindings/{video => display}/renesas,du.txt     |   0
 .../rockchip}/dw_hdmi-rockchip.txt                 |   0
 .../{video => display/rockchip}/rockchip-drm.txt   |   2 +-
 .../{video => display/rockchip}/rockchip-vop.txt   |   0
 .../simple-framebuffer-sunxi.txt                   |   0
 .../{video => display}/simple-framebuffer.txt      |   0
 .../bindings/{fb => display}/sm501fb.txt           |   0
 .../bindings/{video => display}/ssd1289fb.txt      |   0
 .../bindings/{video => display}/ssd1307fb.txt      |   0
 .../bindings/{gpu => display}/st,stih4xx.txt       |   4 +-
 .../tegra}/nvidia,tegra114-mipi.txt                |   0
 .../tegra}/nvidia,tegra20-host1x.txt               |   2 +-
 .../bindings/{video => display/ti}/ti,dra7-dss.txt |   2 +-
 .../bindings/{video => display/ti}/ti,omap-dss.txt |   0
 .../{video => display/ti}/ti,omap2-dss.txt         |   2 +-
 .../{video => display/ti}/ti,omap3-dss.txt         |   2 +-
 .../{video => display/ti}/ti,omap4-dss.txt         |   2 +-
 .../{video => display/ti}/ti,omap5-dss.txt         |   2 +-
 .../bindings/{video => display/ti}/ti,opa362.txt   |   0
 .../bindings/{video => display/ti}/ti,tfp410.txt   |   0
 .../{video => display/ti}/ti,tpd12s015.txt         |   0
 .../bindings/{drm => display}/tilcdc/panel.txt     |   2 +-
 .../bindings/{drm => display}/tilcdc/tfp410.txt    |   0
 .../bindings/{drm => display}/tilcdc/tilcdc.txt    |   0
 .../bindings/{video => display}/via,vt8500-fb.txt  |   0
 .../{video => display}/wm,prizm-ge-rops.txt        |   0
 .../bindings/{video => display}/wm,wm8505-fb.txt   |   0
 .../devicetree/bindings/{misc => eeprom}/at25.txt  |   0
 .../devicetree/bindings/{ => eeprom}/eeprom.txt    |   0
 Documentation/devicetree/bindings/hwmon/ina209.txt |  18 ----
 Documentation/devicetree/bindings/hwmon/ina2xx.txt |   1 +
 .../bindings/{misc => iio/accel}/lis302.txt        |   0
 .../bindings/{misc => iio/dac}/ti,dac7512.txt      |   0
 .../bindings/{misc => iio/pressure}/bmp085.txt     |   0
 .../bindings/{hid => input}/hid-over-i2c.txt       |   0
 .../arm,gic-v3.txt}                                |   0
 .../gic.txt => interrupt-controller/arm,gic.txt}   |   0
 .../arm,versatile-fpga-irq.txt}                    |   0
 .../vic.txt => interrupt-controller/arm,vic.txt}   |   0
 .../axis,crisv32-intc.txt}                         |   0
 .../img,meta-intc.txt}                             |   0
 .../img,pdc-intc.txt}                              |   0
 .../intel,ce4100-ioapic.txt}                       |   0
 .../mediatek,sysirq.txt                            |   0
 .../mrvl,intc.txt}                                 |   0
 .../nxp,lpc3220-mic.txt}                           |   0
 .../{ => interrupt-controller}/open-pic.txt        |   0
 .../samsung,exynos4210-combiner.txt}               |   0
 .../snps,arc700-intc.txt}                          |   0
 .../snps,archs-idu-intc.txt}                       |   0
 .../snps,archs-intc.txt}                           |   0
 .../st,spear3xx-shirq.txt}                         |   0
 .../ti,c64x+megamod-pic.txt}                       |   0
 .../ti,cp-intc.txt}                                |   0
 .../ti,omap2-intc.txt}                             |   0
 .../via,vt8500-intc.txt                            |   0
 .../{video => leds}/backlight/88pm860x.txt         |   0
 .../{video => leds}/backlight/gpio-backlight.txt   |   0
 .../bindings/{video => leds}/backlight/lp855x.txt  |   0
 .../backlight/max8925-backlight.txt                |   0
 .../{video => leds}/backlight/pm8941-wled.txt      |   0
 .../{video => leds}/backlight/pwm-backlight.txt    |   0
 .../backlight/sky81452-backlight.txt               |   0
 .../backlight/tps65217-backlight.txt               |   0
 .../calxeda-ddr-ctrlr.txt}                         |   0
 .../devicetree/bindings/mfd/atmel-hlcdc.txt        |   2 +-
 Documentation/devicetree/bindings/mfd/sky81452.txt |   2 +-
 Documentation/devicetree/bindings/pci/pci.txt      |   4 +-
 .../combophy.txt => phy/calxeda-combophy.txt}      |   0
 .../keystone-phy.txt => phy/keystone-usb-phy.txt}  |   0
 .../{usb/mxs-phy.txt => phy/mxs-usb-phy.txt}       |   0
 .../{usb => phy}/nvidia,tegra20-usb-phy.txt        |   0
 .../bindings/{usb => phy}/qcom,usb-8x16-phy.txt    |   0
 .../bindings/{hwrng => rng}/atmel-trng.txt         |   0
 .../bindings/{hwrng => rng}/brcm,iproc-rng200.txt  |   0
 .../bindings/{hwrng => rng}/omap_rng.txt           |   0
 .../bindings/{hwrng => rng}/timeriomem_rng.txt     |   0
 .../devicetree/bindings/serial/mrvl,pxa-ssp.txt    |   1 -
 Documentation/devicetree/bindings/serial/pl011.txt |   2 +-
 .../devicetree/bindings/usb/samsung-usbphy.txt     | 117 ---------------------
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 arch/arc/Makefile                                  |   2 +-
 arch/arc/boot/dts/Makefile                         |   6 +-
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm64/boot/dts/Makefile                       |   6 ++
 arch/h8300/boot/dts/Makefile                       |   3 +
 arch/metag/Makefile                                |   2 +-
 arch/metag/boot/dts/Makefile                       |   7 +-
 arch/mips/boot/dts/Makefile                        |   3 +
 arch/xtensa/Makefile                               |   4 +
 arch/xtensa/boot/dts/Makefile                      |   7 +-
 drivers/base/core.c                                |   2 +-
 drivers/of/Kconfig                                 |  10 ++
 drivers/of/address.c                               |   6 ++
 drivers/of/device.c                                |  11 +-
 drivers/of/fdt.c                                   |  10 +-
 drivers/of/irq.c                                   |   9 +-
 drivers/of/of_pci.c                                |   6 +-
 drivers/of/of_reserved_mem.c                       |  43 +++++++-
 drivers/of/overlay.c                               |   5 +-
 drivers/of/platform.c                              |   8 +-
 drivers/of/unittest.c                              |   8 +-
 include/linux/of_irq.h                             |  15 ++-
 191 files changed, 202 insertions(+), 202 deletions(-)
 rename Documentation/devicetree/bindings/{nvec => arm/tegra}/nvidia,nvec.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/arm,pl11x.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/armada/marvell,dove-lcd.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/atmel,lcdc.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/atmel/hlcdc-dc.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7123.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7511.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/bridge/dw_hdmi.txt (91%)
 rename Documentation/devicetree/bindings/{video => display}/bridge/ps8622.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/bridge/ptn3460.txt (100%)
 rename Documentation/devicetree/bindings/{drm/i2c => display/bridge}/tda998x.txt (100%)
 rename Documentation/devicetree/bindings/{video/thine,thc63lvdm83d => display/bridge/thine,thc63lvdm83d.txt} (100%)
 rename Documentation/devicetree/bindings/{video => display}/cirrus,clps711x-fb.txt (94%)
 rename Documentation/devicetree/bindings/{video => display/connector}/analog-tv-connector.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/connector}/dvi-connector.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/connector}/hdmi-connector.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/connector}/vga-connector.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos-mic.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos5433-decon.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos7-decon.txt (97%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dp.txt (98%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dsim.txt (98%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmi.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiddc.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiphy.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_mixer.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/exynos}/samsung-fimd.txt (98%)
 rename Documentation/devicetree/bindings/{video => display}/fsl,dcu.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/imx}/fsl,imx-fb.txt (96%)
 rename Documentation/devicetree/bindings/{drm => display}/imx/fsl-imx-drm.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/imx/hdmi.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/imx/ldb.txt (98%)
 create mode 100644 Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt
 rename Documentation/devicetree/bindings/{mipi/dsi => display}/mipi-dsi-bus.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/msm/dsi.txt (98%)
 rename Documentation/devicetree/bindings/{drm => display}/msm/edp.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/msm/gpu.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/msm/hdmi.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/msm/mdp.txt (100%)
 rename Documentation/devicetree/bindings/{fb => display}/mxsfb.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/ampire,am800480r3tmqwa1h.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b080uan01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101aw03.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101ean01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101xtn01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b116xw03.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133htn01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133xtn01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/avic,tm070ddh03.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wa01a.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wb03.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/display-timing.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/edt,et057090dhu.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/edt,et070080dh6.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/edt,etm0700g0dh6.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/foxlink,fl500wvr00-a0t.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/giantplus,gpg482739qs5.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd070pww1.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd100pxn1.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/hit,tx23d38vm0caa.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,at043tn24.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,g121i1-l01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n116bge.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n156bge-l21.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/innolux,zj070na-01p.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lb070wv8.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/lg,ld070wx3-sl01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lg4573.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lh500wx1-sd03.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/lg,lp129qe.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/lgphilips,lb035q02.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/nec,nl4827hc19-05b.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/okaya,rs800480t-7x0gp.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/ortustech,com43h4m85ulc.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/panasonic,vvx10f004b00.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/panel-dpi.txt (94%)
 rename Documentation/devicetree/bindings/{video => display/panel}/panel-dsi-cm.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ld9040.txt (96%)
 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn101nt05.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn140at29-301.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/samsung,s6e8aa0.txt (95%)
 rename Documentation/devicetree/bindings/{ => display}/panel/sharp,lq101r1sx01.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/sharp,ls037v7dw01.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/shelly,sca07010-bfn-lnn.txt (100%)
 rename Documentation/devicetree/bindings/{ => display}/panel/simple-panel.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/sony,acx565akm.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/toppoly,td028ttec1.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/panel}/tpo,td043mtea1.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/renesas,du.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/rockchip}/dw_hdmi-rockchip.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-drm.txt (88%)
 rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-vop.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer-sunxi.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer.txt (100%)
 rename Documentation/devicetree/bindings/{fb => display}/sm501fb.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/ssd1289fb.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/ssd1307fb.txt (100%)
 rename Documentation/devicetree/bindings/{gpu => display}/st,stih4xx.txt (98%)
 rename Documentation/devicetree/bindings/{mipi => display/tegra}/nvidia,tegra114-mipi.txt (100%)
 rename Documentation/devicetree/bindings/{gpu => display/tegra}/nvidia,tegra20-host1x.txt (99%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,dra7-dss.txt (95%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap-dss.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap2-dss.txt (93%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap3-dss.txt (95%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap4-dss.txt (97%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap5-dss.txt (96%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,opa362.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,tfp410.txt (100%)
 rename Documentation/devicetree/bindings/{video => display/ti}/ti,tpd12s015.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/panel.txt (96%)
 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tfp410.txt (100%)
 rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tilcdc.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/via,vt8500-fb.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/wm,prizm-ge-rops.txt (100%)
 rename Documentation/devicetree/bindings/{video => display}/wm,wm8505-fb.txt (100%)
 rename Documentation/devicetree/bindings/{misc => eeprom}/at25.txt (100%)
 rename Documentation/devicetree/bindings/{ => eeprom}/eeprom.txt (100%)
 delete mode 100644 Documentation/devicetree/bindings/hwmon/ina209.txt
 rename Documentation/devicetree/bindings/{misc => iio/accel}/lis302.txt (100%)
 rename Documentation/devicetree/bindings/{misc => iio/dac}/ti,dac7512.txt (100%)
 rename Documentation/devicetree/bindings/{misc => iio/pressure}/bmp085.txt (100%)
 rename Documentation/devicetree/bindings/{hid => input}/hid-over-i2c.txt (100%)
 rename Documentation/devicetree/bindings/{arm/gic-v3.txt => interrupt-controller/arm,gic-v3.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/gic.txt => interrupt-controller/arm,gic.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/versatile-fpga-irq.txt => interrupt-controller/arm,versatile-fpga-irq.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/vic.txt => interrupt-controller/arm,vic.txt} (100%)
 rename Documentation/devicetree/bindings/{cris/interrupts.txt => interrupt-controller/axis,crisv32-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{metag/meta-intc.txt => interrupt-controller/img,meta-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{metag/pdc-intc.txt => interrupt-controller/img,pdc-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{x86/interrupt.txt => interrupt-controller/intel,ce4100-ioapic.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/mediatek => interrupt-controller}/mediatek,sysirq.txt (100%)
 rename Documentation/devicetree/bindings/{arm/mrvl/intc.txt => interrupt-controller/mrvl,intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/lpc32xx-mic.txt => interrupt-controller/nxp,lpc3220-mic.txt} (100%)
 rename Documentation/devicetree/bindings/{ => interrupt-controller}/open-pic.txt (100%)
 rename Documentation/devicetree/bindings/{arm/samsung/interrupt-combiner.txt => interrupt-controller/samsung,exynos4210-combiner.txt} (100%)
 rename Documentation/devicetree/bindings/{arc/interrupts.txt => interrupt-controller/snps,arc700-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arc/archs-idu-intc.txt => interrupt-controller/snps,archs-idu-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arc/archs-intc.txt => interrupt-controller/snps,archs-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/spear/shirq.txt => interrupt-controller/st,spear3xx-shirq.txt} (100%)
 rename Documentation/devicetree/bindings/{c6x/interrupt.txt => interrupt-controller/ti,c64x+megamod-pic.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/davinci/cp-intc.txt => interrupt-controller/ti,cp-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/omap/intc.txt => interrupt-controller/ti,omap2-intc.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/vt8500 => interrupt-controller}/via,vt8500-intc.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/88pm860x.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/gpio-backlight.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/lp855x.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/max8925-backlight.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/pm8941-wled.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/pwm-backlight.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/sky81452-backlight.txt (100%)
 rename Documentation/devicetree/bindings/{video => leds}/backlight/tps65217-backlight.txt (100%)
 rename Documentation/devicetree/bindings/{arm/calxeda/mem-ctrlr.txt => memory-controllers/calxeda-ddr-ctrlr.txt} (100%)
 rename Documentation/devicetree/bindings/{arm/calxeda/combophy.txt => phy/calxeda-combophy.txt} (100%)
 rename Documentation/devicetree/bindings/{usb/keystone-phy.txt => phy/keystone-usb-phy.txt} (100%)
 rename Documentation/devicetree/bindings/{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} (100%)
 rename Documentation/devicetree/bindings/{usb => phy}/nvidia,tegra20-usb-phy.txt (100%)
 rename Documentation/devicetree/bindings/{usb => phy}/qcom,usb-8x16-phy.txt (100%)
 rename Documentation/devicetree/bindings/{hwrng => rng}/atmel-trng.txt (100%)
 rename Documentation/devicetree/bindings/{hwrng => rng}/brcm,iproc-rng200.txt (100%)
 rename Documentation/devicetree/bindings/{hwrng => rng}/omap_rng.txt (100%)
 rename Documentation/devicetree/bindings/{hwrng => rng}/timeriomem_rng.txt (100%)
 delete mode 100644 Documentation/devicetree/bindings/usb/samsung-usbphy.txt
Merging mailbox/mailbox-for-next (8e3c5952144f mailbox/omap: Add ti,mbox-send-noirq quirk to fix AM33xx CPU Idle)
$ git merge mailbox/mailbox-for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mailbox/omap-mailbox.txt   |   8 +
 .../devicetree/bindings/mailbox/sti-mailbox.txt    |  51 ++
 drivers/mailbox/Kconfig                            |  14 +
 drivers/mailbox/Makefile                           |   4 +
 drivers/mailbox/mailbox-sti.c                      | 513 +++++++++++++++++++++
 drivers/mailbox/mailbox-test.c                     | 362 +++++++++++++++
 drivers/mailbox/omap-mailbox.c                     |  49 +-
 drivers/mailbox/pcc.c                              |   2 +-
 8 files changed, 998 insertions(+), 5 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
 create mode 100644 drivers/mailbox/mailbox-sti.c
 create mode 100644 drivers/mailbox/mailbox-test.c
$ git reset --hard HEAD^
HEAD is now at 6b2a0c58dde3 Merge remote-tracking branch 'dt-rh/for-next'
Merging next-20151022 version of mailbox
$ git merge -m next-20151022/mailbox 6c03663f98b91cdd04fce2c9fb7a2cc5d164eded
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mailbox/sti-mailbox.txt    |  51 ++
 drivers/mailbox/Kconfig                            |  14 +
 drivers/mailbox/Makefile                           |   4 +
 drivers/mailbox/mailbox-sti.c                      | 513 +++++++++++++++++++++
 drivers/mailbox/mailbox-test.c                     | 361 +++++++++++++++
 drivers/mailbox/pcc.c                              |   2 +-
 6 files changed, 944 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt
 create mode 100644 drivers/mailbox/mailbox-sti.c
 create mode 100644 drivers/mailbox/mailbox-test.c
Merging spi/for-next (9de608970f32 Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/ti-qspi' and 'spi/topic/txx9' into spi-next)
$ git merge spi/for-next
Resolved 'drivers/nfc/trf7970a.c' using previous resolution.
Auto-merging sound/soc/codecs/wm8731.c
Auto-merging sound/soc/codecs/ad193x-spi.c
Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
Auto-merging drivers/spi/spi-atmel.c
Auto-merging drivers/nfc/trf7970a.c
CONFLICT (content): Merge conflict in drivers/nfc/trf7970a.c
Auto-merging drivers/nfc/st-nci/spi.c
Auto-merging drivers/net/ieee802154/mrf24j40.c
Auto-merging drivers/net/ieee802154/at86rf230.c
Auto-merging drivers/mtd/devices/sst25l.c
Auto-merging drivers/mtd/devices/mtd_dataflash.c
Auto-merging drivers/mtd/devices/m25p80.c
Auto-merging drivers/mmc/host/mmc_spi.c
Auto-merging drivers/mfd/da9052-spi.c
Auto-merging drivers/mfd/arizona-spi.c
Auto-merging drivers/media/i2c/s5c73m3/s5c73m3-spi.c
Auto-merging drivers/input/touchscreen/ads7846.c
Auto-merging drivers/input/misc/ad714x-spi.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 7d6c360af39a] Merge remote-tracking branch 'spi/for-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/spi/brcm,bcm2835-aux-spi.txt          |  38 ++
 .../devicetree/bindings/spi/spi-mt65xx.txt         |   9 +-
 arch/arm/mach-u300/dummyspichip.c                  |   1 -
 arch/mips/bcm63xx/dev-spi.c                        |  42 +-
 .../include/asm/mach-bcm63xx/bcm63xx_dev_spi.h     |  44 --
 arch/mips/txx9/generic/spi_eeprom.c                |   1 -
 drivers/char/tpm/st33zp24/spi.c                    |   1 -
 drivers/gpio/gpio-74x164.c                         |   1 -
 drivers/gpio/gpio-max7301.c                        |   1 -
 drivers/gpio/gpio-mc33880.c                        |   1 -
 drivers/gpio/gpio-mcp23s08.c                       |   2 -
 drivers/gpu/drm/panel/panel-lg-lg4573.c            |   1 -
 drivers/gpu/drm/panel/panel-samsung-ld9040.c       |   1 -
 drivers/hwmon/ad7314.c                             |   1 -
 drivers/hwmon/adcxx.c                              |   1 -
 drivers/hwmon/ads7871.c                            |   1 -
 drivers/hwmon/adt7310.c                            |   1 -
 drivers/hwmon/lm70.c                               |   1 -
 drivers/hwmon/max1111.c                            |   1 -
 drivers/iio/accel/kxsd9.c                          |   1 -
 drivers/iio/accel/st_accel_spi.c                   |   1 -
 drivers/iio/adc/ad7266.c                           |   1 -
 drivers/iio/adc/ad7298.c                           |   1 -
 drivers/iio/adc/ad7476.c                           |   1 -
 drivers/iio/adc/ad7791.c                           |   1 -
 drivers/iio/adc/ad7793.c                           |   1 -
 drivers/iio/adc/ad7887.c                           |   1 -
 drivers/iio/adc/ad7923.c                           |   1 -
 drivers/iio/adc/max1027.c                          |   1 -
 drivers/iio/adc/mcp320x.c                          |   1 -
 drivers/iio/adc/ti-adc128s052.c                    |   1 -
 drivers/iio/amplifiers/ad8366.c                    |   1 -
 drivers/iio/common/ssp_sensors/ssp_dev.c           |   1 -
 drivers/iio/dac/ad5064.c                           |   1 -
 drivers/iio/dac/ad5360.c                           |   1 -
 drivers/iio/dac/ad5380.c                           |   1 -
 drivers/iio/dac/ad5421.c                           |   1 -
 drivers/iio/dac/ad5446.c                           |   1 -
 drivers/iio/dac/ad5449.c                           |   1 -
 drivers/iio/dac/ad5504.c                           |   1 -
 drivers/iio/dac/ad5624r_spi.c                      |   1 -
 drivers/iio/dac/ad5686.c                           |   1 -
 drivers/iio/dac/ad5755.c                           |   1 -
 drivers/iio/dac/ad5764.c                           |   1 -
 drivers/iio/dac/ad5791.c                           |   1 -
 drivers/iio/dac/ad7303.c                           |   1 -
 drivers/iio/dac/mcp4922.c                          |   1 -
 drivers/iio/frequency/ad9523.c                     |   1 -
 drivers/iio/frequency/adf4350.c                    |   1 -
 drivers/iio/gyro/adis16080.c                       |   1 -
 drivers/iio/gyro/adis16130.c                       |   1 -
 drivers/iio/gyro/adis16136.c                       |   1 -
 drivers/iio/gyro/adis16260.c                       |   1 -
 drivers/iio/gyro/adxrs450.c                        |   1 -
 drivers/iio/gyro/st_gyro_spi.c                     |   1 -
 drivers/iio/imu/adis16400_core.c                   |   1 -
 drivers/iio/imu/adis16480.c                        |   1 -
 drivers/iio/magnetometer/st_magn_spi.c             |   1 -
 drivers/iio/pressure/ms5611_spi.c                  |   1 -
 drivers/iio/pressure/st_pressure_spi.c             |   1 -
 drivers/iio/proximity/as3935.c                     |   1 -
 drivers/input/misc/ad714x-spi.c                    |   1 -
 drivers/input/misc/adxl34x-spi.c                   |   1 -
 drivers/input/touchscreen/ad7877.c                 |   1 -
 drivers/input/touchscreen/ad7879-spi.c             |   1 -
 drivers/input/touchscreen/ads7846.c                |   1 -
 drivers/input/touchscreen/cyttsp4_spi.c            |   1 -
 drivers/input/touchscreen/cyttsp_spi.c             |   1 -
 drivers/input/touchscreen/tsc2005.c                |   1 -
 drivers/leds/leds-dac124s085.c                     |   1 -
 drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |   1 -
 drivers/media/tuners/msi001.c                      |   1 -
 drivers/mfd/arizona-spi.c                          |   1 -
 drivers/mfd/cros_ec_spi.c                          |   1 -
 drivers/mfd/da9052-spi.c                           |   1 -
 drivers/mfd/ezx-pcap.c                             |   1 -
 drivers/mfd/mc13xxx-spi.c                          |   1 -
 drivers/mfd/stmpe-spi.c                            |   1 -
 drivers/mfd/tps65912-spi.c                         |   1 -
 drivers/mfd/wm831x-spi.c                           |   1 -
 drivers/misc/ad525x_dpot-spi.c                     |   1 -
 drivers/misc/bmp085-spi.c                          |   1 -
 drivers/misc/eeprom/at25.c                         |   1 -
 drivers/misc/eeprom/eeprom_93xx46.c                |   1 -
 drivers/misc/lattice-ecp3-config.c                 |   1 -
 drivers/misc/lis3lv02d/lis3lv02d_spi.c             |   1 -
 drivers/misc/ti_dac7512.c                          |   1 -
 drivers/mmc/host/mmc_spi.c                         |   1 -
 drivers/mtd/devices/m25p80.c                       |   1 -
 drivers/mtd/devices/mtd_dataflash.c                |   1 -
 drivers/mtd/devices/sst25l.c                       |   1 -
 drivers/net/can/spi/mcp251x.c                      |   1 -
 drivers/net/ethernet/micrel/ks8851.c               |   1 -
 drivers/net/ethernet/microchip/enc28j60.c          |   1 -
 drivers/net/ethernet/qualcomm/qca_spi.c            |   1 -
 drivers/net/ieee802154/at86rf230.c                 |   1 -
 drivers/net/ieee802154/cc2520.c                    |   1 -
 drivers/net/ieee802154/mrf24j40.c                  |   1 -
 drivers/net/phy/spi_ks8995.c                       |   1 -
 drivers/net/wireless/cw1200/cw1200_spi.c           |   1 -
 drivers/net/wireless/libertas/if_spi.c             |   1 -
 drivers/net/wireless/p54/p54spi.c                  |   1 -
 drivers/net/wireless/ti/wl1251/spi.c               |   1 -
 drivers/net/wireless/ti/wlcore/spi.c               |   1 -
 drivers/nfc/st-nci/spi.c                           |   1 -
 drivers/nfc/trf7970a.c                             |   1 -
 drivers/regulator/tps6524x-regulator.c             |   1 -
 drivers/rtc/rtc-ds1305.c                           |   1 -
 drivers/rtc/rtc-ds1343.c                           |   1 -
 drivers/rtc/rtc-ds1347.c                           |   1 -
 drivers/rtc/rtc-ds1390.c                           |   1 -
 drivers/rtc/rtc-ds3234.c                           |   1 -
 drivers/rtc/rtc-m41t93.c                           |   1 -
 drivers/rtc/rtc-m41t94.c                           |   1 -
 drivers/rtc/rtc-max6902.c                          |   1 -
 drivers/rtc/rtc-mcp795.c                           |   1 -
 drivers/rtc/rtc-pcf2123.c                          |   1 -
 drivers/rtc/rtc-r9701.c                            |   1 -
 drivers/rtc/rtc-rs5c348.c                          |   1 -
 drivers/rtc/rtc-rx4581.c                           |   1 -
 drivers/spi/Kconfig                                |  15 +-
 drivers/spi/Makefile                               |   1 +
 drivers/spi/spi-ath79.c                            |  11 +-
 drivers/spi/spi-atmel.c                            |   3 +-
 drivers/spi/spi-au1550.c                           |  11 +-
 drivers/spi/spi-bcm2835.c                          |  14 +-
 drivers/spi/spi-bcm2835aux.c                       | 512 +++++++++++++++++++++
 drivers/spi/spi-bcm53xx.c                          |  13 +-
 drivers/spi/spi-bcm63xx.c                          | 210 ++++++++-
 drivers/spi/spi-bfin-sport.c                       |   5 +-
 drivers/spi/spi-bfin5xx.c                          |   6 +-
 drivers/spi/spi-bitbang.c                          | 152 ++----
 drivers/spi/spi-coldfire-qspi.c                    |   3 +-
 drivers/spi/spi-davinci.c                          |  15 +-
 drivers/spi/spi-dw-mmio.c                          |   7 +-
 drivers/spi/spi-dw-pci.c                           |  29 +-
 drivers/spi/spi-dw.c                               | 108 ++---
 drivers/spi/spi-dw.h                               |   6 +
 drivers/spi/spi-fsl-dspi.c                         |   3 -
 drivers/spi/spi-imx.c                              |   7 +
 drivers/spi/spi-mpc512x-psc.c                      |   8 +-
 drivers/spi/spi-mt65xx.c                           | 129 ++++--
 drivers/spi/spi-oc-tiny.c                          |  14 +-
 drivers/spi/spi-octeon.c                           |   2 +-
 drivers/spi/spi-omap-100k.c                        |  26 +-
 drivers/spi/spi-omap-uwire.c                       |   7 +-
 drivers/spi/spi-omap2-mcspi.c                      |  28 ++
 drivers/spi/spi-ppc4xx.c                           |   4 +-
 drivers/spi/spi-pxa2xx-dma.c                       |   4 -
 drivers/spi/spi-pxa2xx.c                           | 257 +++++++----
 drivers/spi/spi-pxa2xx.h                           |   9 -
 drivers/spi/spi-s3c24xx.c                          |   4 +-
 drivers/spi/spi-s3c64xx.c                          |  46 +-
 drivers/spi/spi-ti-qspi.c                          |  88 +---
 drivers/spi/spi-tle62x0.c                          |   1 -
 drivers/spi/spi-txx9.c                             |   2 +-
 drivers/spi/spi-xilinx.c                           |  38 +-
 drivers/spi/spi.c                                  | 136 +++++-
 drivers/spi/spidev.c                               |   1 -
 drivers/staging/fbtft/fbtft.h                      |   1 -
 drivers/staging/fbtft/flexfb.c                     |   1 -
 drivers/staging/iio/accel/adis16201_core.c         |   1 -
 drivers/staging/iio/accel/adis16203_core.c         |   1 -
 drivers/staging/iio/accel/adis16204_core.c         |   1 -
 drivers/staging/iio/accel/adis16209_core.c         |   1 -
 drivers/staging/iio/accel/adis16220_core.c         |   1 -
 drivers/staging/iio/accel/adis16240_core.c         |   1 -
 drivers/staging/iio/accel/lis3l02dq_core.c         |   1 -
 drivers/staging/iio/accel/sca3000_core.c           |   1 -
 drivers/staging/iio/adc/ad7192.c                   |   1 -
 drivers/staging/iio/adc/ad7280a.c                  |   1 -
 drivers/staging/iio/adc/ad7606_spi.c               |   1 -
 drivers/staging/iio/adc/ad7780.c                   |   1 -
 drivers/staging/iio/adc/ad7816.c                   |   1 -
 drivers/staging/iio/addac/adt7316-spi.c            |   1 -
 drivers/staging/iio/frequency/ad9832.c             |   1 -
 drivers/staging/iio/frequency/ad9834.c             |   1 -
 drivers/staging/iio/gyro/adis16060_core.c          |   2 -
 drivers/staging/iio/magnetometer/hmc5843_spi.c     |   1 -
 drivers/staging/iio/meter/ade7753.c                |   1 -
 drivers/staging/iio/meter/ade7754.c                |   1 -
 drivers/staging/iio/meter/ade7758_core.c           |   1 -
 drivers/staging/iio/meter/ade7759.c                |   1 -
 drivers/staging/iio/meter/ade7854-spi.c            |   1 -
 drivers/staging/iio/resolver/ad2s1200.c            |   1 -
 drivers/staging/iio/resolver/ad2s1210.c            |   1 -
 drivers/staging/iio/resolver/ad2s90.c              |   1 -
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |   1 -
 drivers/tty/serial/ifx6x60.c                       |   2 +-
 drivers/tty/serial/max3100.c                       |   1 -
 drivers/tty/serial/max310x.c                       |   1 -
 drivers/tty/serial/sc16is7xx.c                     |   1 -
 drivers/usb/host/max3421-hcd.c                     |   1 -
 drivers/video/backlight/ams369fg06.c               |   1 -
 drivers/video/backlight/corgi_lcd.c                |   1 -
 drivers/video/backlight/ili922x.c                  |   1 -
 drivers/video/backlight/l4f00242t03.c              |   1 -
 drivers/video/backlight/ld9040.c                   |   1 -
 drivers/video/backlight/lms283gf05.c               |   1 -
 drivers/video/backlight/lms501kf03.c               |   1 -
 drivers/video/backlight/ltv350qv.c                 |   1 -
 drivers/video/backlight/s6e63m0.c                  |   1 -
 drivers/video/backlight/tdo24m.c                   |   1 -
 drivers/video/backlight/tosa_lcd.c                 |   1 -
 drivers/video/backlight/vgg2432a4.c                |   1 -
 drivers/video/fbdev/mmp/panel/tpo_tj032md01bw.c    |   1 -
 drivers/video/fbdev/omap/lcd_mipid.c               |   1 -
 .../omap2/displays-new/panel-lgphilips-lb035q02.c  |   1 -
 .../omap2/displays-new/panel-nec-nl8048hl11.c      |   1 -
 .../omap2/displays-new/panel-sony-acx565akm.c      |   1 -
 .../omap2/displays-new/panel-tpo-td028ttec1.c      |   1 -
 .../omap2/displays-new/panel-tpo-td043mtea1.c      |   1 -
 include/linux/pxa2xx_ssp.h                         |   1 +
 include/linux/spi/spi.h                            |  44 +-
 include/linux/spi/spi_bitbang.h                    |   2 +-
 sound/soc/codecs/ad1836.c                          |   1 -
 sound/soc/codecs/ad193x-spi.c                      |   1 -
 sound/soc/codecs/adau1761-spi.c                    |   1 -
 sound/soc/codecs/adau1781-spi.c                    |   1 -
 sound/soc/codecs/adau1977-spi.c                    |   1 -
 sound/soc/codecs/adav801.c                         |   1 -
 sound/soc/codecs/ak4104.c                          |   1 -
 sound/soc/codecs/cs4271-spi.c                      |   1 -
 sound/soc/codecs/da7210.c                          |   1 -
 sound/soc/codecs/pcm1792a.c                        |   1 -
 sound/soc/codecs/pcm512x-spi.c                     |   1 -
 sound/soc/codecs/rt5677-spi.c                      |   1 -
 sound/soc/codecs/ssm2602-spi.c                     |   1 -
 sound/soc/codecs/tlv320aic23-spi.c                 |   1 -
 sound/soc/codecs/tlv320aic26.c                     |   1 -
 sound/soc/codecs/wm0010.c                          |   1 -
 sound/soc/codecs/wm8510.c                          |   1 -
 sound/soc/codecs/wm8711.c                          |   1 -
 sound/soc/codecs/wm8728.c                          |   1 -
 sound/soc/codecs/wm8731.c                          |   1 -
 sound/soc/codecs/wm8737.c                          |   1 -
 sound/soc/codecs/wm8741.c                          |   1 -
 sound/soc/codecs/wm8750.c                          |   1 -
 sound/soc/codecs/wm8753.c                          |   1 -
 sound/soc/codecs/wm8770.c                          |   1 -
 sound/soc/codecs/wm8776.c                          |   1 -
 sound/soc/codecs/wm8804-spi.c                      |   1 -
 sound/soc/codecs/wm8900.c                          |   1 -
 sound/soc/codecs/wm8983.c                          |   1 -
 sound/soc/codecs/wm8985.c                          |   1 -
 sound/soc/codecs/wm8988.c                          |   1 -
 sound/soc/codecs/wm8995.c                          |   1 -
 247 files changed, 1403 insertions(+), 916 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-aux-spi.txt
 create mode 100644 drivers/spi/spi-bcm2835aux.c
Merging tip/auto-latest (90939cc5352f Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Resolved 'Documentation/arm/uefi.txt' using previous resolution.
Resolved 'arch/arm64/include/asm/atomic.h' using previous resolution.
Resolved 'arch/arm64/kernel/acpi.c' using previous resolution.
Resolved 'arch/arm64/kernel/cpufeature.c' using previous resolution.
Resolved 'arch/x86/Makefile' using previous resolution.
Resolved 'include/linux/of_irq.h' using previous resolution.
Removing tools/perf/bench/mem-memcpy.c
Auto-merging tools/perf/arch/x86/tests/rdpmc.c
Auto-merging tools/perf/arch/x86/tests/perf-time-to-tsc.c
Removing tools/lib/api/fs/tracefs.h
Removing tools/lib/api/fs/tracefs.c
Removing tools/lib/api/fs/findfs.h
Removing tools/lib/api/fs/findfs.c
Removing tools/lib/api/fs/debugfs.h
Removing tools/lib/api/fs/debugfs.c
Auto-merging kernel/irq/manage.c
Auto-merging kernel/events/core.c
Auto-merging include/uapi/linux/perf_event.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/of_irq.h
CONFLICT (content): Merge conflict in include/linux/of_irq.h
Auto-merging include/linux/msi.h
Auto-merging include/linux/fwnode.h
Auto-merging include/linux/acpi.h
Auto-merging drivers/pci/probe.c
Auto-merging drivers/pci/msi.c
Auto-merging drivers/of/irq.c
Auto-merging drivers/net/ethernet/sfc/mcdi.c
Auto-merging drivers/irqchip/irq-gic.c
Auto-merging drivers/firmware/efi/Makefile
Auto-merging drivers/clocksource/h8300_timer8.c
Auto-merging drivers/clocksource/Makefile
Auto-merging drivers/clocksource/Kconfig
Removing arch/x86/kernel/cpu/microcode/intel_early.c
Removing arch/x86/kernel/cpu/microcode/core_early.c
Removing arch/x86/kernel/cpu/microcode/amd_early.c
Auto-merging arch/x86/include/asm/pgtable.h
Removing arch/x86/entry/vdso/vdso32/sysenter.S
Removing arch/x86/entry/vdso/vdso32/syscall.S
Removing arch/x86/entry/vdso/vdso32/int80.S
Auto-merging arch/x86/crypto/sha512_ssse3_glue.c
Auto-merging arch/x86/crypto/sha256_ssse3_glue.c
Auto-merging arch/x86/crypto/sha1_ssse3_glue.c
Auto-merging arch/x86/Makefile
CONFLICT (content): Merge conflict in arch/x86/Makefile
Auto-merging arch/x86/Kconfig
Auto-merging arch/powerpc/sysdev/mpic.c
Auto-merging arch/mips/include/asm/atomic.h
Auto-merging arch/arm64/mm/proc.S
Auto-merging arch/arm64/kvm/Kconfig
Auto-merging arch/arm64/kernel/head.S
Auto-merging arch/arm64/kernel/efi.c
Auto-merging arch/arm64/kernel/cpufeature.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/cpufeature.c
Auto-merging arch/arm64/kernel/cpu_errata.c
Auto-merging arch/arm64/kernel/acpi.c
CONFLICT (content): Merge conflict in arch/arm64/kernel/acpi.c
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging arch/arm64/include/asm/memory.h
Auto-merging arch/arm64/include/asm/cputype.h
Auto-merging arch/arm64/include/asm/cpufeature.h
Auto-merging arch/arm64/include/asm/atomic.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/atomic.h
Auto-merging arch/arm64/include/asm/acpi.h
Auto-merging arch/arm64/Kconfig
Auto-merging arch/arm/mach-omap2/omap-wakeupgen.c
Auto-merging arch/arm/mach-imx/gpc.c
Auto-merging arch/arm/mach-exynos/suspend.c
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt
Auto-merging Documentation/arm64/booting.txt
Auto-merging Documentation/arm/uefi.txt
CONFLICT (content): Merge conflict in Documentation/arm/uefi.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b666f39d08a7] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
 Documentation/IRQ-domain.txt                       |   8 +-
 Documentation/RCU/stallwarn.txt                    |   7 +
 Documentation/RCU/torture.txt                      |  39 +-
 Documentation/RCU/trace.txt                        |  32 +-
 Documentation/RCU/whatisRCU.txt                    |   6 +-
 Documentation/arm/uefi.txt                         |   2 -
 Documentation/arm64/booting.txt                    |  11 +-
 Documentation/atomic_ops.txt                       |   4 +
 .../bindings/interrupt-controller/arm,gic.txt      |  24 +-
 .../bindings/interrupt-controller/renesas,irqc.txt |   1 +
 Documentation/devicetree/bindings/pci/pci-msi.txt  | 220 ++++++
 Documentation/filesystems/proc.txt                 |   5 +-
 Documentation/kernel-parameters.txt                |  24 +-
 Documentation/locking/locktorture.txt              |   3 +
 Documentation/memory-barriers.txt                  |  29 +-
 MAINTAINERS                                        |  16 +-
 arch/alpha/include/asm/atomic.h                    |   8 +-
 arch/arc/include/asm/atomic.h                      |   8 +-
 arch/arm/Kconfig                                   |   1 +
 arch/arm/include/asm/arch_gicv3.h                  | 188 +++++
 arch/arm/include/asm/atomic.h                      |  12 +-
 arch/arm/mach-exynos/suspend.c                     |  55 +-
 arch/arm/mach-imx/gpc.c                            |  55 +-
 arch/arm/mach-omap2/omap-wakeupgen.c               |  55 +-
 arch/arm64/Kconfig                                 |  27 +
 arch/arm64/include/asm/acpi.h                      |   5 +
 arch/arm64/include/asm/arch_gicv3.h                | 170 ++++
 arch/arm64/include/asm/atomic.h                    |   2 +-
 arch/arm64/include/asm/cpufeature.h                |   3 +-
 arch/arm64/include/asm/cputype.h                   |  17 +-
 arch/arm64/include/asm/memory.h                    |   1 +
 arch/arm64/include/asm/pgtable.h                   |   2 +
 arch/arm64/kernel/acpi.c                           |  29 +
 arch/arm64/kernel/cpu_errata.c                     |   9 +
 arch/arm64/kernel/cpufeature.c                     |  18 +-
 arch/arm64/kernel/efi.c                            |  23 +-
 arch/arm64/kernel/head.S                           |   2 +
 arch/arm64/kvm/Kconfig                             |   4 +
 arch/arm64/mm/proc.S                               |   4 +-
 arch/avr32/include/asm/atomic.h                    |   4 +-
 arch/c6x/platforms/megamod-pic.c                   |   2 +-
 arch/frv/include/asm/atomic.h                      |   4 +-
 arch/h8300/include/asm/atomic.h                    |   4 +-
 arch/hexagon/include/asm/atomic.h                  |   2 +-
 arch/ia64/include/asm/atomic.h                     |   8 +-
 arch/m32r/include/asm/atomic.h                     |   4 +-
 arch/m68k/include/asm/atomic.h                     |   4 +-
 arch/metag/include/asm/atomic_lnkget.h             |   2 +-
 arch/metag/include/asm/atomic_lock1.h              |   2 +-
 arch/mips/cavium-octeon/octeon-irq.c               |   4 +-
 arch/mips/include/asm/atomic.h                     |   8 +-
 arch/mn10300/include/asm/atomic.h                  |   4 +-
 arch/parisc/include/asm/atomic.h                   |   2 +-
 arch/powerpc/perf/core-book3s.c                    |  36 +-
 arch/powerpc/perf/hv-24x7.c                        | 166 +++-
 arch/powerpc/perf/power8-pmu.c                     |   3 +
 arch/powerpc/platforms/cell/axon_msi.c             |   2 +-
 arch/powerpc/platforms/cell/spider-pic.c           |   9 +-
 arch/powerpc/platforms/pasemi/msi.c                |   6 +-
 arch/powerpc/platforms/powernv/opal-irqchip.c      |   2 +-
 arch/powerpc/sysdev/ehv_pic.c                      |   3 +-
 arch/powerpc/sysdev/fsl_msi.c                      |   2 +-
 arch/powerpc/sysdev/i8259.c                        |   3 +-
 arch/powerpc/sysdev/ipic.c                         |   3 +-
 arch/powerpc/sysdev/mpic.c                         |   3 +-
 arch/powerpc/sysdev/mpic_msi.c                     |   2 +-
 arch/powerpc/sysdev/qe_lib/qe_ic.c                 |   3 +-
 arch/s390/kernel/perf_cpum_cf.c                    |  35 +-
 arch/sh/include/asm/atomic.h                       |   4 +-
 arch/sparc/include/asm/atomic_64.h                 |   8 +-
 arch/sparc/kernel/perf_event.c                     |  32 +-
 arch/tile/include/asm/atomic.h                     |   2 +-
 arch/tile/include/asm/atomic_64.h                  |   6 +-
 arch/x86/Kconfig                                   |  71 +-
 arch/x86/Kconfig.cpu                               |  24 +-
 arch/x86/Kconfig.debug                             |  36 +-
 arch/x86/Makefile                                  |  10 +-
 arch/x86/boot/compressed/eboot.c                   |  28 +-
 arch/x86/boot/header.S                             |   2 +-
 arch/x86/crypto/camellia_aesni_avx2_glue.c         |   3 +-
 arch/x86/crypto/camellia_aesni_avx_glue.c          |   2 +-
 arch/x86/crypto/cast5_avx_glue.c                   |   3 +-
 arch/x86/crypto/cast6_avx_glue.c                   |   3 +-
 arch/x86/crypto/chacha20_glue.c                    |   2 +-
 arch/x86/crypto/poly1305_glue.c                    |   2 +-
 arch/x86/crypto/serpent_avx2_glue.c                |   3 +-
 arch/x86/crypto/serpent_avx_glue.c                 |   3 +-
 arch/x86/crypto/sha1_ssse3_glue.c                  |   2 +-
 arch/x86/crypto/sha256_ssse3_glue.c                |   2 +-
 arch/x86/crypto/sha512_ssse3_glue.c                |   2 +-
 arch/x86/crypto/twofish_avx_glue.c                 |   2 +-
 arch/x86/entry/common.c                            | 264 +++++--
 arch/x86/entry/entry_32.S                          | 182 ++---
 arch/x86/entry/entry_64.S                          |   9 +-
 arch/x86/entry/entry_64_compat.S                   | 547 ++++---------
 arch/x86/entry/syscall_32.c                        |   9 +-
 arch/x86/entry/syscall_64.c                        |   4 +-
 arch/x86/entry/syscalls/syscall_32.tbl             |  12 +-
 arch/x86/entry/vdso/Makefile                       |  39 +-
 arch/x86/entry/vdso/vdso2c.c                       |   2 +-
 arch/x86/entry/vdso/vdso32-setup.c                 |  28 +-
 arch/x86/entry/vdso/vdso32/int80.S                 |  56 --
 arch/x86/entry/vdso/vdso32/syscall.S               |  75 --
 arch/x86/entry/vdso/vdso32/sysenter.S              | 116 ---
 arch/x86/entry/vdso/vdso32/system_call.S           |  57 ++
 arch/x86/entry/vdso/vdso32/vclock_gettime.c        |   2 +
 arch/x86/entry/vdso/vma.c                          |  13 +-
 arch/x86/entry/vsyscall/vsyscall_64.c              |   9 +-
 arch/x86/ia32/ia32_signal.c                        |  12 +-
 arch/x86/include/asm/acpi.h                        |  23 +
 arch/x86/include/asm/amd_nb.h                      |   2 +-
 arch/x86/include/asm/apic.h                        | 110 +--
 arch/x86/include/asm/atomic.h                      |   4 +-
 arch/x86/include/asm/atomic64_64.h                 |   4 +-
 arch/x86/include/asm/dwarf2.h                      |  84 ++
 arch/x86/include/asm/efi.h                         |   1 +
 arch/x86/include/asm/elf.h                         |  10 +-
 arch/x86/include/asm/fpu/signal.h                  |   2 +-
 arch/x86/include/asm/fpu/types.h                   | 148 ++--
 arch/x86/include/asm/fpu/xstate.h                  |  15 +-
 arch/x86/include/asm/hpet.h                        |   6 +-
 arch/x86/include/asm/ia32.h                        |   4 +-
 arch/x86/include/asm/kdebug.h                      |   6 -
 arch/x86/include/asm/microcode.h                   |  26 +-
 arch/x86/include/asm/microcode_amd.h               |   3 +-
 arch/x86/include/asm/microcode_intel.h             |  10 +-
 arch/x86/include/asm/numachip/numachip.h           |   1 +
 arch/x86/include/asm/numachip/numachip_csr.h       | 153 +---
 arch/x86/include/asm/page_64_types.h               |   3 -
 arch/x86/include/asm/page_types.h                  |   3 +
 arch/x86/include/asm/pgtable.h                     |  25 +-
 arch/x86/include/asm/pgtable_types.h               |  40 +-
 arch/x86/include/asm/preempt.h                     |   5 +-
 arch/x86/include/asm/processor.h                   |   6 +-
 arch/x86/include/asm/sigcontext.h                  |  75 +-
 arch/x86/include/asm/sigframe.h                    |   8 +-
 arch/x86/include/asm/signal.h                      |   2 +-
 arch/x86/include/asm/switch_to.h                   |  12 +-
 arch/x86/include/asm/syscall.h                     |  14 +-
 arch/x86/include/asm/thread_info.h                 |   3 -
 arch/x86/include/asm/trace/mpx.h                   |   7 +-
 arch/x86/include/asm/uaccess.h                     |  14 +-
 arch/x86/include/asm/uv/uv_hub.h                   |   2 +-
 arch/x86/include/asm/vdso.h                        |  10 +-
 arch/x86/include/uapi/asm/mce.h                    |   2 +-
 arch/x86/include/uapi/asm/sigcontext.h             | 475 +++++++----
 arch/x86/include/uapi/asm/sigcontext32.h           |  73 +-
 arch/x86/kernel/apic/apic.c                        |   8 +-
 arch/x86/kernel/apic/apic_numachip.c               | 220 ++++--
 arch/x86/kernel/apic/io_apic.c                     |   2 +-
 arch/x86/kernel/asm-offsets.c                      |  21 +-
 arch/x86/kernel/cpu/Makefile                       |   1 +
 arch/x86/kernel/cpu/intel.c                        |   1 +
 arch/x86/kernel/cpu/intel_cacheinfo.c              |   8 +-
 arch/x86/kernel/cpu/mcheck/mce.c                   |  30 +-
 arch/x86/kernel/cpu/mcheck/therm_throt.c           |   8 -
 arch/x86/kernel/cpu/microcode/Makefile             |   3 -
 arch/x86/kernel/cpu/microcode/amd.c                | 509 +++++++++++-
 arch/x86/kernel/cpu/microcode/amd_early.c          | 440 -----------
 arch/x86/kernel/cpu/microcode/core.c               | 232 ++++--
 arch/x86/kernel/cpu/microcode/core_early.c         | 170 ----
 arch/x86/kernel/cpu/microcode/intel.c              | 791 ++++++++++++++++++-
 arch/x86/kernel/cpu/microcode/intel_early.c        | 808 -------------------
 arch/x86/kernel/cpu/microcode/intel_lib.c          |   1 -
 arch/x86/kernel/cpu/perf_event.c                   |  39 +-
 arch/x86/kernel/cpu/perf_event.h                   |   2 +-
 arch/x86/kernel/cpu/perf_event_intel_bts.c         |  13 +
 arch/x86/kernel/cpu/perf_event_intel_cstate.c      | 694 ++++++++++++++++
 arch/x86/kernel/cpu/perf_event_intel_ds.c          |  40 +-
 arch/x86/kernel/cpu/perf_event_intel_lbr.c         |   8 +-
 arch/x86/kernel/cpu/perf_event_intel_pt.c          |   7 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.c      |  61 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore.h      |  12 +-
 arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c  |  16 +-
 .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c |  34 +-
 arch/x86/kernel/crash.c                            |   3 -
 arch/x86/kernel/e820.c                             |   2 +-
 arch/x86/kernel/early-quirks.c                     |   2 +-
 arch/x86/kernel/early_printk.c                     |   6 +-
 arch/x86/kernel/fpu/init.c                         |  18 +-
 arch/x86/kernel/fpu/regset.c                       |   4 +-
 arch/x86/kernel/fpu/signal.c                       |  10 +-
 arch/x86/kernel/fpu/xstate.c                       | 398 ++++++++--
 arch/x86/kernel/head_32.S                          |   5 +-
 arch/x86/kernel/hpet.c                             |  29 +-
 arch/x86/kernel/irq_64.c                           |   2 +-
 arch/x86/kernel/kgdb.c                             |  17 +-
 arch/x86/kernel/process_32.c                       |   8 -
 arch/x86/kernel/process_64.c                       |  10 +-
 arch/x86/kernel/quirks.c                           |   2 +-
 arch/x86/kernel/setup.c                            | 106 +--
 arch/x86/kernel/signal.c                           |  10 +-
 arch/x86/kernel/traps.c                            |   4 +-
 arch/x86/kernel/tsc.c                              |  35 +-
 arch/x86/kvm/cpuid.c                               |   4 +-
 arch/x86/kvm/x86.c                                 |  27 +-
 arch/x86/kvm/x86.h                                 |   6 +-
 arch/x86/lib/x86-opcode-map.txt                    |  24 +-
 arch/x86/math-emu/fpu_aux.c                        |  70 ++
 arch/x86/math-emu/fpu_emu.h                        |   2 +-
 arch/x86/math-emu/fpu_entry.c                      |  96 +--
 arch/x86/math-emu/fpu_proto.h                      |  12 +
 arch/x86/math-emu/load_store.c                     |  63 +-
 arch/x86/math-emu/reg_compare.c                    | 128 +++
 arch/x86/mm/Makefile                               |   2 +-
 arch/x86/mm/dump_pagetables.c                      |  81 +-
 arch/x86/mm/gup.c                                  |  18 +-
 arch/x86/mm/init.c                                 |   2 -
 arch/x86/mm/init_32.c                              |   2 +
 arch/x86/mm/init_64.c                              |   2 +
 arch/x86/mm/mpx.c                                  |  15 +-
 arch/x86/mm/pageattr.c                             |  88 ++-
 arch/x86/platform/efi/efi-bgrt.c                   |   9 +-
 arch/x86/platform/efi/efi.c                        |  28 +-
 arch/x86/platform/intel-mid/intel-mid.c            |   2 +-
 arch/x86/platform/intel-mid/sfi.c                  |   3 +-
 arch/x86/platform/uv/uv_nmi.c                      |  53 +-
 arch/x86/ras/Kconfig                               |   4 +-
 arch/x86/ras/mce_amd_inj.c                         | 103 ++-
 arch/x86/um/asm/syscall.h                          |   4 +
 arch/x86/um/sys_call_table_32.c                    |   7 +-
 arch/x86/um/sys_call_table_64.c                    |   7 +-
 arch/x86/xen/setup.c                               |  13 +-
 arch/xtensa/include/asm/atomic.h                   |   4 +-
 drivers/acpi/apei/ghes.c                           |  10 +-
 drivers/acpi/gsi.c                                 |  54 +-
 drivers/base/platform-msi.c                        |   6 +-
 drivers/clocksource/Kconfig                        |   4 +
 drivers/clocksource/Makefile                       |   2 +
 drivers/clocksource/em_sti.c                       |   2 -
 drivers/clocksource/exynos_mct.c                   |  12 +-
 drivers/clocksource/h8300_timer16.c                |   1 -
 drivers/clocksource/h8300_timer8.c                 |   1 -
 drivers/clocksource/h8300_tpu.c                    |   1 -
 drivers/clocksource/mtk_timer.c                    |  26 +-
 drivers/clocksource/numachip.c                     |  95 +++
 drivers/clocksource/sh_cmt.c                       |   1 -
 drivers/clocksource/tango_xtal.c                   |  66 ++
 drivers/clocksource/time-armada-370-xp.c           |  14 +
 drivers/clocksource/timer-imx-gpt.c                |   3 +-
 drivers/edac/amd64_edac.c                          |   6 +-
 drivers/firmware/efi/Kconfig                       |  22 +
 drivers/firmware/efi/Makefile                      |   1 +
 drivers/firmware/efi/efi-pstore.c                  |   1 +
 drivers/firmware/efi/efi.c                         | 107 ++-
 drivers/firmware/efi/esrt.c                        |  19 +-
 drivers/firmware/efi/fake_mem.c                    | 238 ++++++
 drivers/gpio/gpio-sodaville.c                      |   2 +-
 drivers/irqchip/Kconfig                            |   6 +
 drivers/irqchip/Makefile                           |   2 +-
 drivers/irqchip/alphascale_asm9260-icoll.h         | 109 +++
 drivers/irqchip/exynos-combiner.c                  |   2 +-
 drivers/irqchip/irq-atmel-aic-common.c             |   2 +-
 drivers/irqchip/irq-atmel-aic5.c                   |  62 +-
 drivers/irqchip/irq-crossbar.c                     |  62 +-
 drivers/irqchip/irq-gic-common.c                   |  11 +
 drivers/irqchip/irq-gic-common.h                   |   9 +
 drivers/irqchip/irq-gic-v2m.c                      | 163 ++--
 drivers/irqchip/irq-gic-v3-its-pci-msi.c           |   7 +-
 drivers/irqchip/irq-gic-v3-its-platform-msi.c      |  21 +-
 drivers/irqchip/irq-gic-v3-its.c                   |  83 +-
 drivers/irqchip/irq-gic-v3.c                       | 161 ++--
 drivers/irqchip/irq-gic.c                          | 110 ++-
 drivers/irqchip/irq-hip04.c                        |   2 +-
 drivers/irqchip/irq-i8259.c                        |   4 +-
 drivers/irqchip/irq-imx-gpcv2.c                    |  64 +-
 drivers/irqchip/irq-mtk-sysirq.c                   |  49 +-
 drivers/irqchip/irq-mxs.c                          | 171 +++-
 drivers/irqchip/irq-nvic.c                         |  18 +-
 drivers/irqchip/irq-renesas-intc-irqpin.c          |   6 +-
 drivers/irqchip/irq-renesas-irqc.c                 |  86 +-
 drivers/irqchip/irq-s3c24xx.c                      |   4 +-
 drivers/irqchip/irq-sunxi-nmi.c                    |  22 +-
 drivers/irqchip/irq-tegra.c                        |  55 +-
 drivers/irqchip/irq-vf610-mscm-ir.c                |  45 +-
 drivers/net/ethernet/sfc/mcdi.c                    |   2 +-
 drivers/net/ethernet/sfc/ptp.c                     |  30 +-
 drivers/of/irq.c                                   | 185 ++++-
 drivers/pci/host/pci-xgene-msi.c                   |   2 +-
 drivers/pci/msi.c                                  |  63 +-
 drivers/pci/of.c                                   |  13 +-
 drivers/pci/probe.c                                |  43 +-
 drivers/phy/phy-rcar-gen2.c                        |   3 +-
 drivers/pps/kapi.c                                 |   4 +-
 drivers/spmi/spmi-pmic-arb.c                       |   2 +-
 drivers/staging/speakup/selection.c                |   2 +-
 drivers/video/fbdev/efifb.c                        |  24 +-
 fs/fs-writeback.c                                  |   4 +-
 fs/proc/array.c                                    |  16 +-
 fs/proc/base.c                                     |   9 +-
 include/asm-generic/atomic-long.h                  |  56 +-
 include/asm-generic/atomic.h                       |   4 +-
 include/asm-generic/mutex-dec.h                    |   8 +-
 include/asm-generic/mutex-xchg.h                   |  10 +-
 include/asm-generic/preempt.h                      |   2 +-
 include/asm-generic/qrwlock_types.h                |   4 +-
 include/asm-generic/rwsem.h                        |  21 +-
 include/kvm/arm_vgic.h                             |   4 +-
 include/linux/acpi.h                               |   3 +
 include/linux/atomic.h                             | 118 ++-
 include/linux/cpu.h                                |   2 -
 include/linux/efi.h                                |  25 +-
 include/linux/fwnode.h                             |   1 +
 include/linux/init_task.h                          |   3 +-
 include/linux/interrupt.h                          |   2 +
 include/linux/irq.h                                |  21 +-
 include/linux/irqchip/arm-gic-v3.h                 | 105 +--
 include/linux/irqchip/arm-gic.h                    |   9 +-
 include/linux/irqdomain.h                          | 106 ++-
 include/linux/irqreturn.h                          |   2 +-
 include/linux/list.h                               |   5 +-
 include/linux/list_bl.h                            |   5 +-
 include/linux/list_nulls.h                         |   3 +-
 include/linux/msi.h                                |  16 +-
 include/linux/of_irq.h                             |  23 +
 include/linux/percpu-rwsem.h                       |   3 +-
 include/linux/perf_event.h                         | 120 ++-
 include/linux/pps_kernel.h                         |  16 +-
 include/linux/preempt.h                            |  20 +-
 include/linux/rcu_sync.h                           |  86 ++
 include/linux/rculist.h                            |   5 +-
 include/linux/rcupdate.h                           |  59 +-
 include/linux/rcutiny.h                            |   3 +-
 include/linux/rcutree.h                            |   2 +-
 include/linux/sched.h                              |  55 +-
 include/linux/sched/deadline.h                     |   5 +
 include/linux/smpboot.h                            |   4 -
 include/linux/srcu.h                               |   5 +-
 include/linux/stop_machine.h                       |   2 +
 include/linux/timekeeping.h                        |   4 +-
 include/linux/timex.h                              |   2 +-
 include/trace/events/sched.h                       |  22 +-
 include/uapi/linux/perf_event.h                    |   6 +-
 include/uapi/linux/screen_info.h                   |   5 +-
 kernel/cpu.c                                       |  23 +-
 kernel/events/core.c                               | 224 ++++--
 kernel/exit.c                                      |   6 +-
 kernel/fork.c                                      |   2 +-
 kernel/futex.c                                     |  13 +-
 kernel/irq/chip.c                                  |  28 +-
 kernel/irq/handle.c                                |   7 +-
 kernel/irq/internals.h                             |   4 +-
 kernel/irq/irqdomain.c                             | 177 ++++-
 kernel/irq/manage.c                                | 221 ++++--
 kernel/irq/msi.c                                   |   8 +-
 kernel/irq/proc.c                                  |   2 +-
 kernel/irq/settings.h                              |  12 +
 kernel/kexec_core.c                                |   6 +-
 kernel/locking/locktorture.c                       | 164 +++-
 kernel/locking/mcs_spinlock.h                      |   4 +-
 kernel/locking/mutex.c                             |   9 +-
 kernel/locking/osq_lock.c                          |  11 +-
 kernel/locking/percpu-rwsem.c                      |  90 +--
 kernel/locking/qrwlock.c                           |   8 +-
 kernel/locking/qspinlock_paravirt.h                |   6 +-
 kernel/locking/rtmutex.c                           |  33 +-
 kernel/locking/rwsem-xadd.c                        |   5 +-
 kernel/rcu/Makefile                                |   2 +-
 kernel/rcu/rcutorture.c                            |  16 +-
 kernel/rcu/srcu.c                                  |   4 +-
 kernel/rcu/sync.c                                  | 223 ++++++
 kernel/rcu/tiny.c                                  |   8 +-
 kernel/rcu/tree.c                                  | 512 +++++++++---
 kernel/rcu/tree.h                                  |  69 +-
 kernel/rcu/tree_plugin.h                           | 437 +++++-----
 kernel/rcu/tree_trace.c                            |  10 +-
 kernel/rcu/update.c                                |   2 +-
 kernel/sched/core.c                                | 204 ++---
 kernel/sched/cpudeadline.c                         |   5 -
 kernel/sched/cpudeadline.h                         |   1 +
 kernel/sched/fair.c                                | 419 +++++-----
 kernel/sched/features.h                            |  21 +-
 kernel/sched/rt.c                                  |  22 +-
 kernel/sched/sched.h                               |  55 +-
 kernel/smpboot.c                                   |   5 +-
 kernel/stop_machine.c                              |  90 ++-
 kernel/time/clocksource.c                          |   7 +-
 kernel/time/hrtimer.c                              |   2 +-
 kernel/time/ntp.c                                  |  16 +-
 kernel/time/ntp_internal.h                         |   2 +-
 kernel/time/posix-cpu-timers.c                     |  63 +-
 kernel/time/timeconst.bc                           |   2 +-
 kernel/time/timekeeping.c                          |  18 +-
 kernel/time/timer.c                                |  13 +-
 kernel/torture.c                                   |   1 +
 kernel/trace/ftrace.c                              |   2 +-
 kernel/trace/trace_sched_switch.c                  |   3 +-
 kernel/trace/trace_sched_wakeup.c                  |   2 +-
 tools/build/.gitignore                             |   1 +
 tools/build/Build                                  |   1 +
 tools/build/Build.include                          |  17 +-
 tools/build/Documentation/Build.txt                |  52 +-
 tools/build/Makefile                               |  43 +
 tools/build/Makefile.build                         |   7 +
 tools/build/Makefile.feature                       |  15 +-
 tools/build/Makefile.include                       |  10 +
 tools/build/feature/Makefile                       |   4 +-
 tools/build/fixdep.c                               | 168 ++++
 tools/build/tests/ex/Build                         |   1 +
 tools/build/tests/ex/Makefile                      |  13 +-
 tools/build/tests/ex/ex.c                          |   2 +
 tools/build/tests/ex/inc.c                         |   8 +
 tools/build/tests/run.sh                           |  27 +
 tools/include/linux/compiler.h                     |  32 +-
 tools/include/linux/err.h                          |  49 ++
 tools/include/linux/filter.h                       | 231 ++++++
 tools/lib/api/Build                                |   1 +
 tools/lib/api/Makefile                             |   6 +-
 tools/lib/api/cpu.c                                |  18 +
 tools/lib/api/cpu.h                                |   6 +
 tools/lib/api/fs/Build                             |   4 +-
 tools/lib/api/fs/debugfs.c                         | 129 ---
 tools/lib/api/fs/debugfs.h                         |  23 -
 tools/lib/api/fs/findfs.c                          |  63 --
 tools/lib/api/fs/findfs.h                          |  23 -
 tools/lib/api/fs/fs.c                              | 165 +++-
 tools/lib/api/fs/fs.h                              |  30 +-
 tools/lib/api/fs/tracefs.c                         |  78 --
 tools/lib/api/fs/tracefs.h                         |  21 -
 tools/lib/api/fs/tracing_path.c                    | 135 ++++
 tools/lib/api/fs/tracing_path.h                    |  16 +
 tools/lib/bpf/Makefile                             |  11 +-
 tools/lib/lockdep/Makefile                         |   6 +-
 tools/lib/symbol/kallsyms.c                        |   6 +
 tools/lib/symbol/kallsyms.h                        |   4 +-
 tools/lib/traceevent/event-parse.c                 |  60 +-
 tools/lib/traceevent/event-parse.h                 |   1 +
 tools/lib/traceevent/plugin_kvm.c                  |  25 +-
 tools/perf/Documentation/intel-pt.txt              |  44 ++
 tools/perf/Documentation/itrace.txt                |   4 +
 tools/perf/Documentation/perf-bench.txt            |  54 +-
 tools/perf/Documentation/perf-inject.txt           |   3 +
 tools/perf/Documentation/perf-list.txt             |   3 +
 tools/perf/Documentation/perf-record.txt           |  16 +-
 tools/perf/Documentation/perf-report.txt           |  48 +-
 tools/perf/Documentation/perf-script.txt           |  17 +-
 tools/perf/Documentation/perf-stat.txt             |   5 +-
 tools/perf/Documentation/perf-top.txt              |   5 +-
 tools/perf/Documentation/perf.txt                  |   8 +
 tools/perf/MANIFEST                                |   5 +
 tools/perf/Makefile.perf                           |  53 +-
 tools/perf/arch/common.c                           |  10 +-
 tools/perf/arch/common.h                           |   4 +-
 tools/perf/arch/x86/Build                          |   2 +-
 tools/perf/arch/x86/Makefile                       |   1 +
 tools/perf/arch/x86/include/arch-tests.h           |  19 +
 tools/perf/arch/x86/tests/Build                    |  10 +-
 tools/perf/arch/x86/tests/arch-tests.c             |  34 +
 tools/perf/arch/x86/tests/dwarf-unwind.c           |   1 +
 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk     |  75 ++
 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh      |  43 +
 tools/perf/arch/x86/tests/insn-x86-dat-32.c        | 658 ++++++++++++++++
 tools/perf/arch/x86/tests/insn-x86-dat-64.c        | 768 ++++++++++++++++++
 tools/perf/arch/x86/tests/insn-x86-dat-src.c       | 877 +++++++++++++++++++++
 tools/perf/arch/x86/tests/insn-x86.c               | 185 +++++
 tools/perf/arch/x86/tests/intel-cqm.c              | 124 +++
 tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c |   4 +-
 tools/perf/{ => arch/x86}/tests/rdpmc.c            |   7 +-
 tools/perf/arch/x86/util/dwarf-regs.c              | 122 ++-
 tools/perf/arch/x86/util/intel-pt.c                |  55 +-
 tools/perf/bench/Build                             |   2 +-
 tools/perf/bench/mem-functions.c                   | 379 +++++++++
 tools/perf/bench/mem-memcpy.c                      | 434 ----------
 tools/perf/bench/numa.c                            |   4 +-
 tools/perf/bench/sched-messaging.c                 |  10 +-
 tools/perf/builtin-annotate.c                      |   2 +-
 tools/perf/builtin-bench.c                         |  14 +-
 tools/perf/builtin-evlist.c                        |   4 +-
 tools/perf/builtin-help.c                          |   2 +-
 tools/perf/builtin-inject.c                        | 127 ++-
 tools/perf/builtin-kmem.c                          |   2 +-
 tools/perf/builtin-kvm.c                           |   1 -
 tools/perf/builtin-list.c                          |  20 +-
 tools/perf/builtin-probe.c                         | 147 +++-
 tools/perf/builtin-record.c                        |  56 +-
 tools/perf/builtin-report.c                        |  65 +-
 tools/perf/builtin-sched.c                         |   4 +-
 tools/perf/builtin-script.c                        | 113 ++-
 tools/perf/builtin-stat.c                          |  93 ++-
 tools/perf/builtin-top.c                           |  59 +-
 tools/perf/builtin-trace.c                         |  31 +-
 tools/perf/config/Makefile                         |  23 +-
 tools/perf/perf.c                                  |  30 +-
 tools/perf/python/twatch.py                        |  23 +-
 tools/perf/scripts/python/export-to-postgresql.py  | 221 ++++++
 tools/perf/tests/Build                             |   4 +-
 tools/perf/tests/bpf-script-example.c              |  44 ++
 tools/perf/tests/builtin-test.c                    |  76 +-
 tools/perf/tests/code-reading.c                    |  76 +-
 tools/perf/tests/dwarf-unwind.c                    |   4 +
 tools/perf/tests/evsel-tp-sched.c                  |  10 +-
 tools/perf/tests/hists_filter.c                    |  55 +-
 tools/perf/tests/make                              |   4 +-
 tools/perf/tests/mmap-basic.c                      |   3 +-
 tools/perf/tests/openat-syscall-all-cpus.c         |  13 +-
 tools/perf/tests/openat-syscall-tp-fields.c        |   5 +-
 tools/perf/tests/openat-syscall.c                  |  13 +-
 tools/perf/tests/parse-events.c                    |  49 +-
 tools/perf/tests/tests.h                           |  10 +-
 tools/perf/tests/topology.c                        | 115 +++
 tools/perf/tests/vmlinux-kallsyms.c                |   4 +-
 tools/perf/trace/strace/groups/file                |   2 +
 tools/perf/ui/browser.c                            |  14 +
 tools/perf/ui/browser.h                            |   2 +-
 tools/perf/ui/browsers/annotate.c                  |  14 +-
 tools/perf/ui/browsers/hists.c                     | 120 ++-
 tools/perf/ui/browsers/map.c                       |   2 +-
 tools/perf/ui/browsers/scripts.c                   |   2 +-
 tools/perf/ui/hist.c                               |  16 +-
 tools/perf/ui/tui/setup.c                          |   8 +-
 tools/perf/util/Build                              |   2 +
 tools/perf/util/annotate.c                         |   5 +-
 tools/perf/util/annotate.h                         |   2 +-
 tools/perf/util/auxtrace.c                         |  24 +-
 tools/perf/util/auxtrace.h                         |   4 +
 tools/perf/util/bpf-loader.c                       | 352 +++++++++
 tools/perf/util/bpf-loader.h                       |  85 ++
 tools/perf/util/callchain.c                        |  42 +-
 tools/perf/util/callchain.h                        |  26 +
 tools/perf/util/cpumap.c                           |  97 +--
 tools/perf/util/cpumap.h                           |  10 +-
 tools/perf/util/env.c                              |  86 ++
 tools/perf/util/env.h                              |  44 ++
 tools/perf/util/event.c                            |  22 +-
 tools/perf/util/event.h                            |   6 +
 tools/perf/util/evlist.c                           |  47 +-
 tools/perf/util/evlist.h                           |   5 +
 tools/perf/util/evsel.c                            |  50 +-
 tools/perf/util/evsel.h                            |  10 +-
 tools/perf/util/header.c                           | 136 +++-
 tools/perf/util/header.h                           |  27 +-
 tools/perf/util/hist.c                             |  59 +-
 tools/perf/util/hist.h                             |   8 +-
 tools/perf/util/include/dwarf-regs.h               |   8 +
 tools/perf/util/intel-pt-decoder/Build             |  13 +-
 .../perf/util/intel-pt-decoder/intel-pt-decoder.c  |   4 +-
 tools/perf/util/intel-pt-decoder/intel-pt-log.c    |  21 +-
 tools/perf/util/intel-pt-decoder/intel-pt-log.h    |  38 +-
 .../perf/util/intel-pt-decoder/x86-opcode-map.txt  |  24 +-
 tools/perf/util/intel-pt.c                         | 266 ++++++-
 tools/perf/util/machine.c                          |  29 +-
 tools/perf/util/machine.h                          |   9 +-
 tools/perf/util/map.c                              |  21 +-
 tools/perf/util/map.h                              |   2 +
 tools/perf/util/parse-branch-options.c             |   1 +
 tools/perf/util/parse-events.c                     | 374 ++++++++-
 tools/perf/util/parse-events.h                     |  16 +-
 tools/perf/util/parse-events.l                     |  12 +-
 tools/perf/util/parse-events.y                     |  82 +-
 tools/perf/util/parse-options.c                    | 156 +++-
 tools/perf/util/parse-options.h                    |   5 +
 tools/perf/util/pmu.c                              |  42 +-
 tools/perf/util/probe-event.c                      | 234 +++---
 tools/perf/util/probe-event.h                      |  11 +
 tools/perf/util/probe-file.c                       |  56 +-
 tools/perf/util/probe-file.h                       |   4 +
 tools/perf/util/probe-finder.c                     |  58 +-
 tools/perf/util/python.c                           |  59 +-
 .../perf/util/scripting-engines/trace-event-perl.c |   1 +
 .../util/scripting-engines/trace-event-python.c    |   3 +-
 tools/perf/util/session.c                          |  37 +-
 tools/perf/util/session.h                          |   2 +
 tools/perf/util/sort.c                             |  74 +-
 tools/perf/util/sort.h                             |   6 +
 tools/perf/util/srcline.c                          |  29 +-
 tools/perf/util/stat.c                             |  13 +-
 tools/perf/util/stat.h                             |   3 +-
 tools/perf/util/strbuf.c                           |  22 +-
 tools/perf/util/strbuf.h                           |   2 +
 tools/perf/util/symbol-minimal.c                   |   2 +-
 tools/perf/util/symbol.c                           |  31 +-
 tools/perf/util/symbol.h                           |   1 +
 tools/perf/util/trace-event-info.c                 |   2 +-
 tools/perf/util/trace-event.c                      |  16 +-
 tools/perf/util/trace-event.h                      |   2 +
 tools/perf/util/unwind-libunwind.c                 |  19 +-
 tools/perf/util/usage.c                            |   5 +
 tools/perf/util/util.c                             |  72 +-
 tools/perf/util/util.h                             |  12 +-
 tools/testing/selftests/rcutorture/bin/kvm.sh      |   6 +-
 .../selftests/rcutorture/configs/lock/CFLIST       |   4 +-
 .../selftests/rcutorture/configs/lock/LOCK05       |   6 +
 .../selftests/rcutorture/configs/lock/LOCK05.boot  |   1 +
 .../selftests/rcutorture/configs/lock/LOCK06       |   6 +
 .../selftests/rcutorture/configs/lock/LOCK06.boot  |   1 +
 tools/testing/selftests/timers/Makefile            |   3 +-
 tools/testing/selftests/timers/adjtick.c           | 221 ++++++
 tools/testing/selftests/x86/Makefile               |   9 +-
 tools/testing/selftests/x86/ptrace_syscall.c       | 294 +++++++
 .../testing/selftests/x86/raw_syscall_helper_32.S  |  46 ++
 tools/testing/selftests/x86/test_FCMOV.c           |  93 +++
 tools/testing/selftests/x86/test_FCOMI.c           | 331 ++++++++
 tools/testing/selftests/x86/test_FISTTP.c          | 137 ++++
 tools/testing/selftests/x86/test_syscall_vdso.c    | 401 ++++++++++
 tools/testing/selftests/x86/thunks_32.S            |  55 ++
 tools/testing/selftests/x86/unwind_vdso.c          | 211 +++++
 tools/vm/page-types.c                              |   6 +-
 virt/kvm/arm/vgic.c                                |   4 +-
 598 files changed, 21302 insertions(+), 7870 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pci/pci-msi.txt
 create mode 100644 arch/arm/include/asm/arch_gicv3.h
 create mode 100644 arch/arm64/include/asm/arch_gicv3.h
 delete mode 100644 arch/x86/entry/vdso/vdso32/int80.S
 delete mode 100644 arch/x86/entry/vdso/vdso32/syscall.S
 delete mode 100644 arch/x86/entry/vdso/vdso32/sysenter.S
 create mode 100644 arch/x86/entry/vdso/vdso32/system_call.S
 create mode 100644 arch/x86/include/asm/dwarf2.h
 delete mode 100644 arch/x86/kernel/cpu/microcode/amd_early.c
 delete mode 100644 arch/x86/kernel/cpu/microcode/core_early.c
 delete mode 100644 arch/x86/kernel/cpu/microcode/intel_early.c
 create mode 100644 arch/x86/kernel/cpu/perf_event_intel_cstate.c
 create mode 100644 drivers/clocksource/numachip.c
 create mode 100644 drivers/clocksource/tango_xtal.c
 create mode 100644 drivers/firmware/efi/fake_mem.c
 create mode 100644 drivers/irqchip/alphascale_asm9260-icoll.h
 create mode 100644 include/linux/rcu_sync.h
 create mode 100644 kernel/rcu/sync.c
 create mode 100644 tools/build/.gitignore
 create mode 100644 tools/build/Build
 create mode 100644 tools/build/Makefile
 create mode 100644 tools/build/Makefile.include
 create mode 100644 tools/build/fixdep.c
 create mode 100644 tools/build/tests/ex/inc.c
 create mode 100644 tools/include/linux/err.h
 create mode 100644 tools/include/linux/filter.h
 create mode 100644 tools/lib/api/cpu.c
 create mode 100644 tools/lib/api/cpu.h
 delete mode 100644 tools/lib/api/fs/debugfs.c
 delete mode 100644 tools/lib/api/fs/debugfs.h
 delete mode 100644 tools/lib/api/fs/findfs.c
 delete mode 100644 tools/lib/api/fs/findfs.h
 delete mode 100644 tools/lib/api/fs/tracefs.c
 delete mode 100644 tools/lib/api/fs/tracefs.h
 create mode 100644 tools/lib/api/fs/tracing_path.c
 create mode 100644 tools/lib/api/fs/tracing_path.h
 create mode 100644 tools/perf/arch/x86/include/arch-tests.h
 create mode 100644 tools/perf/arch/x86/tests/arch-tests.c
 create mode 100644 tools/perf/arch/x86/tests/gen-insn-x86-dat.awk
 create mode 100755 tools/perf/arch/x86/tests/gen-insn-x86-dat.sh
 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-32.c
 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-64.c
 create mode 100644 tools/perf/arch/x86/tests/insn-x86-dat-src.c
 create mode 100644 tools/perf/arch/x86/tests/insn-x86.c
 create mode 100644 tools/perf/arch/x86/tests/intel-cqm.c
 rename tools/perf/{ => arch/x86}/tests/perf-time-to-tsc.c (98%)
 rename tools/perf/{ => arch/x86}/tests/rdpmc.c (97%)
 create mode 100644 tools/perf/bench/mem-functions.c
 delete mode 100644 tools/perf/bench/mem-memcpy.c
 create mode 100644 tools/perf/tests/bpf-script-example.c
 create mode 100644 tools/perf/tests/topology.c
 create mode 100644 tools/perf/util/bpf-loader.c
 create mode 100644 tools/perf/util/bpf-loader.h
 create mode 100644 tools/perf/util/env.c
 create mode 100644 tools/perf/util/env.h
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK05.boot
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06
 create mode 100644 tools/testing/selftests/rcutorture/configs/lock/LOCK06.boot
 create mode 100644 tools/testing/selftests/timers/adjtick.c
 create mode 100644 tools/testing/selftests/x86/ptrace_syscall.c
 create mode 100644 tools/testing/selftests/x86/raw_syscall_helper_32.S
 create mode 100644 tools/testing/selftests/x86/test_FCMOV.c
 create mode 100644 tools/testing/selftests/x86/test_FCOMI.c
 create mode 100644 tools/testing/selftests/x86/test_FISTTP.c
 create mode 100644 tools/testing/selftests/x86/test_syscall_vdso.c
 create mode 100644 tools/testing/selftests/x86/thunks_32.S
 create mode 100644 tools/testing/selftests/x86/unwind_vdso.c
Merging clockevents/clockevents/next (0e4baaa9a11b clocksource/drivers/exynos_mct: Use container_of() instead of this_cpu_ptr())
$ git merge clockevents/clockevents/next
Merge made by the 'recursive' strategy.
Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse)
$ git merge edac-amd/for-next
Auto-merging drivers/edac/amd64_edac.c
Auto-merging arch/arm64/boot/dts/apm/apm-storm.dtsi
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/edac/apm-xgene-edac.txt    |   23 +
 Documentation/edac.txt                             |   46 +
 arch/arm64/boot/dts/apm/apm-storm.dtsi             |   10 +
 drivers/edac/Makefile                              |    2 +
 drivers/edac/altera_edac.c                         |   20 +-
 drivers/edac/altera_edac.h                         |    5 +-
 drivers/edac/amd64_edac.c                          |   35 +-
 drivers/edac/amd64_edac.h                          |   58 +-
 drivers/edac/debugfs.c                             |  163 +++
 drivers/edac/edac_core.h                           |    2 +
 drivers/edac/edac_mc.c                             |    2 +-
 drivers/edac/edac_mc_sysfs.c                       |  150 +--
 drivers/edac/edac_module.h                         |   34 +-
 drivers/edac/ghes_edac.c                           |   24 +-
 drivers/edac/i5100_edac.c                          |   37 +-
 drivers/edac/ppc4xx_edac.c                         |    1 +
 drivers/edac/sb_edac.c                             |    8 +-
 drivers/edac/xgene_edac.c                          | 1193 ++++++++++++++++----
 include/linux/edac.h                               |    2 -
 19 files changed, 1352 insertions(+), 463 deletions(-)
 create mode 100644 drivers/edac/debugfs.c
Merging irqchip/irqchip/for-next (29bade08fb07 irqchip: armada-370-xp: Fix regression by clearing IRQ_NOAUTOEN)
$ git merge irqchip/irqchip/for-next
Merge made by the 'recursive' strategy.
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (fb662288284e tracing: Fix sparse RCU warning)
$ git merge ftrace/for-next
Auto-merging kernel/trace/trace_sched_wakeup.c
Auto-merging kernel/trace/ftrace.c
Auto-merging kernel/trace/blktrace.c
Merge made by the 'recursive' strategy.
 Documentation/trace/ftrace.txt       |  17 ++
 arch/x86/kernel/ftrace.c             |   4 +
 include/linux/trace_events.h         |  20 +-
 include/linux/tracepoint.h           |  30 ++-
 include/trace/define_trace.h         |   2 +-
 include/trace/events/gpio.h          |   4 +
 include/trace/perf.h                 | 258 ------------------
 include/trace/trace_events.h         | 258 ++++++++++++++++++
 kernel/trace/Kconfig                 |   7 +
 kernel/trace/blktrace.c              |  11 +-
 kernel/trace/ftrace.c                | 197 +++++++-------
 kernel/trace/trace.c                 | 403 ++++++++++++++++++-----------
 kernel/trace/trace.h                 | 163 ++++++++----
 kernel/trace/trace_branch.c          |  15 +-
 kernel/trace/trace_events.c          | 489 +++++++++++++++++++++++++++++++++--
 kernel/trace/trace_functions_graph.c |  63 +++--
 kernel/trace/trace_irqsoff.c         |  98 +++----
 kernel/trace/trace_kdb.c             |   8 +-
 kernel/trace/trace_mmiotrace.c       |   4 +-
 kernel/trace/trace_output.c          |  97 ++++---
 kernel/trace/trace_output.h          |   4 -
 kernel/trace/trace_printk.c          |  14 +-
 kernel/trace/trace_probe.h           |   8 +-
 kernel/trace/trace_sched_wakeup.c    | 112 ++++----
 kernel/trace/trace_syscalls.c        |   3 +-
 kernel/tracepoint.c                  |  61 ++++-
 26 files changed, 1545 insertions(+), 805 deletions(-)
Merging rcu/rcu/next (39cd2dd39a8b Merge branches 'doc.2015.10.06a', 'percpu-rwsem.2015.10.06a' and 'torture.2015.10.06a' into HEAD)
$ git merge rcu/rcu/next
Already up-to-date.
Merging kvm/linux-next (8c85ac1c0a1b KVM: x86: MMU: Initialize force_pt_level before calling mapping_level())
$ git merge kvm/linux-next
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/cpuid.c
Auto-merging arch/s390/kvm/kvm-s390.c
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/virtual/kvm/api.txt
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/kernel-parameters.txt   |   1 +
 Documentation/virtual/kvm/api.txt     |  52 ++-
 Documentation/virtual/kvm/locking.txt |  12 +
 MAINTAINERS                           |   7 +
 Makefile                              |  10 +-
 arch/s390/kvm/interrupt.c             | 116 ++----
 arch/s390/kvm/kvm-s390.c              |  46 +--
 arch/s390/kvm/kvm-s390.h              |  35 +-
 arch/s390/kvm/priv.c                  |  19 +-
 arch/x86/include/asm/irq_remapping.h  |  10 +-
 arch/x86/include/asm/kvm_host.h       |  34 +-
 arch/x86/include/asm/vmx.h            |   3 +-
 arch/x86/include/uapi/asm/hyperv.h    |   6 +
 arch/x86/include/uapi/asm/vmx.h       |   4 +-
 arch/x86/kernel/kvmclock.c            |  46 ++-
 arch/x86/kvm/Kconfig                  |   2 +
 arch/x86/kvm/cpuid.c                  |   2 +-
 arch/x86/kvm/cpuid.h                  |  37 ++
 arch/x86/kvm/hyperv.c                 |  31 +-
 arch/x86/kvm/i8254.c                  |   4 +-
 arch/x86/kvm/ioapic.c                 |  29 +-
 arch/x86/kvm/ioapic.h                 |  15 +-
 arch/x86/kvm/irq.c                    |  40 +-
 arch/x86/kvm/irq.h                    |  27 +-
 arch/x86/kvm/irq_comm.c               |  85 +++-
 arch/x86/kvm/lapic.c                  | 125 ++++--
 arch/x86/kvm/lapic.h                  |   7 +-
 arch/x86/kvm/mmu.c                    |  91 +++--
 arch/x86/kvm/paging_tmpl.h            |  19 +-
 arch/x86/kvm/svm.c                    |  43 +-
 arch/x86/kvm/trace.h                  |  51 +++
 arch/x86/kvm/vmx.c                    | 711 ++++++++++++++++++++++++++++------
 arch/x86/kvm/x86.c                    | 226 ++++++++---
 drivers/iommu/irq_remapping.c         |  12 +-
 drivers/vfio/Kconfig                  |   1 +
 drivers/vfio/pci/Kconfig              |   1 +
 drivers/vfio/pci/vfio_pci_intrs.c     |   9 +
 drivers/vfio/pci/vfio_pci_private.h   |   2 +
 include/linux/irqbypass.h             |  90 +++++
 include/linux/kvm_host.h              |  40 +-
 include/linux/kvm_irqfd.h             |  71 ++++
 include/uapi/linux/kvm.h              |   7 +
 kernel/sched/cputime.c                |   2 +
 virt/Makefile                         |   1 +
 virt/kvm/Kconfig                      |   3 +
 virt/kvm/async_pf.c                   |   4 +
 virt/kvm/eventfd.c                    | 187 ++++-----
 virt/kvm/irqchip.c                    |  18 +-
 virt/kvm/kvm_main.c                   |   8 +-
 virt/lib/Kconfig                      |   2 +
 virt/lib/Makefile                     |   1 +
 virt/lib/irqbypass.c                  | 257 ++++++++++++
 52 files changed, 2086 insertions(+), 576 deletions(-)
 create mode 100644 include/linux/irqbypass.h
 create mode 100644 include/linux/kvm_irqfd.h
 create mode 100644 virt/Makefile
 create mode 100644 virt/lib/Kconfig
 create mode 100644 virt/lib/Makefile
 create mode 100644 virt/lib/irqbypass.c
Merging kvm-arm/next (5fdf876d30ce KVM: arm: Do not indent the arguments of DECLARE_BITMAP)
$ git merge kvm-arm/next
Resolved 'arch/x86/include/asm/kvm_host.h' using previous resolution.
Auto-merging virt/kvm/kvm_main.c
Auto-merging virt/kvm/arm/vgic.c
Auto-merging include/linux/kvm_host.h
Auto-merging include/kvm/arm_vgic.h
Auto-merging arch/x86/include/asm/kvm_host.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/kvm_host.h
Auto-merging arch/s390/include/asm/kvm_host.h
Auto-merging arch/powerpc/include/asm/kvm_host.h
Auto-merging arch/arm64/kvm/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 98a8d6efcb91] Merge remote-tracking branch 'kvm-arm/next'
$ git diff -M --stat --summary HEAD^..
 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt | 187 ++++++++++++++++++
 Documentation/virtual/kvm/devices/arm-vgic.txt     |  18 +-
 arch/arm/include/asm/kvm_arm.h                     |  20 ++
 arch/arm/include/asm/kvm_host.h                    |   5 +-
 arch/arm/kvm/Kconfig                               |   2 +
 arch/arm/kvm/arm.c                                 |  76 ++++++--
 arch/arm/kvm/psci.c                                |  10 +-
 arch/arm/kvm/trace.h                               |  10 +-
 arch/arm64/include/asm/kvm_arm.h                   |  16 ++
 arch/arm64/include/asm/kvm_host.h                  |   5 +-
 arch/arm64/kvm/Kconfig                             |   2 +
 arch/arm64/kvm/hyp.S                               |   8 +
 arch/mips/include/asm/kvm_host.h                   |   2 +
 arch/powerpc/include/asm/kvm_host.h                |   2 +
 arch/s390/include/asm/kvm_host.h                   |   2 +
 arch/x86/include/asm/kvm_host.h                    |   4 +
 include/kvm/arm_arch_timer.h                       |   4 +-
 include/kvm/arm_vgic.h                             |  11 +-
 include/linux/kvm_host.h                           |   2 +
 virt/kvm/arm/arch_timer.c                          | 173 +++++++++++------
 virt/kvm/arm/trace.h                               |  63 ++++++
 virt/kvm/arm/vgic.c                                | 212 ++++++++++-----------
 virt/kvm/kvm_main.c                                |   3 +
 23 files changed, 623 insertions(+), 214 deletions(-)
 create mode 100644 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt
 create mode 100644 virt/kvm/arm/trace.h
Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvm-ppc-paulus/kvm-ppc-next (70aa3961a196 KVM: PPC: Book3S HV: Handle H_DOORBELL on the guest exit path)
$ git merge kvm-ppc-paulus/kvm-ppc-next
Auto-merging arch/powerpc/kvm/e500_mmu_host.c
Auto-merging arch/powerpc/kvm/book3s_hv_rm_mmu.c
Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c
Merge made by the 'recursive' strategy.
 arch/powerpc/include/asm/disassemble.h  |  5 +++++
 arch/powerpc/include/asm/reg_booke.h    |  6 ++++++
 arch/powerpc/kvm/book3s_64_mmu_hv.c     |  3 ++-
 arch/powerpc/kvm/book3s_hv_rm_mmu.c     |  2 ++
 arch/powerpc/kvm/book3s_hv_rmhandlers.S | 29 ++++++++++++++++++++++-------
 arch/powerpc/kvm/e500.c                 |  3 ++-
 arch/powerpc/kvm/e500_emulate.c         | 19 +++++++++++++++++++
 arch/powerpc/kvm/e500_mmu_host.c        |  4 ++--
 arch/powerpc/kvm/powerpc.c              |  3 +++
 9 files changed, 63 insertions(+), 11 deletions(-)
Merging kvms390/next (46b708ea875f KVM: s390: use simple switch statement as multiplexer)
$ git merge kvms390/next
Auto-merging arch/s390/kvm/kvm-s390.c
Merge made by the 'recursive' strategy.
 arch/s390/kvm/intercept.c | 42 +++++++++++++++++++++---------------------
 arch/s390/kvm/kvm-s390.c  | 12 +++++++-----
 2 files changed, 28 insertions(+), 26 deletions(-)
Merging xen-tip/linux-next (914beb9fc26d x86/xen: add reschedule point when mapping foreign GFNs)
$ git merge xen-tip/linux-next
Auto-merging drivers/net/xen-netfront.c
Auto-merging drivers/block/xen-blkfront.c
Auto-merging arch/x86/xen/setup.c
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/xen/hypervisor.h    |  10 +
 arch/arm/include/asm/xen/page-coherent.h |  26 +-
 arch/arm/include/asm/xen/page.h          |  22 +-
 arch/arm/xen/enlighten.c                 |  20 +-
 arch/arm/xen/mm.c                        |  39 ++-
 arch/arm/xen/p2m.c                       |   6 +-
 arch/x86/include/asm/xen/hypervisor.h    |   5 +
 arch/x86/include/asm/xen/page.h          |   8 +-
 arch/x86/xen/enlighten.c                 |  15 +
 arch/x86/xen/grant-table.c               |   2 +-
 arch/x86/xen/mmu.c                       |   1 +
 arch/x86/xen/p2m.c                       |  19 +-
 arch/x86/xen/setup.c                     |   7 +-
 drivers/block/xen-blkback/blkback.c      |  13 +-
 drivers/block/xen-blkback/common.h       |  17 +-
 drivers/block/xen-blkback/xenbus.c       |  11 +-
 drivers/block/xen-blkfront.c             | 560 ++++++++++++++++++++-----------
 drivers/net/xen-netback/common.h         |  16 +-
 drivers/net/xen-netback/netback.c        | 167 +++++----
 drivers/net/xen-netfront.c               | 122 +++++--
 drivers/tty/hvc/hvc_xen.c                |   4 +-
 drivers/xen/Makefile                     |   2 -
 drivers/xen/balloon.c                    | 341 ++++++++++++-------
 drivers/xen/biomerge.c                   |   8 +
 drivers/xen/cpu_hotplug.c                |  14 +-
 drivers/xen/events/events_base.c         |   2 +-
 drivers/xen/events/events_fifo.c         |   2 +-
 drivers/xen/grant-table.c                |  56 +++-
 drivers/xen/privcmd.c                    |  10 +-
 drivers/xen/swiotlb-xen.c                |  43 ++-
 drivers/xen/xenbus/xenbus_client.c       | 128 ++++---
 drivers/xen/xenbus/xenbus_probe.c        |   3 +-
 drivers/xen/xlate_mmu.c                  | 124 ++++---
 include/linux/memory_hotplug.h           |   2 +
 include/uapi/xen/gntalloc.h              |  22 +-
 include/uapi/xen/gntdev.h                |  34 +-
 include/xen/balloon.h                    |  12 +-
 include/xen/grant_table.h                |  57 ++++
 include/xen/page.h                       |  27 +-
 include/xen/xenbus.h                     |   4 +-
 mm/memory_hotplug.c                      |  29 +-
 41 files changed, 1364 insertions(+), 646 deletions(-)
Merging percpu/for-next (5a928541585b kernel: Remove unneeded return from void function)
$ git merge percpu/for-next
Merge made by the 'recursive' strategy.
 include/linux/percpu-refcount.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next)
$ git merge workqueues/for-next
Merge made by the 'recursive' strategy.
 kernel/workqueue.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
Merging drivers-x86/for-next (9d1d459bf52b intel_scu_ipc: Protect dev member assignment on ->remove())
$ git merge drivers-x86/for-next
Auto-merging drivers/platform/x86/asus-wmi.c
Auto-merging drivers/platform/x86/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                               |   7 ++
 drivers/platform/olpc/olpc-ec.c           |  13 +-
 drivers/platform/x86/Kconfig              |  22 +++-
 drivers/platform/x86/Makefile             |   1 +
 drivers/platform/x86/acer-wmi.c           |  92 ---------------
 drivers/platform/x86/asus-wmi.c           |  19 ++-
 drivers/platform/x86/compal-laptop.c      |  43 ++++++-
 drivers/platform/x86/intel_mid_powerbtn.c |  10 +-
 drivers/platform/x86/intel_scu_ipc.c      | 189 ++++++++++++++----------------
 drivers/platform/x86/sony-laptop.c        |  13 +-
 drivers/platform/x86/toshiba-wmi.c        | 138 ++++++++++++++++++++++
 drivers/platform/x86/toshiba_acpi.c       |  62 ++++------
 12 files changed, 357 insertions(+), 252 deletions(-)
 create mode 100644 drivers/platform/x86/toshiba-wmi.c
Merging chrome-platform/for-next (18800fc7a04e platform/chrome: Support reading/writing the vboot context)
$ git merge chrome-platform/for-next
Auto-merging include/linux/sysfs.h
Auto-merging fs/sysfs/group.c
Merge made by the 'recursive' strategy.
 drivers/platform/chrome/Kconfig            |   5 +-
 drivers/platform/chrome/Makefile           |   3 +-
 drivers/platform/chrome/cros_ec_dev.c      |   7 ++
 drivers/platform/chrome/cros_ec_lightbar.c |  31 ++++---
 drivers/platform/chrome/cros_ec_lpc.c      |  21 ++---
 drivers/platform/chrome/cros_ec_vbc.c      | 137 +++++++++++++++++++++++++++++
 fs/sysfs/group.c                           |  17 +++-
 include/linux/mfd/cros_ec.h                |   1 +
 include/linux/sysfs.h                      |  18 +++-
 9 files changed, 205 insertions(+), 35 deletions(-)
 create mode 100644 drivers/platform/chrome/cros_ec_vbc.c
Merging regmap/for-next (231e7cb81625 Merge remote-tracking branches 'regmap/topic/rbtree' and 'regmap/topic/update-offload' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 arch/mips/boot/dts/brcm/bcm6328.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7125.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7346.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7358.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7360.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7362.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7420.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7425.dtsi  |  1 -
 arch/mips/boot/dts/brcm/bcm7435.dtsi  |  1 -
 drivers/base/regmap/internal.h        |  1 +
 drivers/base/regmap/regcache-rbtree.c |  9 ++++++--
 drivers/base/regmap/regmap-debugfs.c  | 23 ++++++++-----------
 drivers/base/regmap/regmap-irq.c      | 43 +++++++++++++++++++++++++++++++----
 drivers/base/regmap/regmap-mmio.c     | 16 ++++++-------
 drivers/base/regmap/regmap.c          | 12 +++++++++-
 include/linux/regmap.h                |  5 ++++
 16 files changed, 80 insertions(+), 38 deletions(-)
Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code)
$ git merge hsi/for-next
Merge made by the 'recursive' strategy.
 drivers/hsi/clients/ssi_protocol.c      |  2 +-
 drivers/hsi/controllers/omap_ssi.c      | 21 ++++-----------------
 drivers/hsi/controllers/omap_ssi_port.c |  2 +-
 drivers/hsi/hsi.c                       | 13 +++++++++++--
 4 files changed, 17 insertions(+), 21 deletions(-)
Merging leds/for-next (861497527cda leds: 88pm860x: add missing of_node_put)
$ git merge leds/for-next
Auto-merging drivers/leds/leds-sead3.c
Removing arch/arm/mach-mvebu/netxbig.c
Removing arch/arm/mach-mvebu/board.h
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpio/netxbig-gpio-ext.txt  |  22 ++
 .../devicetree/bindings/leds/leds-aat1290.txt      |   8 +-
 .../devicetree/bindings/leds/leds-bcm6328.txt      |  10 +
 .../devicetree/bindings/leds/leds-netxbig.txt      |  92 ++++++
 arch/arm/boot/dts/kirkwood-net5big.dts             |  60 ++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi            |  80 +++++
 arch/arm/mach-mvebu/Kconfig                        |   7 -
 arch/arm/mach-mvebu/Makefile                       |   1 -
 arch/arm/mach-mvebu/board.h                        |  21 --
 arch/arm/mach-mvebu/kirkwood.c                     |   4 -
 arch/arm/mach-mvebu/netxbig.c                      | 191 ------------
 arch/mips/mti-sead3/Makefile                       |   2 -
 drivers/leds/Kconfig                               |  10 +
 drivers/leds/Makefile                              |   1 +
 drivers/leds/led-class.c                           |  69 +----
 drivers/leds/led-core.c                            |  73 +++++
 drivers/leds/leds-88pm860x.c                       |   1 +
 drivers/leds/leds-bcm6328.c                        |  45 ++-
 drivers/leds/leds-bcm6358.c                        |   4 +-
 drivers/leds/leds-cobalt-qube.c                    |  23 +-
 drivers/leds/leds-gpio.c                           |  13 +
 drivers/leds/leds-hp6xx.c                          |  17 +-
 drivers/leds/leds-ipaq-micro.c                     |  27 +-
 drivers/leds/leds-locomo.c                         |  15 +-
 drivers/leds/leds-menf21bmc.c                      |  26 +-
 drivers/leds/leds-net48xx.c                        |   9 +-
 drivers/leds/leds-netxbig.c                        | 336 ++++++++++++++++-----
 drivers/leds/leds-ot200.c                          |  21 +-
 drivers/leds/leds-powernv.c                        |   8 +-
 {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c |   1 +
 drivers/leds/leds-wrap.c                           |  28 +-
 drivers/leds/leds.h                                |   1 +
 drivers/leds/trigger/ledtrig-heartbeat.c           |  47 ++-
 include/dt-bindings/leds/leds-netxbig.h            |  18 ++
 .../linux/platform_data/leds-kirkwood-netxbig.h    |   1 +
 35 files changed, 760 insertions(+), 532 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/gpio/netxbig-gpio-ext.txt
 create mode 100644 Documentation/devicetree/bindings/leds/leds-netxbig.txt
 delete mode 100644 arch/arm/mach-mvebu/board.h
 delete mode 100644 arch/arm/mach-mvebu/netxbig.c
 rename {arch/mips/mti-sead3 => drivers/leds}/leds-sead3.c (99%)
 create mode 100644 include/dt-bindings/leds/leds-netxbig.h
Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 Documentation/IPMI.txt            |  7 +++-
 drivers/char/ipmi/ipmi_si_intf.c  | 82 +++++++++++++++++++++++++--------------
 drivers/char/ipmi/ipmi_ssif.c     |  9 +++--
 drivers/char/ipmi/ipmi_watchdog.c |  8 +++-
 4 files changed, 69 insertions(+), 37 deletions(-)
Merging driver-core/driver-core-next (c23fe83138ed debugfs: Add debugfs_create_ulong())
$ git merge driver-core/driver-core-next
Auto-merging kernel/futex.c
Auto-merging include/linux/edac.h
Auto-merging drivers/net/wireless/iwlwifi/mvm/mvm.h
Auto-merging drivers/net/wireless/ath/ath9k/hw.h
Auto-merging drivers/net/wireless/ath/ath9k/hw.c
Auto-merging drivers/net/wireless/ath/ath10k/core.h
Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
Auto-merging drivers/iommu/amd_iommu_types.h
Auto-merging drivers/iommu/amd_iommu_init.c
Auto-merging drivers/bluetooth/hci_qca.c
Auto-merging drivers/base/regmap/internal.h
Auto-merging drivers/base/dma-contiguous.c
Auto-merging drivers/acpi/internal.h
Auto-merging arch/arm64/kernel/debug-monitors.c
Merge made by the 'recursive' strategy.
 Documentation/driver-model/platform.txt    |  14 +++
 Documentation/filesystems/debugfs.txt      |   2 +-
 arch/arm64/kernel/debug-monitors.c         |   4 +-
 drivers/acpi/ec_sys.c                      |   2 +-
 drivers/acpi/internal.h                    |   2 +-
 drivers/base/dma-contiguous.c              |   2 +-
 drivers/base/platform.c                    |  80 +++++++++++--
 drivers/base/regmap/internal.h             |   6 +-
 drivers/base/regmap/regcache-lzo.c         |   4 +-
 drivers/base/regmap/regcache.c             |  24 ++--
 drivers/base/soc.c                         |  21 +---
 drivers/bluetooth/hci_qca.c                |   4 +-
 drivers/iommu/amd_iommu_init.c             |   2 +-
 drivers/iommu/amd_iommu_types.h            |   2 +-
 drivers/misc/mei/mei_dev.h                 |   2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h |   4 +-
 drivers/net/wireless/ath/ath10k/core.h     |   2 +-
 drivers/net/wireless/ath/ath5k/ath5k.h     |   2 +-
 drivers/net/wireless/ath/ath9k/hw.c        |   2 +-
 drivers/net/wireless/ath/ath9k/hw.h        |   4 +-
 drivers/net/wireless/b43/debugfs.c         |  18 +--
 drivers/net/wireless/b43/debugfs.h         |   2 +-
 drivers/net/wireless/b43legacy/debugfs.c   |  10 +-
 drivers/net/wireless/b43legacy/debugfs.h   |   2 +-
 drivers/net/wireless/iwlegacy/common.h     |   6 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h     |   6 +-
 drivers/scsi/snic/snic_trc.c               |   4 +-
 drivers/scsi/snic/snic_trc.h               |   2 +-
 drivers/uwb/uwb-debug.c                    |   2 +-
 fs/debugfs/file.c                          | 177 +++++++++++++++++------------
 fs/sysfs/file.c                            |   4 +-
 include/linux/debugfs.h                    |   6 +-
 include/linux/edac.h                       |   2 +-
 include/linux/fault-inject.h               |   2 +-
 include/linux/kobject.h                    |   2 +-
 include/linux/platform_device.h            |   8 ++
 kernel/futex.c                             |   4 +-
 lib/devres.c                               |   2 +-
 lib/dma-debug.c                            |   2 +-
 lib/kobject.c                              |  12 +-
 mm/failslab.c                              |   8 +-
 mm/page_alloc.c                            |   8 +-
 sound/soc/codecs/wm_adsp.h                 |   2 +-
 43 files changed, 291 insertions(+), 185 deletions(-)
Merging tty/tty-next (e052c6d15c61 tty: Use unbound workqueue for all input workers)
$ git merge tty/tty-next
Auto-merging include/linux/platform_data/atmel.h
Auto-merging drivers/tty/serial/sc16is7xx.c
Auto-merging drivers/tty/serial/8250/8250_dma.c
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/serial/ingenic,uart.txt    |    3 +-
 .../devicetree/bindings/serial/qcom,msm-uartdm.txt |    6 +
 .../bindings/serial/renesas,sci-serial.txt         |    2 +
 .../bindings/serial/snps-dw-apb-uart.txt           |    3 +
 Documentation/kernel-parameters.txt                |    7 +
 Documentation/serial/driver                        |   10 +-
 Documentation/serial/tty.txt                       |   60 +-
 arch/arm64/include/asm/dcc.h                       |   55 +
 drivers/char/pcmcia/synclink_cs.c                  |    9 -
 drivers/dma/hsu/Kconfig                            |    9 +-
 drivers/dma/hsu/hsu.c                              |   24 +-
 drivers/dma/hsu/hsu.h                              |    1 +
 drivers/dma/hsu/pci.c                              |    2 +-
 drivers/isdn/i4l/isdn_tty.c                        |    2 +-
 drivers/tty/cyclades.c                             |    9 -
 drivers/tty/hvc/Kconfig                            |    2 +-
 drivers/tty/hvc/hvc_console.c                      |   20 +-
 drivers/tty/hvc/hvc_dcc.c                          |   15 +-
 drivers/tty/hvc/hvcs.c                             |    2 +-
 drivers/tty/mips_ejtag_fdc.c                       |   39 +-
 drivers/tty/n_r3964.c                              |   28 +-
 drivers/tty/n_tty.c                                |   32 +-
 drivers/tty/pty.c                                  |    7 +-
 drivers/tty/rocket.c                               |   13 -
 drivers/tty/serial/68328serial.c                   |    5 +-
 drivers/tty/serial/8250/8250_core.c                |   26 +-
 drivers/tty/serial/8250/8250_dma.c                 |    6 -
 drivers/tty/serial/8250/8250_dw.c                  |  288 ++--
 drivers/tty/serial/8250/8250_early.c               |    4 +
 drivers/tty/serial/8250/8250_ingenic.c             |   88 +-
 drivers/tty/serial/8250/8250_mid.c                 |  326 +++++
 drivers/tty/serial/8250/8250_omap.c                |    8 +-
 drivers/tty/serial/8250/8250_pci.c                 |  229 +--
 drivers/tty/serial/8250/8250_port.c                |   86 +-
 drivers/tty/serial/8250/Kconfig                    |   25 +-
 drivers/tty/serial/8250/Makefile                   |    1 +
 drivers/tty/serial/Kconfig                         |   12 +-
 drivers/tty/serial/altera_uart.c                   |   26 +-
 drivers/tty/serial/amba-pl011.c                    |    4 +-
 drivers/tty/serial/apbuart.c                       |    1 +
 drivers/tty/serial/atmel_serial.c                  |   27 +-
 drivers/tty/serial/clps711x.c                      |    2 +-
 drivers/tty/serial/cpm_uart/cpm_uart_core.c        |    1 +
 drivers/tty/serial/crisv10.c                       |   34 +-
 drivers/tty/serial/fsl_lpuart.c                    |   39 +
 drivers/tty/serial/imx.c                           |  175 ++-
 drivers/tty/serial/lpc32xx_hs.c                    |    7 +-
 drivers/tty/serial/men_z135_uart.c                 |   23 +-
 drivers/tty/serial/mpc52xx_uart.c                  |    7 +
 drivers/tty/serial/mpsc.c                          |   41 +-
 drivers/tty/serial/msm_serial.c                    |  622 ++++++++-
 drivers/tty/serial/msm_serial.h                    |   53 +-
 drivers/tty/serial/mxs-auart.c                     |    2 +-
 drivers/tty/serial/of_serial.c                     |   10 +
 drivers/tty/serial/omap-serial.c                   |    2 +
 drivers/tty/serial/samsung.c                       |   66 +-
 drivers/tty/serial/sc16is7xx.c                     |    7 +-
 drivers/tty/serial/serial-tegra.c                  |   94 +-
 drivers/tty/serial/serial_core.c                   |    9 +-
 drivers/tty/serial/serial_mctrl_gpio.c             |  133 +-
 drivers/tty/serial/serial_mctrl_gpio.h             |   40 +-
 drivers/tty/serial/sh-sci.c                        | 1460 ++++++++++----------
 drivers/tty/serial/sh-sci.h                        |   49 +-
 drivers/tty/serial/sprd_serial.c                   |    1 +
 drivers/tty/serial/st-asc.c                        |    2 +-
 drivers/tty/serial/stm32-usart.c                   |    3 +-
 drivers/tty/synclink.c                             |   20 +-
 drivers/tty/synclink_gt.c                          |   14 +-
 drivers/tty/synclinkmp.c                           |   14 +-
 drivers/tty/sysrq.c                                |    6 +-
 drivers/tty/tty_buffer.c                           |   12 +-
 drivers/tty/tty_io.c                               |   59 +-
 drivers/tty/tty_ldisc.c                            |    2 +-
 drivers/tty/tty_port.c                             |   28 +-
 drivers/usb/gadget/function/u_serial.c             |    6 +-
 include/linux/dma/hsu.h                            |   11 +-
 include/linux/n_r3964.h                            |    8 +-
 include/linux/platform_data/atmel.h                |    6 -
 include/linux/platform_data/dma-hsu.h              |    4 -
 include/linux/tty.h                                |   48 +-
 net/irda/ircomm/ircomm_tty.c                       |   31 +-
 81 files changed, 2733 insertions(+), 1940 deletions(-)
 create mode 100644 arch/arm64/include/asm/dcc.h
 create mode 100644 drivers/tty/serial/8250/8250_mid.c
Merging usb/usb-next (0bbc367e21bf Merge 4.3-rc7 into usb-next)
$ git merge usb/usb-next
Auto-merging include/linux/platform_data/atmel.h
Removing drivers/usb/host/fusbh200.h
Removing drivers/usb/host/fusbh200-hcd.c
Auto-merging drivers/usb/gadget/function/u_serial.c
Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c
Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c
Auto-merging arch/arm/mach-s3c64xx/mach-smartq.c
Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/usb/dwc3.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-bus-usb            |   20 +
 .../bindings/phy/brcm,cygnus-pcie-phy.txt          |   47 +
 .../devicetree/bindings/phy/phy-mt65xx-usb.txt     |   68 +
 .../devicetree/bindings/phy/samsung-phy.txt        |    3 +
 .../devicetree/bindings/usb/ci-hdrc-usb2.txt       |   27 +-
 Documentation/devicetree/bindings/usb/dwc3.txt     |    5 +
 Documentation/usb/authorization.txt                |   31 +
 MAINTAINERS                                        |    7 +
 arch/arm/mach-s3c64xx/mach-crag6410.c              |    4 +-
 arch/arm/mach-s3c64xx/mach-smartq.c                |    4 +-
 arch/arm/mach-s3c64xx/mach-smdk6410.c              |    4 +-
 arch/arm/plat-samsung/devs.c                       |    6 +-
 drivers/phy/Kconfig                                |   18 +
 drivers/phy/Makefile                               |    2 +
 drivers/phy/phy-bcm-cygnus-pcie.c                  |  213 +
 drivers/phy/phy-mt65xx-usb3.c                      |  506 ++
 drivers/phy/phy-samsung-usb2.c                     |   25 +-
 drivers/phy/phy-samsung-usb2.h                     |    2 +
 drivers/phy/phy-sun4i-usb.c                        |   22 +-
 drivers/usb/Makefile                               |    1 -
 drivers/usb/chipidea/Kconfig                       |    1 +
 drivers/usb/chipidea/ci_hdrc_imx.c                 |   11 +
 drivers/usb/chipidea/ci_hdrc_pci.c                 |    6 +-
 drivers/usb/chipidea/core.c                        |  136 +-
 drivers/usb/chipidea/otg.c                         |   48 +-
 drivers/usb/chipidea/usbmisc_imx.c                 |   66 +
 drivers/usb/common/common.c                        |   59 +-
 drivers/usb/core/config.c                          |    4 +
 drivers/usb/core/driver.c                          |   14 +-
 drivers/usb/core/hcd.c                             |  110 +-
 drivers/usb/core/hub.c                             |   87 +-
 drivers/usb/core/message.c                         |   41 +-
 drivers/usb/core/sysfs.c                           |   36 +
 drivers/usb/core/urb.c                             |    3 +-
 drivers/usb/core/usb.c                             |    2 +-
 drivers/usb/core/usb.h                             |    2 +
 drivers/usb/dwc2/core.c                            |  478 +-
 drivers/usb/dwc2/core.h                            |  107 +-
 drivers/usb/dwc2/core_intr.c                       |  106 +-
 drivers/usb/dwc2/debugfs.c                         |   72 +-
 drivers/usb/dwc2/gadget.c                          | 1422 +++--
 drivers/usb/dwc2/hcd.c                             |  346 +-
 drivers/usb/dwc2/hcd.h                             |   15 +-
 drivers/usb/dwc2/hcd_ddma.c                        |   10 +-
 drivers/usb/dwc2/hcd_intr.c                        |  152 +-
 drivers/usb/dwc2/hcd_queue.c                       |   21 +-
 drivers/usb/dwc2/hw.h                              |    1 +
 drivers/usb/dwc2/platform.c                        |  236 +-
 drivers/usb/dwc3/core.c                            |  104 +-
 drivers/usb/dwc3/core.h                            |   27 +
 drivers/usb/dwc3/dwc3-pci.c                        |   39 +-
 drivers/usb/dwc3/dwc3-st.c                         |   12 +-
 drivers/usb/dwc3/gadget.c                          |  100 +-
 drivers/usb/dwc3/platform_data.h                   |    3 +
 drivers/usb/gadget/Kconfig                         |    2 +-
 drivers/usb/gadget/composite.c                     |    6 +-
 drivers/usb/gadget/epautoconf.c                    |   25 +-
 drivers/usb/gadget/function/f_acm.c                |   23 +-
 drivers/usb/gadget/function/f_ecm.c                |   31 +-
 drivers/usb/gadget/function/f_eem.c                |   16 +-
 drivers/usb/gadget/function/f_hid.c                |   12 +-
 drivers/usb/gadget/function/f_loopback.c           |  162 +-
 drivers/usb/gadget/function/f_mass_storage.c       |   10 +-
 drivers/usb/gadget/function/f_midi.c               |   26 +-
 drivers/usb/gadget/function/f_ncm.c                |   29 +-
 drivers/usb/gadget/function/f_obex.c               |   10 +-
 drivers/usb/gadget/function/f_phonet.c             |    8 +-
 drivers/usb/gadget/function/f_printer.c            |    2 -
 drivers/usb/gadget/function/f_rndis.c              |   24 +-
 drivers/usb/gadget/function/f_serial.c             |   10 +-
 drivers/usb/gadget/function/f_sourcesink.c         |  167 +-
 drivers/usb/gadget/function/f_subset.c             |   10 +-
 drivers/usb/gadget/function/f_uac1.c               |    4 -
 drivers/usb/gadget/function/f_uac2.c               |   11 -
 drivers/usb/gadget/function/f_uvc.c                |   42 +-
 drivers/usb/gadget/function/u_ether.c              |   11 +-
 drivers/usb/gadget/function/u_serial.c             |    5 -
 drivers/usb/gadget/legacy/dbgp.c                   |   18 +-
 drivers/usb/gadget/legacy/tcm_usb_gadget.c         |   18 -
 drivers/usb/gadget/udc/Kconfig                     |    2 +-
 drivers/usb/gadget/udc/amd5536udc.c                |  609 +-
 drivers/usb/gadget/udc/amd5536udc.h                |    5 +-
 drivers/usb/gadget/udc/at91_udc.h                  |    8 +
 drivers/usb/gadget/udc/dummy_hcd.c                 |    6 +-
 drivers/usb/gadget/udc/net2280.c                   |    2 +-
 drivers/usb/gadget/udc/pch_udc.c                   |   10 +-
 drivers/usb/host/Kconfig                           |   10 -
 drivers/usb/host/Makefile                          |    6 +-
 drivers/usb/host/ehci-msm.c                        |    6 +-
 drivers/usb/host/ehci-orion.c                      |    3 +-
 drivers/usb/host/ehci-platform.c                   |   12 +-
 drivers/usb/host/ehci-spear.c                      |    1 +
 drivers/usb/host/fotg210-hcd.c                     | 1960 +++----
 drivers/usb/host/fotg210.h                         |   36 +-
 drivers/usb/host/fsl-mph-dr-of.c                   |    1 +
 drivers/usb/host/fusbh200-hcd.c                    | 5894 --------------------
 drivers/usb/host/fusbh200.h                        |  675 ---
 drivers/usb/host/ohci-nxp.c                        |   18 +-
 drivers/usb/host/ohci-spear.c                      |    1 +
 drivers/usb/host/u132-hcd.c                        |    3 +-
 drivers/usb/host/uhci-platform.c                   |    1 +
 drivers/usb/host/whci/init.c                       |    3 +-
 drivers/usb/host/xhci-dbg.c                        |   17 +-
 drivers/usb/host/xhci-hub.c                        |  185 +-
 drivers/usb/host/xhci-mem.c                        |   50 +-
 drivers/usb/host/xhci-pci.c                        |    6 +-
 drivers/usb/host/xhci-plat.c                       |   29 +-
 drivers/usb/host/xhci-ring.c                       |  122 +-
 drivers/usb/host/xhci.c                            |   27 +-
 drivers/usb/host/xhci.h                            |   72 +-
 drivers/usb/misc/usb3503.c                         |    2 +-
 drivers/usb/misc/usbtest.c                         |  156 +-
 drivers/usb/musb/musb_core.c                       |   29 +-
 drivers/usb/musb/musb_core.h                       |    2 +-
 drivers/usb/musb/musb_dsps.c                       |   15 +-
 drivers/usb/musb/sunxi.c                           |   14 +-
 drivers/usb/phy/phy-msm-usb.c                      |    2 +-
 drivers/usb/phy/phy-qcom-8x16-usb.c                |   21 +-
 drivers/usb/phy/phy-tegra-usb.c                    |    2 +-
 drivers/usb/serial/io_ti.c                         |  530 +-
 drivers/usb/serial/option.c                        |   64 +-
 drivers/usb/serial/qcserial.c                      |   15 +
 drivers/usb/serial/usb-wwan.h                      |    2 +-
 drivers/usb/serial/usb_wwan.c                      |   42 +-
 drivers/usb/storage/isd200.c                       |   30 +-
 drivers/usb/storage/uas.c                          |   16 +-
 drivers/usb/usbip/vhci_hcd.c                       |    8 +-
 drivers/uwb/drp.c                                  |    4 +-
 drivers/uwb/neh.c                                  |    4 +-
 drivers/uwb/rsv.c                                  |    9 +-
 include/linux/platform_data/atmel.h                |    9 -
 include/linux/platform_data/s3c-hsotg.h            |   10 +-
 include/linux/usb.h                                |    4 +
 include/linux/usb/ch9.h                            |   11 +-
 include/linux/usb/chipidea.h                       |   24 +
 include/linux/usb/gadget.h                         |   29 +-
 include/linux/usb/hcd.h                            |   26 +-
 include/linux/usb/musb.h                           |    2 +-
 include/linux/usb/of.h                             |   12 -
 include/linux/usb/otg.h                            |    9 +
 include/linux/usb/phy.h                            |    8 +-
 include/uapi/linux/usb/ch9.h                       |   29 +
 tools/usb/testusb.c                                |   10 +-
 tools/usb/usbip/src/usbip_detach.c                 |    4 +-
 144 files changed, 5964 insertions(+), 10544 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,cygnus-pcie-phy.txt
 create mode 100644 Documentation/devicetree/bindings/phy/phy-mt65xx-usb.txt
 create mode 100644 drivers/phy/phy-bcm-cygnus-pcie.c
 create mode 100644 drivers/phy/phy-mt65xx-usb3.c
 delete mode 100644 drivers/usb/host/fusbh200-hcd.c
 delete mode 100644 drivers/usb/host/fusbh200.h
Merging usb-gadget/next (81e9d14a53eb usb: gadget: net2280: restore ep_cfg after defect7374 workaround)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (92944c4520ed USB: qcserial: update comment for Sierra Wireless MC7304/MC7354)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (2fb2884ed856 usb: chipidea: delete static debug support)
$ git merge usb-chipidea-next/ci-for-usb-next
Auto-merging drivers/usb/chipidea/udc.c
Removing drivers/usb/chipidea/debug.h
Auto-merging drivers/usb/chipidea/debug.c
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/Kconfig  |  5 -----
 drivers/usb/chipidea/Makefile |  5 +----
 drivers/usb/chipidea/ci.h     |  3 +++
 drivers/usb/chipidea/core.c   |  1 -
 drivers/usb/chipidea/debug.c  |  1 -
 drivers/usb/chipidea/debug.h  | 30 ------------------------------
 drivers/usb/chipidea/udc.c    | 28 ++++++++++++++++++++--------
 7 files changed, 24 insertions(+), 49 deletions(-)
 delete mode 100644 drivers/usb/chipidea/debug.h
Merging staging/staging-next (e3cc3136df33 Staging: rtl8192u: ieee80211: added missing blank lines)
$ git merge staging/staging-next
Resolved 'drivers/iio/adc/max1027.c' using previous resolution.
Resolved 'drivers/iio/adc/mcp320x.c' using previous resolution.
Resolved 'drivers/iio/adc/ti-adc128s052.c' using previous resolution.
Resolved 'drivers/iio/dac/ad7303.c' using previous resolution.
Resolved 'drivers/iio/frequency/adf4350.c' using previous resolution.
Resolved 'drivers/iio/proximity/as3935.c' using previous resolution.
Resolved 'drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h' using previous resolution.
Resolved 'drivers/staging/mt29f_spinand/mt29f_spinand.c' using previous resolution.
Auto-merging include/linux/fb.h
Removing drivers/staging/wlan-ng/p80211meta.h
Removing drivers/staging/wilc1000/wilc_platform.h
Removing drivers/staging/wilc1000/wilc_oswrapper.h
Removing drivers/staging/wilc1000/wilc_memory.h
Removing drivers/staging/wilc1000/wilc_memory.c
Removing drivers/staging/wilc1000/wilc_exported_buf.c
Removing drivers/staging/wilc1000/wilc_errorsupport.h
Removing drivers/staging/sm750fb/sm750_hw.h
Auto-merging drivers/staging/rdma/ipath/ipath_verbs.c
Auto-merging drivers/staging/rdma/ipath/ipath_ud.c
Auto-merging drivers/staging/rdma/ipath/ipath_ruc.c
Auto-merging drivers/staging/rdma/hfi1/verbs.h
Auto-merging drivers/staging/rdma/hfi1/verbs.c
Auto-merging drivers/staging/rdma/hfi1/ruc.c
Auto-merging drivers/staging/rdma/hfi1/rc.c
Auto-merging drivers/staging/rdma/hfi1/mr.c
Auto-merging drivers/staging/rdma/amso1100/c2_qp.c
Removing drivers/staging/octeon/ethernet-xaui.c
Auto-merging drivers/staging/mt29f_spinand/mt29f_spinand.c
CONFLICT (content): Merge conflict in drivers/staging/mt29f_spinand/mt29f_spinand.c
Auto-merging drivers/staging/media/omap4iss/iss_video.c
Auto-merging drivers/staging/media/omap4iss/iss.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Removing drivers/staging/lustre/lustre/obdclass/dt_object.c
Removing drivers/staging/lustre/lustre/obdclass/capa.c
Removing drivers/staging/lustre/lustre/llite/llite_capa.c
Auto-merging drivers/staging/lustre/lustre/llite/file.c
Removing drivers/staging/lustre/lustre/libcfs/nidstrings.c
Removing drivers/staging/lustre/lustre/include/obd_cache.h
Removing drivers/staging/lustre/lustre/include/lustre_capa.h
Removing drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
Removing drivers/staging/lustre/lustre/include/lustre/libiam.h
Removing drivers/staging/lustre/lustre/include/dt_object.h
Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c
Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
CONFLICT (content): Merge conflict in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h
Auto-merging drivers/staging/iio/resolver/ad2s90.c
Auto-merging drivers/staging/iio/resolver/ad2s1210.c
Auto-merging drivers/staging/iio/meter/ade7854-spi.c
Auto-merging drivers/staging/iio/meter/ade7759.c
Auto-merging drivers/staging/iio/meter/ade7758_core.c
Auto-merging drivers/staging/iio/meter/ade7754.c
Auto-merging drivers/staging/iio/meter/ade7753.c
Auto-merging drivers/staging/iio/magnetometer/hmc5843_spi.c
Auto-merging drivers/staging/iio/gyro/adis16060_core.c
Auto-merging drivers/staging/iio/frequency/ad9834.c
Auto-merging drivers/staging/iio/adc/ad7816.c
Auto-merging drivers/staging/iio/adc/ad7780.c
Auto-merging drivers/staging/iio/adc/ad7606_spi.c
Auto-merging drivers/staging/iio/adc/ad7280a.c
Auto-merging drivers/staging/iio/adc/ad7192.c
Auto-merging drivers/staging/iio/accel/sca3000_core.c
Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
Removing drivers/staging/ft1000/ft1000.h
Removing drivers/staging/ft1000/ft1000-usb/ft3000.img
Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
Removing drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
Removing drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
Removing drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Removing drivers/staging/ft1000/ft1000-usb/ft1000_download.c
Removing drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Removing drivers/staging/ft1000/ft1000-usb/Makefile
Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
Removing drivers/staging/ft1000/ft1000-pcmcia/boot.h
Removing drivers/staging/ft1000/ft1000-pcmcia/Makefile
Removing drivers/staging/ft1000/TODO
Removing drivers/staging/ft1000/Makefile
Removing drivers/staging/ft1000/Kconfig
Auto-merging drivers/staging/fbtft/flexfb.c
Auto-merging drivers/staging/fbtft/fbtft.h
Removing drivers/staging/comedi/drivers/unioxx5.c
Auto-merging drivers/iio/proximity/as3935.c
CONFLICT (content): Merge conflict in drivers/iio/proximity/as3935.c
Auto-merging drivers/iio/gyro/bmg160_core.c
Auto-merging drivers/iio/frequency/adf4350.c
CONFLICT (content): Merge conflict in drivers/iio/frequency/adf4350.c
Auto-merging drivers/iio/dac/ad7303.c
CONFLICT (content): Merge conflict in drivers/iio/dac/ad7303.c
Auto-merging drivers/iio/dac/ad5504.c
Auto-merging drivers/iio/buffer/industrialio-buffer-cb.c
Auto-merging drivers/iio/amplifiers/ad8366.c
Auto-merging drivers/iio/adc/ti-adc128s052.c
CONFLICT (content): Merge conflict in drivers/iio/adc/ti-adc128s052.c
Auto-merging drivers/iio/adc/mcp320x.c
CONFLICT (content): Merge conflict in drivers/iio/adc/mcp320x.c
Auto-merging drivers/iio/adc/max1027.c
CONFLICT (content): Merge conflict in drivers/iio/adc/max1027.c
Auto-merging drivers/iio/accel/bmc150-accel-core.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 59e56dd24246] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/ABI/testing/sysfs-bus-iio            |   32 +
 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435 |   43 +
 .../ABI/testing/sysfs-bus-iio-chemical-vz89x       |    7 +
 .../ABI/testing/sysfs-bus-iio-humidity-hdc100x     |    9 +
 Documentation/ABI/testing/sysfs-bus-iio-meas-spec  |    8 +
 .../ABI/testing/sysfs-bus-iio-trigger-sysfs        |   22 +
 Documentation/DocBook/iio.tmpl                     |    2 +-
 .../devicetree/bindings/i2c/trivial-devices.txt    |    3 +-
 .../devicetree/bindings/iio/accel/mma8452.txt      |   24 +
 .../devicetree/bindings/iio/adc/hi8435.txt         |   21 +
 .../devicetree/bindings/iio/light/apds9960.txt     |   22 +
 .../devicetree/bindings/iio/light/us5182d.txt      |   34 +
 .../devicetree/bindings/vendor-prefixes.txt        |    4 +
 MAINTAINERS                                        |   19 +-
 drivers/iio/Kconfig                                |   30 +-
 drivers/iio/Makefile                               |    7 +-
 drivers/iio/accel/Kconfig                          |   33 +-
 drivers/iio/accel/Makefile                         |    6 +-
 .../accel/{bmc150-accel.c => bmc150-accel-core.c}  |  407 +-
 drivers/iio/accel/bmc150-accel-i2c.c               |  102 +
 drivers/iio/accel/bmc150-accel-spi.c               |   91 +
 drivers/iio/accel/bmc150-accel.h                   |   20 +
 drivers/iio/accel/kxcjk-1013.c                     |   34 +-
 drivers/iio/accel/mma8452.c                        |  356 +-
 drivers/iio/accel/mma9553.c                        |   29 -
 drivers/iio/accel/mxc4005.c                        |  567 ++
 drivers/iio/accel/st_accel_core.c                  |    1 +
 drivers/iio/accel/stk8312.c                        |   30 +-
 drivers/iio/accel/stk8ba50.c                       |   30 +-
 drivers/iio/adc/Kconfig                            |   35 +-
 drivers/iio/adc/Makefile                           |    3 +-
 drivers/iio/adc/ad799x.c                           |    1 -
 drivers/iio/adc/berlin2-adc.c                      |   91 +-
 drivers/iio/adc/hi8435.c                           |  534 ++
 drivers/iio/adc/max1027.c                          |    1 +
 drivers/iio/adc/max1363.c                          |    1 -
 drivers/iio/adc/mcp320x.c                          |    1 +
 drivers/iio/adc/ti-adc128s052.c                    |    8 +
 drivers/iio/adc/twl6030-gpadc.c                    |    1 +
 drivers/iio/adc/vf610_adc.c                        |  101 +-
 drivers/iio/adc/xilinx-xadc-core.c                 |   37 +-
 drivers/iio/adc/xilinx-xadc.h                      |    2 -
 drivers/iio/amplifiers/ad8366.c                    |    1 +
 drivers/iio/buffer/Kconfig                         |   24 +
 drivers/iio/buffer/Makefile                        |    8 +
 .../industrialio-buffer-cb.c}                      |   12 +
 .../{ => buffer}/industrialio-triggered-buffer.c   |    0
 drivers/iio/{ => buffer}/kfifo_buf.c               |    0
 drivers/iio/chemical/Kconfig                       |   15 +
 drivers/iio/chemical/Makefile                      |    6 +
 drivers/iio/chemical/vz89x.c                       |  256 +
 drivers/iio/common/Kconfig                         |    1 +
 drivers/iio/common/Makefile                        |    1 +
 drivers/iio/common/ms_sensors/Kconfig              |    6 +
 drivers/iio/common/ms_sensors/Makefile             |    5 +
 drivers/iio/common/ms_sensors/ms_sensors_i2c.c     |  652 ++
 drivers/iio/common/ms_sensors/ms_sensors_i2c.h     |   66 +
 drivers/iio/common/st_sensors/st_sensors_core.c    |   22 +
 drivers/iio/dac/ad5504.c                           |    1 -
 drivers/iio/dac/ad7303.c                           |    7 +
 drivers/iio/dac/m62332.c                           |   63 +-
 drivers/iio/dac/max5821.c                          |    1 +
 drivers/iio/frequency/adf4350.c                    |    9 +
 drivers/iio/gyro/Kconfig                           |   19 +-
 drivers/iio/gyro/Makefile                          |    4 +-
 drivers/iio/gyro/bmg160.h                          |   10 +
 drivers/iio/gyro/{bmg160.c => bmg160_core.c}       |  361 +-
 drivers/iio/gyro/bmg160_i2c.c                      |   71 +
 drivers/iio/gyro/bmg160_spi.c                      |   57 +
 drivers/iio/gyro/st_gyro_core.c                    |    1 +
 drivers/iio/humidity/Kconfig                       |   23 +
 drivers/iio/humidity/Makefile                      |    2 +
 drivers/iio/humidity/hdc100x.c                     |  320 +
 drivers/iio/humidity/htu21.c                       |  253 +
 drivers/iio/humidity/si7020.c                      |    6 +-
 drivers/iio/imu/kmx61.c                            |   28 -
 drivers/iio/industrialio-core.c                    |   10 +-
 drivers/iio/industrialio-trigger.c                 |   12 +-
 drivers/iio/industrialio-triggered-event.c         |   68 +
 drivers/iio/light/Kconfig                          |   23 +
 drivers/iio/light/Makefile                         |    2 +
 drivers/iio/light/apds9960.c                       | 1130 +++
 drivers/iio/light/opt3001.c                        |    1 -
 drivers/iio/light/stk3310.c                        |   98 +-
 drivers/iio/light/tsl4531.c                        |    9 +-
 drivers/iio/light/us5182d.c                        |  507 ++
 drivers/iio/magnetometer/Kconfig                   |   33 +-
 drivers/iio/magnetometer/Makefile                  |    3 +-
 drivers/iio/magnetometer/bmc150_magn.c             |   29 -
 drivers/iio/magnetometer/st_magn_core.c            |    1 +
 drivers/iio/potentiometer/Kconfig                  |   20 +
 drivers/iio/potentiometer/Makefile                 |    6 +
 drivers/iio/potentiometer/mcp4531.c                |  231 +
 drivers/iio/pressure/Kconfig                       |   13 +
 drivers/iio/pressure/Makefile                      |    1 +
 drivers/iio/pressure/ms5637.c                      |  190 +
 drivers/iio/pressure/st_pressure_core.c            |    1 +
 drivers/iio/proximity/Kconfig                      |   12 +
 drivers/iio/proximity/Makefile                     |    1 +
 drivers/iio/proximity/as3935.c                     |    7 +
 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c  |  289 +
 drivers/iio/proximity/sx9500.c                     |    9 -
 drivers/iio/temperature/Kconfig                    |   22 +
 drivers/iio/temperature/Makefile                   |    2 +
 drivers/iio/temperature/mlx90614.c                 |   92 +-
 drivers/iio/temperature/tsys01.c                   |  230 +
 drivers/iio/temperature/tsys02d.c                  |  191 +
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/android/Kconfig                    |    2 +-
 drivers/staging/android/ashmem.c                   |   44 +-
 drivers/staging/android/ion/compat_ion.h           |    1 -
 drivers/staging/android/ion/ion.c                  |   49 +-
 drivers/staging/android/ion/ion.h                  |   10 +-
 drivers/staging/android/ion/ion_cma_heap.c         |    6 +-
 drivers/staging/android/ion/ion_heap.c             |    4 +-
 drivers/staging/android/ion/ion_page_pool.c        |   10 +-
 drivers/staging/android/ion/ion_priv.h             |    3 +-
 drivers/staging/android/ion/ion_system_heap.c      |    7 +-
 drivers/staging/android/ion/tegra/Makefile         |    2 +-
 drivers/staging/android/lowmemorykiller.c          |   30 +-
 drivers/staging/android/sw_sync.c                  |   17 +-
 drivers/staging/android/timed_output.c             |   16 +-
 drivers/staging/android/uapi/ion.h                 |   25 +-
 drivers/staging/board/board.c                      |    6 +-
 drivers/staging/comedi/Kconfig                     |   10 +-
 drivers/staging/comedi/comedi_buf.c                |  125 +-
 drivers/staging/comedi/comedi_fops.c               |  180 +-
 drivers/staging/comedi/comedi_internal.h           |    1 +
 drivers/staging/comedi/comedi_pci.c                |  108 +-
 drivers/staging/comedi/comedi_pcmcia.c             |  104 +-
 drivers/staging/comedi/comedi_usb.c                |   75 +-
 drivers/staging/comedi/comedidev.h                 |  635 +-
 drivers/staging/comedi/drivers.c                   |  407 +-
 drivers/staging/comedi/drivers/8255.h              |   12 +-
 drivers/staging/comedi/drivers/8255_pci.c          |    4 +-
 drivers/staging/comedi/drivers/Makefile            |    1 -
 drivers/staging/comedi/drivers/addi_apci_1032.c    |    7 +-
 drivers/staging/comedi/drivers/addi_apci_2032.c    |   16 +-
 drivers/staging/comedi/drivers/addi_apci_3120.c    |   59 +-
 drivers/staging/comedi/drivers/addi_apci_3xxx.c    |    6 +-
 drivers/staging/comedi/drivers/adl_pci6208.c       |    2 +-
 drivers/staging/comedi/drivers/adl_pci9111.c       |  171 +-
 drivers/staging/comedi/drivers/adl_pci9118.c       |  289 +-
 drivers/staging/comedi/drivers/adq12b.c            |  136 +-
 drivers/staging/comedi/drivers/adv_pci1710.c       |  304 +-
 drivers/staging/comedi/drivers/adv_pci1723.c       |   33 +-
 drivers/staging/comedi/drivers/adv_pci1724.c       |   15 +-
 drivers/staging/comedi/drivers/aio_aio12_8.c       |  201 +-
 drivers/staging/comedi/drivers/amplc_pci230.c      |    2 +-
 drivers/staging/comedi/drivers/cb_das16_cs.c       |  284 +-
 drivers/staging/comedi/drivers/cb_pcidas.c         | 1175 ++-
 drivers/staging/comedi/drivers/comedi_test.c       |  565 +-
 drivers/staging/comedi/drivers/daqboard2000.c      |    8 +-
 drivers/staging/comedi/drivers/dt3000.c            |  466 +-
 drivers/staging/comedi/drivers/dt9812.c            |   66 +-
 drivers/staging/comedi/drivers/fl512.c             |    2 +-
 drivers/staging/comedi/drivers/gsc_hpdi.c          |   28 +-
 drivers/staging/comedi/drivers/icp_multi.c         |  517 +-
 drivers/staging/comedi/drivers/ii_pci20kc.c        |   84 +-
 drivers/staging/comedi/drivers/ke_counter.c        |    7 +-
 drivers/staging/comedi/drivers/me_daq.c            |  315 +-
 drivers/staging/comedi/drivers/mf6x4.c             |  137 +-
 drivers/staging/comedi/drivers/mpc624.c            |  411 +-
 drivers/staging/comedi/drivers/multiq3.c           |  358 +-
 drivers/staging/comedi/drivers/ni_tio.c            |    6 +-
 drivers/staging/comedi/drivers/ni_tiocmd.c         |    6 -
 drivers/staging/comedi/drivers/ni_usb6501.c        |   16 +-
 drivers/staging/comedi/drivers/pcl711.c            |   19 +-
 drivers/staging/comedi/drivers/pcl812.c            |  186 +-
 drivers/staging/comedi/drivers/pcl816.c            |  109 +-
 drivers/staging/comedi/drivers/pcl818.c            |   40 +-
 drivers/staging/comedi/drivers/pcm3724.c           |  112 +-
 drivers/staging/comedi/drivers/quatech_daqp_cs.c   |  684 +-
 drivers/staging/comedi/drivers/rtd520.c            |  369 +-
 drivers/staging/comedi/drivers/rti800.c            |   28 +-
 drivers/staging/comedi/drivers/s526.c              |  560 +-
 drivers/staging/comedi/drivers/serial2002.c        |   51 +-
 drivers/staging/comedi/drivers/ssv_dnp.c           |   57 +-
 drivers/staging/comedi/drivers/unioxx5.c           |  506 --
 drivers/staging/comedi/drivers/usbdux.c            |  164 +-
 drivers/staging/comedi/drivers/usbduxfast.c        |  310 +-
 drivers/staging/comedi/drivers/usbduxsigma.c       |  142 +-
 drivers/staging/comedi/drivers/vmk80xx.c           |  127 +-
 .../staging/comedi/kcomedilib/kcomedilib_main.c    |   32 +-
 drivers/staging/dgap/dgap.c                        |  532 +-
 drivers/staging/dgap/dgap.h                        |    4 -
 drivers/staging/dgnc/dgnc_cls.c                    |   50 +-
 drivers/staging/dgnc/dgnc_driver.c                 |   52 +-
 drivers/staging/dgnc/dgnc_driver.h                 |   59 +-
 drivers/staging/dgnc/dgnc_mgmt.c                   |   15 +-
 drivers/staging/dgnc/dgnc_neo.c                    |   65 +-
 drivers/staging/dgnc/dgnc_sysfs.c                  |   95 +-
 drivers/staging/dgnc/dgnc_tty.c                    |  324 +-
 drivers/staging/emxx_udc/emxx_udc.c                |  183 +-
 drivers/staging/emxx_udc/emxx_udc.h                |   30 -
 drivers/staging/fbtft/Kconfig                      |   10 +
 drivers/staging/fbtft/Makefile                     |    1 +
 drivers/staging/fbtft/fb_agm1264k-fl.c             |   17 +-
 drivers/staging/fbtft/fb_bd663474.c                |   11 +-
 drivers/staging/fbtft/fb_hx8340bn.c                |   16 +-
 drivers/staging/fbtft/fb_hx8347d.c                 |   16 +-
 drivers/staging/fbtft/fb_hx8353d.c                 |   21 +-
 drivers/staging/fbtft/fb_hx8357d.c                 |   12 +-
 drivers/staging/fbtft/fb_ili9163.c                 |   13 +-
 drivers/staging/fbtft/fb_ili9320.c                 |   21 +-
 drivers/staging/fbtft/fb_ili9325.c                 |   20 +-
 drivers/staging/fbtft/fb_ili9340.c                 |   14 +-
 drivers/staging/fbtft/fb_ili9341.c                 |   20 +-
 drivers/staging/fbtft/fb_ili9481.c                 |   10 +-
 drivers/staging/fbtft/fb_ili9486.c                 |   12 +-
 drivers/staging/fbtft/fb_pcd8544.c                 |   25 +-
 drivers/staging/fbtft/fb_ra8875.c                  |   40 +-
 drivers/staging/fbtft/fb_s6d02a1.c                 |   16 +-
 drivers/staging/fbtft/fb_s6d1121.c                 |   18 +-
 drivers/staging/fbtft/fb_ssd1289.c                 |   20 +-
 drivers/staging/fbtft/fb_ssd1306.c                 |   25 +-
 drivers/staging/fbtft/fb_ssd1331.c                 |   11 +-
 drivers/staging/fbtft/fb_ssd1351.c                 |   67 +-
 drivers/staging/fbtft/fb_st7735r.c                 |   22 +-
 drivers/staging/fbtft/fb_st7789v.c                 |  265 +
 drivers/staging/fbtft/fb_tinylcd.c                 |   14 +-
 drivers/staging/fbtft/fb_tls8204.c                 |   24 +-
 drivers/staging/fbtft/fb_uc1611.c                  |   12 +-
 drivers/staging/fbtft/fb_uc1701.c                  |   25 +-
 drivers/staging/fbtft/fb_upd161704.c               |   11 +-
 drivers/staging/fbtft/fb_watterott.c               |   38 +-
 drivers/staging/fbtft/fbtft-bus.c                  |   27 +-
 drivers/staging/fbtft/fbtft-core.c                 |  135 +-
 drivers/staging/fbtft/fbtft-sysfs.c                |    6 +-
 drivers/staging/fbtft/fbtft.h                      |   11 +-
 drivers/staging/fbtft/fbtft_device.c               |  171 +-
 drivers/staging/fbtft/flexfb.c                     |   10 -
 drivers/staging/fsl-mc/bus/dpbp.c                  |  356 +-
 drivers/staging/fsl-mc/bus/dpmcp-cmd.h             |   81 +-
 drivers/staging/fsl-mc/bus/dpmcp.c                 |  316 +-
 drivers/staging/fsl-mc/bus/dpmcp.h                 |  220 +-
 drivers/staging/fsl-mc/bus/dpmng.c                 |   31 +-
 drivers/staging/fsl-mc/bus/dprc-cmd.h              |    7 +-
 drivers/staging/fsl-mc/bus/dprc-driver.c           |   12 +-
 drivers/staging/fsl-mc/bus/dprc.c                  |  955 ++-
 drivers/staging/fsl-mc/bus/mc-allocator.c          |   98 +-
 drivers/staging/fsl-mc/bus/mc-bus.c                |  136 +-
 drivers/staging/fsl-mc/bus/mc-sys.c                |  208 +-
 drivers/staging/fsl-mc/include/dpbp-cmd.h          |    2 +-
 drivers/staging/fsl-mc/include/dpbp.h              |  303 +-
 drivers/staging/fsl-mc/include/dpcon-cmd.h         |   62 +-
 drivers/staging/fsl-mc/include/dpmng.h             |   33 +-
 drivers/staging/fsl-mc/include/dprc.h              |  638 +-
 drivers/staging/fsl-mc/include/mc-cmd.h            |   52 +-
 drivers/staging/fsl-mc/include/mc-private.h        |   19 +-
 drivers/staging/fsl-mc/include/mc-sys.h            |   55 +-
 drivers/staging/fsl-mc/include/mc.h                |   18 +-
 drivers/staging/ft1000/Kconfig                     |   22 -
 drivers/staging/ft1000/Makefile                    |    3 -
 drivers/staging/ft1000/TODO                        |    9 -
 drivers/staging/ft1000/ft1000-pcmcia/Makefile      |    2 -
 drivers/staging/ft1000/ft1000-pcmcia/boot.h        |  158 -
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h      |   70 -
 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img    |  Bin 305770 -> 0 bytes
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c   |  158 -
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c |  769 --
 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c   | 2068 -----
 drivers/staging/ft1000/ft1000-usb/Makefile         |    3 -
 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c   |  789 --
 .../staging/ft1000/ft1000-usb/ft1000_download.c    | 1058 ---
 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c      | 1586 ----
 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h   |  123 -
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c     |  252 -
 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h     |  150 -
 drivers/staging/ft1000/ft1000-usb/ft3000.img       |  Bin 280414 -> 0 bytes
 drivers/staging/ft1000/ft1000.h                    |  366 -
 drivers/staging/gdm724x/gdm_lte.c                  |   54 +-
 drivers/staging/gdm724x/gdm_mux.c                  |   28 +-
 drivers/staging/gdm724x/gdm_tty.c                  |    8 +-
 drivers/staging/gdm724x/gdm_usb.c                  |   56 +-
 drivers/staging/gdm724x/netlink_k.c                |   10 +-
 drivers/staging/gdm72xx/gdm_qos.c                  |    4 +-
 drivers/staging/gdm72xx/gdm_sdio.c                 |   20 +-
 drivers/staging/gdm72xx/gdm_usb.c                  |   16 +-
 drivers/staging/gdm72xx/gdm_wimax.c                |   22 +-
 drivers/staging/gdm72xx/sdio_boot.c                |    4 +-
 drivers/staging/gdm72xx/usb_boot.c                 |    8 +-
 drivers/staging/goldfish/goldfish_nand.c           |    4 +-
 drivers/staging/goldfish/goldfish_nand_reg.h       |   10 +-
 drivers/staging/iio/accel/lis3l02dq_core.c         |   10 +-
 drivers/staging/iio/accel/lis3l02dq_ring.c         |   30 +-
 drivers/staging/iio/accel/sca3000_core.c           |   65 +-
 drivers/staging/iio/accel/sca3000_ring.c           |   19 +-
 drivers/staging/iio/adc/ad7192.c                   |   64 +-
 drivers/staging/iio/adc/ad7192.h                   |    2 +-
 drivers/staging/iio/adc/ad7280a.c                  |  180 +-
 drivers/staging/iio/adc/ad7606_core.c              |   23 +-
 drivers/staging/iio/adc/ad7606_par.c               |   15 +-
 drivers/staging/iio/adc/ad7606_spi.c               |    5 +-
 drivers/staging/iio/adc/ad7780.c                   |   13 +-
 drivers/staging/iio/adc/ad7816.c                   |   58 +-
 drivers/staging/iio/adc/lpc32xx_adc.c              |   18 +-
 drivers/staging/iio/adc/mxs-lradc.c                |  185 +-
 drivers/staging/iio/adc/spear_adc.c                |    4 +-
 drivers/staging/iio/addac/adt7316.c                |   16 +-
 drivers/staging/iio/cdc/ad7150.c                   |   19 +-
 drivers/staging/iio/cdc/ad7152.c                   |   14 +-
 drivers/staging/iio/cdc/ad7746.c                   |   49 +-
 drivers/staging/iio/frequency/ad9834.c             |    2 +-
 drivers/staging/iio/gyro/adis16060_core.c          |   16 +-
 drivers/staging/iio/iio_dummy_evgen.c              |   26 +-
 drivers/staging/iio/iio_simple_dummy.c             |   11 +-
 drivers/staging/iio/iio_simple_dummy.h             |   17 +-
 drivers/staging/iio/iio_simple_dummy_buffer.c      |    8 +-
 drivers/staging/iio/iio_simple_dummy_events.c      |   19 +-
 drivers/staging/iio/impedance-analyzer/ad5933.c    |   11 +-
 drivers/staging/iio/light/isl29018.c               |    6 +-
 drivers/staging/iio/light/isl29028.c               |   11 +-
 drivers/staging/iio/light/tsl2583.c                |   16 +-
 drivers/staging/iio/light/tsl2x7x_core.c           |   14 +-
 drivers/staging/iio/magnetometer/hmc5843.h         |    2 +-
 drivers/staging/iio/magnetometer/hmc5843_core.c    |    6 +-
 drivers/staging/iio/magnetometer/hmc5843_i2c.c     |    2 +-
 drivers/staging/iio/magnetometer/hmc5843_spi.c     |    4 +-
 drivers/staging/iio/meter/ade7753.c                |   10 +-
 drivers/staging/iio/meter/ade7754.c                |    8 +-
 drivers/staging/iio/meter/ade7758_core.c           |    6 +-
 drivers/staging/iio/meter/ade7759.c                |   10 +-
 drivers/staging/iio/meter/ade7854-spi.c            |    2 +-
 drivers/staging/iio/meter/ade7854.c                |    6 +-
 drivers/staging/iio/resolver/ad2s1210.c            |    2 +-
 drivers/staging/iio/resolver/ad2s90.c              |   10 +-
 drivers/staging/iio/trigger/iio-trig-bfin-timer.c  |    4 +-
 .../staging/iio/trigger/iio-trig-periodic-rtc.c    |    2 +-
 .../staging/lustre/include/linux/libcfs/libcfs.h   |   13 +-
 .../lustre/include/linux/libcfs/libcfs_debug.h     |    1 +
 .../lustre/include/linux/libcfs/libcfs_hash.h      |  189 +-
 .../lustre/include/linux/libcfs/libcfs_prim.h      |   13 -
 .../lustre/include/linux/libcfs/libcfs_private.h   |    2 +-
 .../lustre/include/linux/libcfs/libcfs_string.h    |    5 +-
 .../lustre/include/linux/libcfs/libcfs_time.h      |   49 -
 .../lustre/include/linux/libcfs/linux/libcfs.h     |    3 -
 .../lustre/include/linux/libcfs/linux/linux-time.h |   35 +-
 .../staging/lustre/include/linux/lnet/lib-lnet.h   |    6 +-
 .../staging/lustre/include/linux/lnet/lib-types.h  |    2 +-
 drivers/staging/lustre/include/linux/lnet/nidstr.h |   47 +-
 drivers/staging/lustre/include/linux/lnet/types.h  |    2 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c    |   44 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h    |  289 +-
 .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |   65 +-
 .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c  |    1 -
 .../staging/lustre/lnet/klnds/socklnd/socklnd.c    |   61 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd.h    |    6 +-
 .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |   21 +-
 .../lustre/lnet/klnds/socklnd/socklnd_lib.c        |    6 +-
 .../lustre/lnet/klnds/socklnd/socklnd_modparams.c  |    1 -
 drivers/staging/lustre/lnet/lnet/Makefile          |    2 +-
 drivers/staging/lustre/lnet/lnet/acceptor.c        |    2 -
 drivers/staging/lustre/lnet/lnet/api-ni.c          |   18 +-
 drivers/staging/lustre/lnet/lnet/config.c          |    4 +-
 drivers/staging/lustre/lnet/lnet/lib-eq.c          |   12 +-
 drivers/staging/lustre/lnet/lnet/lib-move.c        |    7 +-
 drivers/staging/lustre/lnet/lnet/lib-ptl.c         |    4 +-
 drivers/staging/lustre/lnet/lnet/nidstrings.c      | 1260 +++
 drivers/staging/lustre/lnet/lnet/router.c          |   15 +-
 drivers/staging/lustre/lnet/lnet/router_proc.c     |   45 +-
 drivers/staging/lustre/lnet/selftest/brw_test.c    |    6 +-
 drivers/staging/lustre/lnet/selftest/conctl.c      |    4 +-
 drivers/staging/lustre/lnet/selftest/conrpc.c      |   18 +-
 drivers/staging/lustre/lnet/selftest/conrpc.h      |    5 +-
 drivers/staging/lustre/lnet/selftest/console.c     |   20 +-
 drivers/staging/lustre/lnet/selftest/console.h     |    3 +-
 drivers/staging/lustre/lnet/selftest/framework.c   |   12 +-
 drivers/staging/lustre/lnet/selftest/module.c      |    1 -
 drivers/staging/lustre/lnet/selftest/ping_test.c   |   16 +-
 drivers/staging/lustre/lnet/selftest/rpc.c         |   11 +-
 drivers/staging/lustre/lnet/selftest/rpc.h         |    1 -
 drivers/staging/lustre/lnet/selftest/selftest.h    |   27 +-
 drivers/staging/lustre/lnet/selftest/timer.c       |   17 +-
 drivers/staging/lustre/lnet/selftest/timer.h       |    2 +-
 drivers/staging/lustre/lustre/fid/fid_request.c    |  132 +-
 drivers/staging/lustre/lustre/fid/lproc_fid.c      |    3 -
 drivers/staging/lustre/lustre/fld/fld_cache.c      |    3 +-
 drivers/staging/lustre/lustre/fld/fld_internal.h   |    3 -
 drivers/staging/lustre/lustre/fld/fld_request.c    |    1 -
 drivers/staging/lustre/lustre/fld/lproc_fld.c      |    1 -
 drivers/staging/lustre/lustre/include/cl_object.h  |   59 +-
 drivers/staging/lustre/lustre/include/dt_object.h  | 1496 ----
 .../staging/lustre/lustre/include/interval_tree.h  |   36 -
 drivers/staging/lustre/lustre/include/lclient.h    |   28 +-
 .../lustre/lustre/include/linux/lustre_compat25.h  |    1 -
 .../lustre/lustre/include/linux/lustre_lite.h      |    4 +-
 .../lustre/include/linux/lustre_patchless_compat.h |    1 -
 drivers/staging/lustre/lustre/include/linux/obd.h  |    2 +-
 .../staging/lustre/lustre/include/lprocfs_status.h |   61 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |   61 +-
 drivers/staging/lustre/lustre/include/lu_ref.h     |    1 -
 .../staging/lustre/lustre/include/lustre/libiam.h  |  145 -
 .../lustre/lustre/include/lustre/ll_fiemap.h       |    3 -
 .../lustre/lustre/include/lustre/lustre_idl.h      |   98 +-
 .../lustre/include/lustre/lustre_lfsck_user.h      |   95 -
 .../lustre/lustre/include/lustre/lustre_user.h     |   40 +-
 .../staging/lustre/lustre/include/lustre_capa.h    |  305 -
 drivers/staging/lustre/lustre/include/lustre_cfg.h |   10 +-
 .../staging/lustre/lustre/include/lustre_debug.h   |    1 -
 .../staging/lustre/lustre/include/lustre_disk.h    |  159 +-
 drivers/staging/lustre/lustre/include/lustre_dlm.h |  117 +-
 .../lustre/lustre/include/lustre_dlm_flags.h       |  228 +-
 .../staging/lustre/lustre/include/lustre_eacl.h    |    5 -
 .../staging/lustre/lustre/include/lustre_export.h  |   37 +-
 drivers/staging/lustre/lustre/include/lustre_fid.h |   96 +-
 drivers/staging/lustre/lustre/include/lustre_fld.h |    5 -
 drivers/staging/lustre/lustre/include/lustre_ha.h  |    1 -
 .../staging/lustre/lustre/include/lustre_handles.h |    3 +-
 .../staging/lustre/lustre/include/lustre_import.h  |   22 +-
 drivers/staging/lustre/lustre/include/lustre_lib.h |   19 +-
 .../staging/lustre/lustre/include/lustre_lite.h    |    1 -
 drivers/staging/lustre/lustre/include/lustre_log.h |  167 +-
 drivers/staging/lustre/lustre/include/lustre_mdc.h |    1 -
 drivers/staging/lustre/lustre/include/lustre_mds.h |    5 -
 drivers/staging/lustre/lustre/include/lustre_net.h |  152 +-
 .../staging/lustre/lustre/include/lustre_param.h   |   12 -
 .../lustre/lustre/include/lustre_req_layout.h      |   11 -
 drivers/staging/lustre/lustre/include/lustre_sec.h |   48 +-
 drivers/staging/lustre/lustre/include/obd.h        |  188 +-
 drivers/staging/lustre/lustre/include/obd_cache.h  |   39 -
 drivers/staging/lustre/lustre/include/obd_cksum.h  |    1 -
 drivers/staging/lustre/lustre/include/obd_class.h  |  236 +-
 .../staging/lustre/lustre/include/obd_support.h    |  284 +-
 drivers/staging/lustre/lustre/lclient/glimpse.c    |    6 +-
 drivers/staging/lustre/lustre/lclient/lcommon_cl.c |  102 +-
 .../staging/lustre/lustre/lclient/lcommon_misc.c   |    1 -
 drivers/staging/lustre/lustre/ldlm/interval_tree.c |  274 +-
 drivers/staging/lustre/lustre/ldlm/l_lock.c        |    7 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_extent.c   |   27 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |  278 +-
 .../staging/lustre/lustre/ldlm/ldlm_inodebits.c    |    1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_internal.h |   36 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lib.c      |   38 -
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |  391 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c    |  132 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_plain.c    |    1 -
 drivers/staging/lustre/lustre/ldlm/ldlm_pool.c     |  441 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_request.c  |  380 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_resource.c |  209 +-
 drivers/staging/lustre/lustre/libcfs/Makefile      |    2 +-
 drivers/staging/lustre/lustre/libcfs/debug.c       |    5 +-
 drivers/staging/lustre/lustre/libcfs/fail.c        |    4 +-
 drivers/staging/lustre/lustre/libcfs/hash.c        |  131 +-
 .../lustre/lustre/libcfs/kernel_user_comm.c        |    1 +
 drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    8 +-
 drivers/staging/lustre/lustre/libcfs/libcfs_mem.c  |   10 +-
 .../staging/lustre/lustre/libcfs/libcfs_string.c   |  144 +-
 .../staging/lustre/lustre/libcfs/linux/linux-cpu.c |    3 +-
 .../lustre/libcfs/linux/linux-crypto-adler.c       |    3 +-
 .../lustre/lustre/libcfs/linux/linux-crypto.c      |    9 +-
 .../lustre/lustre/libcfs/linux/linux-curproc.c     |    1 +
 .../lustre/lustre/libcfs/linux/linux-debug.c       |    2 +-
 .../lustre/lustre/libcfs/linux/linux-module.c      |    1 -
 .../lustre/lustre/libcfs/linux/linux-prim.c        |   70 -
 .../lustre/lustre/libcfs/linux/linux-tracefile.c   |   32 +-
 drivers/staging/lustre/lustre/libcfs/module.c      |  185 +-
 drivers/staging/lustre/lustre/libcfs/nidstrings.c  |  842 --
 drivers/staging/lustre/lustre/libcfs/tracefile.c   |    6 +-
 drivers/staging/lustre/lustre/libcfs/tracefile.h   |    3 -
 drivers/staging/lustre/lustre/libcfs/workitem.c    |   16 +-
 drivers/staging/lustre/lustre/llite/Makefile       |    2 +-
 drivers/staging/lustre/lustre/llite/dcache.c       |    1 -
 drivers/staging/lustre/lustre/llite/dir.c          |   15 +-
 drivers/staging/lustre/lustre/llite/file.c         |   81 +-
 drivers/staging/lustre/lustre/llite/llite_capa.c   |  661 --
 drivers/staging/lustre/lustre/llite/llite_close.c  |    9 +-
 .../staging/lustre/lustre/llite/llite_internal.h   |   49 +-
 drivers/staging/lustre/lustre/llite/llite_lib.c    |  179 +-
 drivers/staging/lustre/lustre/llite/llite_mmap.c   |    2 -
 drivers/staging/lustre/lustre/llite/llite_nfs.c    |    9 +-
 drivers/staging/lustre/lustre/llite/llite_rmtacl.c |    1 -
 drivers/staging/lustre/lustre/llite/lloop.c        |    5 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   38 +-
 drivers/staging/lustre/lustre/llite/namei.c        |   58 +-
 drivers/staging/lustre/lustre/llite/remote_perm.c  |   16 +-
 drivers/staging/lustre/lustre/llite/rw.c           |   42 +-
 drivers/staging/lustre/lustre/llite/rw26.c         |    1 +
 drivers/staging/lustre/lustre/llite/statahead.c    |   40 +-
 drivers/staging/lustre/lustre/llite/super25.c      |   42 +-
 drivers/staging/lustre/lustre/llite/vvp_dev.c      |   11 +-
 drivers/staging/lustre/lustre/llite/vvp_internal.h |    1 -
 drivers/staging/lustre/lustre/llite/vvp_io.c       |   10 +-
 drivers/staging/lustre/lustre/llite/vvp_lock.c     |    1 -
 drivers/staging/lustre/lustre/llite/vvp_object.c   |   13 +-
 drivers/staging/lustre/lustre/llite/vvp_page.c     |    1 -
 drivers/staging/lustre/lustre/llite/xattr.c        |   19 +-
 drivers/staging/lustre/lustre/llite/xattr_cache.c  |   24 +-
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   78 +-
 drivers/staging/lustre/lustre/lmv/lproc_lmv.c      |    2 +
 .../staging/lustre/lustre/lov/lov_cl_internal.h    |    5 -
 drivers/staging/lustre/lustre/lov/lov_dev.c        |   15 +-
 drivers/staging/lustre/lustre/lov/lov_ea.c         |    7 +-
 drivers/staging/lustre/lustre/lov/lov_internal.h   |    5 +-
 drivers/staging/lustre/lustre/lov/lov_io.c         |    9 +-
 drivers/staging/lustre/lustre/lov/lov_lock.c       |   21 +-
 drivers/staging/lustre/lustre/lov/lov_obd.c        |   52 +-
 drivers/staging/lustre/lustre/lov/lov_object.c     |   18 +-
 drivers/staging/lustre/lustre/lov/lov_pack.c       |   22 -
 drivers/staging/lustre/lustre/lov/lov_page.c       |    2 -
 drivers/staging/lustre/lustre/lov/lov_pool.c       |   32 +-
 drivers/staging/lustre/lustre/lov/lov_request.c    |   17 +-
 drivers/staging/lustre/lustre/lov/lovsub_dev.c     |    5 +-
 drivers/staging/lustre/lustre/lov/lovsub_lock.c    |    4 +-
 drivers/staging/lustre/lustre/lov/lovsub_object.c  |    6 +-
 drivers/staging/lustre/lustre/lov/lproc_lov.c      |    5 +
 drivers/staging/lustre/lustre/mdc/mdc_internal.h   |   18 +-
 drivers/staging/lustre/lustre/mdc/mdc_lib.c        |   50 +-
 drivers/staging/lustre/lustre/mdc/mdc_locks.c      |   47 +-
 drivers/staging/lustre/lustre/mdc/mdc_reint.c      |   24 +-
 drivers/staging/lustre/lustre/mdc/mdc_request.c    |  258 +-
 drivers/staging/lustre/lustre/mgc/lproc_mgc.c      |    1 +
 drivers/staging/lustre/lustre/mgc/mgc_request.c    |   63 +-
 drivers/staging/lustre/lustre/obdclass/Makefile    |    2 +-
 drivers/staging/lustre/lustre/obdclass/acl.c       |  120 -
 drivers/staging/lustre/lustre/obdclass/capa.c      |  421 -
 drivers/staging/lustre/lustre/obdclass/cl_io.c     |  106 +-
 drivers/staging/lustre/lustre/obdclass/cl_lock.c   |   49 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |   68 +-
 drivers/staging/lustre/lustre/obdclass/cl_page.c   |    5 +-
 drivers/staging/lustre/lustre/obdclass/class_obd.c |  119 +-
 drivers/staging/lustre/lustre/obdclass/debug.c     |   10 -
 drivers/staging/lustre/lustre/obdclass/dt_object.c | 1054 ---
 drivers/staging/lustre/lustre/obdclass/genops.c    |  600 +-
 .../lustre/lustre/obdclass/linux/linux-module.c    |    3 -
 .../lustre/lustre/obdclass/linux/linux-obdo.c      |  137 -
 .../lustre/lustre/obdclass/linux/linux-sysctl.c    |    4 -
 drivers/staging/lustre/lustre/obdclass/llog.c      |  549 +-
 drivers/staging/lustre/lustre/obdclass/llog_cat.c  |  590 +-
 .../staging/lustre/lustre/obdclass/llog_internal.h |   21 -
 drivers/staging/lustre/lustre/obdclass/llog_obd.c  |   31 -
 drivers/staging/lustre/lustre/obdclass/llog_swab.c |    7 +-
 .../lustre/lustre/obdclass/lprocfs_counters.c      |    9 -
 .../lustre/lustre/obdclass/lprocfs_status.c        |  440 +-
 drivers/staging/lustre/lustre/obdclass/lu_object.c |  383 +-
 .../lustre/lustre/obdclass/lustre_handles.c        |   22 +-
 .../staging/lustre/lustre/obdclass/obd_config.c    |  468 +-
 drivers/staging/lustre/lustre/obdclass/obd_mount.c |  162 +-
 drivers/staging/lustre/lustre/obdclass/obdo.c      |  173 +-
 .../staging/lustre/lustre/obdclass/statfs_pack.c   |   14 -
 .../staging/lustre/lustre/obdecho/echo_client.c    |   45 +-
 .../staging/lustre/lustre/obdecho/echo_internal.h  |    1 -
 drivers/staging/lustre/lustre/osc/lproc_osc.c      |   46 +-
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   44 +-
 .../staging/lustre/lustre/osc/osc_cl_internal.h    |    3 +-
 drivers/staging/lustre/lustre/osc/osc_dev.c        |    8 +-
 drivers/staging/lustre/lustre/osc/osc_internal.h   |    7 +-
 drivers/staging/lustre/lustre/osc/osc_io.c         |   14 +-
 drivers/staging/lustre/lustre/osc/osc_lock.c       |    4 +-
 drivers/staging/lustre/lustre/osc/osc_object.c     |    6 +-
 drivers/staging/lustre/lustre/osc/osc_page.c       |    9 +-
 drivers/staging/lustre/lustre/osc/osc_quota.c      |   11 +-
 drivers/staging/lustre/lustre/osc/osc_request.c    |  238 +-
 drivers/staging/lustre/lustre/ptlrpc/client.c      |  512 +-
 drivers/staging/lustre/lustre/ptlrpc/connection.c  |   10 +-
 drivers/staging/lustre/lustre/ptlrpc/events.c      |   12 +-
 drivers/staging/lustre/lustre/ptlrpc/import.c      |   70 +-
 drivers/staging/lustre/lustre/ptlrpc/layout.c      |  144 +-
 drivers/staging/lustre/lustre/ptlrpc/llog_client.c |   37 +-
 .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c    |  134 +-
 drivers/staging/lustre/lustre/ptlrpc/niobuf.c      |   22 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c         |  129 +-
 .../staging/lustre/lustre/ptlrpc/pack_generic.c    |  362 +-
 drivers/staging/lustre/lustre/ptlrpc/pers.c        |    1 -
 drivers/staging/lustre/lustre/ptlrpc/pinger.c      |  170 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |   19 +-
 .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c   |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c     |  740 +-
 drivers/staging/lustre/lustre/ptlrpc/sec.c         |  165 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |  358 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c  |   78 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_gc.c      |   25 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c   |    6 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_null.c    |    4 +-
 drivers/staging/lustre/lustre/ptlrpc/sec_plain.c   |    2 +-
 drivers/staging/lustre/lustre/ptlrpc/service.c     |  526 +-
 drivers/staging/lustre/lustre/ptlrpc/wiretest.c    |    6 +-
 drivers/staging/media/davinci_vpfe/dm365_ipipe.c   |   60 +-
 .../staging/media/davinci_vpfe/vpfe_mc_capture.c   |    2 +-
 drivers/staging/media/lirc/lirc_sasem.c            |   12 +-
 drivers/staging/media/omap4iss/iss.c               |   40 +-
 drivers/staging/media/omap4iss/iss_csi2.c          |    6 +-
 drivers/staging/media/omap4iss/iss_csi2.h          |    4 +-
 drivers/staging/media/omap4iss/iss_ipipe.c         |   26 +-
 drivers/staging/media/omap4iss/iss_ipipe.h         |    4 +-
 drivers/staging/media/omap4iss/iss_ipipeif.c       |   24 +-
 drivers/staging/media/omap4iss/iss_ipipeif.h       |    8 +-
 drivers/staging/media/omap4iss/iss_regs.h          |  316 +-
 drivers/staging/media/omap4iss/iss_resizer.c       |   28 +-
 drivers/staging/media/omap4iss/iss_resizer.h       |    6 +-
 drivers/staging/media/omap4iss/iss_video.c         |   19 +-
 .../most/Documentation/ABI/sysfs-class-most.txt    |    2 +-
 drivers/staging/most/aim-cdev/cdev.c               |   68 +-
 drivers/staging/most/aim-network/networking.c      |   53 +-
 drivers/staging/most/aim-sound/sound.c             |  114 +-
 drivers/staging/most/aim-v4l2/Makefile             |    1 -
 drivers/staging/most/aim-v4l2/video.c              |   50 +-
 drivers/staging/most/hdm-dim2/Kconfig              |    2 +-
 drivers/staging/most/hdm-dim2/dim2_hal.c           |   62 +-
 drivers/staging/most/hdm-dim2/dim2_hal.h           |    5 -
 drivers/staging/most/hdm-dim2/dim2_hdm.c           |   79 +-
 drivers/staging/most/hdm-dim2/dim2_hdm.h           |    3 +-
 drivers/staging/most/hdm-dim2/dim2_sysfs.c         |    3 +-
 drivers/staging/most/hdm-i2c/hdm_i2c.c             |   45 +-
 drivers/staging/most/hdm-usb/hdm_usb.c             |  162 +-
 drivers/staging/most/mostcore/core.c               |  230 +-
 drivers/staging/most/mostcore/mostcore.h           |   13 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.c      |   67 +-
 drivers/staging/mt29f_spinand/mt29f_spinand.h      |   18 +-
 drivers/staging/netlogic/platform_net.c            |    1 -
 drivers/staging/netlogic/xlr_net.h                 |    3 +-
 drivers/staging/nvec/nvec.c                        |    1 -
 drivers/staging/octeon-usb/octeon-hcd.c            |    7 +-
 drivers/staging/octeon/Makefile                    |    2 -
 drivers/staging/octeon/ethernet-defines.h          |    5 +-
 drivers/staging/octeon/ethernet-rgmii.c            |    2 +-
 drivers/staging/octeon/ethernet-rx.c               |   10 +-
 drivers/staging/octeon/ethernet-sgmii.c            |    2 +-
 drivers/staging/octeon/ethernet-tx.c               |    8 +-
 drivers/staging/octeon/ethernet-xaui.c             |   42 -
 drivers/staging/octeon/ethernet.c                  |   42 +-
 drivers/staging/octeon/octeon-ethernet.h           |    6 +-
 drivers/staging/olpc_dcon/olpc_dcon.c              |   36 +-
 drivers/staging/olpc_dcon/olpc_dcon.h              |    4 +-
 drivers/staging/panel/panel.c                      |  138 +-
 drivers/staging/rdma/Kconfig                       |    2 +-
 drivers/staging/rdma/amso1100/c2.c                 |    6 +-
 drivers/staging/rdma/amso1100/c2_ae.c              |    6 +-
 drivers/staging/rdma/amso1100/c2_alloc.c           |    2 +-
 drivers/staging/rdma/amso1100/c2_cm.c              |    3 -
 drivers/staging/rdma/amso1100/c2_cq.c              |   12 +-
 drivers/staging/rdma/amso1100/c2_intr.c            |    2 +-
 drivers/staging/rdma/amso1100/c2_mm.c              |   10 +-
 drivers/staging/rdma/amso1100/c2_mq.c              |    1 +
 drivers/staging/rdma/amso1100/c2_provider.c        |   10 +-
 drivers/staging/rdma/amso1100/c2_qp.c              |   20 +-
 drivers/staging/rdma/amso1100/c2_rnic.c            |   28 +-
 drivers/staging/rdma/ehca/ehca_cq.c                |   13 +-
 drivers/staging/rdma/hfi1/chip.c                   |  196 +-
 drivers/staging/rdma/hfi1/chip.h                   |    2 +
 drivers/staging/rdma/hfi1/common.h                 |    4 +-
 drivers/staging/rdma/hfi1/device.c                 |    2 +-
 drivers/staging/rdma/hfi1/diag.c                   |    9 +-
 drivers/staging/rdma/hfi1/driver.c                 |   83 +-
 drivers/staging/rdma/hfi1/file_ops.c               |   18 +-
 drivers/staging/rdma/hfi1/firmware.c               |   37 +-
 drivers/staging/rdma/hfi1/hfi.h                    |   22 +-
 drivers/staging/rdma/hfi1/init.c                   |   30 +-
 drivers/staging/rdma/hfi1/mad.c                    |   20 +-
 drivers/staging/rdma/hfi1/mr.c                     |   28 +-
 drivers/staging/rdma/hfi1/pcie.c                   |   15 +-
 drivers/staging/rdma/hfi1/pio.c                    |   21 +-
 drivers/staging/rdma/hfi1/qp.h                     |   15 +
 drivers/staging/rdma/hfi1/qsfp.c                   |   13 +-
 drivers/staging/rdma/hfi1/rc.c                     |   25 +-
 drivers/staging/rdma/hfi1/ruc.c                    |   25 +-
 drivers/staging/rdma/hfi1/sdma.c                   |  168 +-
 drivers/staging/rdma/hfi1/sdma.h                   |   74 +-
 drivers/staging/rdma/hfi1/sysfs.c                  |    2 +-
 drivers/staging/rdma/hfi1/trace.c                  |    4 +-
 drivers/staging/rdma/hfi1/trace.h                  |   48 +-
 drivers/staging/rdma/hfi1/user_sdma.c              |  124 +-
 drivers/staging/rdma/hfi1/verbs.c                  |   19 +-
 drivers/staging/rdma/hfi1/verbs.h                  |    3 +-
 drivers/staging/rdma/ipath/ipath_driver.c          |   27 +-
 drivers/staging/rdma/ipath/ipath_eeprom.c          |    2 +-
 drivers/staging/rdma/ipath/ipath_file_ops.c        |   15 +-
 drivers/staging/rdma/ipath/ipath_fs.c              |   13 +-
 drivers/staging/rdma/ipath/ipath_iba6110.c         |    7 +-
 drivers/staging/rdma/ipath/ipath_init_chip.c       |   32 +-
 drivers/staging/rdma/ipath/ipath_intr.c            |    8 +-
 drivers/staging/rdma/ipath/ipath_kernel.h          |    3 +-
 drivers/staging/rdma/ipath/ipath_qp.c              |    3 +-
 drivers/staging/rdma/ipath/ipath_ruc.c             |    1 -
 drivers/staging/rdma/ipath/ipath_sdma.c            |    6 +-
 drivers/staging/rdma/ipath/ipath_sysfs.c           |    7 +-
 drivers/staging/rdma/ipath/ipath_ud.c              |    1 -
 drivers/staging/rdma/ipath/ipath_user_pages.c      |    1 -
 drivers/staging/rdma/ipath/ipath_user_sdma.c       |    5 +-
 drivers/staging/rdma/ipath/ipath_verbs.c           |   15 +-
 drivers/staging/rdma/ipath/ipath_verbs_mcast.c     |    1 -
 drivers/staging/rtl8188eu/Kconfig                  |    2 +-
 drivers/staging/rtl8188eu/Makefile                 |    1 +
 drivers/staging/rtl8188eu/core/rtw_ap.c            |    2 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c           |    8 +-
 drivers/staging/rtl8188eu/core/rtw_debug.c         |    3 +-
 drivers/staging/rtl8188eu/core/rtw_efuse.c         |   50 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |   14 +-
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |    5 +-
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   96 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |   20 +-
 drivers/staging/rtl8188eu/core/rtw_rf.c            |    2 +-
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |   15 +-
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |   10 +-
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |    4 +
 .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c   |   14 +-
 drivers/staging/rtl8188eu/hal/bb_cfg.c             |   93 +-
 drivers/staging/rtl8188eu/hal/fw.c                 |    5 +-
 drivers/staging/rtl8188eu/hal/mac_cfg.c            |    4 +-
 drivers/staging/rtl8188eu/hal/odm.c                |   33 +-
 drivers/staging/rtl8188eu/hal/odm_HWConfig.c       |    6 +-
 drivers/staging/rtl8188eu/hal/odm_RTL8188E.c       |  122 +-
 drivers/staging/rtl8188eu/hal/phy.c                |   32 +-
 drivers/staging/rtl8188eu/hal/rf_cfg.c             |    6 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c       |   26 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c  |   27 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_led.c      |    6 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c     |    2 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    6 +-
 drivers/staging/rtl8188eu/hal/usb_halinit.c        |   56 +-
 drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h |   14 +-
 drivers/staging/rtl8188eu/include/basic_types.h    |    6 -
 drivers/staging/rtl8188eu/include/drv_types.h      |    2 +
 drivers/staging/rtl8188eu/include/hal_intf.h       |   16 +-
 drivers/staging/rtl8188eu/include/ieee80211.h      |    4 +-
 drivers/staging/rtl8188eu/include/mon.h            |   36 +
 drivers/staging/rtl8188eu/include/odm.h            |   90 +-
 drivers/staging/rtl8188eu/include/odm_debug.h      |   42 +-
 drivers/staging/rtl8188eu/include/odm_reg.h        |    2 +-
 drivers/staging/rtl8188eu/include/osdep_service.h  |   48 -
 drivers/staging/rtl8188eu/include/pwrseq.h         |   84 +-
 drivers/staging/rtl8188eu/include/rtl8188e_spec.h  |  415 +-
 drivers/staging/rtl8188eu/include/rtw_security.h   |    3 -
 drivers/staging/rtl8188eu/include/rtw_sreset.h     |   14 +-
 drivers/staging/rtl8188eu/include/wifi.h           |   12 -
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   28 +-
 drivers/staging/rtl8188eu/os_dep/mlme_linux.c      |    9 +-
 drivers/staging/rtl8188eu/os_dep/mon.c             |  195 +
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    8 +-
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |    2 +-
 drivers/staging/rtl8188eu/os_dep/recv_linux.c      |    2 +-
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |   10 +
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |    5 +-
 drivers/staging/rtl8188eu/os_dep/xmit_linux.c      |    2 +-
 drivers/staging/rtl8192e/dot11d.c                  |    4 -
 drivers/staging/rtl8192e/dot11d.h                  |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8190P_def.h     |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c |    8 +-
 drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c  |   62 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h  |    8 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c     |  103 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h     |    4 -
 .../staging/rtl8192e/rtl8192e/r8192E_firmware.c    |  278 +-
 .../staging/rtl8192e/rtl8192e/r8192E_firmware.h    |   23 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h      |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c   |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h   |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c     |  240 +-
 drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h     |    4 -
 drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h  |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.c        |    8 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_cam.h        |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c       |  358 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_core.h       |    6 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.c         |  311 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_dm.h         |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c     |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h     |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c    |   14 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pci.c        |    8 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_pci.h        |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_pm.c         |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_pm.h         |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_ps.c         |   31 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_ps.h         |    4 -
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.c         |  349 +-
 drivers/staging/rtl8192e/rtl8192e/rtl_wx.h         |    4 -
 drivers/staging/rtl8192e/rtl819x_BA.h              |    4 -
 drivers/staging/rtl8192e/rtl819x_BAProc.c          |    8 +-
 drivers/staging/rtl8192e/rtl819x_HT.h              |    4 -
 drivers/staging/rtl8192e/rtl819x_HTProc.c          |    4 -
 drivers/staging/rtl8192e/rtl819x_Qos.h             |    4 -
 drivers/staging/rtl8192e/rtl819x_TS.h              |    4 -
 drivers/staging/rtl8192e/rtl819x_TSProc.c          |    4 -
 drivers/staging/rtl8192e/rtllib_debug.h            |    4 -
 drivers/staging/rtl8192e/rtllib_module.c           |    9 +-
 drivers/staging/rtl8192e/rtllib_rx.c               |   14 +-
 drivers/staging/rtl8192e/rtllib_softmac.c          |   20 +-
 drivers/staging/rtl8192e/rtllib_tx.c               |   12 +-
 drivers/staging/rtl8192e/rtllib_wx.c               |    4 -
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     |   10 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c      |   47 +-
 .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |   76 +-
 .../staging/rtl8192u/ieee80211/ieee80211_module.c  |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   19 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |   19 +-
 .../rtl8192u/ieee80211/ieee80211_softmac_wx.c      |  102 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c  |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c  |    8 -
 drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h   |   49 +-
 drivers/staging/rtl8192u/r8192U.h                  |   99 +-
 drivers/staging/rtl8192u/r8192U_core.c             | 1980 +++--
 drivers/staging/rtl8192u/r8192U_dm.c               |   17 +-
 drivers/staging/rtl8192u/r8192U_hw.h               |  145 +-
 drivers/staging/rtl8192u/r8192U_wx.c               |    4 +-
 drivers/staging/rtl8192u/r819xU_cmdpkt.h           |    6 +-
 drivers/staging/rtl8192u/r819xU_phy.c              |    4 +-
 drivers/staging/rtl8712/drv_types.h                |   11 +-
 drivers/staging/rtl8712/hal_init.c                 |   57 +-
 drivers/staging/rtl8712/ieee80211.c                |   43 +-
 drivers/staging/rtl8712/ieee80211.h                |   48 +-
 drivers/staging/rtl8712/mlme_linux.c               |    5 +-
 drivers/staging/rtl8712/os_intfs.c                 |   11 +-
 drivers/staging/rtl8712/osdep_service.h            |    4 -
 drivers/staging/rtl8712/recv_linux.c               |    3 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |   42 +-
 drivers/staging/rtl8712/rtl8712_cmdctrl_bitdef.h   |    3 +-
 drivers/staging/rtl8712/rtl8712_efuse.c            |  138 +-
 drivers/staging/rtl8712/rtl8712_gp_bitdef.h        |    3 +-
 drivers/staging/rtl8712/rtl8712_hal.h              |   14 +-
 drivers/staging/rtl8712/rtl8712_io.c               |   28 +-
 drivers/staging/rtl8712/rtl8712_led.c              |  187 +-
 drivers/staging/rtl8712/rtl8712_recv.c             |   55 +-
 drivers/staging/rtl8712/rtl8712_xmit.c             |   86 +-
 drivers/staging/rtl8712/rtl871x_cmd.c              |   25 +-
 drivers/staging/rtl8712/rtl871x_eeprom.c           |   22 +-
 drivers/staging/rtl8712/rtl871x_io.c               |    2 +-
 drivers/staging/rtl8712/rtl871x_io.h               |    8 -
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |  234 +-
 drivers/staging/rtl8712/rtl871x_ioctl_rtl.c        |   53 +-
 drivers/staging/rtl8712/rtl871x_ioctl_set.c        |   33 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |  150 +-
 drivers/staging/rtl8712/rtl871x_mlme.h             |    2 +-
 drivers/staging/rtl8712/rtl871x_mp.c               |   39 +-
 drivers/staging/rtl8712/rtl871x_mp.h               |    1 -
 drivers/staging/rtl8712/rtl871x_mp_ioctl.c         |   38 +-
 drivers/staging/rtl8712/rtl871x_pwrctrl.c          |    6 +-
 drivers/staging/rtl8712/rtl871x_recv.c             |   70 +-
 drivers/staging/rtl8712/rtl871x_security.c         |  133 +-
 drivers/staging/rtl8712/rtl871x_sta_mgt.c          |   10 +-
 drivers/staging/rtl8712/rtl871x_xmit.c             |   95 +-
 drivers/staging/rtl8712/usb_halinit.c              |   13 +-
 drivers/staging/rtl8712/usb_intf.c                 |   21 +-
 drivers/staging/rtl8712/usb_ops.c                  |   20 +-
 drivers/staging/rtl8712/usb_ops_linux.c            |   28 +-
 drivers/staging/rtl8712/wifi.h                     |    9 -
 drivers/staging/rtl8712/xmit_linux.c               |    4 +-
 drivers/staging/rtl8723au/core/rtw_ap.c            |  210 +-
 drivers/staging/rtl8723au/core/rtw_cmd.c           |   16 +-
 drivers/staging/rtl8723au/core/rtw_efuse.c         |  320 +-
 drivers/staging/rtl8723au/core/rtw_ieee80211.c     |    9 +-
 drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |    9 +-
 drivers/staging/rtl8723au/core/rtw_recv.c          |    6 +-
 drivers/staging/rtl8723au/core/rtw_security.c      |   17 +-
 drivers/staging/rtl8723au/core/rtw_wlan_util.c     |    4 +-
 .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c    |   88 +-
 drivers/staging/rtl8723au/hal/rtl8723a_cmd.c       |    3 +-
 drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |   46 +-
 drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c    |   55 +-
 drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c    |   48 +-
 drivers/staging/rtl8723au/hal/usb_halinit.c        |    5 +-
 drivers/staging/rtl8723au/include/rtw_cmd.h        |    2 -
 drivers/staging/rts5208/rtsx.c                     |    6 +-
 drivers/staging/rts5208/rtsx_chip.c                |   28 +-
 drivers/staging/skein/skein_api.c                  |   57 +-
 drivers/staging/skein/skein_api.h                  |   48 +-
 drivers/staging/skein/skein_base.c                 |   24 +-
 drivers/staging/skein/skein_block.c                |  380 +-
 drivers/staging/skein/skein_generic.c              |    3 +-
 drivers/staging/slicoss/slic.h                     |   23 +-
 drivers/staging/slicoss/slichw.h                   |   38 +-
 drivers/staging/slicoss/slicoss.c                  |  211 +-
 drivers/staging/sm750fb/ddk750_chip.c              |  323 +-
 drivers/staging/sm750fb/ddk750_chip.h              |    9 -
 drivers/staging/sm750fb/ddk750_display.c           |   50 +-
 drivers/staging/sm750fb/ddk750_display.h           |   69 +-
 drivers/staging/sm750fb/ddk750_help.h              |   13 +-
 drivers/staging/sm750fb/ddk750_hwi2c.c             |  109 +-
 drivers/staging/sm750fb/ddk750_hwi2c.h             |    9 +-
 drivers/staging/sm750fb/ddk750_mode.c              |    3 +-
 drivers/staging/sm750fb/ddk750_power.c             |   71 +-
 drivers/staging/sm750fb/ddk750_power.h             |   17 -
 drivers/staging/sm750fb/ddk750_reg.h               |  244 -
 drivers/staging/sm750fb/ddk750_sii164.c            |    8 +-
 drivers/staging/sm750fb/ddk750_swi2c.c             |  296 +-
 drivers/staging/sm750fb/ddk750_swi2c.h             |   47 +-
 drivers/staging/sm750fb/sm750.c                    |  439 +-
 drivers/staging/sm750fb/sm750.h                    |  134 +-
 drivers/staging/sm750fb/sm750_accel.c              |   51 +-
 drivers/staging/sm750fb/sm750_cursor.c             |   74 +-
 drivers/staging/sm750fb/sm750_help.h               |   37 +-
 drivers/staging/sm750fb/sm750_hw.c                 |  209 +-
 drivers/staging/sm750fb/sm750_hw.h                 |  101 -
 drivers/staging/speakup/buffers.c                  |    3 +-
 drivers/staging/speakup/devsynth.c                 |    4 +-
 drivers/staging/speakup/i18n.c                     |    2 +-
 drivers/staging/speakup/kobjects.c                 |   16 +-
 drivers/staging/speakup/serialio.c                 |    4 +-
 drivers/staging/speakup/speakup_audptr.c           |    2 +-
 drivers/staging/speakup/speakup_dectlk.c           |    3 +-
 drivers/staging/speakup/speakup_soft.c             |    3 +-
 drivers/staging/speakup/spk_priv.h                 |   42 +-
 drivers/staging/speakup/spk_priv_keyinfo.h         |   44 +-
 drivers/staging/speakup/varhandlers.c              |   20 +-
 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    1 -
 .../Documentation/ABI/sysfs-platform-visorchipset  |    2 +
 drivers/staging/unisys/Documentation/overview.txt  |  458 +-
 drivers/staging/unisys/Kconfig                     |    2 +
 drivers/staging/unisys/Makefile                    |    2 +
 drivers/staging/unisys/TODO                        |   25 +-
 drivers/staging/unisys/include/channel.h           |   19 +-
 drivers/staging/unisys/include/diagchannel.h       |    5 -
 drivers/staging/unisys/include/iochannel.h         |   26 +-
 drivers/staging/unisys/include/periodic_work.h     |   12 +-
 drivers/staging/unisys/visorbus/periodic_work.c    |    8 +-
 drivers/staging/unisys/visorbus/visorchannel.c     |    8 +-
 drivers/staging/unisys/visorbus/visorchipset.c     |    2 +-
 drivers/staging/unisys/visorbus/vmcallinterface.h  |   54 +-
 drivers/staging/unisys/visorhba/Kconfig            |   14 +
 drivers/staging/unisys/visorhba/Makefile           |   10 +
 drivers/staging/unisys/visorhba/visorhba_main.c    | 1241 +++
 drivers/staging/unisys/visorinput/Kconfig          |   10 +
 drivers/staging/unisys/visorinput/Makefile         |    7 +
 .../staging/unisys/visorinput/ultrainputreport.h   |   74 +
 drivers/staging/unisys/visorinput/visorinput.c     |  715 ++
 drivers/staging/unisys/visornic/visornic_main.c    |   70 +-
 drivers/staging/vt6655/baseband.c                  |   14 +-
 drivers/staging/vt6655/card.c                      |  398 +-
 drivers/staging/vt6655/desc.h                      |   58 +-
 drivers/staging/vt6655/device.h                    |  149 +-
 drivers/staging/vt6655/device_main.c               |  866 +-
 drivers/staging/vt6655/dpc.c                       |    8 +-
 drivers/staging/vt6655/dpc.h                       |    2 +-
 drivers/staging/vt6655/mac.c                       |    3 +-
 drivers/staging/vt6655/rf.c                        |   12 +-
 drivers/staging/vt6655/rf.h                        |    4 +-
 drivers/staging/vt6655/rxtx.c                      |    6 +-
 drivers/staging/vt6656/baseband.c                  |    2 -
 drivers/staging/vt6656/card.c                      |    7 +-
 drivers/staging/vt6656/device.h                    |    2 +
 drivers/staging/vt6656/int.c                       |   14 +-
 drivers/staging/vt6656/main_usb.c                  |   28 +-
 drivers/staging/vt6656/power.c                     |   10 +-
 drivers/staging/vt6656/rxtx.c                      |    5 +-
 drivers/staging/vt6656/usbpipe.c                   |    6 -
 drivers/staging/wilc1000/Kconfig                   |   24 +-
 drivers/staging/wilc1000/Makefile                  |   14 +-
 drivers/staging/wilc1000/coreconfigurator.c        | 1620 +---
 drivers/staging/wilc1000/coreconfigurator.h        |   80 +-
 drivers/staging/wilc1000/host_interface.c          | 8313 +++++++-------------
 drivers/staging/wilc1000/host_interface.h          |  594 +-
 drivers/staging/wilc1000/linux_mon.c               |  218 +-
 drivers/staging/wilc1000/linux_wlan.c              | 1625 +---
 drivers/staging/wilc1000/linux_wlan_common.h       |   22 +-
 drivers/staging/wilc1000/linux_wlan_sdio.c         |   51 +-
 drivers/staging/wilc1000/linux_wlan_spi.c          |  116 +-
 drivers/staging/wilc1000/linux_wlan_spi.h          |    6 +-
 drivers/staging/wilc1000/wilc_errorsupport.h       |   67 -
 drivers/staging/wilc1000/wilc_exported_buf.c       |   71 -
 drivers/staging/wilc1000/wilc_memory.c             |   16 -
 drivers/staging/wilc1000/wilc_memory.h             |   66 -
 drivers/staging/wilc1000/wilc_msgqueue.c           |  160 +-
 drivers/staging/wilc1000/wilc_msgqueue.h           |   27 +-
 drivers/staging/wilc1000/wilc_oswrapper.h          |   29 -
 drivers/staging/wilc1000/wilc_platform.h           |   48 -
 drivers/staging/wilc1000/wilc_sdio.c               |  154 +-
 drivers/staging/wilc1000/wilc_spi.c                |  383 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  | 1387 ++--
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.h  |   94 +-
 drivers/staging/wilc1000/wilc_wfi_netdevice.h      |  121 +-
 drivers/staging/wilc1000/wilc_wlan.c               |  951 +--
 drivers/staging/wilc1000/wilc_wlan.h               |   99 +-
 drivers/staging/wilc1000/wilc_wlan_cfg.c           |  189 +-
 drivers/staging/wilc1000/wilc_wlan_cfg.h           |   22 +-
 drivers/staging/wilc1000/wilc_wlan_if.h            | 1455 ++--
 drivers/staging/wlan-ng/cfg80211.c                 |   15 -
 drivers/staging/wlan-ng/hfa384x_usb.c              |    2 +-
 drivers/staging/wlan-ng/p80211conv.c               |   50 +-
 drivers/staging/wlan-ng/p80211conv.h               |    7 +-
 drivers/staging/wlan-ng/p80211meta.h               |   90 -
 drivers/staging/wlan-ng/prism2fw.c                 |   13 +-
 drivers/staging/wlan-ng/prism2sta.c                | 1027 +--
 drivers/staging/wlan-ng/prism2usb.c                |    8 +-
 drivers/staging/xgifb/XGI_main_26.c                |    6 +-
 drivers/staging/xgifb/vb_init.c                    |  103 +-
 drivers/staging/xgifb/vb_util.h                    |    4 +-
 drivers/vme/bridges/vme_ca91cx42.c                 |    5 +-
 drivers/vme/bridges/vme_tsi148.c                   |  172 +-
 drivers/vme/vme.c                                  |   90 +
 drivers/vme/vme_bridge.h                           |   21 +-
 include/linux/fb.h                                 |    5 +-
 include/linux/iio/common/st_sensors.h              |    4 +
 include/linux/iio/iio.h                            |    3 +
 include/linux/iio/triggered_event.h                |   11 +
 include/uapi/linux/iio/types.h                     |    4 +
 include/uapi/rdma/hfi/hfi1_user.h                  |    4 +-
 tools/iio/generic_buffer.c                         |    9 +
 tools/iio/iio_event_monitor.c                      |    6 +-
 990 files changed, 38366 insertions(+), 57692 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-hi8435
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x
 create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-meas-spec
 create mode 100644 Documentation/devicetree/bindings/iio/accel/mma8452.txt
 create mode 100644 Documentation/devicetree/bindings/iio/adc/hi8435.txt
 create mode 100644 Documentation/devicetree/bindings/iio/light/apds9960.txt
 create mode 100644 Documentation/devicetree/bindings/iio/light/us5182d.txt
 rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (81%)
 create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
 create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
 create mode 100644 drivers/iio/accel/bmc150-accel.h
 create mode 100644 drivers/iio/accel/mxc4005.c
 create mode 100644 drivers/iio/adc/hi8435.c
 create mode 100644 drivers/iio/buffer/Kconfig
 create mode 100644 drivers/iio/buffer/Makefile
 rename drivers/iio/{buffer_cb.c => buffer/industrialio-buffer-cb.c} (89%)
 rename drivers/iio/{ => buffer}/industrialio-triggered-buffer.c (100%)
 rename drivers/iio/{ => buffer}/kfifo_buf.c (100%)
 create mode 100644 drivers/iio/chemical/Kconfig
 create mode 100644 drivers/iio/chemical/Makefile
 create mode 100644 drivers/iio/chemical/vz89x.c
 create mode 100644 drivers/iio/common/ms_sensors/Kconfig
 create mode 100644 drivers/iio/common/ms_sensors/Makefile
 create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.c
 create mode 100644 drivers/iio/common/ms_sensors/ms_sensors_i2c.h
 create mode 100644 drivers/iio/gyro/bmg160.h
 rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (75%)
 create mode 100644 drivers/iio/gyro/bmg160_i2c.c
 create mode 100644 drivers/iio/gyro/bmg160_spi.c
 create mode 100644 drivers/iio/humidity/hdc100x.c
 create mode 100644 drivers/iio/humidity/htu21.c
 create mode 100644 drivers/iio/industrialio-triggered-event.c
 create mode 100644 drivers/iio/light/apds9960.c
 create mode 100644 drivers/iio/light/us5182d.c
 create mode 100644 drivers/iio/potentiometer/Kconfig
 create mode 100644 drivers/iio/potentiometer/Makefile
 create mode 100644 drivers/iio/potentiometer/mcp4531.c
 create mode 100644 drivers/iio/pressure/ms5637.c
 create mode 100644 drivers/iio/proximity/pulsedlight-lidar-lite-v2.c
 create mode 100644 drivers/iio/temperature/tsys01.c
 create mode 100644 drivers/iio/temperature/tsys02d.c
 delete mode 100644 drivers/staging/comedi/drivers/unioxx5.c
 create mode 100644 drivers/staging/fbtft/fb_st7789v.c
 delete mode 100644 drivers/staging/ft1000/Kconfig
 delete mode 100644 drivers/staging/ft1000/Makefile
 delete mode 100644 drivers/staging/ft1000/TODO
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/Makefile
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/boot.h
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.h
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000.img
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c
 delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/Makefile
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_download.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.c
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft1000_usb.h
 delete mode 100644 drivers/staging/ft1000/ft1000-usb/ft3000.img
 delete mode 100644 drivers/staging/ft1000/ft1000.h
 create mode 100644 drivers/staging/lustre/lnet/lnet/nidstrings.c
 delete mode 100644 drivers/staging/lustre/lustre/include/dt_object.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/libiam.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lustre/lustre_lfsck_user.h
 delete mode 100644 drivers/staging/lustre/lustre/include/lustre_capa.h
 delete mode 100644 drivers/staging/lustre/lustre/include/obd_cache.h
 delete mode 100644 drivers/staging/lustre/lustre/libcfs/nidstrings.c
 delete mode 100644 drivers/staging/lustre/lustre/llite/llite_capa.c
 delete mode 100644 drivers/staging/lustre/lustre/obdclass/capa.c
 delete mode 100644 drivers/staging/lustre/lustre/obdclass/dt_object.c
 delete mode 100644 drivers/staging/octeon/ethernet-xaui.c
 create mode 100644 drivers/staging/rtl8188eu/include/mon.h
 create mode 100644 drivers/staging/rtl8188eu/os_dep/mon.c
 delete mode 100644 drivers/staging/sm750fb/sm750_hw.h
 create mode 100644 drivers/staging/unisys/visorhba/Kconfig
 create mode 100644 drivers/staging/unisys/visorhba/Makefile
 create mode 100644 drivers/staging/unisys/visorhba/visorhba_main.c
 create mode 100644 drivers/staging/unisys/visorinput/Kconfig
 create mode 100644 drivers/staging/unisys/visorinput/Makefile
 create mode 100644 drivers/staging/unisys/visorinput/ultrainputreport.h
 create mode 100644 drivers/staging/unisys/visorinput/visorinput.c
 delete mode 100644 drivers/staging/wilc1000/wilc_errorsupport.h
 delete mode 100644 drivers/staging/wilc1000/wilc_exported_buf.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.c
 delete mode 100644 drivers/staging/wilc1000/wilc_memory.h
 delete mode 100644 drivers/staging/wilc1000/wilc_oswrapper.h
 delete mode 100644 drivers/staging/wilc1000/wilc_platform.h
 delete mode 100644 drivers/staging/wlan-ng/p80211meta.h
 create mode 100644 include/linux/iio/triggered_event.h
Merging char-misc/char-misc-next (e2d8680741ed fpga: socfpga: Fix check of return value of devm_request_irq)
$ git merge char-misc/char-misc-next
Auto-merging scripts/mod/file2alias.c
Auto-merging scripts/mod/devicetable-offsets.c
Removing include/linux/msm_mdp.h
Auto-merging include/linux/mod_devicetable.h
Auto-merging drivers/vme/vme_bridge.h
Auto-merging drivers/spmi/spmi-pmic-arb.c
Removing drivers/misc/mic/host/mic_sysfs.c
Auto-merging drivers/misc/mei/mei_dev.h
Auto-merging drivers/Makefile
Auto-merging drivers/Kconfig
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/configfs-stp-policy      |   48 +
 .../ABI/testing/sysfs-bus-coresight-devices-etm3x  |   83 +-
 .../ABI/testing/sysfs-bus-intel_th-devices-gth     |   49 +
 .../ABI/testing/sysfs-bus-intel_th-devices-msc     |   33 +
 .../ABI/testing/sysfs-bus-intel_th-devices-pti     |   24 +
 .../ABI/testing/sysfs-bus-intel_th-output-devices  |   13 +
 Documentation/ABI/testing/sysfs-bus-mei            |    7 +
 Documentation/ABI/testing/sysfs-class-fpga-manager |   37 +
 Documentation/ABI/testing/sysfs-class-mic.txt      |   29 +-
 Documentation/ABI/testing/sysfs-class-stm          |   14 +
 Documentation/ABI/testing/sysfs-class-stm_source   |   11 +
 .../bindings/fpga/xilinx-zynq-fpga-mgr.txt         |   19 +
 Documentation/devicetree/bindings/misc/sram.txt    |   16 +
 .../devicetree/bindings/nvmem/imx-ocotp.txt        |   20 +
 .../devicetree/bindings/nvmem/mxs-ocotp.txt        |   25 +
 .../devicetree/bindings/nvmem/rockchip-efuse.txt   |   38 +
 .../devicetree/bindings/nvmem/vf610-ocotp.txt      |   19 +
 Documentation/devicetree/bindings/w1/omap-hdq.txt  |    7 +-
 Documentation/fpga/fpga-mgr.txt                    |  171 ++
 Documentation/ioctl/ioctl-number.txt               |    3 +
 Documentation/mic/mic_overview.txt                 |   31 +-
 Documentation/mic/mpssd/mpss                       |    4 +-
 Documentation/mic/mpssd/mpssd.c                    |  362 ++--
 Documentation/mic/mpssd/mpssd.h                    |    1 +
 Documentation/trace/intel_th.txt                   |   99 +
 Documentation/trace/stm.txt                        |   80 +
 Documentation/w1/masters/omap-hdq                  |    6 +
 MAINTAINERS                                        |   37 +
 arch/arm/boot/dts/zynq-7000.dtsi                   |    5 +
 drivers/Kconfig                                    |    6 +
 drivers/Makefile                                   |    3 +
 drivers/char/efirtc.c                              |   13 +-
 drivers/char/hpet.c                                |   25 +-
 drivers/char/snsc.c                                |    5 +-
 drivers/dma/mic_x100_dma.c                         |   39 +-
 drivers/extcon/extcon-arizona.c                    |   58 +-
 drivers/extcon/extcon-axp288.c                     |   35 +-
 drivers/extcon/extcon-gpio.c                       |  130 +-
 drivers/extcon/extcon-max14577.c                   |   17 +-
 drivers/extcon/extcon-max77693.c                   |   32 +-
 drivers/extcon/extcon-max77843.c                   |   27 +-
 drivers/extcon/extcon-max8997.c                    |   21 +-
 drivers/extcon/extcon-rt8973a.c                    |    7 +-
 drivers/extcon/extcon-sm5502.c                     |    7 +-
 drivers/extcon/extcon.c                            |   61 +-
 drivers/fpga/Kconfig                               |   29 +
 drivers/fpga/Makefile                              |   10 +
 drivers/fpga/fpga-mgr.c                            |  380 ++++
 drivers/fpga/socfpga.c                             |  616 ++++++
 drivers/fpga/zynq-fpga.c                           |  514 +++++
 drivers/hwtracing/coresight/coresight-etm3x.c      |  107 +-
 drivers/hwtracing/coresight/coresight-etm4x.c      |   22 +-
 drivers/hwtracing/coresight/coresight.c            |    5 +
 drivers/hwtracing/intel_th/Kconfig                 |   72 +
 drivers/hwtracing/intel_th/Makefile                |   18 +
 drivers/hwtracing/intel_th/core.c                  |  692 +++++++
 drivers/hwtracing/intel_th/debug.c                 |   36 +
 drivers/hwtracing/intel_th/debug.h                 |   34 +
 drivers/hwtracing/intel_th/gth.c                   |  706 +++++++
 drivers/hwtracing/intel_th/gth.h                   |   66 +
 drivers/hwtracing/intel_th/intel_th.h              |  244 +++
 drivers/hwtracing/intel_th/msu.c                   | 1509 +++++++++++++++
 drivers/hwtracing/intel_th/msu.h                   |  116 ++
 drivers/hwtracing/intel_th/pci.c                   |   86 +
 drivers/hwtracing/intel_th/pti.c                   |  252 +++
 drivers/hwtracing/intel_th/pti.h                   |   29 +
 drivers/hwtracing/intel_th/sth.c                   |  259 +++
 drivers/hwtracing/intel_th/sth.h                   |   42 +
 drivers/hwtracing/stm/Kconfig                      |   26 +
 drivers/hwtracing/stm/Makefile                     |    9 +
 drivers/hwtracing/stm/console.c                    |   80 +
 drivers/hwtracing/stm/core.c                       | 1032 ++++++++++
 drivers/hwtracing/stm/dummy_stm.c                  |   66 +
 drivers/hwtracing/stm/policy.c                     |  529 ++++++
 drivers/hwtracing/stm/stm.h                        |   87 +
 drivers/mcb/mcb-core.c                             |    1 +
 drivers/mcb/mcb-pci.c                              |    1 +
 drivers/memory/fsl-corenet-cf.c                    |    1 +
 drivers/memory/ti-aemif.c                          |    1 +
 drivers/misc/Kconfig                               |    2 +-
 drivers/misc/ad525x_dpot-i2c.c                     |    1 -
 drivers/misc/genwqe/card_base.h                    |    2 +-
 drivers/misc/genwqe/card_ddcb.c                    |    2 +-
 drivers/misc/genwqe/card_dev.c                     |    4 +-
 drivers/misc/genwqe/card_utils.c                   |    5 +-
 drivers/misc/hpilo.c                               |    6 +-
 drivers/misc/kgdbts.c                              |   10 +-
 drivers/misc/lkdtm.c                               |    8 +-
 drivers/misc/mei/amthif.c                          |    2 +-
 drivers/misc/mei/bus-fixup.c                       |    4 +-
 drivers/misc/mei/bus.c                             |  218 ++-
 drivers/misc/mei/client.h                          |   12 +
 drivers/misc/mei/debugfs.c                         |    2 +-
 drivers/misc/mei/hbm.c                             |    6 +-
 drivers/misc/mei/hw-me.c                           |    4 +-
 drivers/misc/mei/init.c                            |    4 +-
 drivers/misc/mei/interrupt.c                       |    4 +
 drivers/misc/mei/mei_dev.h                         |   19 +-
 drivers/misc/mic/Kconfig                           |   25 +-
 drivers/misc/mic/Makefile                          |    2 +
 drivers/misc/mic/bus/Makefile                      |    1 +
 drivers/misc/mic/bus/cosm_bus.c                    |  141 ++
 drivers/misc/mic/bus/cosm_bus.h                    |  134 ++
 drivers/misc/mic/bus/mic_bus.c                     |   24 +-
 drivers/misc/mic/bus/scif_bus.c                    |    9 +-
 drivers/misc/mic/bus/scif_bus.h                    |    6 +-
 drivers/misc/mic/card/mic_device.c                 |   88 +-
 drivers/misc/mic/card/mic_x100.c                   |    2 +-
 drivers/misc/mic/common/mic_dev.h                  |   13 +
 drivers/misc/mic/cosm/Makefile                     |   10 +
 drivers/misc/mic/cosm/cosm_debugfs.c               |  156 ++
 drivers/misc/mic/cosm/cosm_main.c                  |  388 ++++
 drivers/misc/mic/cosm/cosm_main.h                  |   70 +
 drivers/misc/mic/cosm/cosm_scif_server.c           |  405 ++++
 drivers/misc/mic/cosm/cosm_sysfs.c                 |  461 +++++
 drivers/misc/mic/cosm_client/Makefile              |    7 +
 drivers/misc/mic/cosm_client/cosm_scif_client.c    |  275 +++
 drivers/misc/mic/host/Makefile                     |    1 -
 drivers/misc/mic/host/mic_boot.c                   |  317 +---
 drivers/misc/mic/host/mic_debugfs.c                |  114 +-
 drivers/misc/mic/host/mic_device.h                 |   88 +-
 drivers/misc/mic/host/mic_fops.c                   |    4 +-
 drivers/misc/mic/host/mic_intr.c                   |   46 +-
 drivers/misc/mic/host/mic_main.c                   |  223 +--
 drivers/misc/mic/host/mic_smpt.c                   |   30 +-
 drivers/misc/mic/host/mic_sysfs.c                  |  459 -----
 drivers/misc/mic/host/mic_virtio.c                 |   17 +-
 drivers/misc/mic/host/mic_virtio.h                 |    2 +-
 drivers/misc/mic/host/mic_x100.c                   |   46 +-
 drivers/misc/mic/scif/Makefile                     |    5 +
 drivers/misc/mic/scif/scif_api.c                   |  234 ++-
 drivers/misc/mic/scif/scif_debugfs.c               |   85 +-
 drivers/misc/mic/scif/scif_dma.c                   | 1979 ++++++++++++++++++++
 drivers/misc/mic/scif/scif_epd.c                   |   26 +-
 drivers/misc/mic/scif/scif_epd.h                   |   50 +
 drivers/misc/mic/scif/scif_fd.c                    |  178 +-
 drivers/misc/mic/scif/scif_fence.c                 |  771 ++++++++
 drivers/misc/mic/scif/scif_main.c                  |  111 +-
 drivers/misc/mic/scif/scif_main.h                  |   37 +-
 drivers/misc/mic/scif/scif_map.h                   |   25 +-
 drivers/misc/mic/scif/scif_mmap.c                  |  699 +++++++
 drivers/misc/mic/scif/scif_nm.c                    |   20 +-
 drivers/misc/mic/scif/scif_nodeqp.c                |  149 +-
 drivers/misc/mic/scif/scif_nodeqp.h                |   42 +-
 drivers/misc/mic/scif/scif_peer_bus.c              |  179 +-
 drivers/misc/mic/scif/scif_peer_bus.h              |   42 +-
 drivers/misc/mic/scif/scif_rma.c                   | 1775 ++++++++++++++++++
 drivers/misc/mic/scif/scif_rma.h                   |  464 +++++
 drivers/misc/mic/scif/scif_rma_list.c              |  291 +++
 drivers/misc/mic/scif/scif_rma_list.h              |   57 +
 drivers/misc/sgi-gru/gruhandles.c                  |    6 -
 drivers/misc/sgi-gru/gruhandles.h                  |    1 -
 drivers/misc/sgi-gru/grukdump.c                    |   16 +-
 drivers/misc/sgi-gru/grukservices.c                |   15 +-
 drivers/misc/sgi-gru/grumain.c                     |    4 +-
 drivers/misc/sgi-gru/grutlbpurge.c                 |   25 +-
 drivers/misc/sram.c                                |  196 +-
 drivers/misc/ti-st/st_core.c                       |   18 +-
 drivers/misc/vmw_balloon.c                         |  843 +++++++--
 drivers/misc/vmw_vmci/vmci_datagram.c              |    3 +-
 drivers/nfc/mei_phy.c                              |   31 +-
 drivers/nfc/mei_phy.h                              |    4 +-
 drivers/nfc/microread/mei.c                        |   14 +-
 drivers/nfc/pn544/mei.c                            |   14 +-
 drivers/nvmem/Kconfig                              |   42 +
 drivers/nvmem/Makefile                             |    8 +
 drivers/nvmem/imx-ocotp.c                          |  154 ++
 drivers/nvmem/mxs-ocotp.c                          |  257 +++
 drivers/nvmem/rockchip-efuse.c                     |  186 ++
 drivers/nvmem/vf610-ocotp.c                        |  302 +++
 drivers/pcmcia/ds.c                                |    4 +-
 drivers/spmi/spmi-pmic-arb.c                       |   11 +-
 drivers/spmi/spmi.c                                |    5 +-
 drivers/uio/uio.c                                  |    1 +
 drivers/uio/uio_fsl_elbc_gpcm.c                    |    1 +
 drivers/vme/vme_bridge.h                           |    4 +-
 drivers/w1/masters/omap_hdq.c                      |  224 ++-
 drivers/w1/masters/w1-gpio.c                       |   20 +-
 drivers/w1/w1_int.c                                |    3 +-
 include/linux/coresight.h                          |    2 +-
 include/linux/dmaengine.h                          |    4 +
 include/linux/extcon.h                             |   62 +-
 include/linux/extcon/extcon-gpio.h                 |   24 +-
 include/linux/fpga/fpga-mgr.h                      |  127 ++
 include/linux/mei_cl_bus.h                         |   40 +-
 include/linux/mic_bus.h                            |    3 +-
 include/linux/mod_devicetable.h                    |    7 +-
 include/linux/msm_mdp.h                            |   79 -
 include/linux/scif.h                               |  366 +++-
 include/linux/spmi.h                               |    4 +-
 include/linux/stm.h                                |  126 ++
 include/linux/ti_wilink_st.h                       |    1 +
 include/linux/vme.h                                |    3 +
 include/uapi/linux/mic_common.h                    |   16 +-
 include/uapi/linux/scif_ioctl.h                    |   85 +
 include/uapi/linux/stm.h                           |   50 +
 scripts/mod/devicetable-offsets.c                  |    1 +
 scripts/mod/file2alias.c                           |   12 +-
 scripts/ver_linux                                  |  223 ++-
 199 files changed, 21579 insertions(+), 2620 deletions(-)
 create mode 100644 Documentation/ABI/testing/configfs-stp-policy
 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-gth
 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-msc
 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-devices-pti
 create mode 100644 Documentation/ABI/testing/sysfs-bus-intel_th-output-devices
 create mode 100644 Documentation/ABI/testing/sysfs-class-fpga-manager
 create mode 100644 Documentation/ABI/testing/sysfs-class-stm
 create mode 100644 Documentation/ABI/testing/sysfs-class-stm_source
 create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-zynq-fpga-mgr.txt
 create mode 100644 Documentation/devicetree/bindings/nvmem/imx-ocotp.txt
 create mode 100644 Documentation/devicetree/bindings/nvmem/mxs-ocotp.txt
 create mode 100644 Documentation/devicetree/bindings/nvmem/rockchip-efuse.txt
 create mode 100644 Documentation/devicetree/bindings/nvmem/vf610-ocotp.txt
 create mode 100644 Documentation/fpga/fpga-mgr.txt
 create mode 100644 Documentation/trace/intel_th.txt
 create mode 100644 Documentation/trace/stm.txt
 create mode 100644 drivers/fpga/Kconfig
 create mode 100644 drivers/fpga/Makefile
 create mode 100644 drivers/fpga/fpga-mgr.c
 create mode 100644 drivers/fpga/socfpga.c
 create mode 100644 drivers/fpga/zynq-fpga.c
 create mode 100644 drivers/hwtracing/intel_th/Kconfig
 create mode 100644 drivers/hwtracing/intel_th/Makefile
 create mode 100644 drivers/hwtracing/intel_th/core.c
 create mode 100644 drivers/hwtracing/intel_th/debug.c
 create mode 100644 drivers/hwtracing/intel_th/debug.h
 create mode 100644 drivers/hwtracing/intel_th/gth.c
 create mode 100644 drivers/hwtracing/intel_th/gth.h
 create mode 100644 drivers/hwtracing/intel_th/intel_th.h
 create mode 100644 drivers/hwtracing/intel_th/msu.c
 create mode 100644 drivers/hwtracing/intel_th/msu.h
 create mode 100644 drivers/hwtracing/intel_th/pci.c
 create mode 100644 drivers/hwtracing/intel_th/pti.c
 create mode 100644 drivers/hwtracing/intel_th/pti.h
 create mode 100644 drivers/hwtracing/intel_th/sth.c
 create mode 100644 drivers/hwtracing/intel_th/sth.h
 create mode 100644 drivers/hwtracing/stm/Kconfig
 create mode 100644 drivers/hwtracing/stm/Makefile
 create mode 100644 drivers/hwtracing/stm/console.c
 create mode 100644 drivers/hwtracing/stm/core.c
 create mode 100644 drivers/hwtracing/stm/dummy_stm.c
 create mode 100644 drivers/hwtracing/stm/policy.c
 create mode 100644 drivers/hwtracing/stm/stm.h
 create mode 100644 drivers/misc/mic/bus/cosm_bus.c
 create mode 100644 drivers/misc/mic/bus/cosm_bus.h
 create mode 100644 drivers/misc/mic/cosm/Makefile
 create mode 100644 drivers/misc/mic/cosm/cosm_debugfs.c
 create mode 100644 drivers/misc/mic/cosm/cosm_main.c
 create mode 100644 drivers/misc/mic/cosm/cosm_main.h
 create mode 100644 drivers/misc/mic/cosm/cosm_scif_server.c
 create mode 100644 drivers/misc/mic/cosm/cosm_sysfs.c
 create mode 100644 drivers/misc/mic/cosm_client/Makefile
 create mode 100644 drivers/misc/mic/cosm_client/cosm_scif_client.c
 delete mode 100644 drivers/misc/mic/host/mic_sysfs.c
 create mode 100644 drivers/misc/mic/scif/scif_dma.c
 create mode 100644 drivers/misc/mic/scif/scif_fence.c
 create mode 100644 drivers/misc/mic/scif/scif_mmap.c
 create mode 100644 drivers/misc/mic/scif/scif_rma.c
 create mode 100644 drivers/misc/mic/scif/scif_rma.h
 create mode 100644 drivers/misc/mic/scif/scif_rma_list.c
 create mode 100644 drivers/misc/mic/scif/scif_rma_list.h
 create mode 100644 drivers/nvmem/imx-ocotp.c
 create mode 100644 drivers/nvmem/mxs-ocotp.c
 create mode 100644 drivers/nvmem/rockchip-efuse.c
 create mode 100644 drivers/nvmem/vf610-ocotp.c
 create mode 100644 include/linux/fpga/fpga-mgr.h
 delete mode 100644 include/linux/msm_mdp.h
 create mode 100644 include/linux/stm.h
 create mode 100644 include/uapi/linux/stm.h
Merging extcon/extcon-next (11eecf910bd8 extcon: Modify the id and name of external connector)
$ git merge extcon/extcon-next
Already up-to-date.
Merging cgroup/for-next (d57456753787 cgroup: fix race condition around termination check in css_task_iter_next())
$ git merge cgroup/for-next
Resolved 'kernel/events/core.c' using previous resolution.
Resolved 'kernel/sched/core.c' using previous resolution.
Auto-merging mm/memcontrol.c
Auto-merging kernel/sched/core.c
CONFLICT (content): Merge conflict in kernel/sched/core.c
Auto-merging kernel/fork.c
Auto-merging kernel/events/core.c
CONFLICT (content): Merge conflict in kernel/events/core.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/memcontrol.h
Auto-merging include/linux/jump_label.h
Auto-merging include/linux/init_task.h
Auto-merging include/linux/backing-dev.h
Auto-merging block/blk-cgroup.c
Auto-merging Documentation/cgroups/unified-hierarchy.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master abf82ef11e5b] Merge remote-tracking branch 'cgroup/for-next'
$ git diff -M --stat --summary HEAD^..
 Documentation/cgroups/cgroups.txt           |    4 +
 Documentation/cgroups/unified-hierarchy.txt |   25 +-
 block/blk-cgroup.c                          |    1 +
 block/blk-throttle.c                        |    2 +-
 block/cfq-iosched.c                         |    4 +-
 include/linux/backing-dev.h                 |    5 +-
 include/linux/cgroup-defs.h                 |   76 +-
 include/linux/cgroup.h                      |  129 +--
 include/linux/hugetlb_cgroup.h              |    4 +-
 include/linux/init_task.h                   |    8 -
 include/linux/jump_label.h                  |   18 +-
 include/linux/memcontrol.h                  |    8 +-
 include/linux/sched.h                       |   12 -
 kernel/cgroup.c                             | 1297 +++++++++++++++------------
 kernel/cgroup_pids.c                        |    8 +-
 kernel/cpuset.c                             |   72 +-
 kernel/events/core.c                        |    8 -
 kernel/fork.c                               |    5 +-
 kernel/sched/core.c                         |    8 -
 mm/memcontrol.c                             |   27 +-
 20 files changed, 951 insertions(+), 770 deletions(-)
$ git am -3 ../patches/vmscan-build-fix.patch
Applying: vmscan build fix
$ git reset HEAD^
Unstaged changes after reset:
M       mm/vmscan.c
$ git add -A .
$ git commit -v -a --amend
[master 200f1a14cbb6] Merge remote-tracking branch 'cgroup/for-next'
 Date: Mon Nov 2 13:49:04 2015 +1100
Merging scsi/for-next (5575a6ea316b Merge branch 'fixes' into for-next)
$ git merge scsi/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                        |   4 +-
 drivers/scsi/be2iscsi/Kconfig      |   4 +-
 drivers/scsi/be2iscsi/Makefile     |   2 +-
 drivers/scsi/be2iscsi/be.h         |   4 +-
 drivers/scsi/be2iscsi/be_cmds.c    |   4 +-
 drivers/scsi/be2iscsi/be_cmds.h    |   4 +-
 drivers/scsi/be2iscsi/be_iscsi.c   |   4 +-
 drivers/scsi/be2iscsi/be_main.c    |   8 +-
 drivers/scsi/be2iscsi/be_main.h    |   6 +-
 drivers/scsi/be2iscsi/be_mgmt.c    |   4 +-
 drivers/scsi/be2iscsi/be_mgmt.h    |   4 +-
 drivers/scsi/bnx2fc/bnx2fc_fcoe.c  |   1 -
 drivers/scsi/fnic/fnic_fcs.c       |  46 ++++++++--
 drivers/scsi/fnic/fnic_scsi.c      |  16 ++++
 drivers/scsi/lpfc/lpfc.h           |   8 +-
 drivers/scsi/lpfc/lpfc_attr.c      |  23 +++--
 drivers/scsi/lpfc/lpfc_bsg.c       |  20 ----
 drivers/scsi/lpfc/lpfc_ct.c        |  11 ++-
 drivers/scsi/lpfc/lpfc_els.c       | 100 ++++++--------------
 drivers/scsi/lpfc/lpfc_hbadisc.c   |  27 ++++--
 drivers/scsi/lpfc/lpfc_hw.h        |   6 +-
 drivers/scsi/lpfc/lpfc_init.c      |  36 +++++---
 drivers/scsi/lpfc/lpfc_mbox.c      |  19 ++--
 drivers/scsi/lpfc/lpfc_nportdisc.c |   2 -
 drivers/scsi/lpfc/lpfc_scsi.c      |  14 +--
 drivers/scsi/lpfc/lpfc_sli.c       |  10 +-
 drivers/scsi/lpfc/lpfc_sli4.h      |   1 -
 drivers/scsi/lpfc/lpfc_version.h   |   2 +-
 drivers/scsi/scsi_devinfo.c        | 181 ++++++++++++++++---------------------
 29 files changed, 267 insertions(+), 304 deletions(-)
Merging target-updates/for-next (517982229f78 configfs: remove old API)
$ git merge target-updates/for-next
Auto-merging samples/configfs/configfs_sample.c
Removing include/target/target_core_fabric_configfs.h
Auto-merging include/target/target_core_base.h
Removing include/target/configfs_macros.h
Auto-merging drivers/vhost/scsi.c
Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
Auto-merging drivers/usb/gadget/function/f_uac2.c
Auto-merging drivers/usb/gadget/function/f_uac1.c
Auto-merging drivers/usb/gadget/function/f_subset.c
Auto-merging drivers/usb/gadget/function/f_sourcesink.c
Auto-merging drivers/usb/gadget/function/f_serial.c
Auto-merging drivers/usb/gadget/function/f_rndis.c
Auto-merging drivers/usb/gadget/function/f_printer.c
Auto-merging drivers/usb/gadget/function/f_phonet.c
Auto-merging drivers/usb/gadget/function/f_obex.c
Auto-merging drivers/usb/gadget/function/f_ncm.c
Auto-merging drivers/usb/gadget/function/f_midi.c
Auto-merging drivers/usb/gadget/function/f_mass_storage.c
Auto-merging drivers/usb/gadget/function/f_loopback.c
Auto-merging drivers/usb/gadget/function/f_hid.c
Auto-merging drivers/usb/gadget/function/f_eem.c
Auto-merging drivers/usb/gadget/function/f_ecm.c
Auto-merging drivers/usb/gadget/function/f_acm.c
Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
Removing Documentation/filesystems/configfs/configfs_example_explicit.c
Removing Documentation/filesystems/configfs/Makefile
Merge made by the 'recursive' strategy.
 Documentation/filesystems/Makefile                 |    2 -
 Documentation/filesystems/configfs/Makefile        |    3 -
 Documentation/filesystems/configfs/configfs.txt    |   38 +-
 .../configfs/configfs_example_explicit.c           |  483 --------
 Documentation/target/tcm_mod_builder.py            |   17 -
 drivers/infiniband/ulp/srpt/ib_srpt.c              |   78 +-
 drivers/misc/spear13xx_pcie_gadget.c               |  216 ++--
 drivers/net/netconsole.c                           |  271 +++--
 drivers/scsi/qla2xxx/tcm_qla2xxx.c                 |  153 +--
 drivers/target/iscsi/iscsi_target_configfs.c       |  791 +++++--------
 drivers/target/iscsi/iscsi_target_stat.c           |  666 +++++------
 drivers/target/loopback/tcm_loop.c                 |   60 +-
 drivers/target/sbp/sbp_target.c                    |   87 +-
 drivers/target/target_core_configfs.c              | 1209 +++++++-------------
 drivers/target/target_core_fabric_configfs.c       |  275 ++---
 drivers/target/target_core_internal.h              |    3 +
 drivers/target/target_core_stat.c                  |  918 ++++++---------
 drivers/target/tcm_fc/tfc_cmd.c                    |    1 -
 drivers/target/tcm_fc/tfc_conf.c                   |   44 +-
 drivers/target/tcm_fc/tfc_io.c                     |    1 -
 drivers/target/tcm_fc/tfc_sess.c                   |    1 -
 drivers/usb/gadget/configfs.c                      |  295 ++---
 drivers/usb/gadget/function/f_acm.c                |   26 +-
 drivers/usb/gadget/function/f_ecm.c                |    8 +-
 drivers/usb/gadget/function/f_eem.c                |    8 +-
 drivers/usb/gadget/function/f_hid.c                |   34 +-
 drivers/usb/gadget/function/f_loopback.c           |   31 +-
 drivers/usb/gadget/function/f_mass_storage.c       |  119 +-
 drivers/usb/gadget/function/f_midi.c               |   37 +-
 drivers/usb/gadget/function/f_ncm.c                |    8 +-
 drivers/usb/gadget/function/f_obex.c               |   26 +-
 drivers/usb/gadget/function/f_phonet.c             |   25 +-
 drivers/usb/gadget/function/f_printer.c            |   30 +-
 drivers/usb/gadget/function/f_rndis.c              |    8 +-
 drivers/usb/gadget/function/f_serial.c             |   26 +-
 drivers/usb/gadget/function/f_sourcesink.c         |   83 +-
 drivers/usb/gadget/function/f_subset.c             |    8 +-
 drivers/usb/gadget/function/f_uac1.c               |   39 +-
 drivers/usb/gadget/function/f_uac2.c               |   28 +-
 drivers/usb/gadget/function/u_ether_configfs.h     |   44 +-
 drivers/usb/gadget/function/uvc_configfs.c         |  387 +++----
 drivers/usb/gadget/legacy/tcm_usb_gadget.c         |   44 +-
 drivers/vhost/scsi.c                               |   41 +-
 drivers/xen/xen-scsiback.c                         |   32 +-
 fs/configfs/file.c                                 |   12 +-
 fs/dlm/config.c                                    |  288 ++---
 fs/ocfs2/cluster/heartbeat.c                       |  205 +---
 fs/ocfs2/cluster/nodemanager.c                     |  281 ++---
 include/linux/configfs.h                           |   97 +-
 include/linux/usb/gadget_configfs.h                |   19 +-
 include/target/configfs_macros.h                   |  147 ---
 include/target/target_core_base.h                  |   60 +
 include/target/target_core_fabric_configfs.h       |  122 --
 samples/Kconfig                                    |    6 +
 samples/Makefile                                   |    3 +-
 samples/configfs/Makefile                          |    2 +
 .../configfs/configfs_sample.c                     |  140 +--
 57 files changed, 2652 insertions(+), 5434 deletions(-)
 delete mode 100644 Documentation/filesystems/configfs/Makefile
 delete mode 100644 Documentation/filesystems/configfs/configfs_example_explicit.c
 delete mode 100644 include/target/configfs_macros.h
 delete mode 100644 include/target/target_core_fabric_configfs.h
 create mode 100644 samples/configfs/Makefile
 rename Documentation/filesystems/configfs/configfs_example_macros.c => samples/configfs/configfs_sample.c (74%)
$ git am -3 ../patches/stm-class--Use-per-attribute-show-and-store-methods-in-configfs-policy,patch
Applying: stm class: Use per-attribute show and store methods in configfs policy
$ git reset HEAD^
Unstaged changes after reset:
M       drivers/hwtracing/stm/policy.c
$ git add -A .
$ git commit -v -a --amend
[master c96d26e53518] Merge remote-tracking branch 'target-updates/for-next'
 Date: Mon Nov 2 13:58:35 2015 +1100
Merging target-merge/for-next-merge (8edb1554f7c2 mpt3sas: Fix unprotected list lookup in v4.3-rc0 changes)
$ git merge target-merge/for-next-merge
Merge made by the 'recursive' strategy.
 drivers/scsi/mpt3sas/mpt3sas_base.h      |  25 +-
 drivers/scsi/mpt3sas/mpt3sas_scsih.c     | 595 ++++++++++++++++++++++---------
 drivers/scsi/mpt3sas/mpt3sas_transport.c |  18 +-
 3 files changed, 458 insertions(+), 180 deletions(-)
Merging pinctrl/for-next (d99c8053fc24 pinctrl: pinconf: remove needless loop)
$ git merge pinctrl/for-next
Resolved 'arch/arm/boot/dts/sama5d2.dtsi' using previous resolution.
Auto-merging drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c
Auto-merging arch/arm/boot/dts/sama5d2.dtsi
CONFLICT (content): Merge conflict in arch/arm/boot/dts/sama5d2.dtsi
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4dbf91769706] Merge remote-tracking branch 'pinctrl/for-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt   |    1 +
 .../bindings/pinctrl/atmel,at91-pio4-pinctrl.txt   |   90 +
 .../devicetree/bindings/pinctrl/berlin,pinctrl.txt |    5 +-
 .../bindings/pinctrl/brcm,cygnus-gpio.txt          |   16 +-
 .../bindings/pinctrl/fsl,imx7d-pinctrl.txt         |   63 +-
 .../bindings/pinctrl/renesas,pfc-pinctrl.txt       |    1 +
 MAINTAINERS                                        |    7 +
 arch/arm/boot/dts/sama5d2.dtsi                     |   14 +
 drivers/base/dd.c                                  |    2 +
 drivers/base/pinctrl.c                             |   15 +-
 drivers/pinctrl/Kconfig                            |   13 +
 drivers/pinctrl/Makefile                           |    3 +-
 drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c          |  131 +-
 drivers/pinctrl/berlin/Kconfig                     |   16 +-
 drivers/pinctrl/berlin/Makefile                    |    1 +
 drivers/pinctrl/berlin/berlin-bg2.c                |    4 +-
 drivers/pinctrl/berlin/berlin-bg2cd.c              |   66 +-
 drivers/pinctrl/berlin/berlin-bg2q.c               |    4 +-
 drivers/pinctrl/berlin/berlin-bg4ct.c              |  503 ++++
 drivers/pinctrl/berlin/berlin.c                    |   28 +-
 drivers/pinctrl/berlin/berlin.h                    |    6 +-
 drivers/pinctrl/core.c                             |   32 +
 drivers/pinctrl/freescale/pinctrl-imx.c            |   36 +-
 drivers/pinctrl/freescale/pinctrl-imx.h            |    2 +
 drivers/pinctrl/freescale/pinctrl-imx7d.c          |   30 +
 drivers/pinctrl/freescale/pinctrl-mxs.c            |    2 +-
 drivers/pinctrl/intel/Kconfig                      |    8 +
 drivers/pinctrl/intel/Makefile                     |    1 +
 drivers/pinctrl/intel/pinctrl-baytrail.c           |    2 +
 drivers/pinctrl/intel/pinctrl-broxton.c            | 1065 ++++++++
 drivers/pinctrl/intel/pinctrl-intel.c              |  108 +-
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c      |    4 +-
 drivers/pinctrl/pinconf-generic.c                  |   35 +-
 drivers/pinctrl/pinconf.c                          |   13 +-
 drivers/pinctrl/pinctrl-at91-pio4.c                | 1094 ++++++++
 drivers/pinctrl/pinctrl-at91.c                     |    5 +-
 drivers/pinctrl/pinctrl-rockchip.c                 |   17 +
 drivers/pinctrl/pinctrl-tegra-xusb.c               |    9 -
 drivers/pinctrl/pinctrl-tz1090-pdc.c               |    4 +-
 drivers/pinctrl/pinctrl-tz1090.c                   |    4 +-
 drivers/pinctrl/pinctrl-zynq.c                     |   16 +-
 drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c           |    2 +-
 drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c            |    2 +-
 drivers/pinctrl/samsung/pinctrl-exynos5440.c       |    2 +-
 drivers/pinctrl/sh-pfc/Kconfig                     |    5 +
 drivers/pinctrl/sh-pfc/Makefile                    |    1 +
 drivers/pinctrl/sh-pfc/core.c                      |   16 +-
 drivers/pinctrl/sh-pfc/core.h                      |    3 +
 drivers/pinctrl/sh-pfc/gpio.c                      |   37 +-
 drivers/pinctrl/sh-pfc/pfc-emev2.c                 |    4 +-
 drivers/pinctrl/sh-pfc/pfc-r8a73a4.c               |  124 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7740.c               |   68 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7778.c               |  266 +-
 drivers/pinctrl/sh-pfc/pfc-r8a7779.c               |  425 ++-
 drivers/pinctrl/sh-pfc/pfc-r8a7790.c               | 1062 ++++----
 drivers/pinctrl/sh-pfc/pfc-r8a7791.c               | 1103 ++++----
 drivers/pinctrl/sh-pfc/pfc-r8a7794.c               | 1035 ++++---
 drivers/pinctrl/sh-pfc/pfc-r8a7795.c               | 2816 ++++++++++++++++++++
 drivers/pinctrl/sh-pfc/pfc-sh7203.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7264.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7269.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh73a0.c                |   68 +-
 drivers/pinctrl/sh-pfc/pfc-sh7720.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7722.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7723.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7724.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7734.c                |  782 +++---
 drivers/pinctrl/sh-pfc/pfc-sh7757.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7785.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-sh7786.c                |    4 +-
 drivers/pinctrl/sh-pfc/pfc-shx3.c                  |    4 +-
 drivers/pinctrl/sh-pfc/sh_pfc.h                    |   93 +-
 drivers/pinctrl/sirf/pinctrl-atlas7.c              | 1828 +++++++++++--
 drivers/pinctrl/sunxi/Kconfig                      |    4 +
 drivers/pinctrl/sunxi/Makefile                     |    1 +
 drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c        |   24 +-
 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c         |  603 +++++
 drivers/pinctrl/sunxi/pinctrl-sunxi.c              |    8 +-
 drivers/pinctrl/uniphier/Kconfig                   |   14 +-
 drivers/pinctrl/uniphier/Makefile                  |    2 +-
 drivers/pinctrl/uniphier/pinctrl-ph1-ld4.c         |    5 +
 drivers/pinctrl/uniphier/pinctrl-ph1-ld6b.c        |    5 +
 drivers/pinctrl/uniphier/pinctrl-ph1-pro4.c        |   11 +
 drivers/pinctrl/uniphier/pinctrl-ph1-pro5.c        |    5 +
 drivers/pinctrl/uniphier/pinctrl-ph1-sld8.c        |    5 +
 drivers/pinctrl/uniphier/pinctrl-proxstream2.c     |    5 +
 drivers/pinctrl/uniphier/pinctrl-uniphier-core.c   |   10 +-
 drivers/usb/renesas_usbhs/rcar2.c                  |    1 -
 include/linux/pinctrl/devinfo.h                    |   10 +
 include/linux/pinctrl/pinconf-generic.h            |   64 +-
 include/linux/pinctrl/pinctrl-state.h              |    8 +
 91 files changed, 11047 insertions(+), 3000 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt
 create mode 100644 drivers/pinctrl/berlin/berlin-bg4ct.c
 create mode 100644 drivers/pinctrl/intel/pinctrl-broxton.c
 create mode 100644 drivers/pinctrl/pinctrl-at91-pio4.c
 create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c
Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache)
$ git merge vhost/linux-next
Merge made by the 'recursive' strategy.
 drivers/virtio/virtio_ring.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)
Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage)
$ git merge remoteproc/for-next
Already up-to-date.
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (0963670aeaec gpio: fix up SPI submenu)
$ git merge gpio/for-next
Auto-merging drivers/pinctrl/sunxi/pinctrl-sunxi.c
Auto-merging drivers/pinctrl/pinctrl-rockchip.c
Auto-merging drivers/pinctrl/pinctrl-at91.c
Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c
Auto-merging drivers/pinctrl/intel/pinctrl-intel.c
Auto-merging drivers/gpio/gpiolib.h
Auto-merging drivers/gpio/gpiolib.c
Auto-merging drivers/gpio/gpiolib-acpi.c
Removing drivers/gpio/gpio-msm-v2.c
Removing drivers/gpio/gpio-it8761e.c
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/gpio/gpio.txt
Removing Documentation/devicetree/bindings/gpio/gpio-msm.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpio/gpio-msm.txt          |  26 --
 .../devicetree/bindings/gpio/gpio-pca953x.txt      |   1 +
 .../devicetree/bindings/gpio/gpio-zynq.txt         |   9 +
 Documentation/devicetree/bindings/gpio/gpio.txt    |  41 +-
 Documentation/gpio/driver.txt                      |  80 ++++
 MAINTAINERS                                        |  14 +
 drivers/gpio/Kconfig                               | 196 ++++-----
 drivers/gpio/Makefile                              |   5 +-
 drivers/gpio/gpio-104-idio-16.c                    | 216 ++++++++++
 drivers/gpio/gpio-altera.c                         |  15 +-
 drivers/gpio/gpio-amdpt.c                          | 261 ++++++++++++
 drivers/gpio/gpio-arizona.c                        |   2 +
 drivers/gpio/gpio-ath79.c                          | 119 +++---
 drivers/gpio/gpio-etraxfs.c                        |  23 +-
 drivers/gpio/gpio-generic.c                        |  58 +--
 drivers/gpio/gpio-it87.c                           | 411 +++++++++++++++++++
 drivers/gpio/gpio-it8761e.c                        | 230 -----------
 drivers/gpio/gpio-lpc18xx.c                        |  14 +-
 drivers/gpio/gpio-max730x.c                        |   1 -
 drivers/gpio/gpio-moxart.c                         |  14 +-
 drivers/gpio/gpio-msm-v2.c                         | 453 ---------------------
 drivers/gpio/gpio-mvebu.c                          |  14 +-
 drivers/gpio/gpio-omap.c                           |  82 ++--
 drivers/gpio/gpio-pca953x.c                        |  45 +-
 drivers/gpio/gpio-pl061.c                          | 112 +++--
 drivers/gpio/gpio-sx150x.c                         |  31 +-
 drivers/gpio/gpio-tb10x.c                          |  14 +-
 drivers/gpio/gpio-tz1090-pdc.c                     |  14 +-
 drivers/gpio/gpio-vf610.c                          |  43 +-
 drivers/gpio/gpio-xlp.c                            |  21 +-
 drivers/gpio/gpio-zx.c                             |  28 +-
 drivers/gpio/gpio-zynq.c                           |  32 +-
 drivers/gpio/gpiolib-acpi.c                        |  21 +-
 drivers/gpio/gpiolib-legacy.c                      |   8 +-
 drivers/gpio/gpiolib-of.c                          |  20 +-
 drivers/gpio/gpiolib.c                             | 175 ++++++--
 drivers/gpio/gpiolib.h                             |   3 +
 drivers/pinctrl/bcm/pinctrl-bcm2835.c              |  14 +-
 drivers/pinctrl/intel/pinctrl-cherryview.c         |  14 +-
 drivers/pinctrl/intel/pinctrl-intel.c              |  14 +-
 drivers/pinctrl/mediatek/pinctrl-mtk-common.c      |  14 +-
 drivers/pinctrl/nomadik/pinctrl-abx500.c           |  18 +-
 drivers/pinctrl/nomadik/pinctrl-nomadik.c          |  22 +-
 drivers/pinctrl/pinctrl-adi2.c                     |  14 +-
 drivers/pinctrl/pinctrl-as3722.c                   |  14 +-
 drivers/pinctrl/pinctrl-at91.c                     |  26 +-
 drivers/pinctrl/pinctrl-coh901.c                   |  22 +-
 drivers/pinctrl/pinctrl-digicolor.c                |  14 +-
 drivers/pinctrl/pinctrl-pistachio.c                |  14 +-
 drivers/pinctrl/pinctrl-rockchip.c                 |  14 +-
 drivers/pinctrl/pinctrl-st.c                       |  14 +-
 drivers/pinctrl/pinctrl-xway.c                     |  18 +-
 drivers/pinctrl/qcom/pinctrl-msm.c                 |  16 +-
 drivers/pinctrl/qcom/pinctrl-spmi-gpio.c           |  14 +-
 drivers/pinctrl/qcom/pinctrl-spmi-mpp.c            |  14 +-
 drivers/pinctrl/samsung/pinctrl-samsung.c          |  14 +-
 drivers/pinctrl/sunxi/pinctrl-sunxi.c              |  14 +-
 drivers/pinctrl/vt8500/pinctrl-wmt.c               |  14 +-
 include/dt-bindings/gpio/gpio.h                    |  12 +
 include/linux/gpio/consumer.h                      |   1 +
 include/linux/gpio/driver.h                        |   3 +
 include/linux/of_gpio.h                            |   1 +
 62 files changed, 1728 insertions(+), 1473 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-msm.txt
 create mode 100644 drivers/gpio/gpio-104-idio-16.c
 create mode 100644 drivers/gpio/gpio-amdpt.c
 create mode 100644 drivers/gpio/gpio-it87.c
 delete mode 100644 drivers/gpio/gpio-it8761e.c
 delete mode 100644 drivers/gpio/gpio-msm-v2.c
Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (7e3b7dc76c41 pwm: Add MediaTek display PWM driver support)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/pwm/brcm,bcm7038-pwm.txt   |  20 ++
 .../devicetree/bindings/pwm/pwm-berlin.txt         |  17 +
 .../devicetree/bindings/pwm/pwm-mtk-disp.txt       |  42 +++
 .../devicetree/bindings/pwm/renesas,pwm-rcar.txt   |  27 ++
 drivers/pwm/Kconfig                                |  47 ++-
 drivers/pwm/Makefile                               |   4 +
 drivers/pwm/pwm-atmel-hlcdc.c                      |   4 +
 drivers/pwm/pwm-berlin.c                           | 219 +++++++++++++
 drivers/pwm/pwm-brcmstb.c                          | 343 +++++++++++++++++++++
 drivers/pwm/pwm-mtk-disp.c                         | 243 +++++++++++++++
 drivers/pwm/pwm-rcar.c                             | 274 ++++++++++++++++
 11 files changed, 1237 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pwm/brcm,bcm7038-pwm.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-berlin.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/pwm-mtk-disp.txt
 create mode 100644 Documentation/devicetree/bindings/pwm/renesas,pwm-rcar.txt
 create mode 100644 drivers/pwm/pwm-berlin.c
 create mode 100644 drivers/pwm/pwm-brcmstb.c
 create mode 100644 drivers/pwm/pwm-mtk-disp.c
 create mode 100644 drivers/pwm/pwm-rcar.c
Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux)
$ git merge dma-buf/for-next
Already up-to-date.
Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
$ git merge userns/for-next
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
 fs/namei.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Merging ktest/for-next (b953c0d234bc Linux 4.1)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (e5bf1991ea62 clk: qcom: msm8960: Fix dsi1/2 halt bits)
$ git merge clk/clk-next
Resolved 'drivers/clk/Kconfig' using previous resolution.
Auto-merging drivers/tty/serial/8250/8250_dw.c
Auto-merging drivers/clk/shmobile/clk-mstp.c
Auto-merging drivers/clk/rockchip/clk-mmc-phase.c
Auto-merging drivers/clk/berlin/bg2q.c
Auto-merging drivers/clk/Makefile
Auto-merging drivers/clk/Kconfig
CONFLICT (content): Merge conflict in drivers/clk/Kconfig
Auto-merging drivers/base/power/domain.c
Auto-merging arch/arm/mach-bcm/Kconfig
Auto-merging arch/arm/mach-at91/Kconfig
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4d3c5b17ee3d] Merge remote-tracking branch 'clk/clk-next'
$ git diff -M --stat --summary HEAD^..
 .../bindings/arm/mediatek/mediatek,imgsys.txt      |  22 +
 .../bindings/arm/mediatek/mediatek,mmsys.txt       |  22 +
 .../bindings/arm/mediatek/mediatek,vdecsys.txt     |  22 +
 .../bindings/arm/mediatek/mediatek,vencltsys.txt   |  22 +
 .../bindings/arm/mediatek/mediatek,vencsys.txt     |  22 +
 .../devicetree/bindings/clock/at91-clock.txt       |  35 ++
 .../bindings/clock/brcm,iproc-clocks.txt           |  78 +++
 .../bindings/clock/renesas,cpg-div6-clocks.txt     |   2 +-
 .../devicetree/bindings/clock/renesas,cpg-mssr.txt |  69 +++
 .../devicetree/bindings/clock/silabs,si514.txt     |  24 +
 .../devicetree/bindings/clock/st/st,clkgen-pll.txt |   1 +
 arch/arm/mach-at91/Kconfig                         |   3 +
 arch/arm/mach-bcm/Kconfig                          |   2 +-
 drivers/base/power/domain.c                        |   2 +
 drivers/clk/Kconfig                                |  19 +-
 drivers/clk/Makefile                               |   3 +-
 drivers/clk/at91/Makefile                          |   1 +
 drivers/clk/at91/clk-generated.c                   | 306 +++++++++++
 drivers/clk/at91/clk-peripheral.c                  |  24 +-
 drivers/clk/at91/clk-system.c                      |   3 +-
 drivers/clk/at91/clk-utmi.c                        |   4 +-
 drivers/clk/at91/pmc.c                             |  21 +
 drivers/clk/at91/pmc.h                             |   3 +
 drivers/clk/bcm/Kconfig                            |   6 +-
 drivers/clk/bcm/Makefile                           |   3 +
 drivers/clk/bcm/clk-cygnus.c                       | 155 +++---
 drivers/clk/bcm/clk-iproc-pll.c                    | 196 +++----
 drivers/clk/bcm/clk-iproc.h                        |  22 +-
 drivers/clk/bcm/clk-ns2.c                          | 288 +++++++++++
 drivers/clk/bcm/clk-nsp.c                          | 139 +++++
 drivers/clk/berlin/bg2.c                           |   4 +-
 drivers/clk/berlin/bg2q.c                          |   2 +-
 drivers/clk/clk-divider.c                          |  20 +-
 drivers/clk/clk-fractional-divider.c               |  53 +-
 drivers/clk/clk-max77802.c                         |   2 +-
 drivers/clk/clk-multiplier.c                       |  51 --
 drivers/clk/clk-si514.c                            | 379 ++++++++++++++
 drivers/clk/clk-si5351.c                           |  17 +-
 drivers/clk/clk-xgene.c                            |   1 -
 drivers/clk/clk.c                                  |  38 +-
 drivers/clk/hisilicon/clk-hi6220-stub.c            |   2 +-
 drivers/clk/imx/clk-imx27.c                        |   4 +-
 drivers/clk/imx/clk-imx31.c                        |   4 +-
 drivers/clk/imx/clk-pllv2.c                        |  12 +-
 drivers/clk/keystone/pll.c                         |   2 +-
 drivers/clk/mediatek/Makefile                      |   2 +-
 drivers/clk/mediatek/clk-apmixed.c                 | 107 ++++
 drivers/clk/mediatek/clk-gate.c                    |   2 +-
 drivers/clk/mediatek/clk-mt8173.c                  | 347 ++++++++++++-
 drivers/clk/mediatek/clk-mtk.c                     |  36 +-
 drivers/clk/mediatek/clk-mtk.h                     |  24 +-
 drivers/clk/mediatek/clk-pll.c                     |   7 +-
 drivers/clk/mvebu/clk-cpu.c                        |   4 +-
 drivers/clk/mvebu/common.c                         |   2 +-
 drivers/clk/mxs/clk-frac.c                         |  12 +-
 drivers/clk/nxp/clk-lpc18xx-ccu.c                  |  17 +-
 drivers/clk/nxp/clk-lpc18xx-cgu.c                  |  42 +-
 drivers/clk/qcom/Kconfig                           |   9 +
 drivers/clk/qcom/Makefile                          |   1 +
 drivers/clk/qcom/clk-rcg.c                         | 230 +++++++++
 drivers/clk/qcom/clk-rcg.h                         |   8 +-
 drivers/clk/qcom/clk-rcg2.c                        | 170 +++++-
 drivers/clk/qcom/common.c                          |  42 +-
 drivers/clk/qcom/common.h                          |   4 +-
 drivers/clk/qcom/gcc-apq8084.c                     |  49 +-
 drivers/clk/qcom/gcc-ipq806x.c                     |   7 -
 drivers/clk/qcom/gcc-msm8660.c                     |   7 -
 drivers/clk/qcom/gcc-msm8916.c                     | 569 ++++++++++++++++++++-
 drivers/clk/qcom/gcc-msm8960.c                     |  20 +-
 drivers/clk/qcom/gcc-msm8974.c                     |  22 +-
 drivers/clk/qcom/gdsc.c                            | 237 +++++++++
 drivers/clk/qcom/gdsc.h                            |  68 +++
 drivers/clk/qcom/lcc-ipq806x.c                     |   7 -
 drivers/clk/qcom/lcc-msm8960.c                     |   7 -
 drivers/clk/qcom/mmcc-apq8084.c                    | 111 +++-
 drivers/clk/qcom/mmcc-msm8960.c                    | 411 ++++++++++++++-
 drivers/clk/qcom/mmcc-msm8974.c                    |  92 +++-
 drivers/clk/rockchip/clk-mmc-phase.c               |  11 +
 drivers/clk/rockchip/clk-pll.c                     | 135 ++---
 drivers/clk/rockchip/clk.c                         |   6 +-
 drivers/clk/samsung/clk-exynos7.c                  | 467 +++++++++++------
 drivers/clk/shmobile/clk-mstp.c                    |   2 +-
 drivers/clk/shmobile/clk-r8a7778.c                 |   8 +-
 drivers/clk/sirf/clk-atlas7.c                      | 358 +++++++------
 drivers/clk/st/clk-flexgen.c                       |   7 +-
 drivers/clk/st/clkgen-mux.c                        |   3 +
 drivers/clk/st/clkgen-pll.c                        | 469 ++++++++++++++++-
 drivers/clk/st/clkgen.h                            |   2 +
 drivers/clk/sunxi/clk-sun6i-apb0-gates.c           |   1 +
 drivers/clk/sunxi/clk-sun6i-apb0.c                 |   1 +
 drivers/clk/sunxi/clk-sun6i-ar100.c                |   1 +
 drivers/clk/sunxi/clk-sun8i-apb0.c                 |   1 +
 drivers/clk/sunxi/clk-sun9i-mmc.c                  |   1 +
 drivers/clk/tegra/clk-emc.c                        |   4 +-
 drivers/clk/versatile/Kconfig                      |   2 +-
 drivers/clk/versatile/clk-icst.c                   |   4 +-
 drivers/tty/serial/8250/8250_dw.c                  |   4 -
 include/dt-bindings/clock/at91.h                   |   1 +
 include/dt-bindings/clock/bcm-ns2.h                |  72 +++
 include/dt-bindings/clock/bcm-nsp.h                |  51 ++
 include/dt-bindings/clock/exynos7-clk.h            |  43 +-
 include/dt-bindings/clock/mt8173-clk.h             | 104 +++-
 include/dt-bindings/clock/qcom,gcc-apq8084.h       |   6 +
 include/dt-bindings/clock/qcom,gcc-msm8916.h       |  30 ++
 include/dt-bindings/clock/qcom,gcc-msm8974.h       |   3 +
 include/dt-bindings/clock/qcom,mmcc-apq8084.h      |  10 +
 include/dt-bindings/clock/qcom,mmcc-msm8974.h      |   8 +
 include/dt-bindings/clock/r8a7795-cpg-mssr.h       |  63 +++
 include/dt-bindings/clock/renesas-cpg-mssr.h       |  15 +
 include/linux/clk-provider.h                       |  22 +-
 include/linux/clk/at91_pmc.h                       |  22 +-
 111 files changed, 5837 insertions(+), 883 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencltsys.txt
 create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt
 create mode 100644 Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt
 create mode 100644 Documentation/devicetree/bindings/clock/silabs,si514.txt
 create mode 100644 drivers/clk/at91/clk-generated.c
 create mode 100644 drivers/clk/bcm/clk-ns2.c
 create mode 100644 drivers/clk/bcm/clk-nsp.c
 create mode 100644 drivers/clk/clk-si514.c
 create mode 100644 drivers/clk/mediatek/clk-apmixed.c
 create mode 100644 drivers/clk/qcom/gdsc.c
 create mode 100644 drivers/clk/qcom/gdsc.h
 create mode 100644 include/dt-bindings/clock/bcm-ns2.h
 create mode 100644 include/dt-bindings/clock/bcm-nsp.h
 create mode 100644 include/dt-bindings/clock/r8a7795-cpg-mssr.h
 create mode 100644 include/dt-bindings/clock/renesas-cpg-mssr.h
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging aio/master (6ff33f3902c3 Linux 4.3-rc1)
$ git merge aio/master
Already up-to-date.
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging kselftest/next (256d0afb11d6 selftests/seccomp: build and pass on arm64)
$ git merge kselftest/next
Merge made by the 'recursive' strategy.
 tools/testing/selftests/Makefile                   |  4 ++
 tools/testing/selftests/efivarfs/.gitignore        |  2 +
 tools/testing/selftests/memfd/memfd_test.c         |  2 +-
 tools/testing/selftests/pstore/Makefile            | 15 ++++
 tools/testing/selftests/pstore/common_tests        | 83 ++++++++++++++++++++++
 tools/testing/selftests/pstore/pstore_crash_test   | 30 ++++++++
 .../selftests/pstore/pstore_post_reboot_tests      | 77 ++++++++++++++++++++
 tools/testing/selftests/pstore/pstore_tests        | 30 ++++++++
 tools/testing/selftests/seccomp/seccomp_bpf.c      | 71 ++++++++++++------
 9 files changed, 291 insertions(+), 23 deletions(-)
 create mode 100644 tools/testing/selftests/efivarfs/.gitignore
 create mode 100644 tools/testing/selftests/pstore/Makefile
 create mode 100755 tools/testing/selftests/pstore/common_tests
 create mode 100755 tools/testing/selftests/pstore/pstore_crash_test
 create mode 100755 tools/testing/selftests/pstore/pstore_post_reboot_tests
 create mode 100755 tools/testing/selftests/pstore/pstore_tests
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
$ git merge y2038/y2038
Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging fs/coredump.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
CONFLICT (modify/delete): drivers/staging/ft1000/ft1000.h deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000.h left in tree.
CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-usb/ft1000_hw.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-usb/ft1000_hw.c left in tree.
CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-usb/ft1000_debug.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-usb/ft1000_debug.c left in tree.
CONFLICT (modify/delete): drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c deleted in HEAD and modified in y2038/y2038. Version y2038/y2038 of drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c left in tree.
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c drivers/staging/ft1000/ft1000-usb/ft1000_debug.c drivers/staging/ft1000/ft1000-usb/ft1000_hw.c drivers/staging/ft1000/ft1000.h
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c: needs merge
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c: needs merge
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c: needs merge
drivers/staging/ft1000/ft1000.h: needs merge
rm 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c'
rm 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c'
rm 'drivers/staging/ft1000/ft1000-usb/ft1000_hw.c'
rm 'drivers/staging/ft1000/ft1000.h'
$ git commit -v -a
[master be179ea691b3] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
 drivers/staging/gdm72xx/gdm_sdio.c         | 13 ++++----
 drivers/staging/gdm72xx/gdm_sdio.h         |  4 +--
 drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------
 drivers/staging/media/lirc/lirc_sasem.c    | 20 ++++++------
 drivers/staging/media/lirc/lirc_serial.c   | 50 ++++++++++--------------------
 fs/coredump.c                              |  8 +++--
 kernel/cpuset.c                            | 12 ++++---
 7 files changed, 62 insertions(+), 80 deletions(-)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
$ git merge luto-misc/next
Already up-to-date.
Merging access_once/linux-next (c231afa3ccf1 compiler.h: cast away attributes in WRITE_ONCE magic)
$ git merge access_once/linux-next
Merge made by the 'recursive' strategy.
Merging livepatching/for-next (07d42d41dfc4 Merge branch 'for-4.3/upstream' into for-next)
$ git merge livepatching/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging coresight/next (c0d90ad7604a coresight: checking for NULL string in coresight_name_match())
$ git merge coresight/next
Auto-merging drivers/hwtracing/coresight/coresight.c
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging rtc/rtc-next (c794f92f7802 rtc: rtc-s3c: Set year, month, day value for setting alarm)
$ git merge rtc/rtc-next
Auto-merging drivers/rtc/rtc-ds1390.c
Auto-merging drivers/rtc/rtc-ds1343.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/rtc/dallas,ds1390.txt      |  18 +++
 Documentation/devicetree/bindings/rtc/pcf8563.txt  |  25 +++
 drivers/rtc/Kconfig                                |   4 +-
 drivers/rtc/rtc-ab8500.c                           |   6 +-
 drivers/rtc/rtc-at91rm9200.c                       |   2 +
 drivers/rtc/rtc-da9063.c                           |  18 +--
 drivers/rtc/rtc-davinci.c                          |   1 -
 drivers/rtc/rtc-ds1307.c                           |   4 +-
 drivers/rtc/rtc-ds1343.c                           |   9 +-
 drivers/rtc/rtc-ds1390.c                           |  65 +++++++-
 drivers/rtc/rtc-isl12057.c                         |  10 +-
 drivers/rtc/rtc-isl1208.c                          |   2 +-
 drivers/rtc/rtc-opal.c                             |   9 +-
 drivers/rtc/rtc-pcf2127.c                          |  47 +++---
 drivers/rtc/rtc-pcf85063.c                         |   8 +-
 drivers/rtc/rtc-pcf8563.c                          | 170 ++++++++++++++++++++-
 drivers/rtc/rtc-pl031.c                            |  13 +-
 drivers/rtc/rtc-rx8025.c                           |   4 +-
 drivers/rtc/rtc-s3c.c                              |  16 ++
 drivers/rtc/rtc-stmp3xxx.c                         |  27 ++--
 tools/testing/selftests/timers/rtctest.c           |   2 +-
 21 files changed, 377 insertions(+), 83 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/dallas,ds1390.txt
 create mode 100644 Documentation/devicetree/bindings/rtc/pcf8563.txt
Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
$ git merge hwspinlock/for-next
Already up-to-date.
Merging nvdimm/libnvdimm-for-next (538ea4aa4473 pmem, memremap: convert to numa aware allocations)
$ git merge nvdimm/libnvdimm-for-next
Auto-merging arch/x86/mm/init_64.c
Auto-merging arch/x86/mm/init.c
Merge made by the 'recursive' strategy.
 arch/x86/mm/init.c     |  4 ++--
 arch/x86/mm/init_64.c  |  4 ++--
 drivers/base/devres.c  | 19 ++++++++++---------
 drivers/nvdimm/pmem.c  | 28 +++++++++++++---------------
 include/linux/device.h | 16 ++++++++++++----
 include/linux/pmem.h   | 26 +-------------------------
 kernel/memremap.c      | 16 ++++++++--------
 7 files changed, 48 insertions(+), 65 deletions(-)
Merging akpm-current/current (f1e1fabe6b48 ipc/msg.c: use freezable blocking call)
$ git merge --no-ff akpm-current/current
Resolved 'arch/arc/mm/cache.c' using previous resolution.
Resolved 'arch/s390/include/asm/pgtable.h' using previous resolution.
Resolved 'block/blk-mq.c' using previous resolution.
Resolved 'drivers/usb/host/u132-hcd.c' using previous resolution.
Resolved 'fs/9p/vfs_file.c' using previous resolution.
Resolved 'fs/proc/task_mmu.c' using previous resolution.
Resolved 'mm/failslab.c' using previous resolution.
Resolved 'mm/huge_memory.c' using previous resolution.
Resolved 'mm/page_alloc.c' using previous resolution.
Resolved 'mm/pgtable-generic.c' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
Auto-merging net/rxrpc/ar-connection.c
Auto-merging net/rds/ib_recv.c
Auto-merging net/openvswitch/flow.c
Auto-merging net/netlink/af_netlink.c
Auto-merging net/core/sock.c
Auto-merging mm/vmscan.c
Auto-merging mm/pgtable-generic.c
CONFLICT (content): Merge conflict in mm/pgtable-generic.c
Auto-merging mm/page_alloc.c
CONFLICT (content): Merge conflict in mm/page_alloc.c
Auto-merging mm/memory_hotplug.c
Auto-merging mm/memcontrol.c
Auto-merging mm/huge_memory.c
CONFLICT (content): Merge conflict in mm/huge_memory.c
Auto-merging mm/filemap.c
Auto-merging mm/failslab.c
CONFLICT (content): Merge conflict in mm/failslab.c
Auto-merging mm/cma.c
Auto-merging mm/backing-dev.c
Auto-merging lib/kobject.c
Auto-merging lib/dma-debug.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging kernel/sysctl.c
Auto-merging kernel/params.c
Auto-merging kernel/kexec_core.c
Auto-merging kernel/futex.c
Auto-merging kernel/fork.c
Auto-merging kernel/cpuset.c
Auto-merging kernel/cgroup.c
Auto-merging kernel/audit.c
Auto-merging include/net/sock.h
Auto-merging include/linux/skbuff.h
Auto-merging include/linux/sched.h
Auto-merging include/linux/memcontrol.h
Auto-merging include/linux/hugetlb_cgroup.h
Auto-merging include/linux/fs.h
Auto-merging include/linux/compiler.h
Auto-merging include/linux/compiler-gcc.h
Auto-merging include/drm/drmP.h
Auto-merging include/asm-generic/pgtable.h
Auto-merging fs/xfs/xfs_qm.c
Auto-merging fs/proc/task_mmu.c
CONFLICT (content): Merge conflict in fs/proc/task_mmu.c
Auto-merging fs/proc/array.c
Auto-merging fs/ocfs2/dlm/dlmrecovery.c
Auto-merging fs/ocfs2/cluster/heartbeat.c
Auto-merging fs/nfs/file.c
Auto-merging fs/namei.c
Auto-merging fs/mpage.c
Auto-merging fs/jffs2/wbuf.c
Auto-merging fs/fs-writeback.c
Auto-merging fs/ext4/super.c
Auto-merging fs/ext4/readpage.c
Auto-merging fs/ext4/inode.c
Auto-merging fs/direct-io.c
Auto-merging fs/coredump.c
Auto-merging fs/cifs/file.c
Auto-merging fs/9p/vfs_file.c
CONFLICT (content): Merge conflict in fs/9p/vfs_file.c
Auto-merging drivers/usb/host/u132-hcd.c
CONFLICT (content): Merge conflict in drivers/usb/host/u132-hcd.c
Auto-merging drivers/usb/gadget/function/f_mass_storage.c
Auto-merging drivers/staging/rdma/ipath/ipath_file_ops.c
Auto-merging drivers/staging/rdma/hfi1/init.c
Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h
Auto-merging drivers/staging/android/ion/ion_system_heap.c
Auto-merging drivers/nvme/host/pci.c
Auto-merging drivers/mtd/mtdcore.c
Auto-merging drivers/misc/vmw_balloon.c
Auto-merging drivers/media/pci/tw68/tw68-video.c
Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2.c
Auto-merging drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
Auto-merging drivers/md/dm-crypt.c
Auto-merging drivers/iommu/intel-iommu.c
Auto-merging drivers/iommu/amd_iommu.c
Auto-merging drivers/infiniband/core/sa_query.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/drm_gem.c
Auto-merging drivers/block/pktcdvd.c
Auto-merging drivers/block/nbd.c
Auto-merging drivers/block/drbd/drbd_bitmap.c
Auto-merging block/genhd.c
Auto-merging block/blk-mq.c
CONFLICT (content): Merge conflict in block/blk-mq.c
Auto-merging block/blk-mq-tag.c
Auto-merging block/blk-core.c
Auto-merging arch/x86/mm/gup.c
Auto-merging arch/x86/kernel/smpboot.c
Auto-merging arch/x86/kernel/pci-dma.c
Auto-merging arch/x86/kernel/acpi/boot.c
Auto-merging arch/x86/include/asm/pgtable_types.h
Auto-merging arch/x86/include/asm/pgtable.h
Auto-merging arch/x86/entry/syscalls/syscall_32.tbl
Auto-merging arch/x86/Kconfig
Auto-merging arch/s390/include/asm/pgtable.h
CONFLICT (content): Merge conflict in arch/s390/include/asm/pgtable.h
Auto-merging arch/powerpc/sysdev/fsl_pci.c
Auto-merging arch/powerpc/mm/numa.c
Auto-merging arch/powerpc/mm/hugetlbpage.c
Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
Auto-merging arch/mips/mm/tlbex.c
Auto-merging arch/arm64/mm/dma-mapping.c
Auto-merging arch/arm64/include/asm/pgtable.h
Auto-merging arch/arm/xen/mm.c
Auto-merging arch/arm/mm/dma-mapping.c
Auto-merging arch/arc/mm/cache.c
CONFLICT (content): Merge conflict in arch/arc/mm/cache.c
Auto-merging MAINTAINERS
Auto-merging Documentation/kernel-parameters.txt
Auto-merging Documentation/filesystems/proc.txt
Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 3bca89f98866] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 .../vm/pmdp_splitting_flush/arch-support.txt       |   40 -
 Documentation/filesystems/proc.txt                 |   11 +-
 Documentation/filesystems/vfat.txt                 |   10 +
 Documentation/kasan.txt                            |   46 +-
 Documentation/kernel-parameters.txt                |    5 +
 Documentation/lockup-watchdogs.txt                 |    5 +-
 Documentation/printk-formats.txt                   |   29 +
 Documentation/sysctl/kernel.txt                    |   12 +
 Documentation/vm/balance                           |   14 +-
 Documentation/vm/page_migration                    |   27 +-
 Documentation/vm/split_page_table_lock             |    4 +-
 Documentation/vm/transhuge.txt                     |  161 ++-
 Documentation/vm/unevictable-lru.txt               |  120 +-
 MAINTAINERS                                        |    1 +
 arch/alpha/include/uapi/asm/mman.h                 |    4 +
 arch/arc/mm/cache.c                                |    4 +-
 arch/arm/include/asm/pgtable-3level.h              |   10 +-
 arch/arm/lib/uaccess_with_memcpy.c                 |    5 +-
 arch/arm/mm/alignment.c                            |    2 +-
 arch/arm/mm/dma-mapping.c                          |    6 +-
 arch/arm/mm/flush.c                                |   17 +-
 arch/arm/xen/mm.c                                  |    2 +-
 arch/arm64/include/asm/pgtable.h                   |   10 +-
 arch/arm64/mm/dma-mapping.c                        |    4 +-
 arch/arm64/mm/flush.c                              |   16 -
 arch/mips/include/asm/pgtable-bits.h               |   10 +-
 arch/mips/include/asm/pgtable.h                    |   18 -
 arch/mips/include/uapi/asm/mman.h                  |    7 +
 arch/mips/mm/c-r4k.c                               |    3 +-
 arch/mips/mm/cache.c                               |    2 +-
 arch/mips/mm/gup.c                                 |   17 +-
 arch/mips/mm/init.c                                |    6 +-
 arch/mips/mm/pgtable-64.c                          |   14 -
 arch/mips/mm/tlbex.c                               |    1 -
 arch/parisc/include/uapi/asm/mman.h                |    4 +
 arch/powerpc/include/asm/pgtable-ppc64.h           |   29 +-
 arch/powerpc/include/uapi/asm/mman.h               |    1 +
 arch/powerpc/mm/hugepage-hash64.c                  |    3 -
 arch/powerpc/mm/hugetlbpage.c                      |   17 +-
 arch/powerpc/mm/numa.c                             |    2 +-
 arch/powerpc/mm/pgtable_64.c                       |   49 -
 arch/powerpc/mm/subpage-prot.c                     |    2 +-
 arch/powerpc/sysdev/fsl_pci.c                      |    2 +-
 arch/s390/include/asm/pgtable.h                    |   16 +-
 arch/s390/mm/gup.c                                 |   24 +-
 arch/s390/mm/pgtable.c                             |   16 -
 arch/sh/kernel/cpu/sh5/unwind.c                    |    2 +-
 arch/sh/kernel/traps_64.c                          |    2 +-
 arch/sh/mm/cache-sh4.c                             |    2 +-
 arch/sh/mm/cache.c                                 |    8 +-
 arch/sparc/include/asm/pgtable_64.h                |   19 +-
 arch/sparc/include/uapi/asm/mman.h                 |    1 +
 arch/sparc/mm/fault_64.c                           |    3 -
 arch/sparc/mm/gup.c                                |   16 +-
 arch/tile/include/asm/pgtable.h                    |   10 -
 arch/tile/include/uapi/asm/mman.h                  |    1 +
 arch/x86/Kconfig                                   |    3 +
 arch/x86/boot/Makefile                             |    4 +-
 arch/x86/entry/syscalls/syscall_32.tbl             |    1 +
 arch/x86/entry/syscalls/syscall_64.tbl             |    1 +
 arch/x86/include/asm/pgtable.h                     |   14 +-
 arch/x86/include/asm/pgtable_types.h               |    2 -
 arch/x86/kernel/acpi/boot.c                        |    9 +-
 arch/x86/kernel/cpu/perf_event_msr.c               |    7 +-
 arch/x86/kernel/machine_kexec_64.c                 |    1 +
 arch/x86/kernel/pci-dma.c                          |    2 +-
 arch/x86/kernel/smpboot.c                          |    2 +
 arch/x86/kernel/vm86_32.c                          |    6 +-
 arch/x86/mm/gup.c                                  |   17 +-
 arch/x86/mm/kasan_init_64.c                        |    2 +-
 arch/x86/mm/numa.c                                 |   59 +-
 arch/x86/mm/pgtable.c                              |   14 -
 arch/xtensa/configs/iss_defconfig                  |    1 -
 arch/xtensa/include/uapi/asm/mman.h                |    7 +
 arch/xtensa/mm/tlb.c                               |    2 +-
 block/bio.c                                        |   26 +-
 block/blk-core.c                                   |   16 +-
 block/blk-ioc.c                                    |    2 +-
 block/blk-mq-tag.c                                 |    2 +-
 block/blk-mq.c                                     |    6 +-
 block/genhd.c                                      |    2 +-
 block/ioprio.c                                     |    6 +-
 block/scsi_ioctl.c                                 |    6 +-
 drivers/block/drbd/drbd_bitmap.c                   |    2 +-
 drivers/block/drbd/drbd_receiver.c                 |    3 +-
 drivers/block/mtip32xx/mtip32xx.c                  |    2 +-
 drivers/block/nbd.c                                |    9 +-
 drivers/block/osdblk.c                             |    2 +-
 drivers/block/paride/pd.c                          |    2 +-
 drivers/block/pktcdvd.c                            |    4 +-
 drivers/block/zram/zram_drv.c                      |   28 +-
 drivers/connector/connector.c                      |    3 +-
 drivers/firewire/core-cdev.c                       |    2 +-
 drivers/gpu/drm/drm_gem.c                          |    2 +-
 drivers/gpu/drm/drm_lock.c                         |   41 -
 drivers/gpu/drm/i915/i915_gem.c                    |    5 +-
 drivers/ide/ide-atapi.c                            |    2 +-
 drivers/ide/ide-cd.c                               |    2 +-
 drivers/ide/ide-cd_ioctl.c                         |    2 +-
 drivers/ide/ide-devsets.c                          |    2 +-
 drivers/ide/ide-disk.c                             |    2 +-
 drivers/ide/ide-ioctls.c                           |    4 +-
 drivers/ide/ide-park.c                             |    2 +-
 drivers/ide/ide-pm.c                               |    4 +-
 drivers/ide/ide-tape.c                             |    4 +-
 drivers/ide/ide-taskfile.c                         |    4 +-
 drivers/infiniband/core/sa_query.c                 |    2 +-
 drivers/infiniband/hw/qib/qib_init.c               |    2 +-
 drivers/iommu/amd_iommu.c                          |    2 +-
 drivers/iommu/intel-iommu.c                        |    2 +-
 drivers/md/dm-crypt.c                              |    6 +-
 drivers/md/dm-kcopyd.c                             |    2 +-
 drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c     |    2 +-
 drivers/media/pci/solo6x10/solo6x10-v4l2.c         |    2 +-
 drivers/media/pci/tw68/tw68-video.c                |    2 +-
 drivers/misc/sgi-xp/xpc_uv.c                       |    2 +-
 drivers/misc/vmw_balloon.c                         |    2 +-
 drivers/mtd/mtdcore.c                              |    3 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c    |    2 +-
 drivers/nvme/host/pci.c                            |    4 +-
 drivers/scsi/scsi_error.c                          |    2 +-
 drivers/scsi/scsi_lib.c                            |    4 +-
 drivers/staging/android/ion/ion_system_heap.c      |    2 +-
 .../lustre/include/linux/libcfs/libcfs_private.h   |    2 +-
 drivers/staging/rdma/hfi1/init.c                   |    2 +-
 drivers/staging/rdma/ipath/ipath_file_ops.c        |    2 +-
 drivers/usb/gadget/function/f_mass_storage.c       |    4 +-
 drivers/usb/host/u132-hcd.c                        |    2 +-
 drivers/video/fbdev/vermilion/vermilion.c          |    2 +-
 fs/9p/vfs_file.c                                   |    3 +-
 fs/btrfs/compression.c                             |    7 +-
 fs/btrfs/ctree.h                                   |    2 +-
 fs/btrfs/disk-io.c                                 |    2 +-
 fs/btrfs/extent_io.c                               |   14 +-
 fs/btrfs/free-space-cache.c                        |    4 +-
 fs/btrfs/volumes.c                                 |    4 +-
 fs/buffer.c                                        |    2 +-
 fs/cachefiles/internal.h                           |    2 +-
 fs/ceph/addr.c                                     |    7 +-
 fs/cifs/file.c                                     |   10 +-
 fs/coredump.c                                      |   35 +-
 fs/direct-io.c                                     |    2 +-
 fs/ext4/fsync.c                                    |    5 +-
 fs/ext4/inode.c                                    |    2 +-
 fs/ext4/readpage.c                                 |    2 +-
 fs/ext4/super.c                                    |    2 +-
 fs/fat/cache.c                                     |   79 +-
 fs/fat/dir.c                                       |    2 +-
 fs/fat/fat.h                                       |    6 +-
 fs/fat/file.c                                      |   61 +
 fs/fat/inode.c                                     |   75 +-
 fs/fs-writeback.c                                  |    7 +-
 fs/fscache/cookie.c                                |    2 +-
 fs/fscache/page.c                                  |    6 +-
 fs/hugetlbfs/inode.c                               |  155 ++-
 fs/jbd2/transaction.c                              |    4 +-
 fs/jffs2/background.c                              |    7 +-
 fs/jffs2/wbuf.c                                    |    2 +-
 fs/logfs/dev_bdev.c                                |    4 +-
 fs/logfs/segment.c                                 |    2 +-
 fs/mpage.c                                         |    4 +-
 fs/namei.c                                         |    2 +-
 fs/nfs/file.c                                      |    6 +-
 fs/nilfs2/alloc.c                                  |  308 +++--
 fs/nilfs2/alloc.h                                  |    1 +
 fs/nilfs2/btree.c                                  |    7 +-
 fs/nilfs2/dat.c                                    |    2 -
 fs/nilfs2/inode.c                                  |    4 +-
 fs/nilfs2/mdt.c                                    |    6 +
 fs/nilfs2/mdt.h                                    |    2 +-
 fs/nilfs2/recovery.c                               |    4 +-
 fs/nilfs2/segment.c                                |  107 +-
 fs/nilfs2/segment.h                                |    3 +-
 fs/nilfs2/sufile.c                                 |   11 +-
 fs/nilfs2/super.c                                  |   17 +-
 fs/notify/fdinfo.c                                 |    9 +-
 fs/notify/inotify/inotify_user.c                   |   14 +-
 fs/ntfs/file.c                                     |    4 +-
 fs/ocfs2/alloc.c                                   |  105 +-
 fs/ocfs2/aops.c                                    | 1118 ++++++++--------
 fs/ocfs2/aops.h                                    |   11 +-
 fs/ocfs2/cluster/heartbeat.c                       |   19 +-
 fs/ocfs2/dlm/dlmconvert.c                          |   24 +-
 fs/ocfs2/dlm/dlmrecovery.c                         |    1 -
 fs/ocfs2/file.c                                    |  138 +-
 fs/ocfs2/inode.c                                   |    3 +
 fs/ocfs2/inode.h                                   |    5 +
 fs/ocfs2/journal.c                                 |  109 +-
 fs/ocfs2/localalloc.c                              |    4 +-
 fs/ocfs2/mmap.c                                    |    4 +-
 fs/ocfs2/namei.c                                   |   13 +-
 fs/ocfs2/namei.h                                   |    3 +
 fs/ocfs2/ocfs2.h                                   |    8 +
 fs/ocfs2/ocfs2_trace.h                             |   16 +-
 fs/ocfs2/quota_global.c                            |    2 +-
 fs/ocfs2/resize.c                                  |    2 +-
 fs/ocfs2/suballoc.c                                |    5 +-
 fs/ocfs2/super.c                                   |   38 +-
 fs/ocfs2/super.h                                   |    2 -
 fs/proc/array.c                                    |   10 +-
 fs/proc/page.c                                     |    4 +-
 fs/proc/task_mmu.c                                 |  115 +-
 fs/seq_file.c                                      |   51 +-
 fs/splice.c                                        |    2 +-
 fs/sync.c                                          |    7 +-
 fs/xfs/xfs_qm.c                                    |    2 +-
 include/asm-generic/dma-mapping-common.h           |    2 +-
 include/asm-generic/pgtable.h                      |    9 -
 include/drm/drmP.h                                 |    1 -
 include/linux/bitops.h                             |   13 +
 include/linux/compaction.h                         |    3 +-
 include/linux/compiler-gcc.h                       |   22 +-
 include/linux/compiler.h                           |    8 +
 include/linux/cpuset.h                             |   10 +-
 include/linux/crc64_ecma.h                         |   56 +
 include/linux/dma-debug.h                          |    6 +-
 include/linux/dma-mapping.h                        |   18 +-
 include/linux/fs.h                                 |    1 +
 include/linux/gfp.h                                |  287 ++--
 include/linux/huge_mm.h                            |   60 +-
 include/linux/hugetlb.h                            |   29 +
 include/linux/hugetlb_cgroup.h                     |    4 +-
 include/linux/kernel.h                             |    2 +
 include/linux/kexec.h                              |    2 +
 include/linux/memblock.h                           |    4 -
 include/linux/memcontrol.h                         |  163 +--
 include/linux/mm.h                                 |  207 ++-
 include/linux/mm_types.h                           |   63 +-
 include/linux/mmdebug.h                            |    6 +
 include/linux/mmzone.h                             |  104 +-
 include/linux/moduleparam.h                        |    1 +
 include/linux/nmi.h                                |    1 +
 include/linux/page-flags.h                         |  343 ++---
 include/linux/pageblock-flags.h                    |    2 +-
 include/linux/pagemap.h                            |   45 +-
 include/linux/poison.h                             |    9 +-
 include/linux/rbtree.h                             |   12 +-
 include/linux/rmap.h                               |   17 +-
 include/linux/sched.h                              |   45 +-
 include/linux/skbuff.h                             |    6 +-
 include/linux/slab.h                               |   45 +-
 include/linux/string.h                             |    1 +
 include/linux/swap.h                               |    6 +-
 include/linux/syscalls.h                           |    2 +
 include/linux/tracehook.h                          |    3 +
 include/linux/types.h                              |   16 +-
 include/linux/uaccess.h                            |   40 +-
 include/linux/vm_event_item.h                      |    9 +-
 include/linux/vmstat.h                             |   24 +-
 include/linux/zpool.h                              |    8 +-
 include/linux/zsmalloc.h                           |    2 +-
 include/linux/zutil.h                              |    4 +-
 include/net/sock.h                                 |    2 +-
 include/trace/events/compaction.h                  |   72 +-
 include/trace/events/gfpflags.h                    |    5 +-
 include/trace/events/huge_memory.h                 |  166 +++
 include/trace/events/nilfs2.h                      |  224 ++++
 include/uapi/asm-generic/mman-common.h             |    6 +
 include/uapi/asm-generic/mman.h                    |    1 +
 include/uapi/asm-generic/unistd.h                  |    4 +-
 ipc/msg.c                                          |    5 +-
 ipc/msgutil.c                                      |    1 -
 kernel/audit.c                                     |    6 +-
 kernel/cgroup.c                                    |    2 +-
 kernel/cpuset.c                                    |   14 +-
 kernel/events/uprobes.c                            |   11 +-
 kernel/fork.c                                      |    3 +-
 kernel/futex.c                                     |   61 +-
 kernel/kexec.c                                     |    2 +
 kernel/kexec_core.c                                |    4 +-
 kernel/kexec_file.c                                |    2 +
 kernel/locking/lockdep.c                           |    2 +-
 kernel/panic.c                                     |   10 +
 kernel/params.c                                    |    3 +-
 kernel/power/snapshot.c                            |    2 +-
 kernel/power/swap.c                                |   16 +-
 kernel/profile.c                                   |    2 +-
 kernel/signal.c                                    |   53 +-
 kernel/smp.c                                       |    2 +-
 kernel/sys.c                                       |    4 +-
 kernel/sys_ni.c                                    |    1 +
 kernel/sysctl.c                                    |   20 +
 kernel/watchdog.c                                  |  101 +-
 lib/Kconfig                                        |    7 +
 lib/Kconfig.debug                                  |   21 +
 lib/Kconfig.kasan                                  |    3 +-
 lib/Makefile                                       |    2 +
 lib/crc64_ecma.c                                   |  341 +++++
 lib/dma-debug.c                                    |   14 +-
 lib/dynamic_debug.c                                |    8 +-
 lib/halfmd4.c                                      |    3 +-
 lib/idr.c                                          |    4 +-
 lib/is_single_threaded.c                           |    5 +-
 lib/kasprintf.c                                    |   16 +
 lib/kobject.c                                      |   30 +-
 lib/llist.c                                        |    4 +-
 lib/percpu_ida.c                                   |    2 +-
 lib/radix-tree.c                                   |   10 +-
 lib/test-string_helpers.c                          |   36 +
 lib/test_kasan.c                                   |   69 +
 lib/test_printf.c                                  |  362 +++++
 lib/vsprintf.c                                     |   80 +-
 mm/Kconfig                                         |   12 -
 mm/backing-dev.c                                   |    2 +-
 mm/balloon_compaction.c                            |   10 +-
 mm/cma.c                                           |    6 +-
 mm/compaction.c                                    |   46 +-
 mm/debug.c                                         |   14 +-
 mm/dmapool.c                                       |    2 +-
 mm/early_ioremap.c                                 |    6 +-
 mm/failslab.c                                      |    8 +-
 mm/filemap.c                                       |  108 +-
 mm/frame_vector.c                                  |    2 +-
 mm/gup.c                                           |  122 +-
 mm/huge_memory.c                                   | 1412 ++++++++++++--------
 mm/hugetlb.c                                       |  220 ++-
 mm/hugetlb_cgroup.c                                |    2 +-
 mm/internal.h                                      |  107 +-
 mm/kasan/kasan.c                                   |   38 +-
 mm/kasan/kasan.h                                   |    5 +-
 mm/kasan/report.c                                  |  113 +-
 mm/kmemleak.c                                      |    2 +-
 mm/ksm.c                                           |  172 ++-
 mm/list_lru.c                                      |   44 +-
 mm/maccess.c                                       |    7 +-
 mm/madvise.c                                       |  173 +++
 mm/memblock.c                                      |    2 +-
 mm/memcontrol.c                                    |  371 ++---
 mm/memory-failure.c                                |   51 +-
 mm/memory.c                                        |   77 +-
 mm/memory_hotplug.c                                |    4 +-
 mm/mempolicy.c                                     |   40 +-
 mm/mempool.c                                       |   10 +-
 mm/migrate.c                                       |  272 ++--
 mm/mincore.c                                       |    4 +-
 mm/mlock.c                                         |  112 +-
 mm/mmap.c                                          |   61 +-
 mm/mprotect.c                                      |    2 +-
 mm/mremap.c                                        |   27 +-
 mm/msync.c                                         |    2 +-
 mm/nommu.c                                         |   18 +-
 mm/oom_kill.c                                      |   76 +-
 mm/page_alloc.c                                    |  786 +++++------
 mm/page_idle.c                                     |    3 +-
 mm/pagewalk.c                                      |    2 +-
 mm/percpu.c                                        |   10 +-
 mm/pgtable-generic.c                               |   12 -
 mm/readahead.c                                     |   18 +-
 mm/rmap.c                                          |  279 ++--
 mm/shmem.c                                         |   29 +-
 mm/slab.c                                          |  134 +-
 mm/slab.h                                          |   30 +-
 mm/slab_common.c                                   |  142 +-
 mm/slub.c                                          |  304 +++--
 mm/swap.c                                          |  318 +----
 mm/swap_state.c                                    |    9 +-
 mm/swapfile.c                                      |   16 +-
 mm/userfaultfd.c                                   |    8 +-
 mm/util.c                                          |   42 +-
 mm/vmacache.c                                      |    2 +-
 mm/vmalloc.c                                       |   16 +-
 mm/vmpressure.c                                    |    2 +-
 mm/vmscan.c                                        |   50 +-
 mm/vmstat.c                                        |   29 +-
 mm/zbud.c                                          |    2 +-
 mm/zpool.c                                         |   18 +-
 mm/zsmalloc.c                                      |   49 +-
 mm/zswap.c                                         |   87 +-
 net/core/skbuff.c                                  |    8 +-
 net/core/sock.c                                    |    6 +-
 net/netlink/af_netlink.c                           |    2 +-
 net/openvswitch/flow.c                             |    2 +-
 net/rds/ib_recv.c                                  |    4 +-
 net/rxrpc/ar-connection.c                          |    2 +-
 net/sctp/associola.c                               |    2 +-
 scripts/checkpatch.pl                              |   51 +-
 security/integrity/ima/ima_crypto.c                |    2 +-
 tools/testing/selftests/Makefile                   |    1 +
 tools/testing/selftests/lib/Makefile               |    8 +
 tools/testing/selftests/lib/printf.sh              |   10 +
 tools/testing/selftests/vm/Makefile                |    2 +
 tools/testing/selftests/vm/mlock2-tests.c          |  737 ++++++++++
 tools/testing/selftests/vm/on-fault-limit.c        |   47 +
 tools/testing/selftests/vm/run_vmtests             |   22 +
 tools/vm/slabinfo-gnuplot.sh                       |  275 ++++
 tools/vm/slabinfo.c                                |  255 ++--
 386 files changed, 9377 insertions(+), 5894 deletions(-)
 delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt
 create mode 100644 include/linux/crc64_ecma.h
 create mode 100644 include/trace/events/huge_memory.h
 create mode 100644 include/trace/events/nilfs2.h
 create mode 100644 lib/crc64_ecma.c
 create mode 100644 lib/test_printf.c
 create mode 100644 tools/testing/selftests/lib/Makefile
 create mode 100644 tools/testing/selftests/lib/printf.sh
 create mode 100644 tools/testing/selftests/vm/mlock2-tests.c
 create mode 100644 tools/testing/selftests/vm/on-fault-limit.c
 create mode 100644 tools/vm/slabinfo-gnuplot.sh
$ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix.patch
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix
$ git reset HEAD^
Unstaged changes after reset:
M       arch/arm64/mm/dma-mapping.c
$ git add -A .
$ git commit -v -a --amend
[master 2e247d244282] Merge branch 'akpm-current/current'
 Date: Mon Nov 2 14:45:18 2015 +1100
$ git am -3 ../patches/mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix.patch
Applying: mm-page_alloc-rename-__gfp_wait-to-__gfp_reclaim-arm-fix-fix
$ git reset HEAD^
Unstaged changes after reset:
M       arch/arm64/mm/dma-mapping.c
$ git add -A .
$ git commit -v -a --amend
[master 1a580094ce76] Merge branch 'akpm-current/current'
 Date: Mon Nov 2 14:45:18 2015 +1100
$ git am -3 ../patches/0001-block-fixes-for-__GPF_WAIT-changes.patch
Applying: block: fixes for __GPF_WAIT changes
$ git reset HEAD^
Unstaged changes after reset:
M       block/blk-core.c
$ git add -A .
$ git commit -v -a --amend
[master 72ccfdcde2e6] Merge branch 'akpm-current/current'
 Date: Mon Nov 2 14:45:18 2015 +1100
$ git am -3 ../patches/0001-ndb-fix-up-for-dequeue_signal_lock-API-change.patch
Applying: ndb: fix up for dequeue_signal_lock API change
$ git reset HEAD^
Unstaged changes after reset:
M       drivers/block/nbd.c
$ git add -A .
$ git commit -v -a --amend
[master 2727c56c12b1] Merge branch 'akpm-current/current'
 Date: Mon Nov 2 14:45:18 2015 +1100
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: net/ipv4/route.c: prevent oops
Applying: mips: add entry for new mlock2 syscall
Applying: sparc/sparc64: allocate sys_membarrier system call number
Applying: kernel.h: make abs() work with 64-bit types
Applying: Remove abs64()
Applying: remove-abs64-fix
Applying: remove-abs64-fix-fix
Applying: Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
Applying: pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Applying: tw68-core: use pci_set_dma_mask insted of pci_dma_supported
Applying: saa7164: use pci_set_dma_mask insted of pci_dma_supported
Applying: saa7134: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx88: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx25821: use pci_set_dma_mask insted of pci_dma_supported
Applying: cx23885: use pci_set_dma_mask insted of pci_dma_supported
Applying: netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
Applying: nouveau: don't call pci_dma_supported
Applying: sfc: don't call dma_supported
Applying: kaweth: remove ifdefed out call to dma_supported
Applying: usbnet: remove ifdefed out call to dma_supported
Applying: pci: remove pci_dma_supported
Applying: dma: remove external references to dma_supported
Applying: drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
Applying: kmap_atomic_to_page() has no users, remove it
Applying: include/linux/kdev_t.h: remove unused huge_valid_dev()
Applying: include/linux/kdev_t.h: old/new_valid_dev() can return bool
Applying: fs/9p: remove unnecessary new_valid_dev() checks
Applying: fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
Applying: fs/exofs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/ext2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/ext4/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/jfs: remove unnecessary new_valid_dev() checks
Applying: fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
Applying: fs/nfs/dir.c: remove unnecessary new_valid_dev() check
Applying: fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
Applying: fs/stat.c: remove unnecessary new_valid_dev() check
Applying: fs/ubifs/: remove unnecessary new_valid_dev() checks
Applying: fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + fb3e4d832b0c...481e86742ee1 akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (481e86742ee1 fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 Documentation/DMA-API.txt                          | 13 ------
 Documentation/sysctl/vm.txt                        |  2 +-
 arch/arm/include/asm/highmem.h                     |  1 -
 arch/arm/mm/highmem.c                              | 10 -----
 arch/frv/include/asm/highmem.h                     |  2 -
 arch/frv/mm/highmem.c                              |  5 ---
 arch/metag/include/asm/highmem.h                   |  1 -
 arch/metag/mm/highmem.c                            | 14 -------
 arch/microblaze/include/asm/highmem.h              | 13 ------
 arch/mips/include/asm/highmem.h                    |  1 -
 arch/mips/include/uapi/asm/unistd.h                | 15 ++++---
 arch/mips/kernel/scall32-o32.S                     |  1 +
 arch/mips/kernel/scall64-64.S                      |  1 +
 arch/mips/kernel/scall64-n32.S                     |  1 +
 arch/mips/kernel/scall64-o32.S                     |  1 +
 arch/mips/mm/highmem.c                             | 13 ------
 arch/parisc/include/asm/cacheflush.h               |  1 -
 arch/powerpc/include/asm/highmem.h                 | 13 ------
 arch/sparc/include/uapi/asm/unistd.h               |  3 +-
 arch/sparc/kernel/systbls_32.S                     |  2 +-
 arch/sparc/kernel/systbls_64.S                     |  4 +-
 arch/tile/include/asm/highmem.h                    |  1 -
 arch/tile/mm/highmem.c                             | 12 ------
 arch/x86/include/asm/highmem.h                     |  1 -
 arch/x86/mm/highmem_32.c                           | 14 -------
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |  7 +++-
 drivers/gpu/drm/tegra/sor.c                        |  4 +-
 drivers/input/joystick/walkera0701.c               |  4 +-
 drivers/media/i2c/ov9650.c                         |  2 +-
 drivers/media/pci/cx23885/cx23885-core.c           |  2 +-
 drivers/media/pci/cx25821/cx25821-core.c           |  2 +-
 drivers/media/pci/cx88/cx88-alsa.c                 |  2 +-
 drivers/media/pci/cx88/cx88-mpeg.c                 |  2 +-
 drivers/media/pci/cx88/cx88-video.c                |  2 +-
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c |  2 +-
 drivers/media/pci/saa7134/saa7134-core.c           |  2 +-
 drivers/media/pci/saa7164/saa7164-core.c           |  2 +-
 drivers/media/pci/tw68/tw68-core.c                 |  2 +-
 drivers/net/ethernet/amd/pcnet32.c                 |  2 +-
 drivers/net/ethernet/sfc/efx.c                     |  8 ++--
 drivers/net/usb/kaweth.c                           |  6 ---
 drivers/net/usb/usbnet.c                           |  6 ---
 drivers/net/wireless/mac80211_hwsim.c              |  2 +-
 drivers/parisc/ccio-dma.c                          |  2 -
 drivers/scsi/cxgbi/cxgb3i/Kbuild                   |  2 +-
 drivers/scsi/cxgbi/cxgb4i/Kbuild                   |  2 +-
 drivers/thermal/power_allocator.c                  |  2 +-
 drivers/usb/host/ehci-hcd.c                        |  2 +-
 drivers/usb/host/fotg210-hcd.c                     |  2 +-
 drivers/usb/host/oxu210hp-hcd.c                    |  2 +-
 fs/9p/vfs_inode.c                                  |  3 --
 fs/9p/vfs_inode_dotl.c                             |  3 --
 fs/binfmt_elf_fdpic.c                              | 46 ++++++++++++++++++----
 fs/btrfs/inode.c                                   |  3 --
 fs/exofs/namei.c                                   |  3 --
 fs/ext2/namei.c                                    |  3 --
 fs/ext4/namei.c                                    |  3 --
 fs/f2fs/namei.c                                    |  3 --
 fs/gfs2/lock_dlm.c                                 |  2 +-
 fs/hpfs/namei.c                                    |  2 -
 fs/jfs/namei.c                                     |  3 --
 fs/jfs/super.c                                     |  3 --
 fs/ncpfs/dir.c                                     |  2 -
 fs/nfs/dir.c                                       |  3 --
 fs/nilfs2/namei.c                                  |  3 --
 fs/reiserfs/namei.c                                |  3 --
 fs/stat.c                                          |  2 -
 fs/ubifs/dir.c                                     |  3 --
 fs/ubifs/misc.h                                    |  9 +----
 include/asm-generic/pci-dma-compat.h               |  6 ---
 include/linux/highmem.h                            |  1 -
 include/linux/kdev_t.h                             |  9 +----
 include/linux/kernel.h                             | 42 ++++++++++----------
 kernel/time/clocksource.c                          |  2 +-
 kernel/time/timekeeping.c                          |  2 +-
 lib/div64.c                                        |  2 +-
 net/ipv4/route.c                                   |  2 +
 net/sctp/transport.c                               |  2 +-
 78 files changed, 119 insertions(+), 269 deletions(-)
$ git am -3 ../patches/0001-Revert-ext4-fix-abs-usage-in-ext4_mb_check_group_pa.patch
Applying: Revert "ext4: fix abs() usage in ext4_mb_check_group_pa"
$ git reset HEAD^
Unstaged changes after reset:
M       fs/ext4/mballoc.c
$ git add -A .
$ git commit -v -a --amend
[master 4cb2de2063db] Merge branch 'akpm/master'
 Date: Mon Nov 2 14:55:54 2015 +1100