path: root/Next/merge.log

$ date -R
Mon, 16 Jan 2017 09:30:09 +1100
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at e28ac1fc3129 Merge tag 'xfs-for-linus-4.10-rc4-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Merging origin/master (c92816275674 Merge tag 'char-misc-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
$ git merge origin/master
Updating e28ac1fc3129..c92816275674
Fast-forward
 .../ABI/testing/sysfs-devices-deferred_probe       |  12 --
 Documentation/devicetree/bindings/i2c/i2c.txt      |   8 +
 MAINTAINERS                                        |  17 +-
 arch/arm64/include/asm/assembler.h                 |  36 +++--
 arch/arm64/mm/hugetlbpage.c                        |   2 +-
 arch/x86/boot/string.c                             |   1 +
 arch/x86/boot/string.h                             |   9 ++
 arch/x86/entry/entry_32.S                          |  30 ++--
 arch/x86/entry/entry_64.S                          |  11 +-
 arch/x86/events/core.c                             |   4 +
 arch/x86/events/intel/core.c                       |   2 +-
 arch/x86/events/intel/cstate.c                     |   2 +
 arch/x86/events/intel/ds.c                         |   6 +-
 arch/x86/events/intel/rapl.c                       |   1 +
 arch/x86/events/intel/uncore.c                     |   1 +
 arch/x86/events/intel/uncore_snbep.c               |   2 +-
 arch/x86/include/asm/intel-family.h                |   2 +-
 arch/x86/include/asm/microcode_intel.h             |  15 ++
 arch/x86/include/asm/processor.h                   |  18 +++
 arch/x86/include/asm/stacktrace.h                  |   2 +-
 arch/x86/include/asm/switch_to.h                   |  10 +-
 arch/x86/kernel/cpu/amd.c                          |   9 +-
 arch/x86/kernel/cpu/common.c                       |   2 +-
 arch/x86/kernel/cpu/intel.c                        |  11 +-
 arch/x86/kernel/cpu/microcode/intel.c              |  70 ++-------
 arch/x86/kernel/tsc.c                              |   1 +
 arch/x86/kernel/unwind_frame.c                     |  30 +++-
 arch/x86/kvm/emulate.c                             |  70 +++++++--
 arch/x86/kvm/lapic.c                               |   6 +
 arch/x86/kvm/lapic.h                               |   1 +
 arch/x86/kvm/x86.c                                 |   3 +
 arch/x86/mm/mpx.c                                  |   2 +-
 arch/x86/platform/efi/efi.c                        |  66 ++++++++
 arch/x86/platform/efi/quirks.c                     |   4 +-
 arch/x86/platform/intel-mid/device_libs/Makefile   |   2 +-
 .../{platform_spidev.c => platform_mrfld_spidev.c} |   4 +
 block/blk-lib.c                                    |  13 +-
 block/blk-zoned.c                                  |   4 +-
 block/partition-generic.c                          |  14 +-
 drivers/auxdisplay/Kconfig                         |   6 +-
 drivers/base/base.h                                |   2 -
 drivers/base/core.c                                |   7 -
 drivers/base/dd.c                                  |  13 --
 drivers/block/nbd.c                                |   6 +-
 drivers/block/virtio_blk.c                         |   7 +-
 drivers/char/mem.c                                 |  10 +-
 drivers/char/ppdev.c                               |  13 +-
 drivers/dma/dw/Kconfig                             |   2 +-
 drivers/dma/ioat/hw.h                              |   2 +
 drivers/dma/ioat/init.c                            |  15 +-
 drivers/dma/omap-dma.c                             |  61 ++++---
 drivers/dma/pl330.c                                |  11 ++
 drivers/dma/sh/rcar-dmac.c                         |   8 +
 drivers/dma/stm32-dma.c                            |  17 +-
 drivers/dma/ti-dma-crossbar.c                      |   2 +
 drivers/extcon/extcon.c                            |   2 +-
 drivers/firmware/efi/fake_mem.c                    |   3 +-
 drivers/firmware/efi/libstub/efistub.h             |   8 -
 drivers/firmware/efi/libstub/fdt.c                 |  87 ++++++----
 drivers/firmware/efi/memmap.c                      |  38 +++++
 drivers/i2c/busses/i2c-piix4.c                     |  22 +++
 drivers/i2c/i2c-core.c                             |  21 ++-
 drivers/i2c/i2c-dev.c                              |   2 +-
 drivers/input/joydev.c                             |   1 -
 drivers/input/joystick/xpad.c                      |   6 +
 drivers/input/misc/adxl34x-i2c.c                   |   4 +-
 drivers/input/mouse/alps.h                         |   2 +-
 drivers/input/mouse/synaptics_i2c.c                |   4 +-
 drivers/input/rmi4/Kconfig                         |   3 +-
 drivers/input/serio/i8042-x86ia64io.h              |   6 +
 drivers/input/touchscreen/elants_i2c.c             |   4 +-
 drivers/misc/mei/bus-fixup.c                       |   3 +
 drivers/misc/mei/debugfs.c                         |   2 +
 drivers/misc/mei/hbm.c                             |   4 +
 drivers/misc/mei/hw.h                              |   6 +
 drivers/misc/mei/mei_dev.h                         |   2 +
 drivers/nvme/host/core.c                           |   7 +-
 drivers/nvme/host/fc.c                             |   5 +-
 drivers/nvme/host/nvme.h                           |   8 -
 drivers/nvme/host/pci.c                            |  19 +--
 drivers/nvme/host/rdma.c                           |  15 +-
 drivers/scsi/bfa/bfad.c                            |   6 +-
 drivers/scsi/bfa/bfad_drv.h                        |   2 +-
 drivers/scsi/fnic/fnic.h                           |   1 +
 drivers/scsi/fnic/fnic_scsi.c                      |  16 ++
 drivers/scsi/qedi/Kconfig                          |   2 +-
 drivers/scsi/scsi_lib.c                            |   4 +-
 drivers/scsi/sd.c                                  |  17 +-
 drivers/scsi/snic/snic_main.c                      |   3 +
 drivers/tty/serial/8250/8250_core.c                |   2 +-
 drivers/tty/serial/8250/8250_pci.c                 |  12 +-
 drivers/tty/serial/8250/8250_port.c                |   2 +-
 drivers/tty/serial/atmel_serial.c                  |  22 ++-
 drivers/tty/sysrq.c                                |   4 +-
 drivers/usb/host/xhci-ring.c                       |  11 --
 drivers/usb/host/xhci.c                            |  13 --
 drivers/usb/musb/musb_debugfs.c                    |  20 ++-
 drivers/usb/serial/ch341.c                         | 108 ++++++++-----
 drivers/usb/serial/kl5kusb105.c                    |   9 +-
 drivers/usb/wusbcore/crypto.c                      |   3 +-
 drivers/vfio/vfio_iommu_type1.c                    |   4 +-
 drivers/vme/bridges/vme_ca91cx42.c                 |   2 +-
 fs/aio.c                                           |   6 +-
 fs/binfmt_elf.c                                    |   1 +
 fs/btrfs/async-thread.c                            |  15 +-
 fs/btrfs/extent-tree.c                             |   8 +-
 fs/btrfs/inode.c                                   |  13 +-
 fs/btrfs/tree-log.c                                |  13 +-
 fs/btrfs/uuid-tree.c                               |   4 +-
 fs/ceph/addr.c                                     |   4 +-
 fs/ceph/mds_client.c                               |   5 +
 fs/coredump.c                                      |  18 +++
 fs/direct-io.c                                     |   3 +-
 fs/f2fs/segment.c                                  |   4 +-
 fs/f2fs/super.c                                    |   6 +-
 fs/posix_acl.c                                     |   9 +-
 include/linux/blkdev.h                             |  19 ++-
 include/linux/coredump.h                           |   1 +
 include/linux/efi.h                                |   2 +
 include/linux/i2c.h                                |   1 +
 include/linux/jump_label_ratelimit.h               |   5 +
 include/linux/perf_event.h                         |   1 +
 include/sound/hdmi-codec.h                         |   8 +-
 include/sound/soc.h                                |   3 +
 include/trace/events/btrfs.h                       | 146 +++++++++--------
 kernel/capability.c                                |   1 +
 kernel/events/core.c                               | 175 ++++++++++++++++-----
 kernel/jump_label.c                                |   7 +
 kernel/time/tick-sched.c                           |   9 +-
 kernel/time/tick-sched.h                           |   2 +
 lib/iov_iter.c                                     |  54 ++++---
 samples/bpf/sock_example.h                         |   2 +-
 samples/bpf/trace_output_user.c                    |   1 -
 samples/vfio-mdev/mtty.c                           |  23 ++-
 sound/soc/codecs/nau8825.c                         |   9 +-
 sound/soc/codecs/nau8825.h                         |   7 +-
 sound/soc/codecs/rt5645.c                          |   3 +
 sound/soc/codecs/tlv320aic3x.c                     |  13 ++
 sound/soc/codecs/wm_adsp.c                         |  25 ++-
 sound/soc/dwc/designware_i2s.c                     |  25 ++-
 sound/soc/fsl/fsl_ssi.c                            |  74 ++++++---
 sound/soc/intel/boards/bytcr_rt5640.c              |  18 ++-
 sound/soc/intel/skylake/skl-pcm.c                  |   3 +
 sound/soc/intel/skylake/skl-sst.c                  |   3 +
 sound/soc/sh/rcar/core.c                           |   4 +-
 sound/soc/soc-core.c                               |  10 +-
 sound/soc/soc-pcm.c                                |   4 +-
 sound/soc/soc-topology.c                           |   3 +-
 sound/usb/quirks.c                                 |   1 +
 tools/lib/subcmd/parse-options.c                   |   3 +
 tools/lib/subcmd/parse-options.h                   |   5 +
 tools/lib/traceevent/plugin_sched_switch.c         |   4 +-
 tools/perf/Documentation/perf-record.txt           |   4 +
 tools/perf/Makefile.perf                           |   4 +-
 tools/perf/builtin-record.c                        |   4 +-
 tools/perf/builtin-sched.c                         |  17 +-
 tools/perf/util/probe-event.c                      | 105 ++++++++-----
 tools/perf/util/symbol-elf.c                       |   6 +
 virt/lib/irqbypass.c                               |   4 +-
 159 files changed, 1418 insertions(+), 741 deletions(-)
 delete mode 100644 Documentation/ABI/testing/sysfs-devices-deferred_probe
 rename arch/x86/platform/intel-mid/device_libs/{platform_spidev.c => platform_mrfld_spidev.c} (91%)
Merging fixes/master (30066ce675d3 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (c7858bf16c0b asm-prototypes: Clear any CPP defines before declaring the functions)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (e51d5d02f688 ARCv2: IRQ: Call entry/exit functions for chained handlers in MCIP)
$ git merge arc-current/for-curr
Merge made by the 'recursive' strategy.
 arch/arc/kernel/intc-arcv2.c   | 6 +++---
 arch/arc/kernel/intc-compact.c | 4 ++--
 arch/arc/kernel/mcip.c         | 4 ++++
 arch/arc/mm/cache.c            | 6 +++++-
 4 files changed, 14 insertions(+), 6 deletions(-)
Merging arm-current/fixes (ddc37832a134 ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs)
$ git merge arm-current/fixes
Merge made by the 'recursive' strategy.
 arch/arm/include/asm/cputype.h  |  3 +++
 arch/arm/include/asm/ftrace.h   | 18 ++++++++++++++++++
 arch/arm/kernel/hw_breakpoint.c | 16 ++++++++++++++++
 3 files changed, 37 insertions(+)
Merging m68k-current/for-linus (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging powerpc-fixes/fixes (69973b830859 Linux 4.9)
$ git merge powerpc-fixes/fixes
Already up-to-date.
Merging sparc/master (4bbc84ffd137 sparc: use symbolic names for tsb indexing)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
 arch/sparc/include/asm/mmu_context_64.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files)
$ git merge fscrypt-current/for-stable
Already up-to-date.
Merging net/master (003c941057ea tcp: fix tcp_fastopen unaligned access complaints on sparc)
$ git merge net/master
Merge made by the 'recursive' strategy.
 drivers/net/ethernet/broadcom/bcmsysport.c        | 25 ++++++++++++++++-------
 drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 11 +++++-----
 drivers/net/ethernet/mellanox/mlxsw/pci_hw.h      |  8 ++++----
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c    |  1 +
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c    |  1 +
 drivers/net/ethernet/qualcomm/emac/emac-phy.c     |  7 +++++++
 drivers/net/ethernet/qualcomm/emac/emac.c         |  6 ++----
 drivers/net/ethernet/renesas/ravb_main.c          |  8 ++------
 drivers/net/hyperv/netvsc_drv.c                   |  3 +++
 drivers/net/usb/r8152.c                           |  7 ++++++-
 drivers/net/vxlan.c                               | 13 +++++++++---
 include/linux/tcp.h                               |  7 ++++++-
 net/ipv4/fib_semantics.c                          | 11 ++++++----
 net/ipv4/route.c                                  |  2 +-
 net/ipv4/tcp_fastopen.c                           |  2 +-
 net/ipv6/route.c                                  |  3 ++-
 net/ipv6/seg6_hmac.c                              |  2 +-
 net/ipv6/seg6_iptunnel.c                          |  4 ++++
 18 files changed, 82 insertions(+), 39 deletions(-)
Merging ipsec/master (4e5da369df64 Documentation/networking: fix typo in mpls-sysctl)
$ git merge ipsec/master
Already up-to-date.
Merging netfilter/master (bf99b4ded5f8 tcp: fix mark propagation with fwmark_reflect enabled)
$ git merge netfilter/master
Merge made by the 'recursive' strategy.
 net/ipv4/ip_output.c                | 1 +
 net/ipv4/netfilter/nf_reject_ipv4.c | 2 ++
 net/ipv6/netfilter/nf_reject_ipv6.c | 3 +++
 net/ipv6/tcp_ipv6.c                 | 1 +
 4 files changed, 7 insertions(+)
Merging ipvs/master (045169816b31 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6)
$ git merge ipvs/master
Already up-to-date.
Merging wireless-drivers/master (60f59ce02785 rtlwifi: rtl_usb: Fix missing entry in USB driver's private data)
$ git merge wireless-drivers/master
Already up-to-date.
Merging mac80211/master (dbef53621116 mac80211: prevent skb/txq mismatch)
$ git merge mac80211/master
Merge made by the 'recursive' strategy.
 include/uapi/linux/nl80211.h |  4 +++-
 net/mac80211/chan.c          |  3 ---
 net/mac80211/iface.c         | 21 +++++++++++++++++++++
 net/mac80211/main.c          | 13 +++++++++----
 net/mac80211/rate.c          |  2 ++
 net/mac80211/rx.c            | 38 +++++++++++++++++++++-----------------
 net/mac80211/sta_info.c      |  4 ++--
 net/mac80211/tx.c            | 17 +++++++----------
 net/mac80211/vht.c           |  4 +++-
 net/wireless/nl80211.c       | 15 +++++++++++++++
 10 files changed, 83 insertions(+), 38 deletions(-)
Merging sound-current/for-linus (6cf4569ce356 Merge tag 'asoc-fix-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus)
$ git merge sound-current/for-linus
Already up-to-date.
Merging pci-current/for-linus (27d3eef42093 Revert "PCI: Add runtime PM support for PCIe ports")
$ git merge pci-current/for-linus
Merge made by the 'recursive' strategy.
 arch/x86/pci/acpi.c                | 10 +++++++++
 drivers/pci/host/pcie-designware.c | 10 ++++-----
 drivers/pci/pcie/portdrv_core.c    |  3 ---
 drivers/pci/pcie/portdrv_pci.c     | 43 --------------------------------------
 drivers/pci/probe.c                | 12 ++++++-----
 5 files changed, 22 insertions(+), 56 deletions(-)
Merging driver-core.current/driver-core-linus (c7334ce814f7 Revert "driver core: Add deferred_probe attribute to devices in sysfs")
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (802c03881f29 sysrq: attach sysrq handler correctly for 32-bit kernel)
$ git merge tty.current/tty-linus
Already up-to-date.
Merging usb.current/usb-linus (97f9c5f211d1 Merge tag 'usb-serial-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
$ git merge usb.current/usb-linus
Already up-to-date.
Merging usb-gadget-fixes/fixes (43aef5c2ca90 usb: gadget: Fix copy/pasted error message)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (2d5a9c72d0c4 USB: serial: ch341: fix control-message error handling)
$ git merge usb-serial-fixes/usb-linus
Already up-to-date.
Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file)
$ git merge usb-chipidea-fixes/ci-for-usb-stable
Merge made by the 'recursive' strategy.
Merging phy/fixes (7ce7d89f4883 Linux 4.10-rc1)
$ git merge phy/fixes
Already up-to-date.
Merging staging.current/staging-linus (a121103c9228 Linux 4.10-rc3)
$ git merge staging.current/staging-linus
Already up-to-date.
Merging char-misc.current/char-misc-linus (c8a6a09c1c61 vme: Fix wrong pointer utilization in ca91cx42_slave_get)
$ git merge char-misc.current/char-misc-linus
Already up-to-date.
Merging input-current/for-linus (1c3415a06b10 Input: elants_i2c - avoid divide by 0 errors on bad touchscreen data)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (07825f0acd85 crypto: aesni - Fix failure when built-in with modular pcbc)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (da095587e6be Revert "ide: Fix interface autodetection in legacy IDE driver (trial #2)")
$ git merge ide/master
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging vfio-fixes/for-linus (94a6fa899d2c vfio/type1: Remove pid_namespace.h include)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (7738789fba09 selftests: x86/pkeys: fix spelling mistake: "itertation" -> "iteration")
$ 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 (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API)
$ git merge mfd-fixes/for-mfd-fixes
Already up-to-date.
Merging drm-intel-fixes/for-linux-next-fixes (e4621b73b6b4 drm/i915: Fix phys pwrite for struct_mutex-less operation)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/i915/gvt/aperture_gm.c |  7 -----
 drivers/gpu/drm/i915/gvt/gtt.c         | 54 +++++++++++-----------------------
 drivers/gpu/drm/i915/gvt/gvt.c         |  8 ++++-
 drivers/gpu/drm/i915/gvt/handlers.c    | 13 ++++----
 drivers/gpu/drm/i915/gvt/kvmgt.c       | 14 ++++++---
 drivers/gpu/drm/i915/gvt/mmio.c        | 31 +++++++++----------
 drivers/gpu/drm/i915/gvt/opregion.c    |  8 ++---
 drivers/gpu/drm/i915/gvt/reg.h         |  3 +-
 drivers/gpu/drm/i915/gvt/scheduler.c   | 14 ++++-----
 drivers/gpu/drm/i915/gvt/vgpu.c        |  8 +++--
 drivers/gpu/drm/i915/i915_gem.c        | 34 +++------------------
 drivers/gpu/drm/i915/i915_gem_evict.c  |  1 +
 12 files changed, 78 insertions(+), 117 deletions(-)
Merging drm-misc-fixes/for-linux-next-fixes (3846fd9b8600 drm/probe-helpers: Drop locking from poll_enable)
$ git merge drm-misc-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |  7 +++
 drivers/gpu/drm/drm_modes.c                        |  7 +++
 drivers/gpu/drm/drm_probe_helper.c                 | 63 +++++++++++-----------
 drivers/gpu/drm/i915/intel_hotplug.c               |  4 +-
 include/drm/drm_crtc_helper.h                      |  1 -
 5 files changed, 47 insertions(+), 35 deletions(-)
Merging kbuild/for-next (fde42bfcd232 genksyms: Regenerate parser)
$ git merge kbuild/for-next
Merge made by the 'recursive' strategy.
 scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------
 scripts/genksyms/parse.y             |   2 -
 2 files changed, 234 insertions(+), 242 deletions(-)
Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo)
$ git merge asm-generic/master
Resolved 'include/asm-generic/percpu.h' using previous resolution.
Auto-merging include/asm-generic/percpu.h
CONFLICT (content): Merge conflict in include/asm-generic/percpu.h
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master df08dc33de4e] Merge remote-tracking branch 'asm-generic/master'
$ git diff -M --stat --summary HEAD^..
 include/asm-generic/page.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging arc/for-next (e5517c2a5a49 Linux 4.9-rc7)
$ git merge arc/for-next
Already up-to-date.
Merging arm/for-next (0f54ff7ef995 Merge branches 'fixes' and 'misc' into for-next)
$ git merge arm/for-next
Merge made by the 'recursive' strategy.
 arch/arm/Kconfig-nommu    | 3 +--
 arch/arm/mm/dma-mapping.c | 3 +++
 arch/arm/mm/flush.c       | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)
Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (82dc2a5d6a0d ARM: SoC: Document merges)
$ git merge arm-soc/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/shmobile.txt |   2 +-
 arch/arm/arm-soc-for-next-contents.txt             |  37 +++
 arch/arm/boot/dts/ox810se.dtsi                     |  10 +-
 arch/arm/boot/dts/ox820.dtsi                       |  14 +-
 arch/arm/boot/dts/qcom-mdm9615.dtsi                |   2 +-
 arch/arm/boot/dts/r8a73a4.dtsi                     |   4 +-
 arch/arm/boot/dts/r8a7743.dtsi                     |  13 +-
 arch/arm/boot/dts/r8a7745.dtsi                     |  13 +-
 arch/arm/boot/dts/r8a7778.dtsi                     |  10 +-
 arch/arm/boot/dts/r8a7779.dtsi                     |   8 +-
 arch/arm/boot/dts/r8a7790.dtsi                     |  35 ++-
 arch/arm/boot/dts/r8a7791.dtsi                     |  33 ++-
 arch/arm/boot/dts/r8a7792.dtsi                     |  24 +-
 arch/arm/boot/dts/r8a7793-gose.dts                 |  21 ++
 arch/arm/boot/dts/r8a7793.dtsi                     |  21 +-
 arch/arm/boot/dts/r8a7794.dtsi                     |  21 +-
 arch/arm/boot/dts/sh73a0.dtsi                      |   2 +-
 arch/arm/boot/dts/sun4i-a10-a1000.dts              |  12 +-
 arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts         |   2 +-
 arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |  14 +-
 arch/arm/boot/dts/sun4i-a10-cubieboard.dts         |  14 +-
 arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts   |  38 ++-
 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts           |   6 +-
 arch/arm/boot/dts/sun4i-a10-hackberry.dts          |  12 +-
 arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts       |  16 +-
 arch/arm/boot/dts/sun4i-a10-inet1.dts              |  26 +-
 arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |  14 +-
 arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |  29 +--
 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts         |  12 +-
 arch/arm/boot/dts/sun4i-a10-marsboard.dts          |  13 +-
 arch/arm/boot/dts/sun4i-a10-mini-xplus.dts         |   2 +-
 arch/arm/boot/dts/sun4i-a10-mk802.dts              |  18 +-
 arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts     |  27 +-
 arch/arm/boot/dts/sun4i-a10-pcduino.dts            |  19 +-
 arch/arm/boot/dts/sun4i-a10-pcduino2.dts           |   6 +-
 arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts   |  32 +--
 arch/arm/boot/dts/sun4i-a10.dtsi                   | 169 +++++--------
 arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts       |  18 +-
 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts       |  29 +--
 arch/arm/boot/dts/sun5i-a10s-mk802.dts             |  19 +-
 arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts   |  36 ++-
 arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts      |  20 +-
 arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts           |  21 +-
 arch/arm/boot/dts/sun5i-a10s.dtsi                  |  43 ++--
 .../boot/dts/sun5i-a13-empire-electronix-d709.dts  |  23 +-
 arch/arm/boot/dts/sun5i-a13-hsg-h702.dts           |  22 +-
 arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts    |  40 ++-
 arch/arm/boot/dts/sun5i-a13-olinuxino.dts          |  36 ++-
 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts           |  11 +-
 arch/arm/boot/dts/sun5i-a13.dtsi                   |  24 +-
 arch/arm/boot/dts/sun5i-gr8-chip-pro.dts           |  12 +-
 arch/arm/boot/dts/sun5i-gr8-evb.dts                |  24 +-
 arch/arm/boot/dts/sun5i-gr8.dtsi                   | 122 ++++-----
 arch/arm/boot/dts/sun5i-r8-chip.dts                |  27 +-
 .../boot/dts/sun5i-reference-design-tablet.dtsi    |  33 +--
 arch/arm/boot/dts/sun5i.dtsi                       |  75 +++---
 arch/arm/boot/dts/sun6i-a31-app4-evb1.dts          |   6 +-
 arch/arm/boot/dts/sun6i-a31-colombus.dts           |  22 +-
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  23 +-
 arch/arm/boot/dts/sun6i-a31-i7.dts                 |  19 +-
 arch/arm/boot/dts/sun6i-a31-m9.dts                 |  19 +-
 arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts   |  19 +-
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  98 +++-----
 arch/arm/boot/dts/sun6i-a31s-primo81.dts           |  20 +-
 arch/arm/boot/dts/sun6i-a31s-sina31s.dts           |  13 +-
 arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts   |  29 +--
 .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts     |   9 +-
 .../boot/dts/sun6i-reference-design-tablet.dtsi    |  14 +-
 arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts   |  27 +-
 arch/arm/boot/dts/sun7i-a20-bananapi.dts           |  26 +-
 arch/arm/boot/dts/sun7i-a20-bananapro.dts          |  37 +--
 arch/arm/boot/dts/sun7i-a20-cubieboard2.dts        |  13 +-
 arch/arm/boot/dts/sun7i-a20-cubietruck.dts         |  38 +--
 arch/arm/boot/dts/sun7i-a20-hummingbird.dts        |  24 +-
 arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts          |  26 +-
 arch/arm/boot/dts/sun7i-a20-itead-ibox.dts         |   7 +-
 arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts          |  30 +--
 arch/arm/boot/dts/sun7i-a20-m3.dts                 |   6 +-
 arch/arm/boot/dts/sun7i-a20-mk808c.dts             |  12 +-
 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts     |  32 +--
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts     |  27 +-
 .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts    |   6 +-
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |  33 +--
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts    |  28 +--
 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts      |  45 ++--
 arch/arm/boot/dts/sun7i-a20-orangepi.dts           |  38 ++-
 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts      |  25 +-
 arch/arm/boot/dts/sun7i-a20-pcduino3.dts           |  21 +-
 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts     |  25 +-
 arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts   |  13 +-
 arch/arm/boot/dts/sun7i-a20.dtsi                   | 277 ++++++++-------------
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |  99 +++-----
 arch/arm/boot/dts/sun8i-a23-evb.dts                |   7 +-
 .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts   |   8 +-
 .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts   |   8 +-
 arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts     |   9 +-
 arch/arm/boot/dts/sun8i-a33-olinuxino.dts          |  18 +-
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |  11 +-
 arch/arm/boot/dts/sun8i-a33.dtsi                   |   6 +-
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |  21 +-
 arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts    |  18 +-
 arch/arm/boot/dts/sun8i-h3-nanopi.dtsi             |  18 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts          |  26 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts       |  18 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts        |  18 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts    |   4 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |  18 +-
 arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts       |  10 +-
 arch/arm/boot/dts/sun8i-h3.dtsi                    | 104 +++-----
 arch/arm/boot/dts/sun8i-q8-common.dtsi             |   9 +-
 arch/arm/boot/dts/sun8i-r16-parrot.dts             |  36 ++-
 .../boot/dts/sun8i-reference-design-tablet.dtsi    |  26 +-
 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts        |  23 +-
 arch/arm/boot/dts/sun9i-a80-optimus.dts            |  41 ++-
 arch/arm/boot/dts/sun9i-a80.dtsi                   |  61 ++---
 arch/arm/boot/dts/sunxi-common-regulators.dtsi     |  24 +-
 arch/arm/configs/multi_v7_defconfig                |   7 +-
 arch/arm/configs/pxa_defconfig                     |   1 -
 arch/arm/configs/shmobile_defconfig                |   6 +
 arch/arm/configs/tegra_defconfig                   |   2 +-
 arch/arm/mach-shmobile/platsmp-apmu.c              |  41 +--
 arch/arm/mach-shmobile/rcar-gen2.h                 |   2 -
 arch/arm/mach-shmobile/setup-rcar-gen2.c           |  18 --
 arch/arm/mach-shmobile/smp-r8a7791.c               |  14 +-
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |   2 +-
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   2 +
 arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 119 ++++++++-
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |  37 +++
 arch/arm64/boot/dts/renesas/r8a7796.dtsi           | 183 +++++++++++++-
 arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts        |   2 +-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi             |   6 +-
 131 files changed, 1632 insertions(+), 1944 deletions(-)
 create mode 100644 arch/arm/arm-soc-for-next-contents.txt
Merging amlogic/for-next (5853b79aff8b Merge v4.11/dt64)
$ git merge amlogic/for-next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi          | 51 +++++++++++++++++++
 .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 21 ++++++++
 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi   | 17 +++++++
 .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi      | 17 +++++++
 arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi        | 57 ----------------------
 .../boot/dts/amlogic/meson-gxl-s905d-p230.dts      |  2 +
 arch/arm64/boot/dts/amlogic/meson-gxl.dtsi         |  6 ---
 .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts |  2 +
 .../arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts |  2 +
 arch/arm64/boot/dts/amlogic/meson-gxm.dtsi         | 10 ++++
 10 files changed, 122 insertions(+), 63 deletions(-)
Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next)
$ git merge aspeed/for-next
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                    |   1 +
 arch/arm/boot/dts/aspeed-ast2500-evb.dts      |  14 +
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts |  24 +-
 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts  |  45 ++
 arch/arm/boot/dts/aspeed-g4.dtsi              | 776 +++++++++++++++++++++++
 arch/arm/boot/dts/aspeed-g5.dtsi              | 879 ++++++++++++++++++++++++++
 arch/arm/configs/aspeed_g4_defconfig          |  38 +-
 arch/arm/configs/aspeed_g5_defconfig          |  38 +-
 arch/arm/mach-aspeed/Kconfig                  |   4 +
 9 files changed, 1812 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
Merging at91/at91-next (3d928ca85412 Merge branch 'at91-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next)
$ git merge at91/at91-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/arm/axentia.txt |  19 ++
 MAINTAINERS                                       |   8 +
 arch/arm/boot/dts/Makefile                        |   2 +
 arch/arm/boot/dts/at91-linea.dtsi                 |  49 ++++
 arch/arm/boot/dts/at91-sama5d2_xplained.dts       |   2 +
 arch/arm/boot/dts/at91-sama5d4_xplained.dts       |   6 +
 arch/arm/boot/dts/at91-tse850-3.dts               | 274 ++++++++++++++++++++
 arch/arm/boot/dts/sama5d2.dtsi                    |  30 ++-
 arch/arm/boot/dts/sama5d36ek_cmp.dts              |  87 +++++++
 arch/arm/boot/dts/sama5d3_uart.dtsi               |   4 +-
 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi             | 201 +++++++++++++++
 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi             | 301 ++++++++++++++++++++++
 arch/arm/boot/dts/sama5d4.dtsi                    |  16 +-
 arch/arm/configs/sama5_defconfig                  |   7 +-
 arch/arm/mach-at91/pm.c                           |   2 +-
 arch/arm/mach-at91/pm.h                           |   2 -
 drivers/memory/atmel-ebi.c                        |  27 +-
 17 files changed, 1008 insertions(+), 29 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/axentia.txt
 create mode 100644 arch/arm/boot/dts/at91-linea.dtsi
 create mode 100644 arch/arm/boot/dts/at91-tse850-3.dts
 create mode 100644 arch/arm/boot/dts/sama5d36ek_cmp.dts
 create mode 100644 arch/arm/boot/dts/sama5d3xcm_cmp.dtsi
 create mode 100644 arch/arm/boot/dts/sama5d3xmb_cmp.dtsi
Merging bcm2835/for-next (ec09fdf764ee Merge branch anholt/bcm2835-defconfig-64-next into for-next)
$ git merge bcm2835/for-next
Auto-merging drivers/thermal/Makefile
Auto-merging drivers/thermal/Kconfig
Merge made by the 'recursive' strategy.
 drivers/thermal/Kconfig           |   8 +
 drivers/thermal/Makefile          |   1 +
 drivers/thermal/bcm2835_thermal.c | 340 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 349 insertions(+)
 create mode 100644 drivers/thermal/bcm2835_thermal.c
Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
$ git merge cortex-m/for-next
Already up-to-date.
Merging imx-mxs/for-next (1393f73bb898 Merge branch 'zte/pm-domains' into for-next)
$ git merge imx-mxs/for-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/soc/zte/pd-2967xx.txt      |  19 +
 .../devicetree/bindings/vendor-prefixes.txt        |   2 +
 MAINTAINERS                                        |   4 +
 arch/arm/boot/dts/Makefile                         |   5 +
 arch/arm/boot/dts/imx1-ads.dts                     |   1 -
 arch/arm/boot/dts/imx1.dtsi                        |   3 +-
 arch/arm/boot/dts/imx23.dtsi                       |   5 +-
 arch/arm/boot/dts/imx25.dtsi                       |   7 +-
 arch/arm/boot/dts/imx27-apf27dev.dts               |   2 -
 .../boot/dts/imx27-eukrea-mbimxsd27-baseboard.dts  |   1 -
 arch/arm/boot/dts/imx27-pdk.dts                    |   1 -
 arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi  |   1 -
 arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts     |   1 -
 arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi    |   1 -
 arch/arm/boot/dts/imx27.dtsi                       |   1 +
 arch/arm/boot/dts/imx28.dtsi                       |   7 +-
 arch/arm/boot/dts/imx31.dtsi                       |   5 +-
 arch/arm/boot/dts/imx35.dtsi                       |   5 +-
 arch/arm/boot/dts/imx50-evk.dts                    |   1 -
 arch/arm/boot/dts/imx51-apf51dev.dts               |   2 -
 arch/arm/boot/dts/imx51-babbage.dts                |   1 -
 arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi  |   1 -
 .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |   1 -
 arch/arm/boot/dts/imx53-qsb.dts                    |   5 +-
 arch/arm/boot/dts/imx53-qsrb.dts                   |   6 +-
 arch/arm/boot/dts/imx53-smd.dts                    |   1 -
 arch/arm/boot/dts/imx53-tqma53.dtsi                |   2 -
 arch/arm/boot/dts/imx53-tx53.dtsi                  |   1 -
 arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi        |   1 -
 arch/arm/boot/dts/imx6dl-aristainetos2_4.dts       |  10 +-
 arch/arm/boot/dts/imx6dl-aristainetos2_7.dts       |  10 +-
 arch/arm/boot/dts/imx6dl-aristainetos_4.dts        |   1 -
 arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts       |  10 +-
 arch/arm/boot/dts/imx6dl-cubox-i.dts               |  10 +-
 arch/arm/boot/dts/imx6dl-hummingboard.dts          |  10 +-
 arch/arm/boot/dts/imx6dl-icore-rqs.dts             |  51 +++
 arch/arm/boot/dts/imx6dl-icore.dts                 |  10 +-
 arch/arm/boot/dts/imx6dl-nit6xlite.dts             |  10 +-
 arch/arm/boot/dts/imx6dl-nitrogen6x.dts            |  10 +-
 arch/arm/boot/dts/imx6dl-sabrelite.dts             |  10 +-
 arch/arm/boot/dts/imx6dl-savageboard.dts           |  51 +++
 arch/arm/boot/dts/imx6dl-ts4900.dts                |  10 +-
 arch/arm/boot/dts/imx6q-apalis-ixora.dts           |  10 +-
 arch/arm/boot/dts/imx6q-b450v3.dts                 |  10 +-
 arch/arm/boot/dts/imx6q-b650v3.dts                 |  10 +-
 arch/arm/boot/dts/imx6q-b850v3.dts                 |  10 +-
 arch/arm/boot/dts/imx6q-ba16.dtsi                  |  11 +-
 arch/arm/boot/dts/imx6q-bx50v3.dtsi                |  11 +-
 arch/arm/boot/dts/imx6q-cm-fx6.dts                 |  32 +-
 arch/arm/boot/dts/imx6q-cubox-i.dts                |  10 +-
 arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts            |   1 -
 arch/arm/boot/dts/imx6q-evi.dts                    |   3 -
 arch/arm/boot/dts/imx6q-gw5400-a.dts               |   1 -
 arch/arm/boot/dts/imx6q-h100.dts                   |  10 +-
 arch/arm/boot/dts/imx6q-hummingboard.dts           |  10 +-
 arch/arm/boot/dts/imx6q-icore-rqs.dts              |  12 +-
 arch/arm/boot/dts/imx6q-icore.dts                  |  10 +-
 arch/arm/boot/dts/imx6q-marsboard.dts              |  11 +-
 arch/arm/boot/dts/imx6q-mccmon6.dts                | 473 +++++++++++++++++++++
 arch/arm/boot/dts/imx6q-nitrogen6_max.dts          |  10 +-
 arch/arm/boot/dts/imx6q-nitrogen6_som2.dts         |  10 +-
 arch/arm/boot/dts/imx6q-nitrogen6x.dts             |  10 +-
 arch/arm/boot/dts/imx6q-novena.dts                 |   1 -
 arch/arm/boot/dts/imx6q-sabrelite.dts              |  10 +-
 arch/arm/boot/dts/imx6q-savageboard.dts            |  55 +++
 arch/arm/boot/dts/imx6q-ts4900.dts                 |  10 +-
 arch/arm/boot/dts/imx6qdl-apalis.dtsi              |  12 +-
 arch/arm/boot/dts/imx6qdl-apf6dev.dtsi             |   1 -
 arch/arm/boot/dts/imx6qdl-aristainetos.dtsi        |   1 -
 arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi       |  13 +-
 arch/arm/boot/dts/imx6qdl-colibri.dtsi             |  11 +-
 arch/arm/boot/dts/imx6qdl-cubox-i.dtsi             |  10 +-
 arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi       |   1 -
 arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              | 132 ++++--
 arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              | 166 +++++---
 arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              | 163 ++++---
 arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |  16 +
 arch/arm/boot/dts/imx6qdl-gw551x.dtsi              | 132 ++++--
 arch/arm/boot/dts/imx6qdl-gw552x.dtsi              | 130 ++++--
 arch/arm/boot/dts/imx6qdl-gw553x.dtsi              |  98 ++++-
 arch/arm/boot/dts/imx6qdl-hummingboard.dtsi        |  10 +-
 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi           |  10 +-
 arch/arm/boot/dts/imx6qdl-icore.dtsi               |  10 +-
 arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi     |  10 +-
 arch/arm/boot/dts/imx6qdl-microsom.dtsi            |  10 +-
 arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi           |  13 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |  19 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi      |  17 +-
 arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |  13 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |   1 -
 arch/arm/boot/dts/imx6qdl-rex.dtsi                 |   2 -
 arch/arm/boot/dts/imx6qdl-sabreauto.dtsi           |   1 -
 arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |  13 +-
 arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   1 -
 arch/arm/boot/dts/imx6qdl-savageboard.dtsi         | 255 +++++++++++
 arch/arm/boot/dts/imx6qdl-ts4900.dtsi              |  12 +-
 arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |   1 -
 arch/arm/boot/dts/imx6sl-evk.dts                   |   1 -
 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts           |  11 +-
 arch/arm/boot/dts/imx6sx-sdb-sai.dts               |  10 +-
 arch/arm/boot/dts/imx6sx-udoo-neo.dtsi             |   1 +
 arch/arm/boot/dts/imx6ul-geam-kit.dts              |  10 +-
 arch/arm/boot/dts/imx6ul-geam.dtsi                 |  10 +-
 arch/arm/boot/dts/imx6ul-isiot.dts                 | 119 ++++++
 arch/arm/boot/dts/imx6ul-liteboard.dts             |  10 +-
 arch/arm/boot/dts/imx6ul-litesom.dtsi              |  10 +-
 arch/arm/boot/dts/imx6ul-pico-hobbit.dts           |  10 +-
 arch/arm/boot/dts/imx6ul-tx6ul.dtsi                |   1 -
 arch/arm/boot/dts/imx6ul.dtsi                      |   7 +-
 arch/arm/boot/dts/imx6ull-14x14-evk.dts            |  10 +-
 arch/arm/boot/dts/imx6ull.dtsi                     |  10 +-
 arch/arm/boot/dts/imx7d-sdb.dts                    |   1 -
 arch/arm/boot/dts/imx7s.dtsi                       |   1 -
 arch/arm/boot/dts/vf-colibri-eval-v3.dtsi          |  10 +-
 arch/arm/boot/dts/vf-colibri.dtsi                  |  10 +-
 arch/arm/boot/dts/vf500-colibri-eval-v3.dts        |  10 +-
 arch/arm/boot/dts/vf500-colibri.dtsi               |  10 +-
 arch/arm/boot/dts/vf500.dtsi                       |  10 +-
 arch/arm/boot/dts/vf610-colibri-eval-v3.dts        |  10 +-
 arch/arm/boot/dts/vf610-colibri.dtsi               |  10 +-
 arch/arm/boot/dts/vf610-twr.dts                    |  10 +-
 arch/arm/boot/dts/vf610-zii-dev-rev-b.dts          |  10 +-
 arch/arm/boot/dts/vf610.dtsi                       |  10 +-
 arch/arm/boot/dts/vf610m4-colibri.dts              |  10 +-
 arch/arm/boot/dts/vf610m4-cosmic.dts               |  10 +-
 arch/arm/boot/dts/vf610m4.dtsi                     |  10 +-
 arch/arm/boot/dts/vfxxx.dtsi                       |  10 +-
 arch/arm/configs/imx_v6_v7_defconfig               |   4 +-
 arch/arm/mach-imx/devices/platform-flexcan.c       |   9 -
 .../mach-imx/devices/platform-sdhci-esdhc-imx.c    |  10 -
 arch/arm/mach-imx/mach-mx27_3ds.c                  | 107 -----
 arch/arm/mach-imx/mach-mx31_3ds.c                  | 160 -------
 arch/arm/mach-imx/mach-mx35_3ds.c                  | 103 -----
 arch/arm/mach-imx/mach-pcm037.c                    | 115 -----
 arch/arm/mach-imx/mx31moboard-marxbot.c            |  92 ----
 arch/arm/mach-imx/mx31moboard-smartbot.c           |  74 ----
 arch/arm64/boot/dts/freescale/Makefile             |   3 +
 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 115 +++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts  | 128 ++++++
 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts  |  59 +++
 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi     | 247 +++++++++++
 arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi     |  80 ++++
 arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts  |   1 -
 arch/arm64/boot/dts/zte/zx296718.dtsi              |  39 ++
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/zte/Kconfig                            |  13 +
 drivers/soc/zte/Makefile                           |   5 +
 drivers/soc/zte/zx296718_pm_domains.c              | 182 ++++++++
 drivers/soc/zte/zx2967_pm_domains.c                | 143 +++++++
 drivers/soc/zte/zx2967_pm_domains.h                |  44 ++
 include/dt-bindings/soc/zte,pm_domains.h           |  24 ++
 152 files changed, 3158 insertions(+), 1284 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/soc/zte/pd-2967xx.txt
 create mode 100644 arch/arm/boot/dts/imx6dl-icore-rqs.dts
 create mode 100644 arch/arm/boot/dts/imx6dl-savageboard.dts
 create mode 100644 arch/arm/boot/dts/imx6q-mccmon6.dts
 create mode 100644 arch/arm/boot/dts/imx6q-savageboard.dts
 create mode 100644 arch/arm/boot/dts/imx6qdl-savageboard.dtsi
 create mode 100644 arch/arm/boot/dts/imx6ul-isiot.dts
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts
 create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi
 create mode 100644 drivers/soc/zte/Kconfig
 create mode 100644 drivers/soc/zte/Makefile
 create mode 100644 drivers/soc/zte/zx296718_pm_domains.c
 create mode 100644 drivers/soc/zte/zx2967_pm_domains.c
 create mode 100644 drivers/soc/zte/zx2967_pm_domains.h
 create mode 100644 include/dt-bindings/soc/zte,pm_domains.h
Merging keystone/next (45f49b8d26ee Merge branch 'for_4.11/keystone_config' into next)
$ git merge keystone/next
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/keystone-k2e.dtsi  | 12 ++++++++++++
 arch/arm/boot/dts/keystone-k2g.dtsi  | 14 +++++++++++++-
 arch/arm/boot/dts/keystone-k2hk.dtsi | 12 ++++++++++++
 arch/arm/boot/dts/keystone-k2l.dtsi  | 16 ++++++++++++++--
 arch/arm/boot/dts/keystone.dtsi      |  4 ++--
 arch/arm/configs/keystone_defconfig  |  1 +
 drivers/soc/ti/knav_dma.c            |  4 ++--
 drivers/soc/ti/knav_qmss_acc.c       | 15 +++------------
 drivers/soc/ti/knav_qmss_queue.c     | 25 ++++++++-----------------
 9 files changed, 67 insertions(+), 36 deletions(-)
Merging mvebu/for-next (6b0b30683cca Merge branch 'mvebu/dt64' into mvebu/for-next)
$ git merge mvebu/for-next
Auto-merging arch/arm64/configs/defconfig
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
 arch/arm/boot/dts/Makefile                         |   2 +
 arch/arm/boot/dts/armada-370-db.dts                |  10 +-
 arch/arm/boot/dts/armada-370-dlink-dns327l.dts     |  10 +-
 arch/arm/boot/dts/armada-370-mirabox.dts           |  10 +-
 arch/arm/boot/dts/armada-370-netgear-rn102.dts     |  10 +-
 arch/arm/boot/dts/armada-370-netgear-rn104.dts     |  10 +-
 arch/arm/boot/dts/armada-370-rd.dts                |  10 +-
 arch/arm/boot/dts/armada-370-synology-ds213j.dts   |  10 +-
 arch/arm/boot/dts/armada-370-xp.dtsi               |  10 +-
 arch/arm/boot/dts/armada-370.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-375-db.dts                |  10 +-
 arch/arm/boot/dts/armada-375.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-380.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-385-turris-omnia.dts      |  58 +++-
 arch/arm/boot/dts/armada-385.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-388-clearfog-base.dts     | 109 ++++++
 arch/arm/boot/dts/armada-388-clearfog-pro.dts      |  55 +++
 arch/arm/boot/dts/armada-388-clearfog.dts          | 374 ++++-----------------
 arch/arm/boot/dts/armada-388-clearfog.dtsi         | 307 +++++++++++++++++
 arch/arm/boot/dts/armada-388-db.dts                |  10 +-
 arch/arm/boot/dts/armada-388-rd.dts                |  10 +-
 .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 130 ++++---
 arch/arm/boot/dts/armada-38x.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-390-db.dts                |  10 +-
 arch/arm/boot/dts/armada-390.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-395.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-398-db.dts                |  10 +-
 arch/arm/boot/dts/armada-398.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-39x.dtsi                  |  10 +-
 arch/arm/boot/dts/armada-xp-axpwifiap.dts          |  10 +-
 arch/arm/boot/dts/armada-xp-db.dts                 |  10 +-
 arch/arm/boot/dts/armada-xp-gp.dts                 |  10 +-
 arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts    |  10 +-
 arch/arm/boot/dts/armada-xp-matrix.dts             |  10 +-
 arch/arm/boot/dts/armada-xp-mv78230.dtsi           |  10 +-
 arch/arm/boot/dts/armada-xp-mv78260.dtsi           |  10 +-
 arch/arm/boot/dts/armada-xp-mv78460.dtsi           |  10 +-
 arch/arm/boot/dts/armada-xp-netgear-rn2120.dts     |  10 +-
 arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts   |  10 +-
 arch/arm/boot/dts/armada-xp-synology-ds414.dts     |  10 +-
 arch/arm/boot/dts/armada-xp.dtsi                   |  10 +-
 arch/arm/boot/dts/dove-cm-a510.dtsi                |  10 +-
 arch/arm/boot/dts/dove-sbc-a510.dts                |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi   |  10 +-
 .../boot/dts/kirkwood-linkstation-duo-6281.dtsi    |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts   |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts    |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts  |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts   |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts   |  10 +-
 arch/arm/boot/dts/kirkwood-linkstation.dtsi        |  10 +-
 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  10 +-
 .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    |  10 +-
 arch/arm/boot/dts/orion5x-kuroboxpro.dts           |  10 +-
 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts     |  10 +-
 arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   |  10 +-
 arch/arm/boot/dts/orion5x-linkstation.dtsi         |  10 +-
 arch/arm/boot/dts/orion5x-lschl.dts                |  10 +-
 arch/arm/boot/dts/orion5x-lswsgl.dts               |  10 +-
 arch/arm/mach-mv78xx0/pcie.c                       |   2 +-
 arch/arm64/boot/dts/marvell/armada-371x.dtsi       |  10 +-
 arch/arm64/boot/dts/marvell/armada-3720-db.dts     |  44 ++-
 .../boot/dts/marvell/armada-3720-espressobin.dts   |  76 ++++-
 arch/arm64/boot/dts/marvell/armada-372x.dtsi       |  10 +-
 arch/arm64/boot/dts/marvell/armada-37xx.dtsi       |  39 ++-
 arch/arm64/configs/defconfig                       |   1 +
 drivers/soc/dove/pmu.c                             |   2 +-
 67 files changed, 1090 insertions(+), 649 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-388-clearfog-base.dts
 create mode 100644 arch/arm/boot/dts/armada-388-clearfog-pro.dts
 create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dtsi
Merging omap/for-next (cb04b142b1f0 Merge branch 'omap-for-v4.11/dt' into for-next)
$ git merge omap/for-next
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                     |  19 +-
 arch/arm/boot/dts/Makefile                      |   2 +
 arch/arm/boot/dts/am335x-bone-common.dtsi       |   2 +
 arch/arm/boot/dts/am335x-boneblack-common.dtsi  | 163 ++++++++++++++
 arch/arm/boot/dts/am335x-boneblack-wireless.dts | 109 +++++++++
 arch/arm/boot/dts/am335x-boneblack.dts          | 155 +------------
 arch/arm/boot/dts/am335x-bonegreen-common.dtsi  |  44 ++++
 arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 126 +++++++++++
 arch/arm/boot/dts/am335x-bonegreen.dts          |  38 +---
 arch/arm/boot/dts/am335x-chilisom.dtsi          |   8 +
 arch/arm/boot/dts/am335x-icev2.dts              |   1 -
 arch/arm/boot/dts/am335x-nano.dts               |  31 ++-
 arch/arm/boot/dts/am335x-phycore-som.dtsi       |  72 +-----
 arch/arm/boot/dts/am335x-wega.dtsi              |   9 +-
 arch/arm/boot/dts/am33xx.dtsi                   |   3 +-
 arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi |  14 +-
 arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts   |   5 +
 arch/arm/boot/dts/am57xx-beagle-x15.dts         |   5 +
 arch/arm/boot/dts/dm814x.dtsi                   |   9 +-
 arch/arm/boot/dts/dm816x.dtsi                   |   6 +-
 arch/arm/boot/dts/dra7-evm.dts                  | 282 +++---------------------
 arch/arm/boot/dts/dra7.dtsi                     |   1 +
 arch/arm/boot/dts/dra72-evm-common.dtsi         |   7 +-
 arch/arm/boot/dts/dra72-evm-revc.dts            |   6 +-
 arch/arm/boot/dts/omap3-beagle-xm.dts           |  16 ++
 arch/arm/boot/dts/omap3-igep.dtsi               |  21 --
 arch/arm/boot/dts/omap3-n900.dts                |   3 +-
 arch/arm/boot/dts/omap4-panda-common.dtsi       |  16 ++
 arch/arm/boot/dts/omap5-igep0050.dts            |  21 ++
 arch/arm/boot/dts/omap5-uevm.dts                |  21 ++
 arch/arm/boot/dts/omap5.dtsi                    |   1 +
 arch/arm/configs/omap2plus_defconfig            |   4 +-
 arch/arm/mach-omap1/dma.c                       |  16 +-
 arch/arm/mach-omap1/include/mach/usb.h          |   2 -
 arch/arm/mach-omap1/usb.c                       |  51 ++---
 arch/arm/mach-omap2/display.c                   | 258 +---------------------
 arch/arm/mach-omap2/display.h                   |   7 -
 arch/arm/mach-omap2/pdata-quirks.c              |   3 +-
 drivers/soc/ti/wkup_m3_ipc.c                    |   3 +-
 include/dt-bindings/pinctrl/omap.h              |   4 +-
 40 files changed, 710 insertions(+), 854 deletions(-)
 create mode 100644 arch/arm/boot/dts/am335x-boneblack-common.dtsi
 create mode 100644 arch/arm/boot/dts/am335x-boneblack-wireless.dts
 create mode 100644 arch/arm/boot/dts/am335x-bonegreen-common.dtsi
 create mode 100644 arch/arm/boot/dts/am335x-bonegreen-wireless.dts
Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence)
$ git merge omap-pending/for-next
Already up-to-date.
Merging qcom/for-next (ad240de8a360 Merge branch 'dts-for-4.11' into all-for-4.11)
$ git merge qcom/for-next
Auto-merging arch/arm64/boot/dts/qcom/msm8996.dtsi
Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |   1 +
 arch/arm/boot/dts/qcom-apq8060-dragonboard.dts     |  62 ++++-
 .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts |  69 +++++
 arch/arm/boot/dts/qcom-apq8064-ifc6410.dts         |  22 --
 arch/arm/boot/dts/qcom-apq8064-pins.dtsi           |  37 +++
 .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts |   7 +
 arch/arm/boot/dts/qcom-apq8064.dtsi                | 287 ++++++++++++++++++++-
 arch/arm/boot/dts/qcom-ipq8064.dtsi                |   4 +-
 arch/arm/boot/dts/qcom-msm8660-surf.dts            |   2 +-
 arch/arm/boot/dts/qcom-msm8660.dtsi                |  12 +-
 .../boot/dts/qcom-msm8974-sony-xperia-honami.dts   |   8 +
 arch/arm/boot/dts/qcom-msm8974.dtsi                |  96 ++++++-
 arch/arm/configs/qcom_defconfig                    |  34 +++
 .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi |  13 +
 arch/arm64/boot/dts/qcom/apq8016-sbc-soc-pins.dtsi |  13 +
 arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          |  32 +++
 .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi    |  14 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi       |  19 ++
 arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |  13 +
 arch/arm64/boot/dts/qcom/msm8916.dtsi              |  75 +++++-
 arch/arm64/boot/dts/qcom/msm8996.dtsi              |   6 +
 drivers/bus/Kconfig                                |   1 +
 drivers/firmware/qcom_scm-32.c                     |  23 ++
 drivers/firmware/qcom_scm-64.c                     |  31 +++
 drivers/firmware/qcom_scm.c                        |  14 +-
 drivers/firmware/qcom_scm.h                        |   3 +
 include/linux/qcom_scm.h                           |  55 ++--
 27 files changed, 887 insertions(+), 66 deletions(-)
Merging renesas/next (c1809af106b4 Merge branch 'arm64-dt-for-v4.11' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
 arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts     | 2 ++
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 1 +
 arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 1 +
 3 files changed, 4 insertions(+)
Merging rockchip/for-next (07bfba71f858 Merge branch 'v4.11-clk/next' into for-next)
$ git merge rockchip/for-next
Merge made by the 'recursive' strategy.
 .../bindings/clock/rockchip,rk3328-cru.txt         |  57 ++
 .../bindings/clock/rockchip,rk3399-cru.txt         |   6 +
 .../devicetree/bindings/soc/rockchip/grf.txt       |   4 +
 .../bindings/soc/rockchip/power_domain.txt         |   3 +
 arch/arm/boot/dts/rk3036-evb.dts                   |   2 +-
 arch/arm/boot/dts/rk3036-kylin.dts                 |  12 +-
 arch/arm/boot/dts/rk3066a-bqcurie2.dts             |   8 +-
 arch/arm/boot/dts/rk3066a-marsboard.dts            |   6 +-
 arch/arm/boot/dts/rk3066a-mk808.dts                |  10 +-
 arch/arm/boot/dts/rk3066a-rayeager.dts             |  18 +-
 arch/arm/boot/dts/rk3188-px3-evb.dts               |  10 +-
 arch/arm/boot/dts/rk3188-radxarock.dts             |  20 +-
 arch/arm/boot/dts/rk3229-evb.dts                   |   2 +-
 arch/arm/boot/dts/rk3288-evb-act8846.dts           |   6 +-
 arch/arm/boot/dts/rk3288-evb-rk808.dts             |   2 +-
 arch/arm/boot/dts/rk3288-evb.dtsi                  |  14 +-
 arch/arm/boot/dts/rk3288-fennec.dts                |   6 +-
 arch/arm/boot/dts/rk3288-firefly-beta.dts          |   2 +-
 arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi  |   2 +-
 arch/arm/boot/dts/rk3288-firefly-reload.dts        |  26 +-
 arch/arm/boot/dts/rk3288-firefly.dts               |   2 +-
 arch/arm/boot/dts/rk3288-firefly.dtsi              |  18 +-
 arch/arm/boot/dts/rk3288-miqi.dts                  |   8 +-
 arch/arm/boot/dts/rk3288-popmetal.dts              |   8 +-
 arch/arm/boot/dts/rk3288-r89.dts                   |  14 +-
 arch/arm/boot/dts/rk3288-rock2-som.dtsi            |   4 +-
 arch/arm/boot/dts/rk3288-rock2-square.dts          |  14 +-
 arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi  |   8 +-
 arch/arm/boot/dts/rk3288-veyron-brain.dts          |   8 +-
 arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |  14 +-
 arch/arm/boot/dts/rk3288-veyron-jaq.dts            |  14 +-
 arch/arm/boot/dts/rk3288-veyron-jerry.dts          |  12 +-
 arch/arm/boot/dts/rk3288-veyron-mickey.dts         |   6 +-
 arch/arm/boot/dts/rk3288-veyron-minnie.dts         |  18 +-
 arch/arm/boot/dts/rk3288-veyron-pinky.dts          |   4 +-
 arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi         |   2 +-
 arch/arm/boot/dts/rk3288-veyron-speedy.dts         |  10 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi               |  10 +-
 arch/arm/boot/dts/rk3288.dtsi                      |  84 ++
 arch/arm/mach-rockchip/rockchip.c                  |  12 -
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |  10 +-
 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    |  10 +-
 .../boot/dts/rockchip/rk3368-orion-r68-meta.dts    |  14 +-
 arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts    |  10 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |  16 +-
 arch/arm64/boot/dts/rockchip/rk3399-evb.dts        |   8 +-
 arch/arm64/boot/dts/rockchip/rk3399.dtsi           |  41 +-
 drivers/clk/rockchip/Makefile                      |   2 +
 drivers/clk/rockchip/clk-muxgrf.c                  | 102 +++
 drivers/clk/rockchip/clk-pll.c                     |  16 +-
 drivers/clk/rockchip/clk-rk3188.c                  |   4 +-
 drivers/clk/rockchip/clk-rk3288.c                  |  13 +-
 drivers/clk/rockchip/clk-rk3328.c                  | 895 +++++++++++++++++++++
 drivers/clk/rockchip/clk.c                         |   8 +-
 drivers/clk/rockchip/clk.h                         |  40 +
 drivers/soc/rockchip/Kconfig                       |  10 +
 drivers/soc/rockchip/Makefile                      |   1 +
 drivers/soc/rockchip/grf.c                         | 134 +++
 drivers/soc/rockchip/pm_domains.c                  |  63 +-
 include/dt-bindings/clock/rk3188-cru-common.h      |   2 +
 include/dt-bindings/clock/rk3288-cru.h             |   1 +
 include/dt-bindings/clock/rk3328-cru.h             | 400 +++++++++
 include/dt-bindings/power/rk3328-power.h           |  18 +
 63 files changed, 2070 insertions(+), 234 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt
 create mode 100644 drivers/clk/rockchip/clk-muxgrf.c
 create mode 100644 drivers/clk/rockchip/clk-rk3328.c
 create mode 100644 drivers/soc/rockchip/grf.c
 create mode 100644 include/dt-bindings/clock/rk3328-cru.h
 create mode 100644 include/dt-bindings/power/rk3328-power.h
Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
$ git merge rpi/for-rpi-next
Already up-to-date.
Merging samsung/for-next (1001354ca341 Linux 4.9-rc1)
$ git merge samsung/for-next
Already up-to-date.
Merging samsung-krzk/for-next (769b280fb822 Merge branch 'next/dt64' into for-next)
$ git merge samsung-krzk/for-next
Auto-merging arch/arm64/boot/dts/exynos/exynos5433.dtsi
Removing arch/arm/boot/dts/exynos4x12.dtsi
Auto-merging arch/arm/boot/dts/exynos4412-pinctrl.dtsi
Removing arch/arm/boot/dts/exynos4212.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |    1 +
 arch/arm/boot/dts/exynos4.dtsi                     |    6 +-
 arch/arm/boot/dts/exynos4212.dtsi                  |  133 ---
 arch/arm/boot/dts/exynos4412-itop-elite.dts        |   25 +-
 arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |   28 +-
 arch/arm/boot/dts/exynos4412-odroidu3.dts          |    5 +-
 arch/arm/boot/dts/exynos4412-odroidx.dts           |   13 +
 arch/arm/boot/dts/exynos4412-odroidx2.dts          |   25 +-
 ...os4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} |    4 +-
 arch/arm/boot/dts/exynos4412-prime.dtsi            |   41 +
 arch/arm/boot/dts/exynos4412.dtsi                  |  577 +++++++++-
 arch/arm/boot/dts/exynos4x12.dtsi                  |  594 ----------
 arch/arm/boot/dts/exynos5250.dtsi                  |    8 +
 arch/arm/boot/dts/exynos5410.dtsi                  |    8 +
 arch/arm/boot/dts/exynos5420.dtsi                  |    8 +
 arch/arm/configs/exynos_defconfig                  |    1 +
 arch/arm/configs/s3c2410_defconfig                 |    6 +-
 arch/arm/configs/s5pv210_defconfig                 |    4 -
 arch/arm/mach-exynos/exynos.c                      |    4 +-
 arch/arm/mach-exynos/mcpm-exynos.c                 |    2 +-
 arch/arm/mach-exynos/suspend.c                     |   10 +-
 arch/arm/mach-s3c24xx/bast-irq.c                   |    4 +-
 arch/arm/mach-s3c24xx/iotiming-s3c2410.c           |    2 +-
 arch/arm/mach-s3c24xx/pm-s3c2412.c                 |    2 +-
 arch/arm/mach-s3c64xx/common.c                     |    3 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |   19 -
 arch/arm/mach-s3c64xx/pm.c                         |    2 +-
 arch/arm/plat-samsung/devs.c                       |   19 -
 arch/arm/plat-samsung/include/plat/wakeup-mask.h   |    2 +-
 arch/arm/plat-samsung/wakeup-mask.c                |    2 +-
 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi     |  197 ++++
 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi |  373 +++---
 .../boot/dts/exynos/exynos5433-tm2-common.dtsi     | 1187 ++++++++++++++++++++
 arch/arm64/boot/dts/exynos/exynos5433-tm2.dts      | 1036 +----------------
 arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts     |   12 +-
 arch/arm64/boot/dts/exynos/exynos5433.dtsi         |  115 +-
 drivers/clk/samsung/clk-exynos4.c                  |    4 +
 include/dt-bindings/pinctrl/samsung.h              |   14 +
 38 files changed, 2402 insertions(+), 2094 deletions(-)
 delete mode 100644 arch/arm/boot/dts/exynos4212.dtsi
 rename arch/arm/boot/dts/{exynos4x12-pinctrl.dtsi => exynos4412-pinctrl.dtsi} (99%)
 create mode 100644 arch/arm/boot/dts/exynos4412-prime.dtsi
 delete mode 100644 arch/arm/boot/dts/exynos4x12.dtsi
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
 create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
Merging tegra/for-next (e8d16d40e269 Merge branch for-4.10/i2c into for-next)
$ git merge tegra/for-next
Auto-merging drivers/i2c/busses/Makefile
Auto-merging drivers/i2c/busses/Kconfig
Merge made by the 'recursive' strategy.
 .../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt      |  42 ++
 drivers/clk/tegra/Kconfig                          |   4 +
 drivers/clk/tegra/Makefile                         |   1 +
 drivers/clk/tegra/clk-bpmp.c                       | 620 +++++++++++++++++++++
 drivers/clk/tegra/clk-tegra20.c                    |   1 +
 drivers/clk/tegra/clk-tegra30.c                    |   1 +
 drivers/i2c/busses/Kconfig                         |  11 +
 drivers/i2c/busses/Makefile                        |   1 +
 drivers/i2c/busses/i2c-tegra-bpmp.c                | 365 ++++++++++++
 9 files changed, 1046 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt
 create mode 100644 drivers/clk/tegra/clk-bpmp.c
 create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c
Merging arm64/for-next/core (f92f5ce01ee6 arm64: Advertise support for Rounding double multiply instructions)
$ git merge arm64/for-next/core
Auto-merging lib/Kconfig.debug
Auto-merging include/linux/mm.h
Merge made by the 'recursive' strategy.
 Documentation/arm64/cpu-feature-registers.txt | 240 +++++++++++++++++
 arch/arm64/Kconfig                            |   1 +
 arch/arm64/include/asm/cpufeature.h           |  26 +-
 arch/arm64/include/asm/insn.h                 |   2 +
 arch/arm64/include/asm/kvm_mmu.h              |   4 +-
 arch/arm64/include/asm/memory.h               |  66 +++--
 arch/arm64/include/asm/mmu_context.h          |   6 +-
 arch/arm64/include/asm/pgtable.h              |   2 +-
 arch/arm64/include/asm/processor.h            |   1 -
 arch/arm64/include/asm/sysreg.h               |  26 +-
 arch/arm64/include/uapi/asm/hwcap.h           |   2 +
 arch/arm64/kernel/acpi_parking_protocol.c     |   3 +-
 arch/arm64/kernel/armv8_deprecated.c          |   2 +-
 arch/arm64/kernel/cpu-reset.h                 |   2 +-
 arch/arm64/kernel/cpufeature.c                | 354 +++++++++++++++++---------
 arch/arm64/kernel/cpuinfo.c                   |   2 +
 arch/arm64/kernel/head.S                      |   4 +-
 arch/arm64/kernel/hibernate.c                 |  26 +-
 arch/arm64/kernel/insn.c                      |  31 ++-
 arch/arm64/kernel/process.c                   |   2 +-
 arch/arm64/kernel/psci.c                      |   3 +-
 arch/arm64/kernel/setup.c                     |   9 +-
 arch/arm64/kernel/smp_spin_table.c            |   3 +-
 arch/arm64/kernel/traps.c                     |   2 +-
 arch/arm64/kernel/vdso.c                      |   8 +-
 arch/arm64/mm/Makefile                        |   2 +
 arch/arm64/mm/dma-mapping.c                   |  12 +-
 arch/arm64/mm/fault.c                         |  14 -
 arch/arm64/mm/init.c                          |  12 +-
 arch/arm64/mm/kasan_init.c                    |  22 +-
 arch/arm64/mm/mmu.c                           |  33 ++-
 arch/arm64/mm/physaddr.c                      |  30 +++
 arch/x86/Kconfig                              |   1 +
 drivers/firmware/psci.c                       |   2 +-
 include/linux/mm.h                            |   4 +
 kernel/kexec_core.c                           |   2 +-
 lib/Kconfig.debug                             |   5 +-
 mm/cma.c                                      |  15 +-
 mm/kasan/kasan_init.c                         |  15 +-
 mm/usercopy.c                                 |   4 +-
 40 files changed, 753 insertions(+), 247 deletions(-)
 create mode 100644 Documentation/arm64/cpu-feature-registers.txt
 create mode 100644 arch/arm64/mm/physaddr.c
Merging clk/clk-next (89d5dcc48c08 clk: stm32f4: avoid uninitialized variable access)
$ git merge clk/clk-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/clock/hi3660-clock.txt     |  42 ++
 .../devicetree/bindings/clock/qcom,rpmcc.txt       |   1 +
 .../devicetree/bindings/clock/st,stm32-rcc.txt     |  17 +
 .../devicetree/bindings/clock/ti,cdce925.txt       |  15 +-
 .../devicetree/bindings/clock/zx296718-clk.txt     |   3 +
 drivers/clk/Kconfig                                |  11 +-
 drivers/clk/axs10x/i2s_pll_clock.c                 |   1 +
 drivers/clk/clk-cdce925.c                          | 108 +++-
 drivers/clk/clk-conf.c                             |  15 +-
 drivers/clk/clk-scpi.c                             |  14 +-
 drivers/clk/clk-stm32f4.c                          | 597 ++++++++++++++++++++-
 drivers/clk/clk-wm831x.c                           |   3 +-
 drivers/clk/hisilicon/Kconfig                      |   7 +
 drivers/clk/hisilicon/Makefile                     |   1 +
 drivers/clk/hisilicon/clk-hi3660.c                 | 567 +++++++++++++++++++
 drivers/clk/imx/clk-pllv3.c                        |  99 ++++
 drivers/clk/imx/clk-vf610.c                        |   4 +-
 drivers/clk/imx/clk.h                              |   1 +
 drivers/clk/mvebu/ap806-system-controller.c        |  28 +-
 drivers/clk/qcom/clk-smd-rpm.c                     |  71 +++
 drivers/clk/qcom/gcc-ipq4019.c                     | 479 ++++++++++++++++-
 drivers/clk/qcom/gcc-mdm9615.c                     |  30 ++
 drivers/clk/qcom/gcc-msm8996.c                     |   1 +
 drivers/clk/samsung/clk-exynos5420.c               |  14 +-
 drivers/clk/uniphier/clk-uniphier-cpugear.c        |   1 -
 drivers/clk/zte/clk-zx296718.c                     | 154 +++++-
 drivers/clk/zte/clk.c                              | 127 +++++
 drivers/clk/zte/clk.h                              |  21 +
 include/dt-bindings/clock/hi3660-clock.h           | 194 +++++++
 include/dt-bindings/clock/qcom,gcc-ipq4019.h       |  11 +
 include/dt-bindings/clock/qcom,gcc-mdm9615.h       |   2 +
 include/dt-bindings/clock/qcom,gcc-msm8996.h       |   1 +
 include/dt-bindings/clock/qcom,rpmcc.h             |  40 +-
 include/dt-bindings/clock/stm32fx-clock.h          |  39 ++
 34 files changed, 2613 insertions(+), 106 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt
 create mode 100644 drivers/clk/hisilicon/clk-hi3660.c
 create mode 100644 include/dt-bindings/clock/hi3660-clock.h
 create mode 100644 include/dt-bindings/clock/stm32fx-clock.h
Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution.
Auto-merging arch/blackfin/mach-common/pm.c
CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 47a6873eca4a] Merge remote-tracking branch 'blackfin/for-linus'
$ git diff -M --stat --summary HEAD^..
Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE))
$ git merge cris/for-next
Already up-to-date.
Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h)
$ git merge h8300/h8300-next
Merge made by the 'recursive' strategy.
Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (ad595b77c4a8 m68k/atari: Use seq_puts() in atari_get_hardware_list())
$ git merge m68k/for-next
Already up-to-date.
Merging m68knommu/for-next (a121103c9228 Linux 4.10-rc3)
$ git merge m68knommu/for-next
Already up-to-date.
Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1)
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (95eb33ae0ea2 MIPS: Fix printk continuations in cpu-bugs64.c)
$ git merge mips/mips-for-linux-next
Removing arch/mips/kernel/mips_ksyms.c
Removing arch/mips/include/asm/unaligned.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../bindings/mips/img/pistachio-marduk.txt         |  10 +
 MAINTAINERS                                        |   8 +-
 arch/mips/Kconfig                                  |  40 +-
 arch/mips/Makefile                                 |  16 +-
 arch/mips/Makefile.postlink                        |  35 +
 arch/mips/ath79/clock.c                            |   2 +-
 arch/mips/boot/compressed/Makefile                 |  10 +-
 arch/mips/boot/dts/img/Makefile                    |   9 +
 arch/mips/boot/dts/img/pistachio.dtsi              | 924 +++++++++++++++++++++
 arch/mips/boot/dts/img/pistachio_marduk.dts        | 163 ++++
 arch/mips/boot/dts/xilfpga/nexys4ddr.dts           |  63 ++
 .../cavium-octeon/executive/cvmx-helper-rgmii.c    |   3 +-
 .../cavium-octeon/executive/cvmx-helper-sgmii.c    |   3 +-
 .../mips/cavium-octeon/executive/cvmx-helper-spi.c |   3 +-
 .../cavium-octeon/executive/cvmx-helper-xaui.c     |   3 +-
 arch/mips/cavium-octeon/executive/cvmx-helper.c    |  47 +-
 arch/mips/cavium-octeon/octeon-memcpy.S            |   5 +
 arch/mips/cavium-octeon/setup.c                    |  23 +
 arch/mips/cavium-octeon/smp.c                      |  21 +-
 arch/mips/configs/loongson1b_defconfig             |   4 +
 arch/mips/configs/loongson1c_defconfig             |   4 +
 arch/mips/configs/xilfpga_defconfig                |  37 +-
 arch/mips/configs/xway_defconfig                   |  21 +-
 arch/mips/generic/Makefile                         |   1 +
 arch/mips/generic/init.c                           |  13 +
 arch/mips/generic/kexec.c                          |  44 +
 arch/mips/include/asm/Kbuild                       |   2 +
 arch/mips/include/asm/asm.h                        |  10 +-
 arch/mips/include/asm/bootinfo.h                   |  13 +
 arch/mips/include/asm/elf.h                        |   9 +
 arch/mips/include/asm/highmem.h                    |   3 -
 arch/mips/include/asm/i8259.h                      |   1 -
 arch/mips/include/asm/irq.h                        |  12 +
 .../asm/mach-cavium-octeon/kernel-entry-init.h     |  15 +-
 arch/mips/include/asm/mach-loongson32/loongson1.h  |   9 +-
 arch/mips/include/asm/mach-loongson32/platform.h   |   9 +-
 arch/mips/include/asm/mach-loongson32/regs-rtc.h   |  23 +
 arch/mips/include/asm/mach-ralink/mt7620.h         |   7 +-
 arch/mips/include/asm/mips-cm.h                    |   7 +
 arch/mips/include/asm/octeon/cvmx-helper-rgmii.h   |   3 +-
 arch/mips/include/asm/octeon/cvmx-helper-sgmii.h   |   3 +-
 arch/mips/include/asm/octeon/cvmx-helper-spi.h     |   3 +-
 arch/mips/include/asm/octeon/cvmx-helper-xaui.h    |   3 +-
 arch/mips/include/asm/octeon/cvmx-helper.h         |  14 +-
 arch/mips/include/asm/smp.h                        |  10 +-
 arch/mips/include/asm/stackframe.h                 |  19 +-
 arch/mips/include/asm/switch_to.h                  |  18 +-
 arch/mips/include/asm/thread_info.h                |   1 -
 arch/mips/include/asm/unaligned.h                  |  28 -
 arch/mips/kernel/Makefile                          |   4 +-
 arch/mips/kernel/asm-offsets.c                     |   2 +-
 arch/mips/kernel/cacheinfo.c                       |  85 ++
 arch/mips/kernel/cpu-bugs64.c                      |  24 +-
 arch/mips/kernel/crash.c                           |   2 +-
 arch/mips/kernel/entry.S                           |  18 -
 arch/mips/kernel/genex.S                           |  81 +-
 arch/mips/kernel/irq.c                             |  11 +
 arch/mips/kernel/machine_kexec.c                   |  22 +
 arch/mips/kernel/mcount.S                          |   3 +
 arch/mips/kernel/mips-r2-to-r6-emul.c              |  12 +-
 arch/mips/kernel/mips_ksyms.c                      |  94 ---
 arch/mips/kernel/process.c                         | 214 +++--
 arch/mips/kernel/prom.c                            |   7 +
 arch/mips/kernel/ptrace.c                          |  34 +-
 arch/mips/kernel/r2300_switch.S                    |   2 +
 arch/mips/kernel/r4k_switch.S                      |   3 +
 arch/mips/kernel/relocate.c                        |  56 +-
 arch/mips/kernel/setup.c                           |  94 ++-
 arch/mips/kernel/smp-bmips.c                       |   2 +-
 arch/mips/kernel/smp-cps.c                         |   7 +-
 arch/mips/kernel/smp.c                             |  34 +-
 arch/mips/kernel/traps.c                           |  65 +-
 arch/mips/kernel/uprobes.c                         |   2 +-
 arch/mips/kernel/vmlinux.lds.S                     |   2 +-
 arch/mips/lib/csum_partial.S                       |   6 +
 arch/mips/lib/memcpy.S                             |   9 +
 arch/mips/lib/memset.S                             |   5 +
 arch/mips/lib/strlen_user.S                        |   2 +
 arch/mips/lib/strncpy_user.S                       |   5 +
 arch/mips/lib/strnlen_user.S                       |   3 +
 arch/mips/loongson32/common/platform.c             |  45 +-
 arch/mips/loongson32/ls1b/board.c                  |   7 +-
 arch/mips/loongson32/ls1c/board.c                  |   7 +-
 arch/mips/loongson64/loongson-3/smp.c              |   1 -
 arch/mips/mm/c-r4k.c                               |   6 +-
 arch/mips/mm/init.c                                |   2 +
 arch/mips/mm/mmap.c                                |  10 +-
 arch/mips/mm/page-funcs.S                          |   3 +
 arch/mips/mm/page.c                                |   2 +
 arch/mips/mm/sc-ip22.c                             |  54 +-
 arch/mips/mm/sc-mips.c                             |   1 +
 arch/mips/mm/tlbex.c                               |   6 +-
 arch/mips/netlogic/common/irq.c                    |   4 +-
 arch/mips/netlogic/common/smpboot.S                |   4 +-
 arch/mips/pci/pci-tx4927.c                         |  22 +-
 arch/mips/pci/pci-tx4938.c                         |  30 +-
 arch/mips/pci/pci-tx4939.c                         |  10 +-
 arch/mips/ralink/Kconfig                           |   1 +
 arch/mips/ralink/clk.c                             |   6 +
 arch/mips/ralink/mt7620.c                          |  31 +-
 arch/mips/ralink/mt7621.c                          |   2 +-
 arch/mips/ralink/of.c                              |  12 +-
 arch/mips/ralink/prom.c                            |   9 +-
 arch/mips/ralink/rt288x.c                          |   1 +
 arch/mips/ralink/rt305x.c                          |   2 +
 arch/mips/ralink/rt3883.c                          |   4 +-
 arch/mips/txx9/generic/7segled.c                   |   4 +-
 arch/mips/txx9/generic/pci.c                       |  28 +-
 arch/mips/txx9/generic/setup_tx3927.c              |   6 +-
 arch/mips/txx9/generic/setup_tx4927.c              |  20 +-
 arch/mips/txx9/generic/setup_tx4938.c              |  28 +-
 arch/mips/txx9/generic/setup_tx4939.c              |   8 +-
 arch/mips/txx9/generic/smsc_fdc37m81x.c            |  17 +-
 arch/mips/txx9/jmr3927/prom.c                      |   2 +-
 arch/mips/txx9/jmr3927/setup.c                     |  11 +-
 arch/mips/txx9/rbtx4938/setup.c                    |  14 +-
 arch/mips/xilfpga/intc.c                           |   7 +-
 drivers/of/base.c                                  |   2 +-
 drivers/of/fdt.c                                   |   9 +-
 119 files changed, 2437 insertions(+), 645 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mips/img/pistachio-marduk.txt
 create mode 100644 arch/mips/Makefile.postlink
 create mode 100644 arch/mips/boot/dts/img/Makefile
 create mode 100644 arch/mips/boot/dts/img/pistachio.dtsi
 create mode 100644 arch/mips/boot/dts/img/pistachio_marduk.dts
 create mode 100644 arch/mips/generic/kexec.c
 create mode 100644 arch/mips/include/asm/mach-loongson32/regs-rtc.h
 delete mode 100644 arch/mips/include/asm/unaligned.h
 create mode 100644 arch/mips/kernel/cacheinfo.c
 delete mode 100644 arch/mips/kernel/mips_ksyms.c
Merging nios2/for-next (744606c76c4a nios2: add screen_info)
$ git merge nios2/for-next
Already up-to-date.
Merging openrisc/for-next (7c7808ce107d openrisc: prevent VGA console, fix builds)
$ git merge openrisc/for-next
Already up-to-date.
Merging parisc-hd/for-next (69973b830859 Linux 4.9)
$ git merge parisc-hd/for-next
Already up-to-date.
Merging powerpc/next (c6f6634721c8 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next)
$ git merge powerpc/next
Already up-to-date.
Merging fsl/next (baae856ebdee powerpc/fsl/dts: add FMan node for t1042d4rdb)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (086a4facc882 s390/cio: remove cmf related code relevant for 31 bit only)
$ git merge s390/features
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt |   5 +-
 arch/s390/Kconfig.debug                         |   4 +
 arch/s390/configs/default_defconfig             |  27 ++-
 arch/s390/configs/gcov_defconfig                |  50 +++---
 arch/s390/configs/performance_defconfig         |  33 ++--
 arch/s390/defconfig                             |   5 +-
 arch/s390/include/asm/cpu_mf.h                  |   5 +-
 arch/s390/include/asm/ctl_reg.h                 |   8 +-
 arch/s390/include/asm/pci_clp.h                 |   2 +-
 arch/s390/include/asm/sclp.h                    |   1 +
 arch/s390/include/asm/uaccess.h                 |   4 +-
 arch/s390/kernel/Makefile                       |   2 +-
 arch/s390/kernel/early.c                        |  12 ++
 arch/s390/kernel/early_printk.c                 |  35 ++++
 arch/s390/kernel/ipl.c                          |   3 +-
 arch/s390/kernel/os_info.c                      |   6 +-
 arch/s390/kernel/perf_cpum_cf_events.c          |   2 +-
 arch/s390/kernel/processor.c                    |   2 +-
 arch/s390/kernel/sclp.c                         |  47 ++++--
 arch/s390/kernel/setup.c                        |   2 +
 arch/s390/kernel/time.c                         |   2 +-
 arch/s390/kernel/topology.c                     |  19 +--
 arch/s390/kvm/priv.c                            |   2 +-
 arch/s390/kvm/vsie.c                            |   2 +-
 arch/s390/lib/mem.S                             |  28 ++--
 arch/s390/mm/extmem.c                           |   2 +-
 arch/s390/mm/mem_detect.c                       |   6 +-
 arch/s390/pci/pci.c                             |   8 +-
 drivers/s390/char/con3270.c                     |   2 +-
 drivers/s390/char/raw3270.c                     |   2 +-
 drivers/s390/char/zcore.c                       |   3 +-
 drivers/s390/cio/chp.c                          |  13 +-
 drivers/s390/cio/chp.h                          |   2 +-
 drivers/s390/cio/chsc.c                         |  48 +++++-
 drivers/s390/cio/chsc.h                         |   2 +
 drivers/s390/cio/cmf.c                          |  10 +-
 drivers/s390/cio/css.c                          | 209 ++++++++++++------------
 drivers/s390/cio/css.h                          |  13 +-
 drivers/s390/crypto/ap_asm.h                    |  10 +-
 drivers/s390/crypto/ap_card.c                   |   2 +-
 drivers/s390/crypto/ap_queue.c                  |   2 +-
 drivers/s390/crypto/zcrypt_api.c                |   4 +-
 drivers/s390/virtio/virtio_ccw.c                |   2 +-
 43 files changed, 398 insertions(+), 250 deletions(-)
 create mode 100644 arch/s390/kernel/early_printk.c
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board)
$ git merge sh/for-next
Already up-to-date.
Merging tile/master (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
$ git merge tile/master
Already up-to-date.
Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface)
$ git merge unicore32/unicore32
Merge made by the 'recursive' strategy.
 arch/unicore32/Kconfig                          |  14 +
 arch/unicore32/include/asm/Kbuild               |   3 -
 arch/unicore32/include/asm/signal.h             |  21 +
 arch/unicore32/include/asm/syscalls.h           |  25 +
 arch/unicore32/include/uapi/asm/sigcontext.h    |  14 +
 arch/unicore32/include/uapi/asm/stat-oldabi.h   |  71 +++
 arch/unicore32/include/uapi/asm/stat.h          |  19 +
 arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++
 arch/unicore32/include/uapi/asm/unistd.h        |   8 +
 arch/unicore32/kernel/entry.S                   |  17 +
 arch/unicore32/kernel/signal.c                  |  41 ++
 11 files changed, 1000 insertions(+), 3 deletions(-)
 create mode 100644 arch/unicore32/include/asm/signal.h
 create mode 100644 arch/unicore32/include/asm/syscalls.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h
 create mode 100644 arch/unicore32/include/uapi/asm/stat.h
 create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h
Merging xtensa/xtensa-for-next (30b507051dd1 xtensa: update DMA-related Documentation/features entries)
$ git merge xtensa/xtensa-for-next
Already up-to-date.
Merging fscrypt/master (a5d431eff2e0 fscrypt: make fscrypt_operations.key_prefix a string)
$ git merge fscrypt/master
Auto-merging fs/f2fs/super.c
Merge made by the 'recursive' strategy.
 fs/crypto/Kconfig           |   1 -
 fs/crypto/Makefile          |   1 +
 fs/crypto/bio.c             | 145 ++++++++++++++++++++++++++++++++++++++++
 fs/crypto/crypto.c          | 157 +++++---------------------------------------
 fs/crypto/fname.c           |   4 +-
 fs/crypto/fscrypt_private.h |  16 ++++-
 fs/crypto/keyinfo.c         |  46 +++++--------
 fs/crypto/policy.c          |  95 ++++++++++-----------------
 fs/ext4/ext4.h              |  11 ----
 fs/ext4/ialloc.c            |   2 +-
 fs/ext4/namei.c             |  16 ++++-
 fs/ext4/super.c             |  13 +---
 fs/f2fs/dir.c               |   5 +-
 fs/f2fs/f2fs.h              |   9 ---
 fs/f2fs/namei.c             |   4 +-
 fs/f2fs/super.c             |  14 +---
 fs/ubifs/crypto.c           |  11 +---
 include/linux/fscrypto.h    |  14 ++--
 18 files changed, 263 insertions(+), 301 deletions(-)
 create mode 100644 fs/crypto/bio.c
Merging befs/for-next (f7b75aaed5ef befs: add NFS export support)
$ git merge befs/for-next
Merge made by the 'recursive' strategy.
Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults)
$ git merge btrfs/next
Already up-to-date.
Merging btrfs-kdave/for-next (69a582fdbc94 Merge branch 'for-next-next-v4.11-20170111' into for-next-20170111)
$ git merge btrfs-kdave/for-next
Auto-merging fs/btrfs/super.c
Auto-merging fs/btrfs/ioctl.c
Auto-merging fs/btrfs/inode.c
Auto-merging fs/btrfs/file.c
Auto-merging fs/btrfs/extent_io.c
Auto-merging fs/btrfs/ctree.h
Merge made by the 'recursive' strategy.
 fs/btrfs/ctree.c             |   8 +-
 fs/btrfs/ctree.h             |  36 ++++-
 fs/btrfs/delayed-inode.c     |   4 +-
 fs/btrfs/delayed-ref.c       |   6 +-
 fs/btrfs/delayed-ref.h       |   3 +-
 fs/btrfs/export.c            |   3 -
 fs/btrfs/extent-tree.c       |  59 +++++---
 fs/btrfs/extent_io.c         |  68 ++++++++-
 fs/btrfs/extent_io.h         |   5 +
 fs/btrfs/file-item.c         |   4 +-
 fs/btrfs/file.c              |  26 ++--
 fs/btrfs/free-space-cache.c  |   6 +-
 fs/btrfs/inode-map.c         |   6 +-
 fs/btrfs/inode.c             | 325 +++++++++++++++++++++++++++++++++----------
 fs/btrfs/ioctl.c             |  21 ++-
 fs/btrfs/ordered-data.c      |  42 +++---
 fs/btrfs/qgroup.c            |  31 ++++-
 fs/btrfs/relocation.c        |  14 +-
 fs/btrfs/super.c             |   2 +-
 fs/btrfs/tests/inode-tests.c |  15 +-
 fs/btrfs/transaction.c       |  10 +-
 fs/btrfs/tree-log.h          |   4 +-
 22 files changed, 511 insertions(+), 187 deletions(-)
Merging ceph/master (84fcc2d2bd6c ceph: fix get_oldest_context())
$ git merge ceph/master
Already up-to-date.
Merging cifs/for-next (bd5d7428f5e5 Merge tag 'drm-fixes-for-v4.10-rc4' of git://people.freedesktop.org/~airlied/linux)
$ git merge cifs/for-next
Already up-to-date.
Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link)
$ git merge configfs/for-next
Already up-to-date.
Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation)
$ git merge ecryptfs/next
Auto-merging fs/ecryptfs/main.c
Auto-merging fs/ecryptfs/ecryptfs_kernel.h
Merge made by the 'recursive' strategy.
 fs/ecryptfs/crypto.c          | 15 ---------------
 fs/ecryptfs/ecryptfs_kernel.h |  9 ++++++++-
 fs/ecryptfs/keystore.c        |  2 +-
 fs/ecryptfs/main.c            |  2 +-
 fs/ecryptfs/miscdev.c         |  2 +-
 5 files changed, 11 insertions(+), 19 deletions(-)
Merging ext3/for_next (ad4d05329df5 udf: Make stat on symlink report symlink length as st_size)
$ git merge ext3/for_next
Merge made by the 'recursive' strategy.
 fs/udf/inode.c   |  4 +---
 fs/udf/namei.c   |  2 +-
 fs/udf/super.c   |  9 ++++++---
 fs/udf/symlink.c | 30 ++++++++++++++++++++++++++++++
 fs/udf/udfdecl.h |  2 +-
 5 files changed, 39 insertions(+), 8 deletions(-)
Merging ext4/dev (2b3864b32403 ext4: do not polute the extents cache while shifting extents)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
 fs/ext4/extents.c | 27 ++++++++++++++++++---------
 fs/ext4/namei.c   | 12 ++++++++++++
 2 files changed, 30 insertions(+), 9 deletions(-)
Merging f2fs/dev (888a724d144e f2fs: check in-memory sit version bitmap)
$ git merge f2fs/dev
Auto-merging fs/f2fs/super.c
Auto-merging fs/f2fs/segment.c
Auto-merging fs/f2fs/namei.c
Auto-merging fs/f2fs/f2fs.h
Merge made by the 'recursive' strategy.
 Documentation/filesystems/f2fs.txt |   2 +
 fs/f2fs/checkpoint.c               |  33 +++++-----
 fs/f2fs/data.c                     |  80 +++++++++++++++++++---
 fs/f2fs/debug.c                    |   7 ++
 fs/f2fs/extent_cache.c             |  22 +++----
 fs/f2fs/f2fs.h                     |  35 +++++++++-
 fs/f2fs/file.c                     |  17 +++--
 fs/f2fs/gc.c                       |   6 ++
 fs/f2fs/namei.c                    |  18 ++++-
 fs/f2fs/node.c                     |  38 +++++++++--
 fs/f2fs/node.h                     |  17 ++++-
 fs/f2fs/recovery.c                 |   4 --
 fs/f2fs/segment.c                  | 131 ++++++++++++++++++++++++++++++-------
 fs/f2fs/segment.h                  |  27 ++++++++
 fs/f2fs/super.c                    |  38 ++++++++++-
 include/linux/f2fs_fs.h            |   6 ++
 include/trace/events/f2fs.h        |  86 +++++++++++++++---------
 17 files changed, 451 insertions(+), 116 deletions(-)
Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information)
$ git merge freevxfs/for-next
Already up-to-date.
Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew))
$ git merge fscache/fscache
Already up-to-date.
Merging fuse/for-next (210675270caa fuse: fix time_to_jiffies nsec sanity check)
$ git merge fuse/for-next
Merge made by the 'recursive' strategy.
 fs/fuse/dev.c | 3 ++-
 fs/fuse/dir.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
Merging gfs2/for-next (b63f5e84826b GFS2: Wake up io waiters whenever a flush is done)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/ops_fstype.c
Auto-merging fs/gfs2/log.c
Auto-merging fs/gfs2/glock.c
Auto-merging fs/gfs2/bmap.c
Merge made by the 'recursive' strategy.
 fs/gfs2/bmap.c       | 29 ++++++++++++++++++++++++++---
 fs/gfs2/glock.c      | 12 +++++++-----
 fs/gfs2/incore.h     |  1 +
 fs/gfs2/log.c        | 15 ++++++++++++---
 fs/gfs2/ops_fstype.c |  1 +
 5 files changed, 47 insertions(+), 11 deletions(-)
Merging jfs/jfs-next (362ad5d58e9a fs: jfs: Replace CURRENT_TIME_SEC by current_time())
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (c6180a623717 NFSv4: Fix client recovery when server reboots multiple times)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
 fs/nfs/nfs4proc.c  | 29 ++++++++++++++++++-----------
 fs/nfs/nfs4state.c |  1 -
 2 files changed, 18 insertions(+), 12 deletions(-)
Merging nfsd/nfsd-next (799322e05df0 nfsd: opt in to labeled nfs per export)
$ git merge nfsd/nfsd-next
Merge made by the 'recursive' strategy.
 fs/lockd/svc.c                          |  2 ++
 fs/nfsd/export.c                        |  1 +
 fs/nfsd/nfs3proc.c                      |  8 +++---
 fs/nfsd/nfs4proc.c                      |  6 ++++-
 fs/nfsd/nfs4xdr.c                       | 13 +++++++---
 fs/nfsd/nfsctl.c                        | 10 +++++---
 fs/nfsd/nfsd.h                          |  6 ++---
 fs/nfsd/nfsproc.c                       |  8 ++----
 fs/nfsd/nfssvc.c                        |  2 ++
 fs/nfsd/vfs.c                           | 45 ++++++++++-----------------------
 fs/nfsd/vfs.h                           |  6 ++---
 include/linux/sunrpc/cache.h            |  1 +
 include/linux/sunrpc/svc_xprt.h         |  1 +
 include/uapi/linux/nfsd/export.h        |  5 ++--
 net/sunrpc/auth_gss/svcauth_gss.c       |  4 +--
 net/sunrpc/cache.c                      | 12 +++++++++
 net/sunrpc/svc_xprt.c                   | 10 +++++---
 net/sunrpc/xprtrdma/svc_rdma_recvfrom.c |  2 --
 18 files changed, 77 insertions(+), 65 deletions(-)
Merging orangefs/for-next (04102c76a779 orangefs: Axe some dead code)
$ git merge orangefs/for-next
Already up-to-date.
Merging overlayfs/overlayfs-next (c3c869966480 ovl: fix reStructuredText syntax errors in documentation)
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (ba75d570b60c ubifs: Initialize fstr_real_len)
$ git merge ubifs/linux-next
Already up-to-date.
Merging xfs/for-next (0a417b8dc1f1 xfs: Timely free truncated dirty pages)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (59479ae85e43 Merge branches 'work.sendmsg' and 'work.splice-net' into for-next)
$ git merge vfs/for-next
Auto-merging net/socket.c
Auto-merging net/core/skbuff.c
Auto-merging include/net/tcp.h
Auto-merging include/linux/skbuff.h
Auto-merging drivers/block/nbd.c
Merge made by the 'recursive' strategy.
 drivers/block/drbd/drbd_main.c           |  11 ++-
 drivers/block/nbd.c                      |  76 +++++++++------------
 drivers/target/iscsi/iscsi_target_util.c |  64 +++++++----------
 drivers/usb/usbip/usbip_common.c         |  32 +++------
 fs/afs/rxrpc.c                           |  15 ++--
 fs/ncpfs/sock.c                          | 111 +++++++++++-------------------
 fs/splice.c                              |  22 +++---
 include/linux/fs.h                       |   1 +
 include/linux/net.h                      |   2 +-
 include/linux/skbuff.h                   |   3 +-
 include/linux/splice.h                   |   4 +-
 include/net/tcp.h                        |   2 +-
 kernel/relay.c                           |   1 -
 kernel/trace/trace.c                     |   2 -
 net/ceph/messenger.c                     |  44 ++++++++----
 net/core/skbuff.c                        |   4 +-
 net/ipv4/tcp.c                           |   7 +-
 net/kcm/kcmsock.c                        |   5 +-
 net/rds/page.c                           |  29 --------
 net/rds/rds.h                            |   7 --
 net/socket.c                             |   4 +-
 net/unix/af_unix.c                       | 113 +++----------------------------
 22 files changed, 186 insertions(+), 373 deletions(-)
Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities)
$ git merge vfs-jk/vfs
Already up-to-date.
Merging vfs-miklos/next (b12826c5188e Merge branch 'vfs-ovl' into next)
$ git merge vfs-miklos/next
Resolved 'fs/overlayfs/dir.c' using previous resolution.
Resolved 'fs/read_write.c' using previous resolution.
Auto-merging include/linux/fs.h
Auto-merging fs/read_write.c
CONFLICT (content): Merge conflict in fs/read_write.c
Auto-merging fs/proc/namespaces.c
Auto-merging fs/proc/base.c
Auto-merging fs/overlayfs/dir.c
CONFLICT (content): Merge conflict in fs/overlayfs/dir.c
Auto-merging fs/nsfs.c
Auto-merging fs/namei.c
Auto-merging Documentation/filesystems/vfs.txt
Auto-merging Documentation/filesystems/Locking
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 30a568a5179e] Merge remote-tracking branch 'vfs-miklos/next'
$ git diff -M --stat --summary HEAD^..
 Documentation/filesystems/Locking |  6 ++--
 Documentation/filesystems/porting |  3 ++
 Documentation/filesystems/vfs.txt |  5 ++-
 fs/afs/mntpt.c                    |  2 +-
 fs/bad_inode.c                    |  8 +----
 fs/namei.c                        | 65 +++++++++++++++------------------------
 fs/nsfs.c                         | 17 +++++++---
 fs/overlayfs/dir.c                |  3 +-
 fs/proc/base.c                    | 57 ++++++++++++----------------------
 fs/proc/namespaces.c              | 13 ++++----
 fs/read_write.c                   | 17 +++++++---
 include/linux/fs.h                |  6 +---
 include/linux/proc_ns.h           |  4 +--
 13 files changed, 89 insertions(+), 117 deletions(-)
Merging printk/for-next (0e91b7706038 printk: drop call_console_drivers() unused param)
$ git merge printk/for-next
Auto-merging kernel/printk/printk_safe.c
Auto-merging kernel/kexec_core.c
Auto-merging init/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                            |   8 ++
 include/linux/printk.h                 |  21 ++-
 init/Kconfig                           |  16 ++-
 init/main.c                            |   2 +-
 kernel/kexec_core.c                    |   2 +-
 kernel/panic.c                         |   4 +-
 kernel/printk/Makefile                 |   2 +-
 kernel/printk/internal.h               |  79 ++++++-----
 kernel/printk/printk.c                 | 232 ++++++++++++++------------------
 kernel/printk/{nmi.c => printk_safe.c} | 234 +++++++++++++++++++++++----------
 lib/nmi_backtrace.c                    |   2 +-
 11 files changed, 347 insertions(+), 255 deletions(-)
 rename kernel/printk/{nmi.c => printk_safe.c} (53%)
Merging pci/next (7ce7d89f4883 Linux 4.10-rc1)
$ git merge pci/next
Already up-to-date.
Merging pstore/for-next/pstore (0c744ea4f77d Linux 4.10-rc2)
$ git merge pstore/for-next/pstore
Already up-to-date.
Merging hid/for-next (b8ecb5c4a454 Merge branch 'for-4.10/upstream-fixes' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/hid-over-i2c.txt     |   5 +
 drivers/hid/Kconfig                                |   5 +
 drivers/hid/hid-core.c                             |  16 +-
 drivers/hid/hid-corsair.c                          |  60 +-
 drivers/hid/hid-ids.h                              |   7 +-
 drivers/hid/hid-mf.c                               |  19 +-
 drivers/hid/hid-microsoft.c                        |   6 -
 drivers/hid/hid-rmi.c                              | 975 +++------------------
 drivers/hid/i2c-hid/i2c-hid.c                      |  45 +-
 drivers/hid/intel-ish-hid/ipc/pci-ish.c            |   4 +-
 drivers/hid/intel-ish-hid/ishtp-hid.c              |   2 +-
 drivers/hid/intel-ish-hid/ishtp/hbm.c              |   1 -
 drivers/hid/intel-ish-hid/ishtp/init.c             |   1 -
 drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h        |   3 +-
 drivers/hid/usbhid/hid-core.c                      |   3 +-
 drivers/hid/usbhid/hid-quirks.c                    |   5 +-
 drivers/hid/usbhid/usbkbd.c                        |   3 +-
 drivers/hid/usbhid/usbmouse.c                      |   3 +-
 drivers/hid/wacom.h                                |   1 -
 drivers/hid/wacom_sys.c                            |   2 +-
 include/linux/i2c/i2c-hid.h                        |   6 +
 21 files changed, 279 insertions(+), 893 deletions(-)
Merging i2c/i2c/for-next (701dc207bf55 i2c: piix4: Avoid race conditions with IMC)
$ git merge i2c/i2c/for-next
Already up-to-date.
Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (0c744ea4f77d Linux 4.10-rc2)
$ git merge dmi/master
Already up-to-date.
Merging hwmon-staging/hwmon-next (c72eeabd0ca8 hwmon: (adc128d818) Preserve operation mode)
$ git merge hwmon-staging/hwmon-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/hwmon/adc128d818.txt       |  38 +++
 Documentation/hwmon/sht21                          |   5 +-
 drivers/hwmon/adc128d818.c                         | 147 ++++++---
 drivers/hwmon/adm1021.c                            |  14 +-
 drivers/hwmon/adm1025.c                            |  16 +-
 drivers/hwmon/adm1026.c                            | 128 ++++----
 drivers/hwmon/adm1031.c                            |  15 +-
 drivers/hwmon/adm9240.c                            |  28 +-
 drivers/hwmon/adt7411.c                            | 361 ++++++++++++++++++---
 drivers/hwmon/adt7470.c                            |  48 ++-
 drivers/hwmon/adt7475.c                            |  28 +-
 drivers/hwmon/adt7x10.c                            |   7 +-
 drivers/hwmon/asb100.c                             |  36 +-
 drivers/hwmon/atxp1.c                              |  35 +-
 drivers/hwmon/dme1737.c                            |  46 +--
 drivers/hwmon/ds1621.c                             |  16 +-
 drivers/hwmon/emc2103.c                            |  36 +-
 drivers/hwmon/f71805f.c                            |  16 +-
 drivers/hwmon/f71882fg.c                           |   6 +-
 drivers/hwmon/fam15h_power.c                       |  34 +-
 drivers/hwmon/fschmd.c                             |   6 +-
 drivers/hwmon/g760a.c                              |  22 +-
 drivers/hwmon/g762.c                               |  86 +++--
 drivers/hwmon/gl518sm.c                            |  13 +-
 drivers/hwmon/gl520sm.c                            |  73 +++--
 drivers/hwmon/gpio-fan.c                           |  54 +--
 drivers/hwmon/hwmon.c                              |   4 +-
 drivers/hwmon/i5500_temp.c                         |   6 +-
 drivers/hwmon/i5k_amb.c                            |   4 +-
 drivers/hwmon/it87.c                               |  20 +-
 drivers/hwmon/jz4740-hwmon.c                       |   6 +-
 drivers/hwmon/k10temp.c                            |  12 +-
 drivers/hwmon/k8temp.c                             |   4 +-
 drivers/hwmon/lm63.c                               |  48 ++-
 drivers/hwmon/lm70.c                               |   6 +-
 drivers/hwmon/lm78.c                               |  38 +--
 drivers/hwmon/lm80.c                               |   4 +-
 drivers/hwmon/lm83.c                               |   4 +-
 drivers/hwmon/lm85.c                               |  22 +-
 drivers/hwmon/lm87.c                               |  43 +--
 drivers/hwmon/lm90.c                               |   8 +-
 drivers/hwmon/lm92.c                               |  10 +-
 drivers/hwmon/lm93.c                               |  39 +--
 drivers/hwmon/lm95234.c                            |  12 +-
 drivers/hwmon/max1111.c                            |   4 +-
 drivers/hwmon/max1619.c                            |   4 +-
 drivers/hwmon/max197.c                             |   6 +-
 drivers/hwmon/max6650.c                            |  44 +--
 drivers/hwmon/mc13783-adc.c                        |   6 +-
 drivers/hwmon/mcp3021.c                            |   6 +-
 drivers/hwmon/nct6683.c                            |  17 +-
 drivers/hwmon/nct6775.c                            |   4 +-
 drivers/hwmon/nsa320-hwmon.c                       |  12 +-
 drivers/hwmon/pc87360.c                            |  26 +-
 drivers/hwmon/pc87427.c                            |   4 +-
 drivers/hwmon/pcf8591.c                            |  24 +-
 drivers/hwmon/sch5627.c                            |   4 +-
 drivers/hwmon/sch56xx-common.c                     |   1 -
 drivers/hwmon/sht15.c                              |   4 +-
 drivers/hwmon/sht21.c                              |  92 +++++-
 drivers/hwmon/sis5595.c                            |  36 +-
 drivers/hwmon/smsc47m1.c                           |  10 +-
 drivers/hwmon/smsc47m192.c                         |  14 +-
 drivers/hwmon/tmp401.c                             |  60 ++--
 drivers/hwmon/via-cputemp.c                        |   6 +-
 drivers/hwmon/via686a.c                            |   8 +-
 drivers/hwmon/vt8231.c                             |  59 ++--
 drivers/hwmon/w83627ehf.c                          |   8 +-
 drivers/hwmon/w83627hf.c                           |  53 +--
 drivers/hwmon/w83781d.c                            |  34 +-
 drivers/hwmon/w83791d.c                            |  23 +-
 drivers/hwmon/w83792d.c                            |  15 +-
 drivers/hwmon/w83793.c                             |   6 +-
 73 files changed, 1319 insertions(+), 875 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt
Merging jc_docs/docs-next (43d8808b0820 Documentation: cpuset: Fix 'cpuset.tasks' -> 'tasks')
$ git merge jc_docs/docs-next
Removing Documentation/cpu-hotplug.txt
Removing Documentation/DocBook/iio.tmpl
Merge made by the 'recursive' strategy.
 Documentation/DocBook/Makefile                     |   2 +-
 Documentation/DocBook/iio.tmpl                     | 697 ---------------------
 Documentation/admin-guide/README.rst               |   4 +-
 Documentation/cgroup-v1/cpusets.txt                |   2 +-
 Documentation/core-api/cpu_hotplug.rst             | 372 +++++++++++
 Documentation/core-api/index.rst                   |   1 +
 Documentation/cpu-freq/user-guide.txt              |   4 +-
 Documentation/cpu-hotplug.txt                      | 452 -------------
 Documentation/driver-api/iio/buffers.rst           | 125 ++++
 Documentation/driver-api/iio/core.rst              | 182 ++++++
 Documentation/driver-api/iio/index.rst             |  17 +
 Documentation/driver-api/iio/intro.rst             |  33 +
 Documentation/driver-api/iio/triggered-buffers.rst |  69 ++
 Documentation/driver-api/iio/triggers.rst          |  80 +++
 Documentation/driver-api/index.rst                 |   1 +
 Documentation/hwmon/ds1621                         |   8 +-
 Documentation/pps/pps.txt                          |  18 +-
 Documentation/thermal/nouveau_thermal              |   2 +-
 scripts/kernel-doc                                 | 101 ++-
 19 files changed, 978 insertions(+), 1192 deletions(-)
 delete mode 100644 Documentation/DocBook/iio.tmpl
 create mode 100644 Documentation/core-api/cpu_hotplug.rst
 delete mode 100644 Documentation/cpu-hotplug.txt
 create mode 100644 Documentation/driver-api/iio/buffers.rst
 create mode 100644 Documentation/driver-api/iio/core.rst
 create mode 100644 Documentation/driver-api/iio/index.rst
 create mode 100644 Documentation/driver-api/iio/intro.rst
 create mode 100644 Documentation/driver-api/iio/triggered-buffers.rst
 create mode 100644 Documentation/driver-api/iio/triggers.rst
Merging v4l-dvb/master (5dd2470bfddb Merge branch 'v4l_for_linus' into to_next)
$ git merge v4l-dvb/master
Merge made by the 'recursive' strategy.
 drivers/media/cec/cec-adap.c             | 103 ++++++++++++------------
 drivers/media/dvb-core/dvb_net.c         |  15 ++--
 drivers/media/i2c/Kconfig                |   1 +
 drivers/media/i2c/smiapp/smiapp-core.c   |  33 +++-----
 drivers/media/i2c/tvp5150.c              |  56 ++++++++-----
 drivers/media/i2c/tvp5150_reg.h          |   9 +++
 drivers/media/pci/cobalt/cobalt-driver.c |   8 +-
 drivers/media/pci/cobalt/cobalt-driver.h |   2 -
 drivers/media/usb/dvb-usb/pctv452e.c     | 133 +++++++++++++++++--------------
 include/uapi/linux/cec-funcs.h           |  10 ++-
 10 files changed, 195 insertions(+), 175 deletions(-)
Merging fbdev/fbdev-for-next (a0a74270efaa video: fbdev: wm8505fb use permission-specific DEVICE_ATTR variants)
$ git merge fbdev/fbdev-for-next
Merge made by the 'recursive' strategy.
 drivers/video/console/fbcon.c                 | 67 ++++++++++++++++-----------
 drivers/video/fbdev/imxfb.c                   |  6 ++-
 drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 10 +++-
 drivers/video/fbdev/matrox/matroxfb_Ti3026.c  |  5 +-
 drivers/video/fbdev/maxinefb.c                |  2 +-
 drivers/video/fbdev/sh_mobile_lcdcfb.c        |  6 +--
 drivers/video/fbdev/simplefb.c                | 56 +++++++++++++++-------
 drivers/video/fbdev/wm8505fb.c                |  2 +-
 include/linux/platform_data/video-imxfb.h     |  4 --
 9 files changed, 102 insertions(+), 56 deletions(-)
Merging pm/linux-next (a121103c9228 Linux 4.10-rc3)
$ git merge pm/linux-next
Already up-to-date.
Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc())
$ git merge idle/next
Merge made by the 'recursive' strategy.
Merging thermal/next (cad8f6c4f660 Merge branches 'ida-conversion' and 'thermal-core' into next)
$ git merge thermal/next
Merge made by the 'recursive' strategy.
 drivers/thermal/clock_cooling.c   | 50 ++++-------------------
 drivers/thermal/cpu_cooling.c     | 63 +++++------------------------
 drivers/thermal/devfreq_cooling.c | 53 +++++-------------------
 drivers/thermal/thermal_core.c    | 85 ++++++++++++++-------------------------
 drivers/thermal/thermal_hwmon.c   | 20 ++-------
 include/linux/thermal.h           |  4 +-
 6 files changed, 64 insertions(+), 211 deletions(-)
Merging thermal-soc/next (18591add41ec thermal: rockchip: handle set_trips without the trip points)
$ git merge thermal-soc/next
Merge made by the 'recursive' strategy.
 drivers/thermal/rockchip_thermal.c | 153 ++++++++++++++++++++++++-------------
 1 file changed, 100 insertions(+), 53 deletions(-)
Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one)
$ git merge ieee1394/for-next
Merge made by the 'recursive' strategy.
 drivers/firewire/net.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
Merging dlm/next (aa9f1012858b dlm: don't specify WQ_UNBOUND for the ast callback workqueue)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (602d9858f07c swiotlb: ensure that page-sized mappings are page-aligned)
$ git merge swiotlb/linux-next
Merge made by the 'recursive' strategy.
 lib/swiotlb.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Merging net-next/master (bb60b8b35a73 Merge tag 'mac80211-next-for-davem-2017-01-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next)
$ git merge net-next/master
Auto-merging net/wireless/nl80211.c
Auto-merging net/socket.c
Removing net/sctp/ssnmap.c
Auto-merging net/rds/rds.h
Auto-merging net/mac80211/vht.c
Auto-merging net/mac80211/tx.c
Auto-merging net/mac80211/sta_info.c
Auto-merging net/mac80211/rx.c
Auto-merging net/mac80211/iface.c
Auto-merging net/mac80211/chan.c
Auto-merging net/ipv6/tcp_ipv6.c
Auto-merging net/ipv6/seg6_hmac.c
Auto-merging net/ipv4/tcp.c
Auto-merging net/ipv4/route.c
Auto-merging net/ipv4/fib_semantics.c
Auto-merging net/core/skbuff.c
Auto-merging lib/Kconfig.debug
Auto-merging include/uapi/linux/nl80211.h
Auto-merging include/net/tcp.h
Auto-merging include/linux/tcp.h
Auto-merging include/linux/skbuff.h
Auto-merging fs/afs/rxrpc.c
Auto-merging drivers/net/hyperv/netvsc_drv.c
Auto-merging drivers/net/ethernet/qualcomm/emac/emac.c
Auto-merging drivers/net/ethernet/mellanox/mlxsw/switchx2.c
Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum.c
Auto-merging arch/arm/boot/dts/dra7.dtsi
Auto-merging arch/arm/boot/dts/dm814x.dtsi
Auto-merging arch/arm/boot/dts/am33xx.dtsi
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/net/cpsw.txt     |    3 -
 Documentation/devicetree/bindings/net/dsa/dsa.txt  |   20 +-
 .../bindings/net/snps,dwc-qos-ethernet.txt         |    3 +
 Documentation/devicetree/bindings/net/stmmac.txt   |    3 +-
 .../devicetree/bindings/net/wireless/ieee80211.txt |   24 +
 Documentation/driver-api/80211/cfg80211.rst        |    3 +
 Documentation/networking/ip-sysctl.txt             |   31 +-
 Documentation/networking/packet_mmap.txt           |    9 +-
 Documentation/networking/regulatory.txt            |    8 +-
 Documentation/siphash.txt                          |  175 ++
 Documentation/sysctl/net.txt                       |   21 +
 MAINTAINERS                                        |   20 +
 arch/arm/boot/dts/am33xx.dtsi                      |    1 -
 arch/arm/boot/dts/am4372.dtsi                      |    1 -
 arch/arm/boot/dts/dm814x.dtsi                      |    1 -
 arch/arm/boot/dts/dra7.dtsi                        |    1 -
 drivers/atm/eni.c                                  |    2 +-
 drivers/atm/midway.h                               |    2 +-
 drivers/infiniband/hw/mlx5/cq.c                    |   10 +-
 drivers/infiniband/hw/mlx5/main.c                  |  326 ++-
 drivers/infiniband/hw/mlx5/mem.c                   |   32 +-
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |  121 +-
 drivers/infiniband/hw/mlx5/mr.c                    |  518 ++--
 drivers/infiniband/hw/mlx5/odp.c                   |  424 ++-
 drivers/infiniband/hw/mlx5/qp.c                    |  444 ++-
 drivers/net/bonding/bond_main.c                    |   10 +-
 drivers/net/dsa/b53/b53_common.c                   |   83 +-
 drivers/net/dsa/b53/b53_priv.h                     |   57 +-
 drivers/net/dsa/bcm_sf2.c                          |   55 +-
 drivers/net/dsa/mv88e6060.c                        |   10 +-
 drivers/net/dsa/mv88e6xxx/chip.c                   |   33 +-
 drivers/net/dsa/mv88e6xxx/global2.c                |   93 +-
 drivers/net/dsa/mv88e6xxx/global2.h                |   21 +
 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h              |    2 +
 drivers/net/dsa/qca8k.c                            |    2 +-
 drivers/net/dummy.c                                |    5 +-
 drivers/net/ethernet/3com/typhoon.c                |   25 +-
 drivers/net/ethernet/alacritech/slicoss.c          |    6 +-
 drivers/net/ethernet/amazon/ena/ena_netdev.c       |   10 +-
 drivers/net/ethernet/amd/xgbe/xgbe-drv.c           |    6 +-
 drivers/net/ethernet/apm/xgene/xgene_enet_main.c   |    5 +-
 drivers/net/ethernet/atheros/alx/main.c            |    7 +-
 drivers/net/ethernet/broadcom/b44.c                |    5 +-
 drivers/net/ethernet/broadcom/bnx2.c               |    5 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt.c          |  437 ++-
 drivers/net/ethernet/broadcom/bnxt/bnxt.h          |  125 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c  |  117 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h  |   23 +
 drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h      |  295 +-
 drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c    |   20 +-
 drivers/net/ethernet/broadcom/tg3.c                |    8 +-
 drivers/net/ethernet/brocade/bna/bnad.c            |    6 +-
 drivers/net/ethernet/calxeda/xgmac.c               |    5 +-
 drivers/net/ethernet/cavium/liquidio/lio_ethtool.c |   14 +-
 drivers/net/ethernet/cavium/liquidio/lio_main.c    |   58 +-
 drivers/net/ethernet/cavium/liquidio/lio_vf_main.c |   39 +-
 .../net/ethernet/cavium/liquidio/liquidio_common.h |    2 +
 .../net/ethernet/cavium/liquidio/octeon_config.h   |   10 +-
 .../net/ethernet/cavium/liquidio/octeon_console.c  |   10 +
 .../net/ethernet/cavium/liquidio/octeon_device.h   |    6 +
 drivers/net/ethernet/cavium/liquidio/octeon_iq.h   |    2 +-
 .../net/ethernet/cavium/liquidio/octeon_mailbox.c  |    5 +-
 .../net/ethernet/cavium/liquidio/octeon_mailbox.h  |    4 +-
 .../net/ethernet/cavium/liquidio/octeon_mem_ops.c  |   21 +-
 drivers/net/ethernet/cavium/liquidio/octeon_nic.c  |    4 +-
 .../net/ethernet/cavium/liquidio/request_manager.c |   49 +-
 .../net/ethernet/cavium/thunder/nicvf_ethtool.c    |    2 +-
 drivers/net/ethernet/cavium/thunder/nicvf_main.c   |    8 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h         |   13 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c    |   35 +-
 drivers/net/ethernet/chelsio/cxgb4/sched.c         |    5 -
 drivers/net/ethernet/chelsio/cxgb4/sge.c           |   16 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c         |  114 +-
 drivers/net/ethernet/chelsio/cxgb4/t4_msg.h        |   15 +
 drivers/net/ethernet/chelsio/cxgb4/t4_regs.h       |   21 +
 .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c    |   21 +-
 drivers/net/ethernet/cisco/enic/enic_main.c        |    8 +-
 drivers/net/ethernet/dec/tulip/de2104x.c           |   91 +-
 drivers/net/ethernet/dec/tulip/uli526x.c           |   41 +-
 drivers/net/ethernet/dec/tulip/winbond-840.c       |   14 +-
 drivers/net/ethernet/dlink/dl2k.c                  |   71 +-
 drivers/net/ethernet/dlink/sundance.c              |   14 +-
 drivers/net/ethernet/ec_bhf.c                      |    4 +-
 drivers/net/ethernet/emulex/benet/be_ethtool.c     |   73 +-
 drivers/net/ethernet/emulex/benet/be_main.c        |    5 +-
 drivers/net/ethernet/ethoc.c                       |    7 -
 drivers/net/ethernet/faraday/ftmac100.c            |   14 +-
 drivers/net/ethernet/fealnx.c                      |   14 +-
 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c     |    6 +-
 drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c |   18 +-
 drivers/net/ethernet/hisilicon/hns/hns_enet.c      |    6 +-
 drivers/net/ethernet/ibm/ehea/ehea_ethtool.c       |   51 +-
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |    5 +-
 drivers/net/ethernet/ibm/emac/core.c               |   70 +-
 drivers/net/ethernet/ibm/ibmveth.c                 |   30 +-
 drivers/net/ethernet/ibm/ibmvnic.c                 |   31 +-
 drivers/net/ethernet/intel/e100.c                  |   14 +-
 drivers/net/ethernet/intel/e1000e/e1000.h          |    4 +-
 drivers/net/ethernet/intel/e1000e/netdev.c         |    8 +-
 drivers/net/ethernet/intel/fm10k/fm10k.h           |    4 +-
 drivers/net/ethernet/intel/fm10k/fm10k_common.c    |    6 +-
 drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c   |   21 +-
 drivers/net/ethernet/intel/fm10k/fm10k_main.c      |   12 +-
 drivers/net/ethernet/intel/fm10k/fm10k_mbx.c       |   10 +-
 drivers/net/ethernet/intel/fm10k/fm10k_netdev.c    |    6 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pci.c       |    6 +-
 drivers/net/ethernet/intel/fm10k/fm10k_pf.c        |    4 -
 drivers/net/ethernet/intel/i40e/i40e.h             |    5 +-
 drivers/net/ethernet/intel/i40e/i40e_main.c        |   18 +-
 drivers/net/ethernet/intel/igb/e1000_82575.c       |   11 +
 drivers/net/ethernet/intel/igb/e1000_i210.c        |    4 +-
 drivers/net/ethernet/intel/igb/e1000_mac.c         |   15 +-
 drivers/net/ethernet/intel/igb/e1000_phy.c         |    4 +
 drivers/net/ethernet/intel/igb/e1000_regs.h        |    2 +-
 drivers/net/ethernet/intel/igb/igb_main.c          |   40 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe.h           |    5 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c     |    2 -
 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |    2 -
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.c    |  113 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_common.h    |    6 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c   |  153 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c       |    8 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c      |   99 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h       |    1 +
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c       |   66 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h       |    4 -
 drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c       |   12 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c     |   50 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_type.h      |   90 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c      |   10 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c      |  594 +++-
 drivers/net/ethernet/intel/ixgbevf/ixgbevf.h       |    1 +
 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c  |   72 +-
 drivers/net/ethernet/intel/ixgbevf/mbx.h           |    1 +
 drivers/net/ethernet/intel/ixgbevf/vf.c            |   24 +-
 drivers/net/ethernet/marvell/mvneta.c              |    4 +-
 drivers/net/ethernet/marvell/mvpp2.c               |    4 +-
 drivers/net/ethernet/marvell/sky2.c                |    6 +-
 drivers/net/ethernet/mediatek/mtk_eth_soc.c        |    6 +-
 drivers/net/ethernet/mellanox/mlx4/en_netdev.c     |    4 +-
 drivers/net/ethernet/mellanox/mlx5/core/cq.c       |    2 +
 drivers/net/ethernet/mellanox/mlx5/core/dev.c      |   33 +
 drivers/net/ethernet/mellanox/mlx5/core/en.h       |   11 +-
 .../net/ethernet/mellanox/mlx5/core/en_common.c    |   12 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_main.c  |   26 +-
 drivers/net/ethernet/mellanox/mlx5/core/en_rep.c   |    3 +-
 drivers/net/ethernet/mellanox/mlx5/core/eq.c       |  290 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |   63 +-
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |    2 +
 drivers/net/ethernet/mellanox/mlx5/core/qp.c       |  114 -
 drivers/net/ethernet/mellanox/mlx5/core/uar.c      |  351 ++-
 drivers/net/ethernet/mellanox/mlxsw/cmd.h          |   10 +-
 drivers/net/ethernet/mellanox/mlxsw/i2c.c          |    2 +-
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c     |  105 +-
 drivers/net/ethernet/mellanox/mlxsw/switchx2.c     |    3 +-
 drivers/net/ethernet/myricom/myri10ge/myri10ge.c   |    9 +-
 drivers/net/ethernet/neterion/vxge/vxge-main.c     |    4 +-
 .../net/ethernet/netronome/nfp/nfp_net_common.c    |    6 +-
 drivers/net/ethernet/nvidia/forcedeth.c            |    4 +-
 .../net/ethernet/qlogic/netxen/netxen_nic_main.c   |   10 +-
 drivers/net/ethernet/qlogic/qed/qed.h              |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_cxt.c          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_cxt.h          |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_dcbx.c         |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_dcbx.h         |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_dev.c          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_dev_api.h      |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_hsi.h          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_hw.c           |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_hw.h           |   32 +-
 .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c    |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_init_ops.c     |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_init_ops.h     |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_int.c          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_int.h          |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_iscsi.c        |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_iscsi.h        |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_l2.c           |  303 +-
 drivers/net/ethernet/qlogic/qed/qed_l2.h           |   60 +-
 drivers/net/ethernet/qlogic/qed/qed_ll2.c          |   31 +-
 drivers/net/ethernet/qlogic/qed/qed_ll2.h          |   31 +-
 drivers/net/ethernet/qlogic/qed/qed_main.c         |   43 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.c          |   36 +-
 drivers/net/ethernet/qlogic/qed/qed_mcp.h          |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_ooo.c          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_ooo.h          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_reg_addr.h     |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_roce.c         |    2 +-
 drivers/net/ethernet/qlogic/qed/qed_roce.h         |    2 +-
 drivers/net/ethernet/qlogic/qed/qed_selftest.c     |   32 +
 drivers/net/ethernet/qlogic/qed/qed_sp.h           |   34 +-
 drivers/net/ethernet/qlogic/qed/qed_sp_commands.c  |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_spq.c          |   32 +-
 drivers/net/ethernet/qlogic/qed/qed_sriov.c        |  242 +-
 drivers/net/ethernet/qlogic/qed/qed_sriov.h        |   41 +-
 drivers/net/ethernet/qlogic/qed/qed_vf.c           |   44 +-
 drivers/net/ethernet/qlogic/qed/qed_vf.h           |   32 +-
 drivers/net/ethernet/qlogic/qede/Makefile          |    2 +-
 drivers/net/ethernet/qlogic/qede/qede.h            |   83 +-
 drivers/net/ethernet/qlogic/qede/qede_ethtool.c    |  114 +-
 drivers/net/ethernet/qlogic/qede/qede_filter.c     |  759 +++++
 drivers/net/ethernet/qlogic/qede/qede_fp.c         | 1691 +++++++++++
 drivers/net/ethernet/qlogic/qede/qede_main.c       | 2622 ++---------------
 drivers/net/ethernet/qlogic/qede/qede_roce.c       |    2 +-
 drivers/net/ethernet/qualcomm/emac/Makefile        |    2 +-
 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c  |  185 ++
 drivers/net/ethernet/qualcomm/emac/emac.c          |   54 +-
 drivers/net/ethernet/qualcomm/emac/emac.h          |    3 +
 drivers/net/ethernet/realtek/8139too.c             |    9 +-
 drivers/net/ethernet/realtek/r8169.c               |    4 +-
 drivers/net/ethernet/renesas/sh_eth.c              |  241 +-
 drivers/net/ethernet/renesas/sh_eth.h              |   10 +-
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |    8 +-
 drivers/net/ethernet/sfc/ef10.c                    |   19 +-
 drivers/net/ethernet/sfc/ef10_sriov.c              |   14 -
 drivers/net/ethernet/sfc/ef10_sriov.h              |    3 -
 drivers/net/ethernet/sfc/efx.c                     |   31 +-
 drivers/net/ethernet/sfc/falcon/efx.c              |    9 +-
 drivers/net/ethernet/sfc/falcon/ethtool.c          |   29 +-
 drivers/net/ethernet/sfc/falcon/mdio_10g.c         |   44 +-
 drivers/net/ethernet/sfc/falcon/mdio_10g.h         |    3 +-
 drivers/net/ethernet/sfc/falcon/net_driver.h       |   12 +-
 drivers/net/ethernet/sfc/falcon/qt202x_phy.c       |    9 +-
 drivers/net/ethernet/sfc/falcon/tenxpress.c        |   22 +-
 drivers/net/ethernet/sfc/falcon/txc43128_phy.c     |    9 +-
 drivers/net/ethernet/sfc/net_driver.h              |    5 +-
 drivers/net/ethernet/sfc/sriov.c                   |   11 -
 drivers/net/ethernet/sfc/sriov.h                   |    3 -
 drivers/net/ethernet/stmicro/stmmac/Kconfig        |    9 +
 drivers/net/ethernet/stmicro/stmmac/Makefile       |    1 +
 drivers/net/ethernet/stmicro/stmmac/common.h       |    8 +-
 .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c    |  202 ++
 .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c    |    2 +-
 .../net/ethernet/stmicro/stmmac/dwmac1000_core.c   |    5 +-
 drivers/net/ethernet/stmicro/stmmac/dwmac4.h       |   21 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c  |   75 +
 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c   |    5 +
 drivers/net/ethernet/stmicro/stmmac/stmmac.h       |    5 -
 .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c   |    4 +-
 drivers/net/ethernet/stmicro/stmmac/stmmac_main.c  |  111 +-
 .../net/ethernet/stmicro/stmmac/stmmac_platform.c  |   66 +-
 drivers/net/ethernet/sun/niu.c                     |    6 +-
 drivers/net/ethernet/synopsys/dwc_eth_qos.c        |    4 +-
 drivers/net/ethernet/ti/cpsw.c                     |   97 +-
 drivers/net/ethernet/ti/cpsw_ale.c                 |  180 +-
 drivers/net/ethernet/ti/cpsw_ale.h                 |   17 +-
 drivers/net/ethernet/ti/davinci_cpdma.c            |  161 +-
 drivers/net/ethernet/ti/davinci_cpdma.h            |    5 +
 drivers/net/ethernet/ti/netcp.h                    |   21 +
 drivers/net/ethernet/ti/netcp_core.c               |  100 +-
 drivers/net/ethernet/ti/netcp_ethss.c              |   23 +-
 drivers/net/ethernet/tile/tilepro.c                |    8 +-
 drivers/net/ethernet/via/via-rhine.c               |    8 +-
 drivers/net/ethernet/xilinx/xilinx_emaclite.c      |   18 +-
 drivers/net/fddi/skfp/cfm.c                        |   22 +-
 drivers/net/fddi/skfp/drvfbi.c                     |    4 +-
 drivers/net/fddi/skfp/ecm.c                        |   34 +-
 drivers/net/fddi/skfp/ess.c                        |   66 +-
 drivers/net/fddi/skfp/fplustm.c                    |   24 +-
 drivers/net/fddi/skfp/h/cmtdef.h                   |   67 +-
 drivers/net/fddi/skfp/h/hwmtm.h                    |   24 +-
 drivers/net/fddi/skfp/hwmtm.c                      |  178 +-
 drivers/net/fddi/skfp/pcmplc.c                     |   83 +-
 drivers/net/fddi/skfp/pmf.c                        |    4 +-
 drivers/net/fddi/skfp/rmt.c                        |   40 +-
 drivers/net/fddi/skfp/smt.c                        |  109 +-
 drivers/net/fddi/skfp/srf.c                        |   14 +-
 drivers/net/fjes/fjes_main.c                       |    7 +-
 drivers/net/hyperv/netvsc_drv.c                    |    6 +-
 drivers/net/ifb.c                                  |   22 +-
 drivers/net/ipvlan/ipvlan.h                        |    2 +
 drivers/net/ipvlan/ipvlan_core.c                   |    3 -
 drivers/net/ipvlan/ipvlan_main.c                   |  101 +-
 drivers/net/loopback.c                             |    5 +-
 drivers/net/macsec.c                               |    8 +-
 drivers/net/macvlan.c                              |    5 +-
 drivers/net/mdio.c                                 |  178 ++
 drivers/net/nlmon.c                                |    4 +-
 drivers/net/phy/mdio-gpio.c                        |   60 +-
 drivers/net/phy/mdio_device.c                      |    2 +-
 drivers/net/ppp/ppp_generic.c                      |    4 +-
 drivers/net/slip/slip.c                            |    3 +-
 drivers/net/team/team.c                            |    3 +-
 drivers/net/tun.c                                  |    3 +-
 drivers/net/usb/cdc_ether.c                        |    2 +-
 drivers/net/veth.c                                 |    6 +-
 drivers/net/virtio_net.c                           |    9 +-
 drivers/net/vmxnet3/vmxnet3_ethtool.c              |    4 +-
 drivers/net/vmxnet3/vmxnet3_int.h                  |    4 +-
 drivers/net/vrf.c                                  |    5 +-
 drivers/net/wireless/admtek/adm8211.c              |   27 +-
 drivers/net/wireless/ath/ath10k/core.c             |   11 +-
 drivers/net/wireless/ath/ath10k/core.h             |    2 +-
 drivers/net/wireless/ath/ath10k/debug.c            |   43 +-
 drivers/net/wireless/ath/ath10k/debug.h            |    8 +
 drivers/net/wireless/ath/ath10k/htt_rx.c           |    3 +-
 drivers/net/wireless/ath/ath10k/htt_tx.c           |    2 +
 drivers/net/wireless/ath/ath10k/hw.h               |    2 +-
 drivers/net/wireless/ath/ath10k/mac.c              |   73 +-
 drivers/net/wireless/ath/ath10k/pci.c              |    4 +-
 drivers/net/wireless/ath/ath10k/wmi-tlv.c          |   12 +-
 drivers/net/wireless/ath/ath9k/ar5008_phy.c        |    2 +-
 drivers/net/wireless/ath/ath9k/ar9002_hw.c         |    6 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c     |   21 +-
 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h     |    4 +-
 drivers/net/wireless/ath/ath9k/ath9k.h             |   36 +-
 drivers/net/wireless/ath/ath9k/channel.c           |   14 +-
 drivers/net/wireless/ath/ath9k/debug.c             |    3 +
 drivers/net/wireless/ath/ath9k/debug.h             |   13 +
 drivers/net/wireless/ath/ath9k/debug_sta.c         |   54 +
 drivers/net/wireless/ath/ath9k/eeprom.c            |   42 +-
 drivers/net/wireless/ath/ath9k/eeprom.h            |   85 +-
 drivers/net/wireless/ath/ath9k/eeprom_4k.c         |  137 +-
 drivers/net/wireless/ath/ath9k/eeprom_9287.c       |  129 +-
 drivers/net/wireless/ath/ath9k/eeprom_def.c        |  163 +-
 drivers/net/wireless/ath/ath9k/init.c              |    2 +
 drivers/net/wireless/ath/ath9k/main.c              |    6 +-
 drivers/net/wireless/ath/ath9k/recv.c              |   65 +
 drivers/net/wireless/ath/ath9k/xmit.c              |  192 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |    4 +-
 drivers/net/wireless/intel/iwlegacy/3945-mac.c     |   20 +-
 drivers/net/wireless/marvell/libertas/cfg.c        |    2 +-
 drivers/net/wireless/marvell/mwifiex/cfg80211.c    |    2 +-
 drivers/net/wireless/marvell/mwifiex/fw.h          |   19 +-
 drivers/net/wireless/marvell/mwifiex/init.c        |    3 +-
 drivers/net/wireless/marvell/mwifiex/main.h        |    2 +-
 drivers/net/wireless/marvell/mwifiex/sdio.c        |    6 +
 drivers/net/wireless/marvell/mwifiex/sta_cmd.c     |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2800.h        |    2 +
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c     |   79 +-
 drivers/net/wireless/ralink/rt2x00/rt2800lib.h     |    2 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00.h        |    6 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00dev.c     |    7 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00lib.h     |   31 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00link.c    |  132 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00mac.c     |    8 +-
 drivers/net/wireless/ralink/rt2x00/rt2x00queue.c   |   12 +-
 drivers/net/wireless/realtek/rtlwifi/base.c        |   15 +-
 drivers/net/wireless/realtek/rtlwifi/cam.c         |   14 +-
 drivers/net/wireless/realtek/rtlwifi/core.c        |   31 +-
 drivers/net/wireless/realtek/rtlwifi/debug.h       |   16 +-
 drivers/net/wireless/realtek/rtlwifi/efuse.c       |    3 +-
 drivers/net/wireless/realtek/rtlwifi/pci.c         |   48 +-
 drivers/net/wireless/realtek/rtlwifi/ps.c          |    3 +-
 drivers/net/wireless/realtek/rtlwifi/rc.c          |    3 +-
 drivers/net/wireless/realtek/rtlwifi/regd.c        |    2 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c    |   44 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c    |   33 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c   |   35 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c   |    8 +-
 .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c  |   46 +-
 .../wireless/realtek/rtlwifi/rtl8192c/phy_common.c |   28 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c    |   39 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/led.c   |    7 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/phy.c   |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c    |   35 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/led.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c   |   12 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/phy.c   |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c    |    5 +-
 .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c   |    2 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c    |   34 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c    |   35 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/led.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c   |   45 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c    |   10 +-
 .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c    |   40 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c    |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c   |   39 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c   |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c    |   46 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c    |   43 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/led.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c   |   45 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c    |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c    |   21 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/led.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c   |   31 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c    |   15 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c    |   18 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/led.c   |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c   |   33 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c    |    8 +-
 .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c   |   14 +-
 .../realtek/rtlwifi/rtl8723com/fw_common.c         |   26 +-
 .../realtek/rtlwifi/rtl8723com/phy_common.c        |    6 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c    |    3 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c    |   28 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c    |   33 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c   |   54 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/rf.c    |    5 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c    |   14 +-
 .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c   |   20 +-
 drivers/net/wireless/realtek/rtlwifi/usb.c         |   48 +-
 drivers/net/wireless/ti/wlcore/debugfs.c           |    2 +-
 drivers/net/xen-netfront.c                         |    6 +-
 drivers/s390/net/qeth_core.h                       |    5 -
 drivers/s390/net/qeth_core_main.c                  |  135 +-
 drivers/s390/net/qeth_core_mpc.h                   |   17 +
 drivers/s390/net/qeth_l2_main.c                    |  189 +-
 drivers/s390/net/qeth_l3_main.c                    |   15 -
 drivers/s390/net/qeth_l3_sys.c                     |   33 +-
 drivers/staging/netlogic/xlr_net.c                 |   10 +-
 drivers/staging/octeon/ethernet-tx.c               |    5 +-
 fs/afs/callback.c                                  |    2 +-
 fs/afs/cmservice.c                                 |   63 +-
 fs/afs/file.c                                      |  168 +-
 fs/afs/fsclient.c                                  |  195 +-
 fs/afs/internal.h                                  |  115 +-
 fs/afs/main.c                                      |    1 +
 fs/afs/rxrpc.c                                     |  208 +-
 fs/afs/vlclient.c                                  |    8 +-
 fs/afs/vlocation.c                                 |    4 +-
 fs/afs/vnode.c                                     |   30 +-
 fs/afs/volume.c                                    |    1 +
 fs/afs/write.c                                     |   19 +-
 include/linux/bpf.h                                |   19 +-
 include/linux/etherdevice.h                        |   60 +
 include/linux/ieee80211.h                          |    2 +
 include/linux/mdio.h                               |   21 +
 include/linux/mlx5/cq.h                            |    5 +-
 include/linux/mlx5/device.h                        |   29 +-
 include/linux/mlx5/doorbell.h                      |    6 +-
 include/linux/mlx5/driver.h                        |  184 +-
 include/linux/mlx5/mlx5_ifc.h                      |   38 +-
 include/linux/mlx5/qp.h                            |   76 +-
 include/linux/mroute.h                             |   59 +-
 include/linux/netdevice.h                          |   26 +-
 include/linux/qed/common_hsi.h                     |   33 +-
 include/linux/qed/eth_common.h                     |   32 +-
 include/linux/qed/iscsi_common.h                   |   32 +-
 include/linux/qed/qed_chain.h                      |   34 +-
 include/linux/qed/qed_eth_if.h                     |   34 +-
 include/linux/qed/qed_if.h                         |   35 +-
 include/linux/qed/qed_iov_if.h                     |   34 +-
 include/linux/qed/qed_iscsi_if.h                   |   32 +-
 include/linux/qed/qed_ll2_if.h                     |   31 +-
 include/linux/qed/qed_roce_if.h                    |    2 +-
 include/linux/qed/qede_roce.h                      |    2 +-
 include/linux/qed/rdma_common.h                    |   32 +-
 include/linux/qed/roce_common.h                    |   32 +-
 include/linux/qed/storage_common.h                 |   32 +-
 include/linux/qed/tcp_common.h                     |   32 +-
 include/linux/siphash.h                            |  140 +
 include/linux/skbuff.h                             |   15 +-
 include/linux/soc/ti/knav_dma.h                    |    2 +
 include/linux/socket.h                             |   13 +-
 include/linux/stmmac.h                             |    7 +-
 include/linux/tcp.h                                |    8 +-
 include/net/cfg80211.h                             |  135 +-
 include/net/dsa.h                                  |   13 +-
 include/net/flow_dissector.h                       |   19 +
 include/net/inet_connection_sock.h                 |    4 +-
 include/net/inet_timewait_sock.h                   |   13 +-
 include/net/ip_fib.h                               |    1 -
 include/net/ip_tunnels.h                           |    4 +-
 include/net/iw_handler.h                           |   66 +-
 include/net/mac80211.h                             |    6 +-
 include/net/netns/ipv4.h                           |   12 +
 include/net/request_sock.h                         |    4 +-
 include/net/sch_generic.h                          |   20 +-
 include/net/sctp/sctp.h                            |    1 -
 include/net/sctp/structs.h                         |   83 +-
 include/net/smc.h                                  |   20 +
 include/net/sock.h                                 |    4 +
 include/net/tcp.h                                  |   41 +-
 include/trace/events/afs.h                         |  184 ++
 include/trace/events/rxrpc.h                       |  518 +++-
 include/uapi/linux/netlink.h                       |    1 +
 include/uapi/linux/nl80211.h                       |   64 +-
 include/uapi/linux/pkt_cls.h                       |   66 +-
 include/uapi/linux/rds.h                           |   33 +
 include/uapi/linux/rtnetlink.h                     |    1 +
 include/uapi/linux/smc.h                           |   35 +
 include/uapi/linux/smc_diag.h                      |   85 +
 include/uapi/linux/tc_act/tc_csum.h                |    3 +-
 include/uapi/rdma/mlx5-abi.h                       |   19 +-
 kernel/bpf/bpf_lru_list.c                          |   20 +-
 kernel/bpf/helpers.c                               |    4 +-
 kernel/bpf/verifier.c                              |  223 +-
 kernel/trace/bpf_trace.c                           |   35 +-
 lib/Kconfig.debug                                  |    6 +-
 lib/Makefile                                       |    5 +-
 lib/siphash.c                                      |  551 ++++
 lib/test_siphash.c                                 |  223 ++
 net/8021q/vlan_dev.c                               |    5 +-
 net/Kconfig                                        |    1 +
 net/Makefile                                       |    1 +
 net/bridge/br_device.c                             |    6 +-
 net/compat.c                                       |   17 +-
 net/core/dev.c                                     |   52 +-
 net/core/filter.c                                  |  216 +-
 net/core/flow_dissector.c                          |   57 +
 net/core/lwt_bpf.c                                 |    2 +-
 net/core/pktgen.c                                  |    4 +-
 net/core/request_sock.c                            |    2 -
 net/core/scm.c                                     |    2 +-
 net/core/secure_seq.c                              |  147 +-
 net/core/skbuff.c                                  |    3 -
 net/core/sock.c                                    |   13 +-
 net/core/sysctl_net_core.c                         |   31 +-
 net/dsa/Kconfig                                    |    5 +-
 net/dsa/Makefile                                   |    1 +
 net/dsa/dsa.c                                      |  198 +-
 net/dsa/dsa2.c                                     |   32 +-
 net/dsa/dsa_priv.h                                 |   10 +-
 net/dsa/hwmon.c                                    |  147 +
 net/dsa/slave.c                                    |   13 +-
 net/ipv4/af_inet.c                                 |    2 -
 net/ipv4/fib_semantics.c                           |    2 +-
 net/ipv4/icmp.c                                    |  125 +-
 net/ipv4/inet_diag.c                               |    2 +-
 net/ipv4/inet_timewait_sock.c                      |    3 +-
 net/ipv4/ip_sockglue.c                             |    9 +-
 net/ipv4/ip_tunnel_core.c                          |    6 +-
 net/ipv4/ipmr.c                                    |  266 +-
 net/ipv4/proc.c                                    |    2 +-
 net/ipv4/route.c                                   |   25 +-
 net/ipv4/syncookies.c                              |   21 +-
 net/ipv4/sysctl_net_ipv4.c                         |   49 +-
 net/ipv4/tcp.c                                     |   40 +-
 net/ipv4/tcp_input.c                               |  230 +-
 net/ipv4/tcp_ipv4.c                                |   20 +-
 net/ipv4/tcp_metrics.c                             |    1 -
 net/ipv4/tcp_minisocks.c                           |   15 +-
 net/ipv4/tcp_output.c                              |   75 +-
 net/ipv4/tcp_recovery.c                            |  148 +-
 net/ipv4/tcp_timer.c                               |    5 +-
 net/ipv4/udp.c                                     |   29 +-
 net/ipv6/addrconf.c                                |    7 +
 net/ipv6/icmp.c                                    |   68 +-
 net/ipv6/ip6mr.c                                   |    4 +-
 net/ipv6/ipv6_sockglue.c                           |   16 +-
 net/ipv6/ping.c                                    |    7 -
 net/ipv6/seg6_hmac.c                               |   43 +-
 net/ipv6/syncookies.c                              |   41 +-
 net/ipv6/tcp_ipv6.c                                |   10 +-
 net/l2tp/l2tp_eth.c                                |    6 +-
 net/l2tp/l2tp_ip.c                                 |   29 +-
 net/l2tp/l2tp_ip6.c                                |   30 +-
 net/mac80211/cfg.c                                 |   12 +
 net/mac80211/chan.c                                |    4 +-
 net/mac80211/debugfs.c                             |   27 +
 net/mac80211/debugfs_netdev.c                      |    3 +
 net/mac80211/ieee80211_i.h                         |    6 +-
 net/mac80211/iface.c                               |    4 +-
 net/mac80211/mesh.c                                |    7 +-
 net/mac80211/mesh.h                                |    2 +-
 net/mac80211/mesh_plink.c                          |   14 +-
 net/mac80211/mesh_sync.c                           |   27 +-
 net/mac80211/mlme.c                                |    4 -
 net/mac80211/rc80211_minstrel.c                    |   21 +-
 net/mac80211/rc80211_minstrel.h                    |   33 +-
 net/mac80211/rc80211_minstrel_debugfs.c            |   24 +-
 net/mac80211/rc80211_minstrel_ht.c                 |   68 +-
 net/mac80211/rc80211_minstrel_ht.h                 |    6 +-
 net/mac80211/rc80211_minstrel_ht_debugfs.c         |   32 +-
 net/mac80211/rx.c                                  |    4 -
 net/mac80211/scan.c                                |    8 +-
 net/mac80211/sta_info.c                            |   18 +-
 net/mac80211/status.c                              |    8 +-
 net/mac80211/tx.c                                  |  132 +-
 net/mac80211/vht.c                                 |    4 -
 net/mac80211/wep.c                                 |    3 +-
 net/mac80211/wpa.c                                 |    3 +-
 net/openvswitch/vport-internal_dev.c               |    4 +-
 net/packet/af_packet.c                             |   42 +-
 net/packet/diag.c                                  |    3 +-
 net/rds/af_rds.c                                   |   31 +
 net/rds/bind.c                                     |    4 +-
 net/rds/connection.c                               |   10 +-
 net/rds/ib.c                                       |   11 +
 net/rds/ib.h                                       |   22 +-
 net/rds/ib_cm.c                                    |   89 +-
 net/rds/ib_frmr.c                                  |   16 +-
 net/rds/ib_recv.c                                  |   14 +-
 net/rds/ib_send.c                                  |   29 +-
 net/rds/ib_stats.c                                 |    2 +
 net/rds/rdma.c                                     |   22 +-
 net/rds/rdma_transport.c                           |   11 +-
 net/rds/rds.h                                      |   17 +
 net/rds/recv.c                                     |   36 +-
 net/rds/send.c                                     |   50 +-
 net/rds/tcp_listen.c                               |    1 +
 net/rds/tcp_recv.c                                 |    5 +
 net/rfkill/core.c                                  |  100 +-
 net/rxrpc/af_rxrpc.c                               |    8 +
 net/rxrpc/ar-internal.h                            |  195 +-
 net/rxrpc/call_accept.c                            |    3 +-
 net/rxrpc/call_object.c                            |   18 -
 net/rxrpc/conn_client.c                            |    8 -
 net/rxrpc/conn_object.c                            |    1 +
 net/rxrpc/input.c                                  |   16 +-
 net/rxrpc/misc.c                                   |  151 -
 net/rxrpc/proc.c                                   |    9 +-
 net/rxrpc/sendmsg.c                                |    2 +-
 net/sched/Kconfig                                  |    1 +
 net/sched/act_api.c                                |   11 +-
 net/sched/act_csum.c                               |   30 +
 net/sched/act_ife.c                                |    7 +-
 net/sched/act_mirred.c                             |   21 +-
 net/sched/cls_flower.c                             |   51 +
 net/sched/cls_matchall.c                           |   22 +-
 net/sched/cls_u32.c                                |    1 -
 net/sched/sch_api.c                                |    3 +-
 net/sched/sch_generic.c                            |    2 +-
 net/sched/sch_netem.c                              |    2 +-
 net/sched/sch_teql.c                               |    5 +-
 net/sctp/Makefile                                  |    2 +-
 net/sctp/associola.c                               |   13 +-
 net/sctp/chunk.c                                   |  107 +-
 net/sctp/input.c                                   |   17 +-
 net/sctp/ipv6.c                                    |   16 +-
 net/sctp/objcnt.c                                  |    2 -
 net/sctp/output.c                                  |   14 +-
 net/sctp/protocol.c                                |   18 +-
 net/sctp/sm_make_chunk.c                           |   10 +-
 net/sctp/sm_statefuns.c                            |  125 +-
 net/sctp/ssnmap.c                                  |  125 -
 net/sctp/stream.c                                  |   85 +
 net/sctp/ulpqueue.c                                |   36 +-
 net/smc/Kconfig                                    |   20 +
 net/smc/Makefile                                   |    4 +
 net/smc/af_smc.c                                   | 1407 +++++++++
 net/smc/smc.h                                      |  274 ++
 net/smc/smc_cdc.c                                  |  304 ++
 net/smc/smc_cdc.h                                  |  218 ++
 net/smc/smc_clc.c                                  |  280 ++
 net/smc/smc_clc.h                                  |  116 +
 net/smc/smc_close.c                                |  442 +++
 net/smc/smc_close.h                                |   28 +
 net/smc/smc_core.c                                 |  677 +++++
 net/smc/smc_core.h                                 |  181 ++
 net/smc/smc_diag.c                                 |  215 ++
 net/smc/smc_ib.c                                   |  466 +++
 net/smc/smc_ib.h                                   |   71 +
 net/smc/smc_llc.c                                  |  158 +
 net/smc/smc_llc.h                                  |   63 +
 net/smc/smc_pnet.c                                 |  534 ++++
 net/smc/smc_pnet.h                                 |   23 +
 net/smc/smc_rx.c                                   |  217 ++
 net/smc/smc_rx.h                                   |   23 +
 net/smc/smc_tx.c                                   |  483 ++++
 net/smc/smc_tx.h                                   |   35 +
 net/smc/smc_wr.c                                   |  614 ++++
 net/smc/smc_wr.h                                   |  106 +
 net/socket.c                                       |    8 +-
 net/tipc/bcast.c                                   |    6 +-
 net/tipc/link.c                                    |   75 +-
 net/tipc/msg.h                                     |    2 -
 net/tipc/name_table.c                              |  100 +-
 net/tipc/name_table.h                              |   21 +-
 net/tipc/node.c                                    |   15 +-
 net/tipc/socket.c                                  |  449 ++-
 net/wireless/Makefile                              |    1 +
 net/wireless/core.c                                |    3 +
 net/wireless/core.h                                |    8 +-
 net/wireless/mlme.c                                |   29 +-
 net/wireless/nl80211.c                             |  137 +-
 net/wireless/nl80211.h                             |   10 +-
 net/wireless/of.c                                  |  138 +
 net/wireless/reg.c                                 |   27 +-
 net/wireless/scan.c                                |    9 +-
 net/wireless/sme.c                                 |   72 +-
 net/wireless/sysfs.c                               |    6 +-
 net/wireless/util.c                                |   30 +-
 net/wireless/wext-core.c                           |   67 +
 net/wireless/wext-sme.c                            |   23 -
 tools/testing/selftests/bpf/test_verifier.c        | 3003 ++++++++++++++------
 tools/testing/selftests/net/psock_lib.h            |   39 +-
 tools/testing/selftests/net/psock_tpacket.c        |   97 +-
 688 files changed, 28497 insertions(+), 12307 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/wireless/ieee80211.txt
 create mode 100644 Documentation/siphash.txt
 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_filter.c
 create mode 100644 drivers/net/ethernet/qlogic/qede/qede_fp.c
 create mode 100644 drivers/net/ethernet/qualcomm/emac/emac-ethtool.c
 create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c
 create mode 100644 include/linux/siphash.h
 create mode 100644 include/net/smc.h
 create mode 100644 include/trace/events/afs.h
 create mode 100644 include/uapi/linux/smc.h
 create mode 100644 include/uapi/linux/smc_diag.h
 create mode 100644 lib/siphash.c
 create mode 100644 lib/test_siphash.c
 create mode 100644 net/dsa/hwmon.c
 delete mode 100644 net/sctp/ssnmap.c
 create mode 100644 net/sctp/stream.c
 create mode 100644 net/smc/Kconfig
 create mode 100644 net/smc/Makefile
 create mode 100644 net/smc/af_smc.c
 create mode 100644 net/smc/smc.h
 create mode 100644 net/smc/smc_cdc.c
 create mode 100644 net/smc/smc_cdc.h
 create mode 100644 net/smc/smc_clc.c
 create mode 100644 net/smc/smc_clc.h
 create mode 100644 net/smc/smc_close.c
 create mode 100644 net/smc/smc_close.h
 create mode 100644 net/smc/smc_core.c
 create mode 100644 net/smc/smc_core.h
 create mode 100644 net/smc/smc_diag.c
 create mode 100644 net/smc/smc_ib.c
 create mode 100644 net/smc/smc_ib.h
 create mode 100644 net/smc/smc_llc.c
 create mode 100644 net/smc/smc_llc.h
 create mode 100644 net/smc/smc_pnet.c
 create mode 100644 net/smc/smc_pnet.h
 create mode 100644 net/smc/smc_rx.c
 create mode 100644 net/smc/smc_rx.h
 create mode 100644 net/smc/smc_tx.c
 create mode 100644 net/smc/smc_tx.h
 create mode 100644 net/smc/smc_wr.c
 create mode 100644 net/smc/smc_wr.h
 create mode 100644 net/wireless/of.c
$ git am -3 ../patches/0001-smc-merge-fix-for-switch-socket-splice_read-to-struc.patch
Applying: smc: merge fix for "switch socket ->splice_read() to struct file *"
$ git reset HEAD^
Unstaged changes after reset:
M	net/smc/af_smc.c
$ git add -A .
$ git commit -v -a --amend
[master 9fe272d4b1c0] Merge remote-tracking branch 'net-next/master'
 Date: Mon Jan 16 11:13:22 2017 +1100
Merging ipsec-next/master (75cda62d9ca2 xfrm: state: simplify rcu_read_unlock handling in two spots)
$ git merge ipsec-next/master
Merge made by the 'recursive' strategy.
 include/net/xfrm.h     |  2 +-
 net/ipv4/xfrm4_state.c |  8 -----
 net/xfrm/xfrm_output.c |  8 ++---
 net/xfrm/xfrm_policy.c |  2 +-
 net/xfrm/xfrm_state.c  | 88 ++++++++++++++++++++++++--------------------------
 5 files changed, 48 insertions(+), 60 deletions(-)
Merging netfilter-next/master (ec2318904965 xtables: extend matches and targets with .usersize)
$ git merge netfilter-next/master
Removing net/netfilter/nf_nat_proto_udplite.c
Removing net/netfilter/nf_conntrack_proto_udplite.c
Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c
Merge made by the 'recursive' strategy.
 include/linux/netfilter/x_tables.h             |   9 +
 include/net/netfilter/ipv4/nf_conntrack_ipv4.h |   1 +
 include/net/netfilter/ipv6/nf_conntrack_ipv6.h |   1 +
 include/net/netns/conntrack.h                  |  16 --
 include/uapi/linux/netfilter/nf_tables.h       |   5 +
 net/bridge/netfilter/ebt_limit.c               |   1 +
 net/bridge/netfilter/ebtables.c                |  78 +++---
 net/ipv4/netfilter/arp_tables.c                |  15 +-
 net/ipv4/netfilter/ip_tables.c                 |  21 +-
 net/ipv4/netfilter/ipt_CLUSTERIP.c             |   1 +
 net/ipv6/netfilter/ip6_tables.c                |  21 +-
 net/ipv6/netfilter/ip6t_NPT.c                  |   2 +
 net/netfilter/Kconfig                          |   2 +-
 net/netfilter/Makefile                         |   2 -
 net/netfilter/nf_conntrack_proto_sctp.c        |  32 +++
 net/netfilter/nf_conntrack_proto_udp.c         | 123 ++++++++++
 net/netfilter/nf_conntrack_proto_udplite.c     | 324 -------------------------
 net/netfilter/nf_nat_proto_udp.c               |  78 +++++-
 net/netfilter/nf_nat_proto_udplite.c           |  73 ------
 net/netfilter/nft_ct.c                         |  22 +-
 net/netfilter/x_tables.c                       |  68 +++++-
 net/netfilter/xt_CT.c                          |   3 +
 net/netfilter/xt_RATEEST.c                     |   1 +
 net/netfilter/xt_TEE.c                         |   2 +
 net/netfilter/xt_bpf.c                         |   2 +
 net/netfilter/xt_cgroup.c                      |   1 +
 net/netfilter/xt_connlimit.c                   |   5 +-
 net/netfilter/xt_hashlimit.c                   |   4 +
 net/netfilter/xt_limit.c                       |   2 +
 net/netfilter/xt_quota.c                       |   1 +
 net/netfilter/xt_rateest.c                     |   1 +
 net/netfilter/xt_string.c                      |   1 +
 32 files changed, 406 insertions(+), 512 deletions(-)
 delete mode 100644 net/netfilter/nf_conntrack_proto_udplite.c
 delete mode 100644 net/netfilter/nf_nat_proto_udplite.c
Merging ipvs-next/master (8d8e20e2d7bb ipvs: Decrement ttl)
$ git merge ipvs-next/master
Already up-to-date.
Merging wireless-drivers-next/master (cc75c577806a mwifiex: get rid of global save_adapter and sdio_work)
$ git merge wireless-drivers-next/master
Merge made by the 'recursive' strategy.
 drivers/net/wireless/marvell/mwifiex/init.c |  38 +--
 drivers/net/wireless/marvell/mwifiex/main.c | 137 +++-----
 drivers/net/wireless/marvell/mwifiex/main.h |  15 +-
 drivers/net/wireless/marvell/mwifiex/pcie.c | 191 +++++------
 drivers/net/wireless/marvell/mwifiex/pcie.h |   2 +
 drivers/net/wireless/marvell/mwifiex/sdio.c | 508 +++++++++++++---------------
 drivers/net/wireless/marvell/mwifiex/sdio.h |   4 +-
 drivers/net/wireless/marvell/mwifiex/usb.c  |  41 +--
 drivers/net/wireless/marvell/mwifiex/util.c |  15 -
 9 files changed, 371 insertions(+), 580 deletions(-)
Merging bluetooth/master (4289e60cb056 Merge branch 'tc-skb-diet')
$ git merge bluetooth/master
Already up-to-date.
Merging mac80211-next/master (c88215d7050f cfg80211: Fix documentation for connect result)
$ git merge mac80211-next/master
Already up-to-date.
Merging rdma/for-next (102c5ce082f5 RDMA/cma: use cached port state when bind loopback)
$ git merge rdma/for-next
Merge made by the 'recursive' strategy.
 drivers/infiniband/core/cache.c                    |  28 +-
 drivers/infiniband/core/cma.c                      |  12 +-
 drivers/infiniband/hw/cxgb4/cm.c                   |   6 +-
 drivers/infiniband/hw/hfi1/pcie.c                  |  10 -
 drivers/infiniband/hw/i40iw/i40iw_ctrl.c           | 128 +++--
 drivers/infiniband/hw/i40iw/i40iw_uk.c             |  34 +-
 drivers/infiniband/hw/mlx4/qp.c                    |   6 +-
 drivers/infiniband/hw/nes/nes_cm.c                 |  22 +-
 drivers/infiniband/hw/ocrdma/ocrdma_ah.c           |   4 +-
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c           |   3 +-
 drivers/infiniband/hw/ocrdma/ocrdma_sli.h          |   5 -
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |  15 +-
 drivers/infiniband/hw/qedr/qedr_cm.c               |   2 +-
 drivers/infiniband/hw/qedr/qedr_cm.h               |   1 -
 drivers/infiniband/hw/qedr/verbs.c                 | 549 +++++++++------------
 drivers/infiniband/hw/qib/qib_pcie.c               |   8 -
 drivers/infiniband/hw/qib/qib_user_sdma.c          |   6 +-
 drivers/infiniband/hw/usnic/usnic_common_pkt_hdr.h |   1 -
 drivers/infiniband/hw/usnic/usnic_fwd.h            |   3 +-
 drivers/infiniband/sw/rxe/rxe.c                    |   2 +-
 drivers/infiniband/sw/rxe/rxe_comp.c               |  91 ++--
 drivers/infiniband/sw/rxe/rxe_cq.c                 |   4 +-
 drivers/infiniband/sw/rxe/rxe_hdr.h                |  12 +-
 drivers/infiniband/sw/rxe/rxe_loc.h                |  29 +-
 drivers/infiniband/sw/rxe/rxe_mcast.c              |   8 +-
 drivers/infiniband/sw/rxe/rxe_mr.c                 |  10 +-
 drivers/infiniband/sw/rxe/rxe_net.c                |  51 +-
 drivers/infiniband/sw/rxe/rxe_pool.c               |  14 +-
 drivers/infiniband/sw/rxe/rxe_pool.h               |   8 +-
 drivers/infiniband/sw/rxe/rxe_qp.c                 |   4 +-
 drivers/infiniband/sw/rxe/rxe_recv.c               |   2 +-
 drivers/infiniband/sw/rxe/rxe_req.c                |  34 +-
 drivers/infiniband/sw/rxe/rxe_resp.c               |  64 +--
 drivers/infiniband/sw/rxe/rxe_verbs.c              |  10 +-
 drivers/infiniband/sw/rxe/rxe_verbs.h              |  24 +-
 drivers/infiniband/ulp/ipoib/ipoib_cm.c            |  30 +-
 drivers/infiniband/ulp/ipoib/ipoib_main.c          |  33 +-
 drivers/infiniband/ulp/ipoib/ipoib_multicast.c     |   6 +-
 drivers/infiniband/ulp/ipoib/ipoib_vlan.c          |  10 +-
 include/rdma/ib_cache.h                            |  13 +
 include/rdma/ib_sa.h                               |   6 +-
 include/rdma/ib_verbs.h                            |   1 +
 include/uapi/linux/if_ether.h                      |   1 +
 include/uapi/rdma/Kbuild                           |   1 +
 include/uapi/rdma/hfi/Kbuild                       |   1 +
 include/uapi/rdma/hfi/hfi1_ioctl.h                 | 173 +++++++
 include/uapi/rdma/hfi/hfi1_user.h                  | 175 +------
 include/uapi/rdma/ib_user_mad.h                    |  14 +-
 include/uapi/rdma/rdma_user_ioctl.h                |  87 ++++
 49 files changed, 888 insertions(+), 873 deletions(-)
 create mode 100644 include/uapi/rdma/hfi/hfi1_ioctl.h
 create mode 100644 include/uapi/rdma/rdma_user_ioctl.h
Merging rdma-leon/rdma-next (ee02a82baec7 Merge branch 'topic/odp-ksm' into rdma-next)
$ git merge rdma-leon/rdma-next
Auto-merging include/rdma/ib_verbs.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/sriov/sriov.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/sriov/eswitch_offloads.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/sriov/eswitch.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/sriov/eswitch.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/pagealloc.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/main.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/vport.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/vport.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/uar.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/transobj.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/transobj.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/srq.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/srq.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/rl.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/qp.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/qp.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/port.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/port.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/pd.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/mr.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/mlx5_ifc.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/mcg.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/mad.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/fw.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/fs.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/driver.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/device.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/cq.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/cq.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lib/alloc.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/lag.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/health.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/fs/counters.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/fs/core.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/fs/core.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/fs/cmd.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/eq.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/wq.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/wq.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/vxlan.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/vxlan.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/txrx.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/tx.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/tc.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/selftest.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/rx_am.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/rx.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/rep.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/main.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/fs_ethtool.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/fs.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/ethtool.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/en.h
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/dcbnl.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/common.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/clock.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/en/arfs.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/dev.c
Auto-merging drivers/net/ethernet/mellanox/mlx5/debugfs.c
Removing drivers/net/ethernet/mellanox/mlx5/core/Makefile
Auto-merging drivers/net/ethernet/mellanox/mlx5/cmd.c
Auto-merging drivers/infiniband/core/cma.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 MAINTAINERS                                        |  11 +-
 drivers/infiniband/core/cm.c                       |   2 +
 drivers/infiniband/core/cma.c                      |  95 +++-
 drivers/infiniband/core/umem.c                     |   3 -
 drivers/infiniband/core/umem_odp.c                 |  92 +++-
 drivers/infiniband/core/umem_rbtree.c              |  21 +-
 drivers/infiniband/core/uverbs.h                   |   1 +
 drivers/infiniband/core/uverbs_cmd.c               |  53 ++-
 drivers/infiniband/hw/cxgb3/iwch_provider.c        |   7 +-
 drivers/infiniband/hw/cxgb4/provider.c             |   8 +-
 drivers/infiniband/hw/hfi1/verbs.c                 |   1 +
 drivers/infiniband/hw/hns/hns_roce_main.c          |   7 +-
 drivers/infiniband/hw/i40iw/i40iw_verbs.c          |   8 +-
 drivers/infiniband/hw/mlx4/alias_GUID.c            |   1 +
 drivers/infiniband/hw/mlx4/main.c                  |  23 +-
 drivers/infiniband/hw/mlx4/sysfs.c                 |   1 +
 drivers/infiniband/hw/mlx5/Makefile                |   3 +-
 drivers/infiniband/hw/mlx5/cmd.c                   |  48 ++
 drivers/infiniband/hw/mlx5/cmd.h                   |  42 ++
 drivers/infiniband/hw/mlx5/ib_virt.c               |   2 +-
 drivers/infiniband/hw/mlx5/mad.c                   |  18 +-
 drivers/infiniband/hw/mlx5/main.c                  | 296 +++++++++---
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |  56 ++-
 drivers/infiniband/hw/mlx5/mr.c                    | 128 ++++--
 drivers/infiniband/hw/mlx5/odp.c                   | 505 +++++++++++++++++++--
 drivers/infiniband/hw/mlx5/qp.c                    |  84 +++-
 drivers/infiniband/hw/mlx5/srq.c                   |  15 +-
 drivers/infiniband/hw/mthca/mthca_provider.c       |   9 +-
 drivers/infiniband/hw/nes/nes_verbs.c              |   5 +-
 drivers/infiniband/hw/ocrdma/ocrdma_main.c         |   9 +-
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c        |   1 +
 drivers/infiniband/hw/qedr/verbs.c                 |   9 +-
 drivers/infiniband/hw/qib/qib_verbs.c              |   1 +
 drivers/infiniband/hw/usnic/usnic_ib_main.c        |   4 +-
 drivers/infiniband/hw/usnic/usnic_ib_verbs.c       |   2 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c     |   5 +-
 drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c    |   4 +-
 drivers/infiniband/sw/rdmavt/vt.c                  |   7 +-
 drivers/infiniband/sw/rxe/rxe_verbs.c              |   6 +-
 drivers/net/ethernet/mellanox/Kconfig              |   2 +-
 drivers/net/ethernet/mellanox/Makefile             |   2 +-
 .../net/ethernet/mellanox/mlx5/{core => }/Kconfig  |   0
 drivers/net/ethernet/mellanox/mlx5/Makefile        |  21 +
 .../net/ethernet/mellanox/mlx5/{core => }/cmd.c    |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/Makefile   |  13 -
 .../ethernet/mellanox/mlx5/{core => }/debugfs.c    |   8 +-
 .../net/ethernet/mellanox/mlx5/{core => }/dev.c    |   4 +-
 .../mellanox/mlx5/{core/en_arfs.c => en/arfs.c}    |   4 +-
 .../mellanox/mlx5/{core/en_clock.c => en/clock.c}  |   2 +-
 .../mlx5/{core/en_common.c => en/common.c}         |   2 +-
 .../mellanox/mlx5/{core/en_dcbnl.c => en/dcbnl.c}  |   2 +-
 .../net/ethernet/mellanox/mlx5/{core => en}/en.h   |  18 +-
 .../mlx5/{core/en_ethtool.c => en/ethtool.c}       |   2 +-
 .../mellanox/mlx5/{core/en_fs.c => en/fs.c}        |   4 +-
 .../mlx5/{core/en_fs_ethtool.c => en/fs_ethtool.c} |   4 +-
 .../mellanox/mlx5/{core/en_main.c => en/main.c}    |  10 +-
 .../mellanox/mlx5/{core/en_rep.c => en/rep.c}      |   8 +-
 .../mellanox/mlx5/{core/en_rx.c => en/rx.c}        |   6 +-
 .../mellanox/mlx5/{core/en_rx_am.c => en/rx_am.c}  |   2 +-
 .../mlx5/{core/en_selftest.c => en/selftest.c}     |   2 +-
 .../mellanox/mlx5/{core/en_stats.h => en/stats.h}  |   0
 .../mellanox/mlx5/{core/en_tc.c => en/tc.c}        |  12 +-
 .../mellanox/mlx5/{core/en_tc.h => en/tc.h}        |   0
 .../mellanox/mlx5/{core/en_tx.c => en/tx.c}        |   2 +-
 .../mellanox/mlx5/{core/en_txrx.c => en/txrx.c}    |   2 +-
 .../ethernet/mellanox/mlx5/{core => en}/vxlan.c    |   6 +-
 .../ethernet/mellanox/mlx5/{core => en}/vxlan.h    |   4 +-
 .../net/ethernet/mellanox/mlx5/{core => en}/wq.c   |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => en}/wq.h   |   2 +-
 drivers/net/ethernet/mellanox/mlx5/{core => }/eq.c |   8 +-
 .../mellanox/mlx5/{core/fs_cmd.c => fs/cmd.c}      |  15 +-
 .../mellanox/mlx5/{core/fs_cmd.h => fs/cmd.h}      |   0
 .../mellanox/mlx5/{core/fs_core.c => fs/core.c}    |  21 +-
 .../mellanox/mlx5/{core/fs_core.h => fs/core.h}    |   2 +-
 .../mlx5/{core/fs_counters.c => fs/counters.c}     |  10 +-
 .../net/ethernet/mellanox/mlx5/{core => }/health.c |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => }/lag.c    |   6 +-
 .../ethernet/mellanox/mlx5/{core => lib}/alloc.c   |   5 +-
 .../net/ethernet/mellanox/mlx5/lib}/cmd.h          |   0
 .../net/ethernet/mellanox/mlx5/{core => lib}/cq.c  |   8 +-
 .../net/ethernet/mellanox/mlx5/lib}/cq.h           |   2 +-
 .../net/ethernet/mellanox/mlx5/lib}/device.h       |   2 +-
 .../net/ethernet/mellanox/mlx5/lib}/doorbell.h     |   0
 .../net/ethernet/mellanox/mlx5/lib}/driver.h       |  12 +-
 .../net/ethernet/mellanox/mlx5/lib}/fs.h           |   4 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/fw.c  |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/mad.c |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/mcg.c |   6 +-
 .../net/ethernet/mellanox/mlx5/lib}/mlx5_ifc.h     |   2 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/mr.c  |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/pd.c  |   6 +-
 .../ethernet/mellanox/mlx5/{core => lib}/port.c    |   8 +-
 .../net/ethernet/mellanox/mlx5/lib}/port.h         |   2 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/qp.c  |  11 +-
 .../net/ethernet/mellanox/mlx5/lib}/qp.h           |   4 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/rl.c  |   6 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/srq.c |  10 +-
 .../net/ethernet/mellanox/mlx5/lib}/srq.h          |   2 +-
 .../mellanox/mlx5/{core => lib}/transobj.c         |   6 +-
 .../net/ethernet/mellanox/mlx5/lib}/transobj.h     |   2 +-
 .../net/ethernet/mellanox/mlx5/{core => lib}/uar.c |   6 +-
 .../ethernet/mellanox/mlx5/{core => lib}/vport.c   |   6 +-
 .../net/ethernet/mellanox/mlx5/lib}/vport.h        |   4 +-
 .../net/ethernet/mellanox/mlx5/{core => }/main.c   |  16 +-
 .../mellanox/mlx5/{core/mlx5_core.h => mlx5.h}     |   0
 .../ethernet/mellanox/mlx5/{core => }/pagealloc.c  |   6 +-
 .../mellanox/mlx5/{core => sriov}/eswitch.c        |  12 +-
 .../mellanox/mlx5/{core => sriov}/eswitch.h        |   2 +-
 .../mlx5/{core => sriov}/eswitch_offloads.c        |  12 +-
 .../ethernet/mellanox/mlx5/{core => sriov}/sriov.c |   6 +-
 include/rdma/ib_umem_odp.h                         |  21 +-
 include/rdma/ib_verbs.h                            |  57 ++-
 include/uapi/rdma/ib_user_verbs.h                  |  19 +-
 113 files changed, 1641 insertions(+), 458 deletions(-)
 create mode 100644 drivers/infiniband/hw/mlx5/cmd.c
 create mode 100644 drivers/infiniband/hw/mlx5/cmd.h
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/Kconfig (100%)
 create mode 100644 drivers/net/ethernet/mellanox/mlx5/Makefile
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/cmd.c (99%)
 delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/Makefile
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/debugfs.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/dev.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_arfs.c => en/arfs.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_clock.c => en/clock.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_common.c => en/common.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_dcbnl.c => en/dcbnl.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => en}/en.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_ethtool.c => en/ethtool.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_fs.c => en/fs.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_fs_ethtool.c => en/fs_ethtool.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_main.c => en/main.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_rep.c => en/rep.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_rx.c => en/rx.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_rx_am.c => en/rx_am.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_selftest.c => en/selftest.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_stats.h => en/stats.h} (100%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_tc.c => en/tc.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_tc.h => en/tc.h} (100%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_tx.c => en/tx.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/en_txrx.c => en/txrx.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => en}/vxlan.c (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => en}/vxlan.h (97%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => en}/wq.c (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => en}/wq.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/eq.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/fs_cmd.c => fs/cmd.c} (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/fs_cmd.h => fs/cmd.h} (100%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/fs_core.c => fs/core.c} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/fs_core.h => fs/core.h} (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/fs_counters.c => fs/counters.c} (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/health.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/lag.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/alloc.c (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/cmd.h (100%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/cq.c (98%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/cq.h (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/device.h (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/doorbell.h (100%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/driver.h (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/fs.h (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/fw.c (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/mad.c (96%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/mcg.c (96%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/mlx5_ifc.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/mr.c (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/pd.c (96%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/port.c (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/port.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/qp.c (98%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/qp.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/rl.c (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/srq.c (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/srq.h (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/transobj.c (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/transobj.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/uar.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => lib}/vport.c (99%)
 rename {include/linux/mlx5 => drivers/net/ethernet/mellanox/mlx5/lib}/vport.h (98%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/main.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core/mlx5_core.h => mlx5.h} (100%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => }/pagealloc.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => sriov}/eswitch.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => sriov}/eswitch.h (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => sriov}/eswitch_offloads.c (99%)
 rename drivers/net/ethernet/mellanox/mlx5/{core => sriov}/sriov.c (98%)
Merging rdma-leon-test/testing/rdma-next (a909d3e63699 Linux 4.9-rc3)
$ git merge rdma-leon-test/testing/rdma-next
Already up-to-date.
Merging mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
$ git merge mtd/master
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/mtd/tango-nand.txt | 6 +++---
 drivers/mtd/nand/Kconfig                             | 3 ++-
 drivers/mtd/nand/lpc32xx_mlc.c                       | 2 +-
 drivers/mtd/nand/tango_nand.c                        | 4 +++-
 drivers/mtd/nand/xway_nand.c                         | 5 +----
 5 files changed, 10 insertions(+), 10 deletions(-)
Merging l2-mtd/master (5bdee5496978 Merge tag 'nand/fixes-for-4.10-rc3' of github.com:linux-nand/linux)
$ git merge l2-mtd/master
Already up-to-date.
Merging nand/nand/next (9018bf842d4e mtd: nand: fsmc: remove stale non-DT probe path)
$ git merge nand/nand/next
Removing include/linux/mtd/fsmc.h
Auto-merging drivers/mtd/nand/Kconfig
Merge made by the 'recursive' strategy.
 drivers/mtd/nand/Kconfig       |   1 +
 drivers/mtd/nand/fsmc_nand.c   | 153 ++++++++++++++++++++++++++++++++++------
 drivers/mtd/nand/lpc32xx_slc.c |   9 +--
 include/linux/mtd/fsmc.h       | 156 -----------------------------------------
 include/linux/mtd/nand.h       |   3 +-
 5 files changed, 137 insertions(+), 185 deletions(-)
 delete mode 100644 include/linux/mtd/fsmc.h
Merging crypto/master (87170961f312 crypto: virtio - adjust priority of algorithm)
$ git merge crypto/master
Auto-merging arch/x86/crypto/aesni-intel_glue.c
Removing arch/arm/crypto/bsaes-armv7.pl
Removing arch/arm/crypto/aesbs-glue.c
Removing arch/arm/crypto/aesbs-core.S_shipped
Removing arch/arm/crypto/aes_glue.h
Removing arch/arm/crypto/aes_glue.c
Removing arch/arm/crypto/aes-armv4.S
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/crypto/mediatek-crypto.txt |   27 +
 arch/arm/crypto/Kconfig                            |   27 +-
 arch/arm/crypto/Makefile                           |   11 +-
 arch/arm/crypto/aes-armv4.S                        | 1089 ---------
 arch/arm/crypto/aes-cipher-core.S                  |  179 ++
 arch/arm/crypto/aes-cipher-glue.c                  |   74 +
 arch/arm/crypto/aes-neonbs-core.S                  | 1021 ++++++++
 arch/arm/crypto/aes-neonbs-glue.c                  |  405 ++++
 arch/arm/crypto/aes_glue.c                         |   98 -
 arch/arm/crypto/aes_glue.h                         |   19 -
 arch/arm/crypto/aesbs-core.S_shipped               | 2548 --------------------
 arch/arm/crypto/aesbs-glue.c                       |  367 ---
 arch/arm/crypto/bsaes-armv7.pl                     | 2471 -------------------
 arch/arm/crypto/chacha20-neon-core.S               |  523 ++++
 arch/arm/crypto/chacha20-neon-glue.c               |  128 +
 arch/arm64/crypto/Kconfig                          |   17 +
 arch/arm64/crypto/Makefile                         |    9 +
 arch/arm64/crypto/aes-cipher-core.S                |  127 +
 arch/arm64/crypto/aes-cipher-glue.c                |   69 +
 arch/arm64/crypto/aes-glue.c                       |   25 +-
 arch/arm64/crypto/aes-neonbs-core.S                |  963 ++++++++
 arch/arm64/crypto/aes-neonbs-glue.c                |  420 ++++
 arch/arm64/crypto/chacha20-neon-core.S             |  450 ++++
 arch/arm64/crypto/chacha20-neon-glue.c             |  127 +
 arch/x86/crypto/aesni-intel_glue.c                 |   12 +-
 arch/x86/crypto/chacha20_glue.c                    |   70 +-
 crypto/ablkcipher.c                                |    5 +-
 crypto/acompress.c                                 |    3 +-
 crypto/aead.c                                      |    3 +-
 crypto/ahash.c                                     |    3 +-
 crypto/akcipher.c                                  |    3 +-
 crypto/algif_hash.c                                |    2 +-
 crypto/blkcipher.c                                 |    7 +-
 crypto/chacha20_generic.c                          |   73 +-
 crypto/cts.c                                       |    5 +-
 crypto/kpp.c                                       |    3 +-
 crypto/pcbc.c                                      |    3 +-
 crypto/rng.c                                       |    3 +-
 crypto/scompress.c                                 |    3 +-
 crypto/shash.c                                     |    9 +-
 crypto/skcipher.c                                  |   23 +-
 crypto/testmgr.c                                   | 1048 ++------
 crypto/testmgr.h                                   |  272 +--
 drivers/char/hw_random/core.c                      |   64 +-
 drivers/char/hw_random/n2-drv.c                    |  204 +-
 drivers/char/hw_random/n2rng.h                     |   51 +-
 drivers/crypto/Kconfig                             |   16 +-
 drivers/crypto/Makefile                            |   15 +-
 drivers/crypto/bfin_crc.c                          |    6 +-
 drivers/crypto/bfin_crc.h                          |    1 -
 drivers/crypto/mediatek/Makefile                   |    2 +
 drivers/crypto/mediatek/mtk-aes.c                  |  765 ++++++
 drivers/crypto/mediatek/mtk-platform.c             |  604 +++++
 drivers/crypto/mediatek/mtk-platform.h             |  238 ++
 drivers/crypto/mediatek/mtk-regs.h                 |  194 ++
 drivers/crypto/mediatek/mtk-sha.c                  | 1437 +++++++++++
 drivers/crypto/picoxcell_crypto.c                  |   28 +-
 drivers/crypto/qat/qat_c3xxx/adf_drv.c             |    2 +-
 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c           |    2 +-
 drivers/crypto/qat/qat_c62x/adf_drv.c              |    4 +-
 drivers/crypto/qat/qat_c62xvf/adf_drv.c            |    2 +-
 drivers/crypto/qat/qat_common/adf_accel_devices.h  |    1 +
 drivers/crypto/qat/qat_common/adf_cfg_common.h     |    1 +
 drivers/crypto/qat/qat_common/adf_common_drv.h     |    4 +-
 drivers/crypto/qat/qat_common/adf_dev_mgr.c        |    2 +-
 drivers/crypto/qat/qat_common/adf_init.c           |   28 +-
 drivers/crypto/qat/qat_common/adf_sriov.c          |    4 +-
 drivers/crypto/qat/qat_common/adf_vf_isr.c         |    4 +-
 drivers/crypto/qat/qat_common/qat_hal.c            |    4 +-
 drivers/crypto/qat/qat_dh895xcc/adf_drv.c          |    2 +-
 drivers/crypto/qat/qat_dh895xccvf/adf_drv.c        |    2 +-
 drivers/crypto/virtio/Kconfig                      |    1 +
 drivers/crypto/virtio/virtio_crypto_algs.c         |   54 +-
 drivers/crypto/virtio/virtio_crypto_common.h       |   16 +
 drivers/crypto/virtio/virtio_crypto_core.c         |   74 +-
 include/crypto/chacha20.h                          |    6 +-
 include/crypto/internal/skcipher.h                 |    2 +-
 include/crypto/skcipher.h                          |   34 +
 include/linux/compiler-gcc.h                       |    1 +
 include/linux/miscdevice.h                         |    1 +
 80 files changed, 8582 insertions(+), 8038 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/crypto/mediatek-crypto.txt
 delete mode 100644 arch/arm/crypto/aes-armv4.S
 create mode 100644 arch/arm/crypto/aes-cipher-core.S
 create mode 100644 arch/arm/crypto/aes-cipher-glue.c
 create mode 100644 arch/arm/crypto/aes-neonbs-core.S
 create mode 100644 arch/arm/crypto/aes-neonbs-glue.c
 delete mode 100644 arch/arm/crypto/aes_glue.c
 delete mode 100644 arch/arm/crypto/aes_glue.h
 delete mode 100644 arch/arm/crypto/aesbs-core.S_shipped
 delete mode 100644 arch/arm/crypto/aesbs-glue.c
 delete mode 100644 arch/arm/crypto/bsaes-armv7.pl
 create mode 100644 arch/arm/crypto/chacha20-neon-core.S
 create mode 100644 arch/arm/crypto/chacha20-neon-glue.c
 create mode 100644 arch/arm64/crypto/aes-cipher-core.S
 create mode 100644 arch/arm64/crypto/aes-cipher-glue.c
 create mode 100644 arch/arm64/crypto/aes-neonbs-core.S
 create mode 100644 arch/arm64/crypto/aes-neonbs-glue.c
 create mode 100644 arch/arm64/crypto/chacha20-neon-core.S
 create mode 100644 arch/arm64/crypto/chacha20-neon-glue.c
 create mode 100644 drivers/crypto/mediatek/Makefile
 create mode 100644 drivers/crypto/mediatek/mtk-aes.c
 create mode 100644 drivers/crypto/mediatek/mtk-platform.c
 create mode 100644 drivers/crypto/mediatek/mtk-platform.h
 create mode 100644 drivers/crypto/mediatek/mtk-regs.h
 create mode 100644 drivers/crypto/mediatek/mtk-sha.c
Merging drm/drm-next (282d0a35c8c4 Merge tag 'drm-misc-next-2017-01-09' of git://anongit.freedesktop.org/git/drm-misc into drm-next)
$ git merge drm/drm-next
Auto-merging lib/Makefile
Auto-merging drivers/gpu/drm/tilcdc/tilcdc_crtc.c
Auto-merging drivers/gpu/drm/meson/meson_plane.c
Auto-merging drivers/gpu/drm/i915/intel_uc.h
Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c
Auto-merging drivers/gpu/drm/i915/i915_gem.c
Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
Auto-merging drivers/gpu/drm/i915/gvt/handlers.c
Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c
Auto-merging drivers/gpu/drm/drm_probe_helper.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
Auto-merging MAINTAINERS
Removing Documentation/dma-buf-sharing.txt
Merge made by the 'recursive' strategy.
 .../bindings/display/bridge/ti,ths8135.txt         |   46 +
 .../bindings/display/hisilicon/hisi-ade.txt        |    2 +-
 Documentation/dma-buf-sharing.txt                  |  482 -----
 Documentation/driver-api/dma-buf.rst               |   92 +
 Documentation/gpu/drm-mm.rst                       |   40 +-
 Documentation/gpu/drm-uapi.rst                     |   25 +-
 Documentation/gpu/i915.rst                         |  103 +
 Documentation/gpu/introduction.rst                 |   15 +-
 MAINTAINERS                                        |    2 +-
 arch/blackfin/include/asm/vga.h                    |    1 +
 drivers/char/agp/intel-gtt.c                       |    6 +-
 drivers/dma-buf/dma-buf.c                          |  207 +-
 drivers/dma-buf/dma-fence.c                        |   26 +
 drivers/dma-buf/sync_debug.c                       |   17 +-
 drivers/dma-buf/sync_file.c                        |   21 +-
 drivers/gpu/drm/Kconfig                            |   32 +-
 drivers/gpu/drm/Makefile                           |    5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu.h                |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_display.c        |    2 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c             |    4 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c        |    3 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c            |    6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c            |    5 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h           |    1 +
 drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c            |    6 +-
 drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c       |    3 +-
 drivers/gpu/drm/amd/amdgpu/dce_v10_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v11_0.c             |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v6_0.c              |    6 +-
 drivers/gpu/drm/amd/amdgpu/dce_v8_0.c              |    6 +-
 drivers/gpu/drm/arc/arcpgu_crtc.c                  |    3 +-
 drivers/gpu/drm/arc/arcpgu_hdmi.c                  |    5 +-
 drivers/gpu/drm/arm/hdlcd_crtc.c                   |   18 +-
 drivers/gpu/drm/arm/malidp_planes.c                |   10 +-
 drivers/gpu/drm/armada/Makefile                    |    2 +
 drivers/gpu/drm/armada/armada_crtc.c               |    9 +-
 drivers/gpu/drm/armada/armada_debugfs.c            |    6 +-
 drivers/gpu/drm/armada/armada_drv.c                |    6 -
 drivers/gpu/drm/armada/armada_fb.c                 |    2 +-
 drivers/gpu/drm/armada/armada_fbdev.c              |    5 +-
 drivers/gpu/drm/armada/armada_overlay.c            |    4 +-
 drivers/gpu/drm/ast/Kconfig                        |    2 +-
 drivers/gpu/drm/ast/ast_drv.h                      |    3 +-
 drivers/gpu/drm/ast/ast_fb.c                       |    4 +-
 drivers/gpu/drm/ast/ast_main.c                     |    5 +-
 drivers/gpu/drm/ast/ast_mode.c                     |   16 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c    |    2 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c   |    4 +-
 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c    |   22 +-
 drivers/gpu/drm/bochs/Kconfig                      |    2 +-
 drivers/gpu/drm/bochs/bochs.h                      |    1 +
 drivers/gpu/drm/bochs/bochs_drv.c                  |    3 +-
 drivers/gpu/drm/bochs/bochs_fbdev.c                |    2 +-
 drivers/gpu/drm/bochs/bochs_mm.c                   |    2 +-
 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c |    9 +-
 drivers/gpu/drm/bridge/dumb-vga-dac.c              |    1 +
 drivers/gpu/drm/bridge/dw-hdmi.c                   |    3 +-
 drivers/gpu/drm/cirrus/Kconfig                     |    2 +-
 drivers/gpu/drm/cirrus/cirrus_drv.h                |    3 +-
 drivers/gpu/drm/cirrus/cirrus_fbdev.c              |    6 +-
 drivers/gpu/drm/cirrus/cirrus_main.c               |    7 +-
 drivers/gpu/drm/cirrus/cirrus_mode.c               |    9 +-
 drivers/gpu/drm/drm_atomic.c                       |   53 +-
 drivers/gpu/drm/drm_atomic_helper.c                |  139 +-
 drivers/gpu/drm/drm_auth.c                         |    8 +-
 drivers/gpu/drm/drm_bridge.c                       |   88 +-
 drivers/gpu/drm/drm_color_mgmt.c                   |    4 +-
 drivers/gpu/drm/drm_connector.c                    |  231 ++-
 drivers/gpu/drm/drm_crtc.c                         |   32 +-
 drivers/gpu/drm/drm_crtc_helper.c                  |   67 +-
 drivers/gpu/drm/drm_crtc_internal.h                |    9 +
 drivers/gpu/drm/drm_debugfs.c                      |    1 +
 drivers/gpu/drm/drm_debugfs_crc.c                  |   34 +-
 drivers/gpu/drm/drm_drv.c                          |   25 +-
 drivers/gpu/drm/drm_dumb_buffers.c                 |    2 +-
 drivers/gpu/drm/drm_edid.c                         |    7 +-
 drivers/gpu/drm/drm_encoder.c                      |   21 +-
 drivers/gpu/drm/drm_fb_cma_helper.c                |   97 +-
 drivers/gpu/drm/drm_fb_helper.c                    |   35 +-
 drivers/gpu/drm/drm_fops.c                         |    4 +-
 drivers/gpu/drm/drm_framebuffer.c                  |   59 +-
 drivers/gpu/drm/drm_gem_cma_helper.c               |   93 +-
 drivers/gpu/drm/drm_global.c                       |   23 +
 drivers/gpu/drm/drm_internal.h                     |    8 +-
 drivers/gpu/drm/drm_ioctl.c                        |   34 +-
 drivers/gpu/drm/drm_irq.c                          |   32 +-
 drivers/gpu/drm/drm_legacy.h                       |    7 +
 drivers/gpu/drm/drm_mm.c                           |  655 +++---
 drivers/gpu/drm/drm_mode_config.c                  |  145 +-
 drivers/gpu/drm/drm_mode_object.c                  |    3 +-
 drivers/gpu/drm/drm_modeset_helper.c               |   25 +-
 drivers/gpu/drm/drm_of.c                           |    1 +
 drivers/gpu/drm/drm_pci.c                          |    4 -
 drivers/gpu/drm/drm_plane.c                        |   18 +-
 drivers/gpu/drm/drm_plane_helper.c                 |    8 +-
 drivers/gpu/drm/drm_platform.c                     |    4 -
 drivers/gpu/drm/drm_print.c                        |    6 +
 drivers/gpu/drm/drm_probe_helper.c                 |   20 +-
 drivers/gpu/drm/drm_property.c                     |    2 +-
 drivers/gpu/drm/drm_rect.c                         |    6 +-
 drivers/gpu/drm/drm_simple_kms_helper.c            |   23 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c              |   12 +-
 drivers/gpu/drm/etnaviv/etnaviv_mmu.c              |    9 +-
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c      |    6 +-
 drivers/gpu/drm/exynos/exynos7_drm_decon.c         |    8 +-
 drivers/gpu/drm/exynos/exynos_dp.c                 |    5 +-
 drivers/gpu/drm/exynos/exynos_drm_drv.c            |    4 +-
 drivers/gpu/drm/exynos/exynos_drm_dsi.c            |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_fb.c             |    2 +-
 drivers/gpu/drm/exynos/exynos_drm_fbdev.c          |    6 +-
 drivers/gpu/drm/exynos/exynos_drm_fimd.c           |    4 +-
 drivers/gpu/drm/exynos/exynos_mixer.c              |   12 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c          |   11 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h          |    2 +
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c        |    4 +-
 drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c          |    5 +-
 drivers/gpu/drm/gma500/Kconfig                     |    2 +-
 drivers/gpu/drm/gma500/accel_2d.c                  |    2 +-
 drivers/gpu/drm/gma500/framebuffer.c               |    6 +-
 drivers/gpu/drm/gma500/gma_display.c               |   13 +-
 drivers/gpu/drm/gma500/mdfld_intel_display.c       |   17 +-
 drivers/gpu/drm/gma500/oaktrail_crtc.c             |   13 +-
 drivers/gpu/drm/gma500/psb_drv.c                   |    3 +-
 drivers/gpu/drm/gma500/psb_intel_drv.h             |    1 +
 drivers/gpu/drm/hisilicon/hibmc/Kconfig            |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c     |    6 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c  |    2 +-
 drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c        |    2 +-
 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c       |    5 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c    |   17 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c    |   12 +-
 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h    |    4 +-
 drivers/gpu/drm/i915/Kconfig.debug                 |   15 +
 drivers/gpu/drm/i915/Makefile                      |    9 +-
 drivers/gpu/drm/i915/gvt/aperture_gm.c             |    7 +-
 drivers/gpu/drm/i915/gvt/cmd_parser.c              |    5 +-
 drivers/gpu/drm/i915/gvt/handlers.c                |    2 +-
 drivers/gpu/drm/i915/gvt/scheduler.c               |   10 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c             |  174 +-
 drivers/gpu/drm/i915/i915_debugfs.c                | 1047 +---------
 drivers/gpu/drm/i915/i915_drv.c                    |  146 +-
 drivers/gpu/drm/i915/i915_drv.h                    |  880 +++++---
 drivers/gpu/drm/i915/i915_gem.c                    |  232 ++-
 drivers/gpu/drm/i915/i915_gem.h                    |    4 +-
 drivers/gpu/drm/i915/i915_gem_context.c            |  244 +--
 drivers/gpu/drm/i915/i915_gem_context.h            |  277 +++
 drivers/gpu/drm/i915/i915_gem_dmabuf.c             |    2 +-
 drivers/gpu/drm/i915/i915_gem_evict.c              |  164 +-
 drivers/gpu/drm/i915/i915_gem_execbuffer.c         |   10 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c          |   36 +-
 drivers/gpu/drm/i915/i915_gem_gtt.c                |  193 +-
 drivers/gpu/drm/i915/i915_gem_gtt.h                |   21 +-
 drivers/gpu/drm/i915/i915_gem_internal.c           |    4 +-
 drivers/gpu/drm/i915/i915_gem_request.c            |   75 +-
 drivers/gpu/drm/i915/i915_gem_request.h            |   11 -
 drivers/gpu/drm/i915/i915_gem_stolen.c             |  119 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c             |    2 +-
 drivers/gpu/drm/i915/i915_gem_timeline.c           |   16 +-
 drivers/gpu/drm/i915/i915_gem_timeline.h           |    2 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |    2 +-
 drivers/gpu/drm/i915/i915_gpu_error.c              |  115 +-
 drivers/gpu/drm/i915/i915_guc_reg.h                |    7 +-
 drivers/gpu/drm/i915/i915_guc_submission.c         |  368 ++--
 drivers/gpu/drm/i915/i915_irq.c                    |   14 +-
 drivers/gpu/drm/i915/i915_oa_hsw.c                 |  752 +++++++
 drivers/gpu/drm/i915/i915_oa_hsw.h                 |   38 +
 drivers/gpu/drm/i915/i915_params.c                 |    6 +-
 drivers/gpu/drm/i915/i915_params.h                 |    2 +-
 drivers/gpu/drm/i915/i915_pci.c                    |  183 +-
 drivers/gpu/drm/i915/i915_perf.c                   | 2096 +++++++++++++++++++
 drivers/gpu/drm/i915/i915_reg.h                    |  462 ++++-
 drivers/gpu/drm/i915/i915_suspend.c                |   16 +-
 drivers/gpu/drm/i915/i915_sw_fence.c               |  140 +-
 drivers/gpu/drm/i915/i915_sw_fence.h               |    6 +
 drivers/gpu/drm/i915/i915_sysfs.c                  |    4 +-
 drivers/gpu/drm/i915/i915_trace.h                  |   34 +-
 drivers/gpu/drm/i915/i915_utils.h                  |   64 +
 drivers/gpu/drm/i915/i915_vma.c                    |   52 +-
 drivers/gpu/drm/i915/i915_vma.h                    |   18 +-
 drivers/gpu/drm/i915/intel_atomic.c                |   31 -
 drivers/gpu/drm/i915/intel_atomic_plane.c          |   51 +-
 drivers/gpu/drm/i915/intel_audio.c                 |   39 +-
 drivers/gpu/drm/i915/intel_bios.c                  |   27 +-
 drivers/gpu/drm/i915/intel_breadcrumbs.c           |   10 +-
 drivers/gpu/drm/i915/intel_crt.c                   |    7 +-
 drivers/gpu/drm/i915/intel_csr.c                   |    4 +-
 drivers/gpu/drm/i915/intel_ddi.c                   |   70 +-
 drivers/gpu/drm/i915/intel_device_info.c           |   53 +-
 drivers/gpu/drm/i915/intel_display.c               |  744 ++++---
 drivers/gpu/drm/i915/intel_dp.c                    |  314 ++-
 drivers/gpu/drm/i915/intel_dp_mst.c                |   28 +-
 drivers/gpu/drm/i915/intel_dpio_phy.c              |  130 +-
 drivers/gpu/drm/i915/intel_dpll_mgr.c              |  351 +++-
 drivers/gpu/drm/i915/intel_dpll_mgr.h              |  178 +-
 drivers/gpu/drm/i915/intel_drv.h                   |  103 +-
 drivers/gpu/drm/i915/intel_dsi.c                   |   46 +-
 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c         |   38 +-
 drivers/gpu/drm/i915/intel_dsi_pll.c               |   18 +-
 drivers/gpu/drm/i915/intel_dvo.c                   |    9 +-
 drivers/gpu/drm/i915/intel_engine_cs.c             |   28 +-
 drivers/gpu/drm/i915/intel_fbc.c                   |   18 +-
 drivers/gpu/drm/i915/intel_fbdev.c                 |   16 +-
 drivers/gpu/drm/i915/intel_guc_fwif.h              |   55 +-
 drivers/gpu/drm/i915/intel_guc_loader.c            |   49 +-
 drivers/gpu/drm/i915/intel_hangcheck.c             |  256 ++-
 drivers/gpu/drm/i915/intel_hdmi.c                  |  184 +-
 drivers/gpu/drm/i915/intel_i2c.c                   |   22 +-
 drivers/gpu/drm/i915/intel_lrc.c                   |  216 +-
 drivers/gpu/drm/i915/intel_lrc.h                   |    9 +-
 drivers/gpu/drm/i915/intel_lspcon.c                |   94 +-
 drivers/gpu/drm/i915/intel_lvds.c                  |    8 +-
 drivers/gpu/drm/i915/intel_mocs.c                  |    7 +-
 drivers/gpu/drm/i915/intel_mocs.h                  |    2 +-
 drivers/gpu/drm/i915/intel_overlay.c               |  286 +--
 drivers/gpu/drm/i915/intel_panel.c                 |   32 +-
 drivers/gpu/drm/i915/intel_pipe_crc.c              |  939 +++++++++
 drivers/gpu/drm/i915/intel_pm.c                    |  843 ++++----
 drivers/gpu/drm/i915/intel_psr.c                   |    6 +-
 drivers/gpu/drm/i915/intel_ringbuffer.c            |   85 +-
 drivers/gpu/drm/i915/intel_ringbuffer.h            |   66 +-
 drivers/gpu/drm/i915/intel_runtime_pm.c            |  163 +-
 drivers/gpu/drm/i915/intel_sdvo.c                  |   21 +-
 drivers/gpu/drm/i915/intel_sprite.c                |  131 +-
 drivers/gpu/drm/i915/intel_tv.c                    |    4 +-
 drivers/gpu/drm/i915/intel_uc.c                    |  142 ++
 drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h}   |   41 +-
 drivers/gpu/drm/i915/intel_uncore.c                |   14 +-
 drivers/gpu/drm/i915/intel_vbt_defs.h              |   12 +-
 drivers/gpu/drm/imx/imx-ldb.c                      |    8 +-
 drivers/gpu/drm/imx/imx-tve.c                      |   11 +-
 drivers/gpu/drm/imx/ipuv3-plane.c                  |   40 +-
 drivers/gpu/drm/imx/parallel-display.c             |    6 +-
 drivers/gpu/drm/lib/drm_random.c                   |   41 +
 drivers/gpu/drm/lib/drm_random.h                   |   25 +
 drivers/gpu/drm/mediatek/mtk_dpi.c                 |    8 +-
 drivers/gpu/drm/mediatek/mtk_drm_drv.c             |    3 +-
 drivers/gpu/drm/mediatek/mtk_drm_fb.c              |    2 +-
 drivers/gpu/drm/mediatek/mtk_drm_plane.c           |    4 +-
 drivers/gpu/drm/mediatek/mtk_dsi.c                 |   24 +-
 drivers/gpu/drm/mediatek/mtk_hdmi.c                |   11 +-
 drivers/gpu/drm/meson/meson_plane.c                |    2 +-
 drivers/gpu/drm/mga/mga_dma.c                      |    4 +-
 drivers/gpu/drm/mga/mga_drv.h                      |    2 +-
 drivers/gpu/drm/mgag200/Kconfig                    |    2 +-
 drivers/gpu/drm/mgag200/mgag200_drv.h              |    3 +-
 drivers/gpu/drm/mgag200/mgag200_fb.c               |    4 +-
 drivers/gpu/drm/mgag200/mgag200_main.c             |    9 +-
 drivers/gpu/drm/mgag200/mgag200_mode.c             |   23 +-
 drivers/gpu/drm/msm/dsi/dsi_manager.c              |   17 +-
 drivers/gpu/drm/msm/edp/edp_bridge.c               |    2 +-
 drivers/gpu/drm/msm/hdmi/hdmi_bridge.c             |    2 +-
 drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c          |    2 +-
 drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c          |    2 +-
 drivers/gpu/drm/msm/msm_debugfs.c                  |    6 +-
 drivers/gpu/drm/msm/msm_fb.c                       |   12 +-
 drivers/gpu/drm/msm/msm_fbdev.c                    |    2 +-
 drivers/gpu/drm/mxsfb/mxsfb_crtc.c                 |    2 +-
 drivers/gpu/drm/mxsfb/mxsfb_drv.c                  |    4 +-
 drivers/gpu/drm/nouveau/Kconfig                    |    3 +-
 drivers/gpu/drm/nouveau/dispnv04/crtc.c            |   17 +-
 drivers/gpu/drm/nouveau/dispnv04/dfp.c             |    3 +-
 drivers/gpu/drm/nouveau/dispnv04/overlay.c         |    8 +-
 drivers/gpu/drm/nouveau/nouveau_connector.c        |    5 +-
 drivers/gpu/drm/nouveau/nouveau_connector.h        |    1 +
 drivers/gpu/drm/nouveau/nouveau_display.c          |   10 +-
 drivers/gpu/drm/nouveau/nouveau_drm.c              |    3 +-
 drivers/gpu/drm/nouveau/nouveau_fbcon.c            |    6 +-
 drivers/gpu/drm/nouveau/nouveau_ttm.c              |   28 +-
 drivers/gpu/drm/nouveau/nv50_display.c             |   14 +-
 drivers/gpu/drm/omapdrm/omap_debugfs.c             |    6 +-
 drivers/gpu/drm/omapdrm/omap_drv.c                 |    4 +-
 drivers/gpu/drm/omapdrm/omap_fb.c                  |   12 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c               |    2 +-
 drivers/gpu/drm/qxl/Kconfig                        |    2 +-
 drivers/gpu/drm/qxl/qxl_display.c                  |    2 +-
 drivers/gpu/drm/qxl/qxl_draw.c                     |    2 +-
 drivers/gpu/drm/qxl/qxl_drv.h                      |    3 +-
 drivers/gpu/drm/qxl/qxl_fb.c                       |    5 +-
 drivers/gpu/drm/qxl/qxl_kms.c                      |    5 +-
 drivers/gpu/drm/qxl/qxl_ttm.c                      |    6 +-
 drivers/gpu/drm/radeon/atombios_crtc.c             |   19 +-
 drivers/gpu/drm/radeon/r100.c                      |   10 +-
 drivers/gpu/drm/radeon/radeon_display.c            |    8 +-
 drivers/gpu/drm/radeon/radeon_drv.c                |    2 +-
 drivers/gpu/drm/radeon/radeon_fb.c                 |    4 +-
 drivers/gpu/drm/radeon/radeon_irq_kms.c            |   12 +-
 drivers/gpu/drm/radeon/radeon_kms.c                |    5 +-
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c        |   16 +-
 drivers/gpu/drm/radeon/radeon_mode.h               |    1 +
 drivers/gpu/drm/radeon/radeon_ttm.c                |    6 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h          |    1 +
 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c          |    5 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c            |    4 +-
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c              |    4 +-
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c        |   17 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c         |    2 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c      |    5 +-
 drivers/gpu/drm/rockchip/rockchip_drm_vop.c        |   22 +-
 drivers/gpu/drm/savage/savage_bci.c                |    4 +-
 drivers/gpu/drm/savage/savage_drv.h                |    2 +-
 drivers/gpu/drm/selftests/Makefile                 |    1 +
 drivers/gpu/drm/selftests/drm_mm_selftests.h       |   23 +
 drivers/gpu/drm/selftests/drm_selftest.c           |  109 +
 drivers/gpu/drm/selftests/drm_selftest.h           |   41 +
 drivers/gpu/drm/selftests/test-drm_mm.c            | 2176 ++++++++++++++++++++
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c          |    6 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h          |    1 +
 drivers/gpu/drm/shmobile/shmob_drm_drv.c           |    4 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.c         |    4 +-
 drivers/gpu/drm/sis/sis_drv.c                      |    4 +-
 drivers/gpu/drm/sti/sti_dvo.c                      |    3 +-
 drivers/gpu/drm/sti/sti_gdp.c                      |   10 +-
 drivers/gpu/drm/sti/sti_hda.c                      |    3 +-
 drivers/gpu/drm/sti/sti_hdmi.c                     |    3 +-
 drivers/gpu/drm/sti/sti_hqvdp.c                    |    2 +-
 drivers/gpu/drm/sun4i/sun4i_backend.c              |    5 +-
 drivers/gpu/drm/sun4i/sun4i_rgb.c                  |   13 +-
 drivers/gpu/drm/tegra/dc.c                         |    8 +-
 drivers/gpu/drm/tegra/drm.c                        |   20 +-
 drivers/gpu/drm/tegra/drm.h                        |    1 +
 drivers/gpu/drm/tegra/fb.c                         |    6 +-
 drivers/gpu/drm/tilcdc/tilcdc_crtc.c               |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_drv.c                |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_external.c           |    4 +-
 drivers/gpu/drm/tilcdc/tilcdc_plane.c              |    4 +-
 drivers/gpu/drm/ttm/ttm_bo_manager.c               |   13 +-
 drivers/gpu/drm/udl/udl_drv.h                      |    2 +-
 drivers/gpu/drm/udl/udl_fb.c                       |    6 +-
 drivers/gpu/drm/udl/udl_main.c                     |    3 +-
 drivers/gpu/drm/vc4/vc4_drv.h                      |    2 +
 drivers/gpu/drm/vc4/vc4_plane.c                    |    8 +-
 drivers/gpu/drm/via/via_drv.h                      |    2 +-
 drivers/gpu/drm/via/via_map.c                      |    4 +-
 drivers/gpu/drm/virtio/Kconfig                     |    2 +-
 drivers/gpu/drm/virtio/virtgpu_display.c           |    3 +-
 drivers/gpu/drm/virtio/virtgpu_drm_bus.c           |    4 -
 drivers/gpu/drm/virtio/virtgpu_drv.h               |    3 +-
 drivers/gpu/drm/virtio/virtgpu_fb.c                |    4 +-
 drivers/gpu/drm/virtio/virtgpu_kms.c               |    3 +-
 drivers/gpu/drm/virtio/virtgpu_ttm.c               |   10 +-
 drivers/gpu/drm/vmwgfx/Kconfig                     |    2 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_drv.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_fb.c                 |   11 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c      |   10 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c                |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h                |    1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c                |    5 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c               |    4 +-
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c               |    2 +-
 drivers/gpu/drm/zte/zx_plane.c                     |    4 +-
 drivers/gpu/drm/zte/zx_vou.c                       |   15 +-
 drivers/video/fbdev/Kconfig                        |    8 +
 drivers/video/fbdev/core/fbmem.c                   |   18 +-
 include/drm/drmP.h                                 |   14 +
 include/drm/drm_atomic.h                           |   31 +-
 include/drm/drm_atomic_helper.h                    |    3 -
 include/drm/drm_auth.h                             |   17 +-
 include/drm/drm_bridge.h                           |   46 +-
 include/drm/drm_connector.h                        |   91 +-
 include/drm/drm_crtc.h                             |   31 +-
 include/drm/drm_drv.h                              |   34 +-
 include/drm/drm_encoder.h                          |    7 +-
 include/drm/drm_encoder_slave.h                    |    1 +
 include/drm/drm_fb_cma_helper.h                    |    5 +-
 include/drm/drm_fb_helper.h                        |    5 +-
 include/drm/drm_framebuffer.h                      |   33 +-
 include/drm/drm_gem_cma_helper.h                   |   17 +
 include/drm/drm_irq.h                              |    4 +-
 include/drm/drm_mm.h                               |  373 +++-
 include/drm/drm_mode_config.h                      |   20 +-
 include/drm/drm_modeset_helper.h                   |    3 +-
 include/drm/drm_modeset_helper_vtables.h           |    3 +-
 include/drm/drm_plane.h                            |    4 +-
 include/drm/drm_print.h                            |   24 +-
 include/drm/drm_simple_kms_helper.h                |   10 +-
 include/drm/i915_pciids.h                          |   21 +-
 include/drm/intel-gtt.h                            |    6 +-
 include/linux/dma-buf.h                            |  224 +-
 include/linux/dma-fence.h                          |   52 +-
 include/linux/kref.h                               |    2 +-
 include/linux/prime_numbers.h                      |   37 +
 include/linux/reservation.h                        |   34 +
 include/uapi/drm/drm_fourcc.h                      |   11 +
 include/uapi/drm/i915_drm.h                        |  135 ++
 lib/Kconfig                                        |    7 +
 lib/Makefile                                       |    2 +
 lib/prime_numbers.c                                |  314 +++
 tools/testing/selftests/drivers/gpu/drm_mm.sh      |   15 +
 tools/testing/selftests/lib/prime_numbers.sh       |   15 +
 389 files changed, 15850 insertions(+), 6674 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/display/bridge/ti,ths8135.txt
 delete mode 100644 Documentation/dma-buf-sharing.txt
 create mode 100644 arch/blackfin/include/asm/vga.h
 create mode 100644 drivers/gpu/drm/i915/i915_gem_context.h
 create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.c
 create mode 100644 drivers/gpu/drm/i915/i915_oa_hsw.h
 create mode 100644 drivers/gpu/drm/i915/i915_perf.c
 create mode 100644 drivers/gpu/drm/i915/i915_utils.h
 create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.c
 create mode 100644 drivers/gpu/drm/i915/intel_uc.c
 rename drivers/gpu/drm/i915/{intel_guc.h => intel_uc.h} (85%)
 create mode 100644 drivers/gpu/drm/lib/drm_random.c
 create mode 100644 drivers/gpu/drm/lib/drm_random.h
 create mode 100644 drivers/gpu/drm/selftests/Makefile
 create mode 100644 drivers/gpu/drm/selftests/drm_mm_selftests.h
 create mode 100644 drivers/gpu/drm/selftests/drm_selftest.c
 create mode 100644 drivers/gpu/drm/selftests/drm_selftest.h
 create mode 100644 drivers/gpu/drm/selftests/test-drm_mm.c
 create mode 100644 include/linux/prime_numbers.h
 create mode 100644 lib/prime_numbers.c
 create mode 100755 tools/testing/selftests/drivers/gpu/drm_mm.sh
 create mode 100755 tools/testing/selftests/lib/prime_numbers.sh
Merging drm-panel/drm/panel/for-next (327bc443416d drm/panel: Constify device node argument to of_drm_find_panel())
$ git merge drm-panel/drm/panel/for-next
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/drm_panel.c | 2 +-
 include/drm/drm_panel.h     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging drm-intel/for-linux-next (47a8e3f6aebd drm/i915: Eliminate superfluous i915_ggtt_view_normal)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/gvt/aperture_gm.c
Merge made by the 'recursive' strategy.
 Documentation/sound/hd-audio/dp-mst.rst      |  17 ++
 drivers/gpu/drm/i915/gvt/aperture_gm.c       |  33 +--
 drivers/gpu/drm/i915/i915_debugfs.c          |  55 +++-
 drivers/gpu/drm/i915/i915_drv.c              |  18 +-
 drivers/gpu/drm/i915/i915_drv.h              |  29 +-
 drivers/gpu/drm/i915/i915_gem.c              | 153 ++++-------
 drivers/gpu/drm/i915/i915_gem_context.c      |  28 +-
 drivers/gpu/drm/i915/i915_gem_evict.c        |  39 +--
 drivers/gpu/drm/i915/i915_gem_execbuffer.c   |   5 +-
 drivers/gpu/drm/i915/i915_gem_fence_reg.c    |  64 ++---
 drivers/gpu/drm/i915/i915_gem_fence_reg.h    |   2 +
 drivers/gpu/drm/i915/i915_gem_gtt.c          | 389 +++++++++++++++++++++------
 drivers/gpu/drm/i915/i915_gem_gtt.h          |  74 +++--
 drivers/gpu/drm/i915/i915_gem_internal.c     |   7 +-
 drivers/gpu/drm/i915/i915_gem_object.h       |  23 ++
 drivers/gpu/drm/i915/i915_gem_render_state.c |   4 +-
 drivers/gpu/drm/i915/i915_gem_request.c      |   7 +
 drivers/gpu/drm/i915/i915_gem_stolen.c       |  12 +-
 drivers/gpu/drm/i915/i915_gem_tiling.c       | 347 +++++++++++++++---------
 drivers/gpu/drm/i915/i915_guc_submission.c   |   3 -
 drivers/gpu/drm/i915/i915_irq.c              |  80 ++++--
 drivers/gpu/drm/i915/i915_reg.h              |  20 +-
 drivers/gpu/drm/i915/i915_sysfs.c            |   2 +-
 drivers/gpu/drm/i915/i915_trace.h            |  16 +-
 drivers/gpu/drm/i915/i915_vgpu.c             |  33 +--
 drivers/gpu/drm/i915/i915_vma.c              | 132 ++++-----
 drivers/gpu/drm/i915/i915_vma.h              |  35 ++-
 drivers/gpu/drm/i915/intel_csr.c             |  12 +-
 drivers/gpu/drm/i915/intel_device_info.c     |   2 +-
 drivers/gpu/drm/i915/intel_display.c         |  20 +-
 drivers/gpu/drm/i915/intel_dp.c              |  38 ++-
 drivers/gpu/drm/i915/intel_drv.h             |   6 +
 drivers/gpu/drm/i915/intel_fbc.c             |   2 +-
 drivers/gpu/drm/i915/intel_guc_loader.c      |  14 +-
 drivers/gpu/drm/i915/intel_lrc.c             |  30 +--
 drivers/gpu/drm/i915/intel_lrc.h             |   2 +-
 drivers/gpu/drm/i915/intel_overlay.c         |   3 +-
 drivers/gpu/drm/i915/intel_pipe_crc.c        |  94 ++++++-
 drivers/gpu/drm/i915/intel_psr.c             | 209 ++++++++++----
 drivers/gpu/drm/i915/intel_ringbuffer.c      |  18 +-
 include/drm/drm_dp_helper.h                  |  13 +-
 sound/pci/hda/hda_codec.c                    |  76 +++++-
 sound/pci/hda/hda_codec.h                    |   3 +
 sound/pci/hda/patch_hdmi.c                   | 245 +++++++++++++----
 44 files changed, 1609 insertions(+), 805 deletions(-)
Merging drm-tegra/drm/tegra/for-next (585ee0f27ef7 drm/tegra: Set sgt pointer in BO pin)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/for-linux-next (3e7d2fddba5a drm/tegra: Stop using drm_framebuffer_unregister_private)
$ git merge drm-misc/for-linux-next
Auto-merging drivers/gpu/drm/i915/i915_drv.h
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Merge made by the 'recursive' strategy.
 Documentation/gpu/drm-mm.rst                  |   6 ++
 drivers/gpu/drm/Kconfig                       |   4 +-
 drivers/gpu/drm/armada/Kconfig                |   2 +-
 drivers/gpu/drm/drm_atomic_helper.c           | 133 ++++++++++++++++++++++----
 drivers/gpu/drm/drm_cache.c                   |  23 +++++
 drivers/gpu/drm/drm_fb_cma_helper.c           |   9 +-
 drivers/gpu/drm/etnaviv/Kconfig               |   1 +
 drivers/gpu/drm/exynos/exynos5433_drm_decon.c |   2 +-
 drivers/gpu/drm/i915/i915_drv.h               |   1 +
 drivers/gpu/drm/msm/Kconfig                   |   1 +
 drivers/gpu/drm/msm/msm_fbdev.c               |   5 +-
 drivers/gpu/drm/omapdrm/omap_fbdev.c          |   8 +-
 drivers/gpu/drm/selftests/test-drm_mm.c       |  12 ++-
 drivers/gpu/drm/tegra/fb.c                    |   7 +-
 drivers/gpu/drm/vgem/vgem_drv.h               |   1 +
 include/drm/drmP.h                            |   5 -
 include/drm/drm_atomic_helper.h               |   6 ++
 include/drm/drm_cache.h                       |   4 +
 include/drm/drm_crtc.h                        |   9 ++
 include/uapi/drm/drm_fourcc.h                 |   7 ++
 20 files changed, 192 insertions(+), 54 deletions(-)
Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux)
$ git merge drm-exynos/exynos-drm/for-next
Already up-to-date.
Merging drm-msm/msm-next (2401a0084614 drm/msm: gpu: Add support for the GPMU)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
$ git merge hdlcd/for-upstream/hdlcd
Already up-to-date.
Merging mali-dp/for-upstream/mali-dp (8e3eb71c80ad drm/arm/malidp: Fix possible dereference of NULL)
$ git merge mali-dp/for-upstream/mali-dp
Auto-merging drivers/gpu/drm/arm/malidp_planes.c
Merge made by the 'recursive' strategy.
 drivers/gpu/drm/arm/malidp_planes.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)
Merging sunxi/sunxi/for-next (bc34c1af0a28 Merge branches 'sunxi/clk-for-4.11', 'sunxi/core-for-4.11', 'sunxi/defconfig-for-4.11', 'sunxi/drm-for-4.11', 'sunxi/dt-for-4.11', 'sunxi/dt64-for-4.11' and 'sunxi/fixes-for-4.10' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging drivers/gpu/drm/sun4i/sun4i_backend.c
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 Documentation/arm/sunxi/README                     |   4 +
 Documentation/devicetree/bindings/arm/sunxi.txt    |   1 +
 .../devicetree/bindings/vendor-prefixes.txt        |   2 +
 arch/arm/boot/dts/Makefile                         |   3 +
 arch/arm/boot/dts/sun4i-a10-a1000.dts              |  31 +++
 arch/arm/boot/dts/sun4i-a10.dtsi                   |   1 +
 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts       | 224 +++++++++++++++++++++
 arch/arm/boot/dts/sun5i.dtsi                       |   9 +
 arch/arm/boot/dts/sun6i-a31-hummingbird.dts        |  23 +++
 arch/arm/boot/dts/sun6i-a31-i7.dts                 |  30 +++
 arch/arm/boot/dts/sun6i-a31.dtsi                   |  23 +++
 arch/arm/boot/dts/sun7i-a20-bananapro.dts          |  33 +--
 arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts     |  38 ++++
 .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts    |   2 +-
 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts    |  90 ++++-----
 arch/arm/boot/dts/sun7i-a20.dtsi                   |   6 +
 arch/arm/boot/dts/sun8i-a23-a33.dtsi               |   9 +-
 arch/arm/boot/dts/sun8i-a23-q8-tablet.dts          |  23 +++
 arch/arm/boot/dts/sun8i-a23.dtsi                   |  16 ++
 arch/arm/boot/dts/sun8i-a33.dtsi                   |  35 ++++
 arch/arm/boot/dts/sun8i-a83t.dtsi                  |   1 +
 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts  | 160 +++++++++++++++
 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts         |   8 +
 arch/arm/boot/dts/sun8i-h3.dtsi                    |  22 ++
 .../boot/dts/sun8i-reference-design-tablet.dtsi    |   4 +
 arch/arm/boot/dts/sun9i-a80.dtsi                   |   3 +
 arch/arm/configs/sunxi_defconfig                   |   1 +
 arch/arm/mach-sunxi/sunxi.c                        |   1 +
 .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts |  23 ++-
 arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi      |  59 ++++++
 drivers/clk/sunxi-ng/ccu-sun6i-a31.c               |   4 +-
 drivers/clk/sunxi-ng/ccu-sun8i-a33.c               |  12 +-
 drivers/clk/sunxi-ng/ccu-sun8i-h3.c                |  10 +
 drivers/gpu/drm/sun4i/sun4i_backend.c              |   2 +-
 34 files changed, 844 insertions(+), 69 deletions(-)
 create mode 100644 arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
 create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
Merging kspp/for-next/kspp (e9569a422c27 Merge branch 'for-next/gcc-plugin/structleak' into for-next/gcc-plugins)
$ git merge kspp/for-next/kspp
Merge made by the 'recursive' strategy.
 arch/Kconfig                                |  22 +++
 include/linux/compiler.h                    |   6 +-
 scripts/Makefile.gcc-plugins                |   4 +
 scripts/gcc-plugins/cyc_complexity_plugin.c |   6 +-
 scripts/gcc-plugins/gcc-common.h            |  55 +++++--
 scripts/gcc-plugins/latent_entropy_plugin.c |   8 +-
 scripts/gcc-plugins/sancov_plugin.c         |   8 +-
 scripts/gcc-plugins/structleak_plugin.c     | 246 ++++++++++++++++++++++++++++
 8 files changed, 326 insertions(+), 29 deletions(-)
 create mode 100644 scripts/gcc-plugins/structleak_plugin.c
Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate")
$ git merge kconfig/for-next
Already up-to-date.
Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
 drivers/base/regmap/regcache-rbtree.c |   7 +-
 drivers/base/regmap/regcache.c        |  20 +++---
 drivers/base/regmap/regmap-irq.c      |  62 ++++++++--------
 drivers/base/regmap/regmap.c          | 129 +++++++++++++++++++---------------
 include/linux/regmap.h                | 115 +++++++++++++++++-------------
 5 files changed, 184 insertions(+), 149 deletions(-)
Merging sound/for-next (41438f1314b0 ALSA: hda - Make single_cmd option to stop the fallback mechanism)
$ git merge sound/for-next
Auto-merging sound/usb/quirks.c
Auto-merging sound/pci/hda/patch_realtek.c
Merge made by the 'recursive' strategy.
 include/sound/rawmidi.h                    |  4 +--
 include/sound/snd_wavefront.h              |  4 +--
 sound/core/rawmidi.c                       |  2 +-
 sound/core/seq/seq_virmidi.c               |  4 +--
 sound/drivers/mpu401/mpu401_uart.c         |  4 +--
 sound/drivers/mtpav.c                      |  4 +--
 sound/drivers/mts64.c                      |  4 +--
 sound/drivers/portman2x4.c                 |  4 +--
 sound/drivers/serial-u16550.c              |  4 +--
 sound/drivers/vx/vx_pcm.c                  |  8 +++--
 sound/firewire/Kconfig                     |  1 +
 sound/firewire/bebob/bebob_hwdep.c         | 17 +++++-----
 sound/firewire/bebob/bebob_midi.c          | 26 +++++++--------
 sound/firewire/bebob/bebob_pcm.c           | 51 ++++++++++++++---------------
 sound/firewire/dice/dice-interface.h       |  1 +
 sound/firewire/dice/dice-midi.c            | 22 ++++++-------
 sound/firewire/dice/dice-stream.c          | 12 ++++++-
 sound/firewire/digi00x/digi00x-hwdep.c     | 17 +++++-----
 sound/firewire/digi00x/digi00x-midi.c      | 52 ++++++++++++++----------------
 sound/firewire/digi00x/digi00x-pcm.c       | 52 ++++++++++++++----------------
 sound/firewire/fireworks/fireworks_hwdep.c | 19 ++++++-----
 sound/firewire/fireworks/fireworks_midi.c  | 26 +++++++--------
 sound/firewire/fireworks/fireworks_pcm.c   | 52 ++++++++++++++----------------
 sound/firewire/oxfw/oxfw-midi.c            | 26 +++++++--------
 sound/firewire/oxfw/oxfw-scs1x.c           | 14 ++++----
 sound/firewire/oxfw/oxfw.c                 |  1 +
 sound/firewire/tascam/tascam-hwdep.c       | 17 +++++-----
 sound/firewire/tascam/tascam-midi.c        | 26 +++++++--------
 sound/firewire/tascam/tascam-pcm.c         | 52 ++++++++++++++----------------
 sound/isa/gus/gus_uart.c                   |  4 +--
 sound/isa/msnd/msnd_midi.c                 |  2 +-
 sound/isa/sb/sb8_midi.c                    |  4 +--
 sound/isa/wavefront/wavefront_midi.c       |  4 +--
 sound/pci/ca0106/ca_midi.c                 |  4 +--
 sound/pci/cs4281.c                         |  4 +--
 sound/pci/cs46xx/cs46xx_lib.c              |  4 +--
 sound/pci/cs5535audio/cs5535audio_pm.c     |  4 +--
 sound/pci/echoaudio/midi.c                 |  4 +--
 sound/pci/emu10k1/emu10k1x.c               |  4 +--
 sound/pci/emu10k1/emumpu401.c              |  4 +--
 sound/pci/ens1370.c                        |  4 +--
 sound/pci/hda/hda_controller.c             |  4 +++
 sound/pci/hda/hda_controller.h             |  1 +
 sound/pci/hda/hda_intel.c                  | 23 +++++++++++--
 sound/pci/hda/patch_ca0132.c               |  3 ++
 sound/pci/hda/patch_realtek.c              | 20 +++++++++++-
 sound/pci/ice1712/ice1724.c                |  4 +--
 sound/pci/mixart/mixart.h                  |  2 +-
 sound/pci/rme9652/hdsp.c                   |  4 +--
 sound/pci/rme9652/hdspm.c                  |  4 +--
 sound/pci/vx222/vx222_ops.c                | 12 +++----
 sound/pcmcia/vx/vxp_ops.c                  | 12 +++----
 sound/synth/emux/emux_seq.c                | 14 ++++----
 sound/usb/6fire/midi.c                     |  4 +--
 sound/usb/bcd2000/bcd2000.c                |  4 +--
 sound/usb/caiaq/midi.c                     |  4 +--
 sound/usb/line6/midi.c                     |  4 +--
 sound/usb/midi.c                           |  4 +--
 sound/usb/quirks.c                         | 15 +++++++++
 59 files changed, 379 insertions(+), 331 deletions(-)
Merging sound-asoc/for-next (3e54e452295d Merge remote-tracking branches 'asoc/topic/wm8731', 'asoc/topic/wm8753' and 'asoc/topic/zte' into asoc-next)
$ git merge sound-asoc/for-next
Removing sound/soc/pxa/pxa2xx-ac97.h
Removing sound/soc/fsl/mpc5200_psc_ac97.h
Auto-merging arch/arm/mach-s3c64xx/dev-audio.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/misc/atmel-ssc.txt         |   2 +
 .../bindings/sound/axentia,tse850-pcm5142.txt      |  11 +-
 arch/arm/mach-s3c64xx/dev-audio.c                  |   4 +-
 drivers/misc/atmel-ssc.c                           |  50 +++++
 include/linux/atmel-ssc.h                          |   1 +
 include/linux/platform_data/asoc-s3c.h             |   6 +-
 include/sound/soc.h                                |  18 +-
 sound/hda/ext/hdac_ext_stream.c                    |  15 +-
 sound/soc/amd/acp-pcm-dma.c                        |   3 -
 sound/soc/atmel/tse850-pcm5142.c                   |  23 +--
 sound/soc/codecs/Kconfig                           |  10 +-
 sound/soc/codecs/Makefile                          |   4 +-
 sound/soc/codecs/adau17x1.c                        |   3 +-
 sound/soc/codecs/ak4642.c                          |   2 +-
 sound/soc/codecs/arizona.h                         |   1 +
 sound/soc/codecs/cs47l24.c                         |   3 +
 sound/soc/codecs/da7218.c                          |   3 +-
 sound/soc/codecs/hdac_hdmi.c                       |   5 -
 sound/soc/codecs/max98090.c                        |   2 +-
 sound/soc/codecs/max9867.c                         |   5 +-
 sound/soc/codecs/pcm3168a.c                        |   2 -
 sound/soc/codecs/rt5514-spi.c                      |   1 -
 sound/soc/codecs/rt5640.c                          |  12 +-
 sound/soc/codecs/rt5645.c                          |   2 +-
 sound/soc/codecs/rt5659.c                          |  90 ++++-----
 sound/soc/codecs/rt5660.c                          |   6 +-
 sound/soc/codecs/rt5677-spi.c                      |   1 -
 sound/soc/codecs/tlv320aic3x.c                     |   6 +
 sound/soc/codecs/wm0010.c                          |   1 -
 sound/soc/codecs/wm5102.c                          |   2 +
 sound/soc/codecs/wm5110.c                          |   5 +
 sound/soc/codecs/wm8731.h                          |   2 +-
 sound/soc/codecs/wm8753.c                          |   3 +-
 sound/soc/codecs/wm_adsp.c                         |  45 ++++-
 sound/soc/codecs/wm_adsp.h                         |  11 ++
 sound/soc/dwc/designware_i2s.c                     |   9 +-
 sound/soc/dwc/designware_pcm.c                     |  99 ++++++++--
 sound/soc/dwc/local.h                              |   9 +-
 sound/soc/fsl/efika-audio-fabric.c                 |   1 -
 sound/soc/fsl/mpc5200_psc_ac97.c                   |   1 -
 sound/soc/fsl/mpc5200_psc_ac97.h                   |  13 --
 sound/soc/img/img-parallel-out.c                   |   2 -
 sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   4 +-
 sound/soc/intel/atom/sst/sst_ipc.c                 |   2 -
 sound/soc/intel/atom/sst/sst_stream.c              |   2 -
 sound/soc/intel/boards/bytcr_rt5640.c              |  10 +
 sound/soc/intel/common/sst-dsp.c                   |  52 +++---
 sound/soc/intel/skylake/bxt-sst.c                  |  64 +++----
 sound/soc/intel/skylake/skl-pcm.c                  | 158 ++++++++--------
 sound/soc/intel/skylake/skl-sst-dsp.h              |   4 +-
 sound/soc/intel/skylake/skl-sst-ipc.h              |   5 +-
 sound/soc/intel/skylake/skl-topology.c             |  65 ++++---
 sound/soc/intel/skylake/skl-topology.h             |  19 ++
 sound/soc/intel/skylake/skl-tplg-interface.h       |  12 --
 sound/soc/pxa/e740_wm9705.c                        |   3 -
 sound/soc/pxa/e750_wm9705.c                        |   2 -
 sound/soc/pxa/e800_wm9712.c                        |   2 -
 sound/soc/pxa/em-x270.c                            |   2 -
 sound/soc/pxa/mioa701_wm9713.c                     |   1 -
 sound/soc/pxa/palm27x.c                            |   2 -
 sound/soc/pxa/pxa2xx-ac97.c                        |   2 -
 sound/soc/pxa/pxa2xx-ac97.h                        |  17 --
 sound/soc/pxa/tosa.c                               |   2 -
 sound/soc/pxa/zylonite.c                           |   1 -
 sound/soc/samsung/Kconfig                          |   2 +
 sound/soc/samsung/i2s.c                            | 203 ++++++++++-----------
 sound/soc/samsung/smdk_wm8580.c                    |   5 +-
 sound/soc/samsung/tm2_wm5110.c                     |   1 +
 sound/soc/soc-ac97.c                               |   2 +-
 sound/soc/soc-core.c                               |  23 ++-
 sound/soc/soc-ops.c                                |   2 +-
 sound/soc/soc-pcm.c                                |  55 +++---
 sound/soc/soc-topology.c                           |  10 +-
 sound/soc/sunxi/sun4i-codec.c                      |   1 +
 sound/soc/sunxi/sun4i-spdif.c                      |  36 +++-
 sound/soc/zte/zx-i2s.c                             |   5 +-
 76 files changed, 706 insertions(+), 564 deletions(-)
 delete mode 100644 sound/soc/fsl/mpc5200_psc_ac97.h
 delete mode 100644 sound/soc/pxa/pxa2xx-ac97.h
Merging modules/modules-next (2fc42a1bbbc4 livepatch/module: print notice of TAINT_LIVEPATCH)
$ git merge modules/modules-next
Auto-merging kernel/panic.c
Merge made by the 'recursive' strategy.
 include/linux/kernel.h | 4 ++--
 include/linux/module.h | 2 --
 kernel/module.c        | 4 +++-
 kernel/panic.c         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
Merging input/next (13e360ac97e2 Input: cyapa - use msleep() for long delay)
$ git merge input/next
Removing include/linux/i2c/mpr121_touchkey.h
Removing drivers/input/touchscreen/intel-mid-touch.c
Auto-merging drivers/input/serio/i8042-x86ia64io.h
Auto-merging drivers/input/joystick/xpad.c
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/input/mpr121-touchkey.txt  |  30 +
 drivers/input/joystick/xpad.c                      | 112 ++--
 drivers/input/keyboard/mpr121_touchkey.c           | 168 ++++--
 drivers/input/misc/bma150.c                        |   4 +-
 drivers/input/mouse/cyapa_gen3.c                   |  29 +-
 drivers/input/serio/i8042-x86ia64io.h              |   8 +
 drivers/input/touchscreen/Kconfig                  |  12 -
 drivers/input/touchscreen/Makefile                 |   1 -
 drivers/input/touchscreen/edt-ft5x06.c             |   4 +-
 drivers/input/touchscreen/intel-mid-touch.c        | 654 ---------------------
 include/linux/i2c/mpr121_touchkey.h                |  20 -
 11 files changed, 218 insertions(+), 824 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/input/mpr121-touchkey.txt
 delete mode 100644 drivers/input/touchscreen/intel-mid-touch.c
 delete mode 100644 include/linux/i2c/mpr121_touchkey.h
Merging block/for-next (cdb98c2698b4 Revert "nvme: add support for the Write Zeroes command")
$ git merge block/for-next
Already up-to-date.
Merging lightnvm/for-next (a5f78b7f7dd1 Merge branch 'for-4.10/block' into for-next)
$ git merge lightnvm/for-next
Merge made by the 'recursive' strategy.
Merging device-mapper/for-next (ef548c551e72 dm flakey: introduce "error_writes" feature)
$ git merge device-mapper/for-next
Already up-to-date.
Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
$ git merge pcmcia/master
Already up-to-date.
Merging mmc/next (b91c18f107d0 mmc: sdhci-pci: Add support for HS200 tuning mode on AMD, eMMC-4.5.1)
$ git merge mmc/next
Removing include/linux/mmc/dw_mmc.h
Removing include/linux/mmc/boot.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mmc/synopsys-dw-mshc.txt   |  13 +
 .../devicetree/bindings/mmc/zx-dw-mshc.txt         |  33 +++
 MAINTAINERS                                        |   1 -
 arch/sh/boot/romimage/mmcif-sh7724.c               |  16 +-
 drivers/mmc/core/block.c                           |  47 ++--
 drivers/mmc/core/core.c                            |  10 +-
 drivers/mmc/core/mmc.c                             |  14 +-
 drivers/mmc/core/mmc_ops.c                         |  44 ++--
 drivers/mmc/core/mmc_test.c                        | 103 ++++----
 drivers/mmc/core/queue.c                           |   2 +-
 drivers/mmc/core/sd_ops.c                          |  30 +--
 drivers/mmc/core/sdio.c                            |  38 ++-
 drivers/mmc/core/sdio_ops.c                        |  10 +-
 drivers/mmc/core/slot-gpio.c                       |   6 -
 drivers/mmc/host/Kconfig                           |   9 +
 drivers/mmc/host/Makefile                          |   1 +
 drivers/mmc/host/davinci_mmc.c                     |   1 +
 drivers/mmc/host/dw_mmc-exynos.c                   |   1 -
 drivers/mmc/host/dw_mmc-k3.c                       |   1 -
 drivers/mmc/host/dw_mmc-pci.c                      |   1 -
 drivers/mmc/host/dw_mmc-pltfm.c                    |   1 -
 drivers/mmc/host/dw_mmc-rockchip.c                 |   1 -
 drivers/mmc/host/dw_mmc-zx.c                       | 241 ++++++++++++++++++
 drivers/mmc/host/dw_mmc-zx.h                       |  31 +++
 drivers/mmc/host/dw_mmc.c                          |  18 +-
 drivers/mmc/host/dw_mmc.h                          | 263 ++++++++++++++++++++
 drivers/mmc/host/meson-gx-mmc.c                    |   9 +-
 drivers/mmc/host/mtk-sd.c                          |   8 +-
 drivers/mmc/host/mxs-mmc.c                         |   6 +-
 drivers/mmc/host/rtsx_pci_sdmmc.c                  |   2 +-
 drivers/mmc/host/rtsx_usb_sdmmc.c                  |   2 +-
 drivers/mmc/host/sdhci-acpi.c                      |   3 +-
 drivers/mmc/host/sdhci-cadence.c                   |   1 +
 drivers/mmc/host/sdhci-esdhc.h                     |  39 +--
 drivers/mmc/host/sdhci-iproc.c                     |  11 +-
 drivers/mmc/host/sdhci-of-esdhc.c                  |  18 +-
 drivers/mmc/host/sdhci-pci-core.c                  |  97 +++++++-
 drivers/mmc/host/sdhci-pci.h                       |   1 -
 drivers/mmc/host/sdhci.c                           |   4 +-
 drivers/mmc/host/sdhci.h                           |   2 +
 drivers/mmc/host/sh_mmcif.c                        |  28 +--
 drivers/mmc/host/sh_mobile_sdhi.c                  |  66 ++---
 drivers/mmc/host/tmio_mmc.h                        |   1 +
 drivers/mmc/host/tmio_mmc_pio.c                    |  27 +-
 drivers/mmc/host/via-sdmmc.c                       |   1 +
 drivers/mmc/host/vub300.c                          |   2 -
 drivers/mmc/host/wmt-sdmmc.c                       |   1 +
 include/linux/mmc/boot.h                           |   7 -
 include/linux/mmc/card.h                           |   3 +
 include/linux/mmc/dw_mmc.h                         | 274 ---------------------
 include/linux/mmc/mmc.h                            |   3 +
 include/linux/mmc/sh_mmcif.h                       |   5 -
 include/linux/platform_data/mmc-mxcmmc.h           |   1 +
 53 files changed, 976 insertions(+), 582 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mmc/zx-dw-mshc.txt
 create mode 100644 drivers/mmc/host/dw_mmc-zx.c
 create mode 100644 drivers/mmc/host/dw_mmc-zx.h
 delete mode 100644 include/linux/mmc/boot.h
 delete mode 100644 include/linux/mmc/dw_mmc.h
Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Auto-merging kernel/debug/kdb/kdb_io.c
Merge made by the 'recursive' strategy.
 kernel/debug/kdb/kdb_io.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (46d47f14bddb md/r5cache: enable chunk_aligned_read with write back cache)
$ git merge md/for-next
Merge made by the 'recursive' strategy.
 drivers/md/linear.c      |   2 +
 drivers/md/md.c          |  42 ++++++++++++
 drivers/md/md.h          |   2 +
 drivers/md/multipath.c   |   4 ++
 drivers/md/raid0.c       |   2 +
 drivers/md/raid5-cache.c | 173 +++++++++++++++++++++++++++++++++++++++++------
 drivers/md/raid5.c       |  75 +++++++++++++++++---
 drivers/md/raid5.h       |   5 ++
 lib/radix-tree.c         |   1 +
 9 files changed, 278 insertions(+), 28 deletions(-)
Merging mfd/for-mfd-next (6f96d7eab40f mfd: axp20x: Fix AXP806 access errors on cold boot)
$ git merge mfd/for-mfd-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/mfd/aspeed-gfx.txt         |  17 +
 .../devicetree/bindings/mfd/aspeed-lpc.txt         | 137 ++++
 Documentation/devicetree/bindings/mfd/mfd.txt      |  12 +-
 Documentation/mtd/intel-spi.txt                    |  88 +++
 drivers/mfd/Kconfig                                |   1 +
 drivers/mfd/arizona-irq.c                          |  86 ++-
 drivers/mfd/arizona.h                              |   2 -
 drivers/mfd/axp20x.c                               |  78 ++-
 drivers/mfd/cros_ec.c                              |  51 ++
 drivers/mfd/lpc_ich.c                              | 131 ++++
 drivers/mfd/sun6i-prcm.c                           |  13 +
 drivers/mtd/spi-nor/Kconfig                        |  20 +
 drivers/mtd/spi-nor/Makefile                       |   2 +
 drivers/mtd/spi-nor/intel-spi-platform.c           |  57 ++
 drivers/mtd/spi-nor/intel-spi.c                    | 777 +++++++++++++++++++++
 drivers/mtd/spi-nor/intel-spi.h                    |  24 +
 drivers/platform/chrome/cros_ec_proto.c            |   5 +
 drivers/power/supply/axp288_charger.c              | 132 ++--
 drivers/power/supply/axp288_fuel_gauge.c           | 405 +----------
 include/linux/mfd/abx500.h                         |   2 +-
 include/linux/mfd/abx500/ab8500-bm.h               |   4 +-
 include/linux/mfd/axp20x.h                         |  49 +-
 include/linux/mfd/cros_ec.h                        |   2 +
 include/linux/mfd/cros_ec_commands.h               |  14 +
 include/linux/mfd/lpc_ich.h                        |   3 +
 include/linux/platform_data/intel-spi.h            |  31 +
 26 files changed, 1621 insertions(+), 522 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-gfx.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/aspeed-lpc.txt
 create mode 100644 Documentation/mtd/intel-spi.txt
 create mode 100644 drivers/mtd/spi-nor/intel-spi-platform.c
 create mode 100644 drivers/mtd/spi-nor/intel-spi.c
 create mode 100644 drivers/mtd/spi-nor/intel-spi.h
 create mode 100644 include/linux/platform_data/intel-spi.h
Merging backlight/for-backlight-next (0c9501f823a4 backlight: pwm_bl: Handle gpio that can sleep)
$ git merge backlight/for-backlight-next
Already up-to-date.
Merging battery/for-next (178478921b6e power: supply: bq27xxx: adds device tree binding documentation.)
$ git merge battery/for-next
Auto-merging include/linux/mfd/axp20x.h
Removing drivers/power/supply/intel_mid_battery.c
Merge made by the 'recursive' strategy.
 .../bindings/power/supply/axp20x_usb_power.txt     |   5 +
 .../devicetree/bindings/power/supply/bq27xxx.txt   |  36 +
 .../bindings/power/supply/sbs_sbs-charger.txt      |  23 +
 .../bindings/power/supply/ti,bq24735.txt           |   8 +-
 drivers/power/supply/Kconfig                       |  13 +-
 drivers/power/supply/Makefile                      |   2 +-
 drivers/power/supply/ab8500_btemp.c                |   6 +-
 drivers/power/supply/axp20x_usb_power.c            | 117 ++-
 drivers/power/supply/axp288_charger.c              | 277 +++----
 drivers/power/supply/axp288_fuel_gauge.c           | 134 ++--
 drivers/power/supply/bq24190_charger.c             |   2 +-
 drivers/power/supply/bq24735-charger.c             | 108 ++-
 drivers/power/supply/bq27xxx_battery.c             | 356 ++++++++-
 drivers/power/supply/bq27xxx_battery_i2c.c         |  22 +-
 drivers/power/supply/gpio-charger.c                |  84 ++-
 drivers/power/supply/intel_mid_battery.c           | 795 ---------------------
 drivers/power/supply/max8997_charger.c             |  15 +-
 drivers/power/supply/qcom_smbb.c                   |   2 +-
 drivers/power/supply/sbs-charger.c                 | 274 +++++++
 drivers/power/supply/tps65217_charger.c            |  99 +--
 drivers/power/supply/wm97xx_battery.c              |   5 -
 include/linux/mfd/axp20x.h                         |   2 +-
 include/linux/power/bq27xxx_battery.h              |  12 +-
 23 files changed, 1178 insertions(+), 1219 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/power/supply/bq27xxx.txt
 create mode 100644 Documentation/devicetree/bindings/power/supply/sbs_sbs-charger.txt
 delete mode 100644 drivers/power/supply/intel_mid_battery.c
 create mode 100644 drivers/power/supply/sbs-charger.c
Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable)
$ git merge omap_dss2/for-next
Already up-to-date.
Merging regulator/for-next (4dc8f39eb379 Merge remote-tracking branches 'regulator/topic/arizona' and 'regulator/topic/supplies' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
 drivers/regulator/arizona-micsupp.c |  6 ++++--
 drivers/regulator/core.c            | 13 +++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)
Merging security/next (b8aa8453918e security: Fix inode_getattr documentation)
$ git merge security/next
Merge made by the 'recursive' strategy.
 include/linux/lsm_hooks.h    |   3 +-
 samples/seccomp/bpf-helper.h | 125 +++++++++++++++++++++++++------------------
 2 files changed, 73 insertions(+), 55 deletions(-)
Merging integrity/next (b4bfec7f4a86 security/integrity: Harden against malformed xattrs)
$ git merge integrity/next
Already up-to-date.
Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next)
$ git merge keys/keys-next
Auto-merging security/keys/keyctl.c
Auto-merging crypto/asymmetric_keys/x509_cert_parser.c
Auto-merging crypto/asymmetric_keys/public_key.c
Merge made by the 'recursive' strategy.
 Documentation/crypto/asymmetric-keys.txt  |  26 ++-
 Documentation/security/keys.txt           | 217 ++++++++++++++++++++
 certs/Kconfig                             |  18 ++
 certs/Makefile                            |   6 +
 certs/blacklist.c                         | 174 ++++++++++++++++
 certs/blacklist.h                         |   3 +
 certs/blacklist_hashes.c                  |   6 +
 certs/blacklist_nohashes.c                |   5 +
 crypto/asymmetric_keys/Kconfig            |  10 +
 crypto/asymmetric_keys/Makefile           |  13 ++
 crypto/asymmetric_keys/asymmetric_keys.h  |   3 +
 crypto/asymmetric_keys/asymmetric_type.c  |  59 +++++-
 crypto/asymmetric_keys/pkcs7_parser.c     |   1 +
 crypto/asymmetric_keys/pkcs7_parser.h     |   1 +
 crypto/asymmetric_keys/pkcs7_verify.c     |  32 ++-
 crypto/asymmetric_keys/pkcs8.asn1         |  24 +++
 crypto/asymmetric_keys/pkcs8_parser.c     | 184 +++++++++++++++++
 crypto/asymmetric_keys/public_key.c       | 195 ++++++++++++++++--
 crypto/asymmetric_keys/signature.c        |  95 +++++++++
 crypto/asymmetric_keys/x509_cert_parser.c |  21 +-
 crypto/asymmetric_keys/x509_parser.h      |   1 +
 crypto/asymmetric_keys/x509_public_key.c  |  15 ++
 include/crypto/public_key.h               |  14 +-
 include/keys/asymmetric-subtype.h         |   9 +
 include/keys/system_keyring.h             |  12 ++
 include/linux/key-type.h                  |  11 +
 include/linux/keyctl.h                    |  46 +++++
 include/uapi/linux/keyctl.h               |  30 +++
 security/keys/Makefile                    |   1 +
 security/keys/compat.c                    |  18 ++
 security/keys/internal.h                  |  39 ++++
 security/keys/keyctl.c                    |  24 +++
 security/keys/keyctl_pkey.c               | 323 ++++++++++++++++++++++++++++++
 33 files changed, 1584 insertions(+), 52 deletions(-)
 create mode 100644 certs/blacklist.c
 create mode 100644 certs/blacklist.h
 create mode 100644 certs/blacklist_hashes.c
 create mode 100644 certs/blacklist_nohashes.c
 create mode 100644 crypto/asymmetric_keys/pkcs8.asn1
 create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c
 create mode 100644 include/linux/keyctl.h
 create mode 100644 security/keys/keyctl_pkey.c
Merging selinux/next (3a2f5a59a695 security,selinux,smack: kill security_task_wait hook)
$ git merge selinux/next
Auto-merging include/linux/lsm_hooks.h
Auto-merging fs/proc/base.c
Merge made by the 'recursive' strategy.
 fs/proc/base.c                      |  13 +-
 include/linux/lsm_hooks.h           |  10 +-
 include/linux/security.h            |  10 +-
 kernel/exit.c                       |  19 +-
 security/apparmor/lsm.c             |   7 +-
 security/security.c                 |  10 +-
 security/selinux/hooks.c            | 377 ++++++++++++++++++------------------
 security/selinux/include/classmap.h |  62 ++++++
 security/selinux/include/objsec.h   |  10 +
 security/selinux/include/security.h |   3 +-
 security/selinux/selinuxfs.c        |  98 ++++++----
 security/selinux/ss/services.c      |   3 +
 security/smack/smack_lsm.c          |  31 +--
 13 files changed, 339 insertions(+), 314 deletions(-)
$ git am -3 ../patches/0001-selinux-merge-fix-for-smc-establish-new-socket-famil.patch
Applying: selinux: merge fix for "smc: establish new socket family"
$ git reset HEAD^
Unstaged changes after reset:
M	security/selinux/hooks.c
M	security/selinux/include/classmap.h
$ git add -A .
$ git commit -v -a --amend
[master b38720358970] Merge remote-tracking branch 'selinux/next'
 Date: Mon Jan 16 12:41:46 2017 +1100
Merging tpmdd/next (8e25809f17af tpm: Do not print an error message when doing TPM auto startup)
$ git merge tpmdd/next
Merge made by the 'recursive' strategy.
 drivers/char/tpm/st33zp24/st33zp24.c |   1 -
 drivers/char/tpm/tpm-chip.c          |   8 +--
 drivers/char/tpm/tpm-interface.c     |  42 +++++++++++---
 drivers/char/tpm/tpm2-cmd.c          | 104 ++++++++++++++++++----------------
 drivers/char/tpm/tpm_crb.c           |   8 ++-
 drivers/char/tpm/tpm_ibmvtpm.c       | 106 ++++++++++++++++++-----------------
 drivers/char/tpm/tpm_tis_spi.c       |   1 -
 drivers/char/tpm/tpm_vtpm_proxy.c    |  48 ++++++++++++----
 8 files changed, 190 insertions(+), 128 deletions(-)
Merging watchdog/master (7ce7d89f4883 Linux 4.10-rc1)
$ git merge watchdog/master
Already up-to-date.
Merging iommu/next (fce794089d60 Merge branches 'iommu/fixes' and 'core' into next)
$ git merge iommu/next
Merge made by the 'recursive' strategy.
 drivers/iommu/iova.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)
Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation)
$ git merge dwmw2-iommu/master
Already up-to-date.
Merging vfio/next (2b8bb1d771f7 vfio iommu type1: Fix size argument to vfio_find_dma() in pin_pages/unpin_pages)
$ git merge vfio/next
Already up-to-date.
Merging trivial/for-next (74dcba3589fc NTB: correct ntb_spad_count comment typo)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (89670affa2a6 audit: Make AUDIT_ANOM_ABEND event normalized)
$ git merge audit/next
Auto-merging kernel/auditsc.c
Auto-merging kernel/audit.c
Merge made by the 'recursive' strategy.
 kernel/audit.c   | 4 +++-
 kernel/auditsc.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
Merging devicetree/for-next (25dc3bbc55a6 serial: fsl-imx-uart.txt: Remove generic property)
$ git merge devicetree/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/bus/qcom,ebi2.txt          |   6 +-
 .../bindings/clock/mvebu-gated-clock.txt           |   2 +-
 .../devicetree/bindings/display/arm,pl11x.txt      |   2 +-
 .../bindings/display/bridge/analogix_dp.txt        |   2 +-
 .../bindings/display/cirrus,clps711x-fb.txt        |   2 +-
 .../bindings/display/exynos/exynos7-decon.txt      |   2 +-
 .../bindings/display/exynos/samsung-fimd.txt       |   2 +-
 .../devicetree/bindings/display/imx/fsl,imx-fb.txt |   2 +-
 .../devicetree/bindings/display/imx/ldb.txt        |   2 +-
 .../bindings/display/mediatek/mediatek,disp.txt    |   2 +-
 .../devicetree/bindings/display/msm/dsi.txt        |   2 +-
 .../devicetree/bindings/display/msm/edp.txt        |   2 +-
 .../devicetree/bindings/display/msm/hdmi.txt       |   2 +-
 .../bindings/display/panel/panel-dpi.txt           |   2 +-
 .../bindings/display/panel/samsung,ld9040.txt      |   2 +-
 .../bindings/display/panel/samsung,s6e8aa0.txt     |   2 +-
 .../display/rockchip/analogix_dp-rockchip.txt      |   2 +-
 .../devicetree/bindings/display/tilcdc/panel.txt   |   2 +-
 .../devicetree/bindings/iommu/arm,smmu.txt         |  10 +-
 .../devicetree/bindings/mfd/omap-usb-host.txt      |   4 +-
 .../devicetree/bindings/pci/pci-iommu.txt          |   6 +-
 .../devicetree/bindings/serial/fsl-imx-uart.txt    |   4 +-
 .../devicetree/bindings/soc/fsl/qman-portals.txt   |  20 -
 .../devicetree/bindings/usb/ehci-omap.txt          |   1 -
 .../devicetree/bindings/vendor-prefixes.txt        |   1 +
 drivers/of/irq.c                                   |  19 +-
 drivers/of/of_pci_irq.c                            |  10 +-
 drivers/of/of_reserved_mem.c                       |   4 +
 drivers/of/overlay.c                               |   2 -
 drivers/of/resolver.c                              |   1 -
 drivers/of/unittest.c                              |   1 -
 scripts/dtc/checks.c                               | 349 +++++-----
 scripts/dtc/dtc-lexer.l                            |  21 +-
 scripts/dtc/dtc-lexer.lex.c_shipped                | 650 +++++++++---------
 scripts/dtc/dtc-parser.tab.c_shipped               | 752 +++++++++++----------
 scripts/dtc/dtc-parser.tab.h_shipped               |  54 +-
 scripts/dtc/dtc-parser.y                           |  34 +-
 scripts/dtc/dtc.c                                  |  69 +-
 scripts/dtc/dtc.h                                  |  39 +-
 scripts/dtc/flattree.c                             |  41 +-
 scripts/dtc/fstree.c                               |   5 +-
 scripts/dtc/libfdt/Makefile.libfdt                 |   2 +-
 scripts/dtc/libfdt/fdt_ro.c                        |  30 +-
 scripts/dtc/libfdt/fdt_rw.c                        |   6 +-
 scripts/dtc/libfdt/fdt_strerror.c                  |   6 +
 scripts/dtc/libfdt/fdt_wip.c                       |  29 +-
 scripts/dtc/libfdt/libfdt.h                        | 210 +++++-
 scripts/dtc/libfdt/libfdt_env.h                    |   1 +
 scripts/dtc/livetree.c                             | 299 +++++++-
 scripts/dtc/srcpos.c                               |  35 +-
 scripts/dtc/srcpos.h                               |   1 -
 scripts/dtc/treesource.c                           |  14 +-
 scripts/dtc/util.c                                 |  30 +
 scripts/dtc/util.h                                 |   1 +
 scripts/dtc/version_gen.h                          |   2 +-
 55 files changed, 1720 insertions(+), 1083 deletions(-)
Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
$ git merge mailbox/mailbox-for-next
Already up-to-date.
Merging spi/for-next (50c9ac769aa1 Merge remote-tracking branches 'spi/topic/rockchip', 'spi/topic/rspi', 'spi/topic/s3c64xx', 'spi/topic/sh-msiof' and 'spi/topic/slave' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/spi/sh-msiof.txt | 19 ++++---
 .../devicetree/bindings/spi/spi-rockchip.txt       |  7 +++
 drivers/spi/Kconfig                                |  6 ++-
 drivers/spi/spi-armada-3700.c                      | 23 +++++----
 drivers/spi/spi-ath79.c                            | 23 +++++----
 drivers/spi/spi-axi-spi-engine.c                   |  3 +-
 drivers/spi/spi-bcm53xx.c                          | 18 ++++---
 drivers/spi/spi-davinci.c                          |  4 +-
 drivers/spi/spi-dw-mid.c                           |  4 +-
 drivers/spi/spi-dw.c                               |  9 ++--
 drivers/spi/spi-dw.h                               |  1 -
 drivers/spi/spi-fsl-lpspi.c                        |  8 +--
 drivers/spi/spi-imx.c                              | 16 +++---
 drivers/spi/spi-pxa2xx-pci.c                       | 24 +++++++++
 drivers/spi/spi-pxa2xx.c                           |  1 +
 drivers/spi/spi-rockchip.c                         |  5 ++
 drivers/spi/spi-rspi.c                             |  4 +-
 drivers/spi/spi-s3c64xx.c                          | 57 ++++++++++----------
 drivers/spi/spi-sh-msiof.c                         |  8 +--
 drivers/spi/spi.c                                  | 60 +++++++++++++---------
 include/linux/pxa2xx_ssp.h                         | 14 ++---
 21 files changed, 189 insertions(+), 125 deletions(-)
Merging tip/auto-latest (8266f4d2b1da Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Removing include/linux/intel_pmic_gpio.h
Removing drivers/platform/x86/intel_pmic_gpio.c
Removing arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.h
Removing arch/x86/platform/intel-mid/device_libs/platform_ipc.c
Merge made by the 'recursive' strategy.
 Documentation/x86/intel_rdt_ui.txt                 | 114 +++++++
 arch/ia64/include/asm/thread_info.h                |   6 +
 arch/ia64/kernel/time.c                            |  66 +++--
 arch/powerpc/include/asm/accounting.h              |  14 +-
 arch/powerpc/include/asm/paca.h                    |   1 -
 arch/powerpc/kernel/asm-offsets.c                  |   8 +-
 arch/powerpc/kernel/time.c                         | 138 +++++----
 arch/powerpc/xmon/xmon.c                           |   8 +-
 arch/s390/include/asm/lowcore.h                    |  65 ++--
 arch/s390/include/asm/processor.h                  |   3 +
 arch/s390/kernel/vtime.c                           | 138 +++++----
 arch/x86/events/amd/ibs.c                          |   2 +-
 arch/x86/include/asm/e820.h                        |   2 -
 arch/x86/include/asm/intel-mid.h                   |   5 +-
 arch/x86/include/asm/pgtable_32.h                  |  32 ++
 arch/x86/include/asm/spinlock.h                    |   3 -
 arch/x86/kernel/apic/apic.c                        |  39 +--
 arch/x86/kernel/apic/vector.c                      |   2 +-
 arch/x86/kernel/apic/x2apic_uv_x.c                 |  30 +-
 arch/x86/kernel/cpu/mcheck/mce_amd.c               |   4 +-
 arch/x86/kernel/cpu/mcheck/therm_throt.c           |   6 +-
 arch/x86/kernel/cpu/mcheck/threshold.c             |   4 +-
 arch/x86/kernel/e820.c                             |  22 +-
 arch/x86/kernel/head32.c                           |  62 ++++
 arch/x86/kernel/head_32.S                          | 121 +-------
 arch/x86/kernel/irq.c                              |   4 +-
 arch/x86/kernel/irq_work.c                         |   5 +-
 arch/x86/kernel/jump_label.c                       |   3 +-
 arch/x86/kernel/kvm.c                              |  14 -
 arch/x86/kernel/paravirt-spinlocks.c               |   3 -
 arch/x86/kernel/smp.c                              |  15 +-
 arch/x86/platform/intel-mid/device_libs/Makefile   |   2 -
 .../intel-mid/device_libs/platform_gpio_keys.c     |   3 +
 .../platform/intel-mid/device_libs/platform_ipc.c  |  68 -----
 .../platform/intel-mid/device_libs/platform_ipc.h  |  18 --
 .../intel-mid/device_libs/platform_msic_audio.c    |   3 +-
 .../intel-mid/device_libs/platform_msic_battery.c  |   3 +-
 .../intel-mid/device_libs/platform_msic_gpio.c     |   3 +-
 .../intel-mid/device_libs/platform_msic_ocd.c      |   3 +-
 .../device_libs/platform_msic_power_btn.c          |   3 +-
 .../intel-mid/device_libs/platform_msic_thermal.c  |   3 +-
 .../intel-mid/device_libs/platform_pmic_gpio.c     |  54 ----
 arch/x86/platform/intel-mid/mrfld.c                |   1 +
 arch/x86/platform/intel-mid/sfi.c                  |  72 +++--
 arch/x86/xen/spinlock.c                            |  19 --
 drivers/platform/x86/Kconfig                       |   7 -
 drivers/platform/x86/Makefile                      |   1 -
 drivers/platform/x86/intel_pmic_gpio.c             | 326 ---------------------
 include/linux/intel_pmic_gpio.h                    |  15 -
 include/linux/kernel_stat.h                        |   5 +-
 include/linux/kprobes.h                            |  30 +-
 include/linux/spinlock.h                           |   8 -
 include/linux/spinlock_api_smp.h                   |   2 -
 include/linux/spinlock_api_up.h                    |   1 -
 include/linux/vtime.h                              |   7 +-
 kernel/extable.c                                   |   9 +-
 kernel/kprobes.c                                   |  73 +++--
 kernel/locking/qspinlock_paravirt.h                |   2 +-
 kernel/locking/spinlock.c                          |   8 -
 kernel/sched/cputime.c                             |  16 +-
 tools/arch/x86/include/uapi/asm/vmx.h              |   5 +
 tools/lib/subcmd/parse-options.h                   |   1 +
 tools/perf/Build                                   |   1 +
 tools/perf/Documentation/perf-kallsyms.txt         |  24 ++
 tools/perf/Documentation/perf-record.txt           |  14 +-
 tools/perf/Documentation/perf-trace.txt            |   8 +-
 tools/perf/Makefile.perf                           |   1 +
 tools/perf/builtin-help.c                          |   2 +-
 tools/perf/builtin-kallsyms.c                      |  67 +++++
 tools/perf/builtin-record.c                        | 154 +++++++++-
 tools/perf/builtin-trace.c                         | 120 ++++++--
 tools/perf/builtin.h                               |   1 +
 tools/perf/command-list.txt                        |   1 +
 tools/perf/perf.c                                  |   1 +
 tools/perf/tests/Build                             |   1 +
 tools/perf/tests/builtin-test.c                    |   4 +
 tools/perf/tests/tests.h                           |   1 +
 tools/perf/tests/unit_number__scnprintf.c          |  37 +++
 tools/perf/util/evlist.c                           |  12 +-
 tools/perf/util/evlist.h                           |   2 +
 tools/perf/util/machine.c                          |  19 ++
 tools/perf/util/machine.h                          |   1 +
 tools/perf/util/util.c                             |  13 +
 tools/perf/util/util.h                             |   1 +
 tools/testing/selftests/x86/Makefile               |   2 +-
 tools/testing/selftests/x86/sysret_rip.c           | 195 ++++++++++++
 86 files changed, 1378 insertions(+), 1014 deletions(-)
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.c
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_ipc.h
 delete mode 100644 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
 delete mode 100644 drivers/platform/x86/intel_pmic_gpio.c
 delete mode 100644 include/linux/intel_pmic_gpio.h
 create mode 100644 tools/perf/Documentation/perf-kallsyms.txt
 create mode 100644 tools/perf/builtin-kallsyms.c
 create mode 100644 tools/perf/tests/unit_number__scnprintf.c
 create mode 100644 tools/testing/selftests/x86/sysret_rip.c
Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map())
$ git merge clockevents/clockevents/next
Already up-to-date.
Merging edac/linux_next (9cae24b7b113 Merge commit 'daf34710a9e8849e04867d206692dc42d6d22263' into next)
$ git merge edac/linux_next
Resolved 'Documentation/00-INDEX' using previous resolution.
Resolved 'drivers/edac/edac_device.c' using previous resolution.
Resolved 'drivers/edac/edac_pci.c' using previous resolution.
Auto-merging drivers/edac/edac_pci.c
CONFLICT (content): Merge conflict in drivers/edac/edac_pci.c
Auto-merging drivers/edac/edac_device.c
CONFLICT (content): Merge conflict in drivers/edac/edac_device.c
Auto-merging Documentation/00-INDEX
CONFLICT (content): Merge conflict in Documentation/00-INDEX
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 2676a00d547e] Merge remote-tracking branch 'edac/linux_next'
$ git diff -M --stat --summary HEAD^..
Merging edac-amd/for-next (eca90a3b3226 EDAC: Fix typos in enum mem_type comments)
$ git merge edac-amd/for-next
Merge made by the 'recursive' strategy.
 drivers/edac/edac_mc_sysfs.c | 2 +-
 include/linux/edac.h         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
Merging irqchip/irqchip/for-next (88e20c74ee02 irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND)
$ git merge irqchip/irqchip/for-next
Merge made by the 'recursive' strategy.
 drivers/irqchip/irq-keystone.c | 28 +++++++++++++++++++---------
 drivers/irqchip/irq-mxs.c      |  4 ++++
 2 files changed, 23 insertions(+), 9 deletions(-)
Merging ftrace/for-next (3dbb16b87b57 selftests: ftrace: Shift down default message verbosity)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (8237112f17ea rcu: Make arch select smp_mb__after_unlock_lock() strength)
$ git merge rcu/rcu/next
Auto-merging lib/Kconfig.debug
Auto-merging init/Kconfig
Auto-merging include/linux/sched.h
Auto-merging arch/Kconfig
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 .../Design/Data-Structures/Data-Structures.html    |   5 +-
 .../Design/Expedited-Grace-Periods/ExpRCUFlow.svg  | 830 +++++++++++++++++++++
 .../Expedited-Grace-Periods/ExpSchedFlow.svg       | 826 ++++++++++++++++++++
 .../Expedited-Grace-Periods.html                   | 626 ++++++++++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel0.svg | 275 +++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel1.svg | 275 +++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel2.svg | 287 +++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel3.svg | 323 ++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel4.svg | 323 ++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel5.svg | 335 +++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel6.svg | 335 +++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel7.svg | 347 +++++++++
 .../RCU/Design/Expedited-Grace-Periods/Funnel8.svg | 311 ++++++++
 .../RCU/Design/Requirements/Requirements.html      |  12 +-
 Documentation/RCU/trace.txt                        |   5 +-
 Documentation/admin-guide/kernel-parameters.txt    |   7 +
 Documentation/memory-barriers.txt                  |  70 +-
 arch/Kconfig                                       |   3 +
 arch/powerpc/Kconfig                               |   1 +
 include/linux/llist.h                              |  37 +-
 include/linux/rcupdate.h                           |  24 +
 include/linux/rcutiny.h                            |  21 +
 include/linux/rcutree.h                            |   2 +
 include/linux/sched.h                              |   3 +-
 include/linux/srcu.h                               |  10 +-
 include/trace/events/rcu.h                         |  10 +-
 init/Kconfig                                       |  14 -
 kernel/locking/lockdep.c                           |  12 +-
 kernel/locking/locktorture.c                       |   6 +
 kernel/membarrier.c                                |   4 +
 kernel/rcu/rcu.h                                   |   1 +
 kernel/rcu/rcutorture.c                            |  19 +-
 kernel/rcu/srcu.c                                  | 128 ++--
 kernel/rcu/tiny.c                                  |   6 -
 kernel/rcu/tiny_plugin.h                           |   9 +-
 kernel/rcu/tree.c                                  | 366 ++++++---
 kernel/rcu/tree.h                                  |  16 +-
 kernel/rcu/tree_exp.h                              |  90 ++-
 kernel/rcu/tree_plugin.h                           |  20 +-
 kernel/rcu/tree_trace.c                            |   5 +-
 kernel/rcu/update.c                                |  44 +-
 kernel/sched/core.c                                |   1 +
 lib/Kconfig.debug                                  |   1 +
 .../selftests/rcutorture/configs/rcu/CFcommon      |   3 -
 .../selftests/rcutorture/configs/rcu/TINY01        |   1 +
 .../selftests/rcutorture/configs/rcu/TINY02        |   3 +-
 .../selftests/rcutorture/configs/rcu/TREE01        |   3 +
 .../selftests/rcutorture/configs/rcu/TREE02        |   4 +
 .../selftests/rcutorture/configs/rcu/TREE03        |   3 +
 .../selftests/rcutorture/configs/rcu/TREE04        |   4 +
 .../selftests/rcutorture/configs/rcu/TREE05        |   3 +
 .../selftests/rcutorture/configs/rcu/TREE06        |   3 +
 .../selftests/rcutorture/configs/rcu/TREE07        |   3 +
 .../selftests/rcutorture/configs/rcu/TREE08        |   4 +-
 .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt  |  33 +-
 .../rcutorture/formal/srcu-cbmc/.gitignore         |   1 +
 .../selftests/rcutorture/formal/srcu-cbmc/Makefile |  16 +
 .../formal/srcu-cbmc/empty_includes/linux/delay.h  |   0
 .../formal/srcu-cbmc/empty_includes/linux/export.h |   0
 .../formal/srcu-cbmc/empty_includes/linux/mutex.h  |   0
 .../formal/srcu-cbmc/empty_includes/linux/percpu.h |   0
 .../srcu-cbmc/empty_includes/linux/preempt.h       |   0
 .../srcu-cbmc/empty_includes/linux/rcupdate.h      |   0
 .../formal/srcu-cbmc/empty_includes/linux/sched.h  |   0
 .../formal/srcu-cbmc/empty_includes/linux/smp.h    |   0
 .../srcu-cbmc/empty_includes/linux/workqueue.h     |   0
 .../srcu-cbmc/empty_includes/uapi/linux/types.h    |   0
 .../formal/srcu-cbmc/include/linux/.gitignore      |   1 +
 .../formal/srcu-cbmc/include/linux/kconfig.h       |   1 +
 .../formal/srcu-cbmc/include/linux/types.h         | 155 ++++
 .../rcutorture/formal/srcu-cbmc/modify_srcu.awk    | 375 ++++++++++
 .../rcutorture/formal/srcu-cbmc/src/assume.h       |  16 +
 .../rcutorture/formal/srcu-cbmc/src/barriers.h     |  41 +
 .../rcutorture/formal/srcu-cbmc/src/bug_on.h       |  13 +
 .../formal/srcu-cbmc/src/combined_source.c         |  13 +
 .../rcutorture/formal/srcu-cbmc/src/config.h       |  27 +
 .../rcutorture/formal/srcu-cbmc/src/include_srcu.c |  31 +
 .../rcutorture/formal/srcu-cbmc/src/int_typedefs.h |  33 +
 .../rcutorture/formal/srcu-cbmc/src/locks.h        | 220 ++++++
 .../rcutorture/formal/srcu-cbmc/src/misc.c         |  11 +
 .../rcutorture/formal/srcu-cbmc/src/misc.h         |  58 ++
 .../rcutorture/formal/srcu-cbmc/src/percpu.h       |  92 +++
 .../rcutorture/formal/srcu-cbmc/src/preempt.c      |  78 ++
 .../rcutorture/formal/srcu-cbmc/src/preempt.h      |  58 ++
 .../formal/srcu-cbmc/src/simple_sync_srcu.c        |  50 ++
 .../rcutorture/formal/srcu-cbmc/src/workqueues.h   | 102 +++
 .../srcu-cbmc/tests/store_buffering/.gitignore     |   1 +
 .../srcu-cbmc/tests/store_buffering/Makefile       |  11 +
 .../tests/store_buffering/assert_end.fail          |   1 +
 .../srcu-cbmc/tests/store_buffering/force.fail     |   1 +
 .../srcu-cbmc/tests/store_buffering/force2.fail    |   1 +
 .../srcu-cbmc/tests/store_buffering/force3.fail    |   1 +
 .../srcu-cbmc/tests/store_buffering/main.pass      |   0
 .../formal/srcu-cbmc/tests/store_buffering/test.c  |  72 ++
 .../formal/srcu-cbmc/tests/test_script.sh          | 102 +++
 95 files changed, 7356 insertions(+), 338 deletions(-)
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpRCUFlow.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/ExpSchedFlow.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Expedited-Grace-Periods.html
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel0.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel1.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel2.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel3.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel4.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel5.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel6.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel7.svg
 create mode 100644 Documentation/RCU/Design/Expedited-Grace-Periods/Funnel8.svg
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/.gitignore
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/Makefile
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/delay.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/export.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/mutex.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/percpu.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/preempt.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/rcupdate.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/sched.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/smp.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/linux/workqueue.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/empty_includes/uapi/linux/types.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/.gitignore
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/kconfig.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/include/linux/types.h
 create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/assume.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/barriers.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/bug_on.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/combined_source.c
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/config.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/include_srcu.c
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/int_typedefs.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/locks.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.c
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/misc.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/percpu.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.c
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/preempt.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/simple_sync_srcu.c
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/src/workqueues.h
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/.gitignore
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/Makefile
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/assert_end.fail
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force.fail
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force2.fail
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/force3.fail
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/main.pass
 create mode 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/store_buffering/test.c
 create mode 100755 tools/testing/selftests/rcutorture/formal/srcu-cbmc/tests/test_script.sh
Merging kvm/linux-next (0f89b207b04a kvm: svm: Use the hardware provided GPA instead of page walk)
$ git merge kvm/linux-next
Auto-merging arch/x86/kvm/x86.c
Auto-merging arch/x86/kvm/lapic.h
Auto-merging arch/x86/kvm/lapic.c
Auto-merging arch/x86/kvm/emulate.c
Merge made by the 'recursive' strategy.
 Documentation/virtual/kvm/locking.txt |  31 ++-
 arch/x86/include/asm/kvm_emulate.h    |   1 +
 arch/x86/include/asm/kvm_host.h       |  24 +-
 arch/x86/include/asm/vmx.h            |  28 +-
 arch/x86/kvm/emulate.c                |  20 +-
 arch/x86/kvm/hyperv.c                 |   4 +-
 arch/x86/kvm/i8259.c                  |  16 +-
 arch/x86/kvm/irq.h                    |  19 +-
 arch/x86/kvm/irq_comm.c               |  29 +-
 arch/x86/kvm/lapic.c                  |  73 +++--
 arch/x86/kvm/lapic.h                  |  11 -
 arch/x86/kvm/mmu.c                    | 489 +++++++++++++++++++++++-----------
 arch/x86/kvm/svm.c                    |   2 +
 arch/x86/kvm/vmx.c                    |  54 ++--
 arch/x86/kvm/x86.c                    |  90 ++++---
 15 files changed, 609 insertions(+), 282 deletions(-)
Merging kvm-arm/next (21cbe3cc8a48 arm64: KVM: pmu: Reset PMSELR_EL0.SEL to a sane value before entering the guest)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-mips/next (07d9a380680d Linux 4.9-rc2)
$ git merge kvm-mips/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (e34af7849014 KVM: PPC: Book3S: Move prototypes for KVM functions into kvm_ppc.h)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (40d9766ee501 KVM: s390: Introduce BCD Vector Instructions to the guest)
$ git merge kvms390/next
Auto-merging arch/s390/kvm/vsie.c
Auto-merging arch/s390/kvm/priv.c
Merge made by the 'recursive' strategy.
 arch/s390/kvm/gaccess.c          | 26 ++++++++++++++++----------
 arch/s390/kvm/gaccess.h          | 10 +++++-----
 arch/s390/kvm/kvm-s390.c         | 12 +++++++++++-
 arch/s390/kvm/kvm-s390.h         | 10 ++++------
 arch/s390/kvm/priv.c             | 30 +++++++++++++++---------------
 arch/s390/kvm/vsie.c             |  3 +++
 arch/s390/tools/gen_facilities.c |  2 ++
 7 files changed, 56 insertions(+), 37 deletions(-)
Merging xen-tip/linux-next (0b47a6bd1150 Xen: ARM: Zero reserved fields of xatp before making hypervisor call)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (3ca45a46f8af percpu: ensure the requested alignment is power of two)
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (8bc4a0445596 Merge branch 'for-4.9' into for-4.10)
$ git merge workqueues/for-next
Already up-to-date.
Merging drivers-x86/for-next (c97ce278336b platform/x86: surface3-wmi: Shut up unused-function warning)
$ git merge drivers-x86/for-next
Auto-merging drivers/platform/x86/fujitsu-laptop.c
Merge made by the 'recursive' strategy.
 drivers/platform/x86/acer-wmi.c          | 22 +++++++--
 drivers/platform/x86/fujitsu-laptop.c    |  1 +
 drivers/platform/x86/hp_accel.c          |  1 +
 drivers/platform/x86/intel_mid_thermal.c |  2 +-
 drivers/platform/x86/intel_pmc_ipc.c     |  2 -
 drivers/platform/x86/mlx-platform.c      | 84 +++++++++++++++++++-------------
 drivers/platform/x86/surface3-wmi.c      |  4 +-
 7 files changed, 72 insertions(+), 44 deletions(-)
Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch")
$ git merge chrome-platform/for-next
Merge made by the 'recursive' strategy.
Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (4e552c8cb5bc leds: add LED_ON brightness as boolean value)
$ git merge leds/for-next
Merge made by the 'recursive' strategy.
 Documentation/devicetree/bindings/leds/common.txt | 28 +++++++++++++++--------
 include/linux/leds.h                              |  1 +
 2 files changed, 19 insertions(+), 10 deletions(-)
Merging ipmi/for-next (c5afee1b0dfc acpi:ipmi: Make IPMI user handler const)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
 Documentation/IPMI.txt              | 2 +-
 drivers/acpi/acpi_ipmi.c            | 2 +-
 drivers/char/ipmi/ipmi_devintf.c    | 2 +-
 drivers/char/ipmi/ipmi_msghandler.c | 4 ++--
 drivers/char/ipmi/ipmi_watchdog.c   | 2 +-
 include/linux/ipmi.h                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)
Merging driver-core/driver-core-next (113ccc38378b firmware: revamp firmware documentation)
$ git merge driver-core/driver-core-next
Removing Documentation/firmware_class/README
Auto-merging Documentation/driver-api/index.rst
Merge made by the 'recursive' strategy.
 Documentation/driver-api/firmware/built-in-fw.rst  |  38 ++++
 Documentation/driver-api/firmware/core.rst         |  16 ++
 .../driver-api/firmware/direct-fs-lookup.rst       |  30 ++++
 .../driver-api/firmware/fallback-mechanisms.rst    | 195 +++++++++++++++++++++
 .../driver-api/firmware/firmware_cache.rst         |  51 ++++++
 .../driver-api/firmware/fw_search_path.rst         |  26 +++
 Documentation/driver-api/firmware/index.rst        |  16 ++
 Documentation/driver-api/firmware/introduction.rst |  27 +++
 Documentation/driver-api/firmware/lookup-order.rst |  18 ++
 .../driver-api/firmware/request_firmware.rst       |  56 ++++++
 Documentation/driver-api/index.rst                 |   1 +
 Documentation/firmware_class/README                | 128 --------------
 drivers/base/platform.c                            |   2 +-
 include/linux/debugfs.h                            |   3 +-
 tools/testing/selftests/firmware/fw_filesystem.sh  |  25 ++-
 15 files changed, 496 insertions(+), 136 deletions(-)
 create mode 100644 Documentation/driver-api/firmware/built-in-fw.rst
 create mode 100644 Documentation/driver-api/firmware/core.rst
 create mode 100644 Documentation/driver-api/firmware/direct-fs-lookup.rst
 create mode 100644 Documentation/driver-api/firmware/fallback-mechanisms.rst
 create mode 100644 Documentation/driver-api/firmware/firmware_cache.rst
 create mode 100644 Documentation/driver-api/firmware/fw_search_path.rst
 create mode 100644 Documentation/driver-api/firmware/index.rst
 create mode 100644 Documentation/driver-api/firmware/introduction.rst
 create mode 100644 Documentation/driver-api/firmware/lookup-order.rst
 create mode 100644 Documentation/driver-api/firmware/request_firmware.rst
 delete mode 100644 Documentation/firmware_class/README
Merging tty/tty-next (a2d6a987bfe4 serial: 8250: Add new port type for TI DA8xx/66AK2x)
$ git merge tty/tty-next
Auto-merging lib/Kconfig.debug
Auto-merging drivers/tty/serial/8250/8250_port.c
Auto-merging drivers/tty/serial/8250/8250_pci.c
Auto-merging Documentation/admin-guide/kernel-parameters.txt
Merge made by the 'recursive' strategy.
 Documentation/admin-guide/kernel-parameters.txt   |  6 ++++
 Documentation/devicetree/bindings/serial/8250.txt |  1 +
 drivers/tty/goldfish.c                            |  2 +-
 drivers/tty/serial/8250/8250_lpss.c               |  4 +--
 drivers/tty/serial/8250/8250_moxa.c               |  1 +
 drivers/tty/serial/8250/8250_of.c                 |  1 +
 drivers/tty/serial/8250/8250_pci.c                | 13 +++++---
 drivers/tty/serial/8250/8250_port.c               | 26 ++++++++++++---
 drivers/tty/serial/8250/Kconfig                   |  6 ++--
 drivers/tty/serial/Kconfig                        |  1 +
 drivers/tty/serial/fsl_lpuart.c                   | 35 ++++++++++----------
 drivers/tty/serial/imx.c                          |  6 +++-
 drivers/tty/serial/lantiq.c                       | 40 ++++++++++++++++++-----
 drivers/tty/serial/max310x.c                      |  2 +-
 drivers/tty/serial/msm_serial.c                   |  1 +
 drivers/tty/serial/mxs-auart.c                    |  3 ++
 drivers/tty/serial/pic32_uart.c                   |  6 ++--
 drivers/tty/serial/samsung.c                      | 17 ++++------
 drivers/tty/serial/samsung.h                      |  4 ---
 drivers/tty/serial/sh-sci.c                       |  4 ++-
 include/linux/serial_core.h                       |  2 +-
 include/uapi/linux/serial_core.h                  |  3 +-
 include/uapi/linux/serial_reg.h                   |  8 +++++
 lib/Kconfig.debug                                 | 10 ++++++
 24 files changed, 139 insertions(+), 63 deletions(-)
Merging usb/usb-next (1129d270cbfb USB: Increase usbfs transfer limit)
$ git merge usb/usb-next
Merge made by the 'recursive' strategy.
 drivers/usb/core/devio.c                    |  43 +++++------
 drivers/usb/host/Kconfig                    |   4 +-
 drivers/usb/host/ehci-exynos.c              |   2 +
 drivers/usb/host/ohci-exynos.c              |   2 +
 drivers/usb/host/ohci-omap.c                |   3 +-
 drivers/usb/renesas_usbhs/mod_host.c        |   2 +-
 tools/usb/usbip/README                      |  57 ++++++++++++++-
 tools/usb/usbip/vudc/vudc_server_example.sh | 107 ++++++++++++++++++++++++++++
 8 files changed, 187 insertions(+), 33 deletions(-)
 create mode 100755 tools/usb/usbip/vudc/vudc_server_example.sh
Merging usb-gadget/next (d5c024f3761d usb: gadget: serial: fix possible Oops caused by calling kthread_stop(NULL))
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (a121103c9228 Linux 4.10-rc3)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging usb-chipidea-next/ci-for-usb-next (223e92311583 usb: chipdata: Replace the extcon API)
$ git merge usb-chipidea-next/ci-for-usb-next
Auto-merging drivers/usb/chipidea/core.c
Merge made by the 'recursive' strategy.
 drivers/usb/chipidea/core.c | 30 ++++++------------------------
 1 file changed, 6 insertions(+), 24 deletions(-)
Merging phy-next/next (7ce7d89f4883 Linux 4.10-rc1)
$ git merge phy-next/next
Already up-to-date.
Merging staging/staging-next (18ff854e8e30 staging:vt6656:main_usb.c Removed un-needed blank lines)
$ git merge staging/staging-next
Removing drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h
Removing drivers/staging/i4l/pcbit/pcbit.h
Removing drivers/staging/i4l/pcbit/module.c
Removing drivers/staging/i4l/pcbit/layer2.h
Removing drivers/staging/i4l/pcbit/layer2.c
Removing drivers/staging/i4l/pcbit/edss1.h
Removing drivers/staging/i4l/pcbit/edss1.c
Removing drivers/staging/i4l/pcbit/drv.c
Removing drivers/staging/i4l/pcbit/capi.h
Removing drivers/staging/i4l/pcbit/capi.c
Removing drivers/staging/i4l/pcbit/callbacks.h
Removing drivers/staging/i4l/pcbit/callbacks.c
Removing drivers/staging/i4l/pcbit/Makefile
Removing drivers/staging/i4l/pcbit/Kconfig
Removing drivers/staging/i4l/icn/icn.h
Removing drivers/staging/i4l/icn/icn.c
Removing drivers/staging/i4l/icn/Makefile
Removing drivers/staging/i4l/icn/Kconfig
Removing drivers/staging/i4l/act2000/module.c
Removing drivers/staging/i4l/act2000/capi.h
Removing drivers/staging/i4l/act2000/capi.c
Removing drivers/staging/i4l/act2000/act2000_isa.h
Removing drivers/staging/i4l/act2000/act2000_isa.c
Removing drivers/staging/i4l/act2000/act2000.h
Removing drivers/staging/i4l/act2000/Makefile
Removing drivers/staging/i4l/act2000/Kconfig
Removing drivers/staging/i4l/TODO
Removing drivers/staging/i4l/Makefile
Removing drivers/staging/i4l/Kconfig
Removing drivers/staging/i4l/Documentation/README.sc
Removing drivers/staging/i4l/Documentation/README.pcbit
Removing drivers/staging/i4l/Documentation/README.icn
Removing drivers/staging/i4l/Documentation/README.act2000
Removing drivers/staging/greybus/timesync_platform.c
Removing drivers/staging/greybus/timesync.h
Removing drivers/staging/greybus/timesync.c
Merge made by the 'recursive' strategy.
 drivers/staging/Kconfig                            |    2 -
 drivers/staging/Makefile                           |    1 -
 drivers/staging/android/ion/ion_cma_heap.c         |    6 +-
 drivers/staging/comedi/comedi_compat32.h           |    3 +-
 drivers/staging/comedi/comedi_fops.c               |   10 +-
 drivers/staging/comedi/comedi_internal.h           |    9 +-
 drivers/staging/comedi/comedi_pci.h                |   18 +-
 drivers/staging/comedi/comedi_pcmcia.c             |    3 +-
 drivers/staging/comedi/comedi_pcmcia.h             |   22 +-
 drivers/staging/comedi/comedi_usb.h                |   16 +-
 drivers/staging/comedi/comedidev.h                 |   55 +-
 drivers/staging/comedi/drivers/addi_watchdog.h     |    2 +-
 drivers/staging/comedi/drivers/cb_pcidas64.c       |  140 +-
 drivers/staging/comedi/drivers/comedi_8254.h       |   30 +-
 drivers/staging/comedi/drivers/comedi_isadma.h     |   10 +-
 drivers/staging/comedi/drivers/daqboard2000.c      |  401 ++---
 drivers/staging/comedi/drivers/mite.h              |   37 +-
 drivers/staging/comedi/drivers/ni_670x.c           |    2 +-
 drivers/staging/comedi/drivers/ni_at_ao.c          |   62 +-
 drivers/staging/comedi/drivers/ni_labpc.h          |    4 +-
 drivers/staging/comedi/drivers/ni_tio.h            |   42 +-
 drivers/staging/comedi/drivers/ni_tio_internal.h   |   14 +-
 drivers/staging/comedi/proc.c                      |    6 +-
 drivers/staging/dgnc/TODO                          |    3 +-
 drivers/staging/emxx_udc/emxx_udc.c                |   30 +-
 drivers/staging/fbtft/fb_agm1264k-fl.c             |   18 +-
 drivers/staging/gdm724x/gdm_endian.c               |   24 +-
 drivers/staging/gdm724x/gdm_endian.h               |   15 +-
 drivers/staging/gdm724x/gdm_lte.c                  |   27 +-
 drivers/staging/gdm724x/hci_packet.h               |   46 +-
 drivers/staging/greybus/Makefile                   |    4 +-
 drivers/staging/greybus/arche-apb-ctrl.c           |    4 +-
 drivers/staging/greybus/arche_platform.h           |    2 -
 drivers/staging/greybus/audio_topology.c           |    2 +-
 drivers/staging/greybus/connection.c               |    6 +
 drivers/staging/greybus/control.c                  |   50 -
 drivers/staging/greybus/control.h                  |    7 -
 drivers/staging/greybus/core.c                     |   11 -
 drivers/staging/greybus/es2.c                      |  132 --
 drivers/staging/greybus/greybus.h                  |    1 -
 drivers/staging/greybus/greybus_protocols.h        |   47 -
 drivers/staging/greybus/greybus_trace.h            |   28 -
 drivers/staging/greybus/hd.h                       |    7 -
 drivers/staging/greybus/interface.c                |   56 +-
 drivers/staging/greybus/interface.h                |    5 -
 drivers/staging/greybus/log.c                      |    6 +-
 drivers/staging/greybus/loopback.c                 |   11 +
 drivers/staging/greybus/svc.c                      |   87 -
 drivers/staging/greybus/svc.h                      |    7 -
 drivers/staging/greybus/svc_watchdog.c             |    4 +-
 drivers/staging/greybus/timesync.c                 | 1357 ----------------
 drivers/staging/greybus/timesync.h                 |   45 -
 drivers/staging/greybus/timesync_platform.c        |   82 -
 drivers/staging/i4l/Documentation/README.act2000   |  104 --
 drivers/staging/i4l/Documentation/README.icn       |  148 --
 drivers/staging/i4l/Documentation/README.pcbit     |   40 -
 drivers/staging/i4l/Documentation/README.sc        |  281 ----
 drivers/staging/i4l/Kconfig                        |   13 -
 drivers/staging/i4l/Makefile                       |    5 -
 drivers/staging/i4l/TODO                           |    3 -
 drivers/staging/i4l/act2000/Kconfig                |    9 -
 drivers/staging/i4l/act2000/Makefile               |    9 -
 drivers/staging/i4l/act2000/act2000.h              |  202 ---
 drivers/staging/i4l/act2000/act2000_isa.c          |  444 -----
 drivers/staging/i4l/act2000/act2000_isa.h          |  136 --
 drivers/staging/i4l/act2000/capi.c                 | 1187 --------------
 drivers/staging/i4l/act2000/capi.h                 |  357 ----
 drivers/staging/i4l/act2000/module.c               |  816 ----------
 drivers/staging/i4l/icn/Kconfig                    |   12 -
 drivers/staging/i4l/icn/Makefile                   |    5 -
 drivers/staging/i4l/icn/icn.c                      | 1696 --------------------
 drivers/staging/i4l/icn/icn.h                      |  252 ---
 drivers/staging/i4l/pcbit/Kconfig                  |   10 -
 drivers/staging/i4l/pcbit/Makefile                 |    9 -
 drivers/staging/i4l/pcbit/callbacks.c              |  345 ----
 drivers/staging/i4l/pcbit/callbacks.h              |   44 -
 drivers/staging/i4l/pcbit/capi.c                   |  646 --------
 drivers/staging/i4l/pcbit/capi.h                   |   81 -
 drivers/staging/i4l/pcbit/drv.c                    | 1070 ------------
 drivers/staging/i4l/pcbit/edss1.c                  |  310 ----
 drivers/staging/i4l/pcbit/edss1.h                  |   99 --
 drivers/staging/i4l/pcbit/layer2.c                 |  710 --------
 drivers/staging/i4l/pcbit/layer2.h                 |  281 ----
 drivers/staging/i4l/pcbit/module.c                 |  125 --
 drivers/staging/i4l/pcbit/pcbit.h                  |  177 --
 drivers/staging/iio/addac/adt7316-i2c.c            |    2 +-
 drivers/staging/ks7010/ks7010_sdio.h               |    4 +-
 drivers/staging/lustre/lnet/selftest/brw_test.c    |    2 +-
 drivers/staging/lustre/lustre/include/lu_object.h  |    3 +
 .../lustre/lustre/include/lustre/lustre_idl.h      |   46 -
 .../staging/lustre/lustre/include/lustre_obdo.h    |   54 +
 drivers/staging/lustre/lustre/include/obd.h        |    5 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_flock.c    |    2 +-
 drivers/staging/lustre/lustre/ldlm/ldlm_lock.c     |    5 +-
 drivers/staging/lustre/lustre/llite/file.c         |    2 +-
 drivers/staging/lustre/lustre/llite/lproc_llite.c  |   27 +-
 drivers/staging/lustre/lustre/llite/vvp_internal.h |    2 -
 drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   58 +-
 drivers/staging/lustre/lustre/lov/lov_pack.c       |    3 +-
 drivers/staging/lustre/lustre/obdclass/cl_io.c     |    4 +-
 drivers/staging/lustre/lustre/obdclass/cl_object.c |    3 +-
 drivers/staging/lustre/lustre/obdclass/obdo.c      |   54 +
 drivers/staging/lustre/lustre/osc/osc_cache.c      |   30 +-
 .../staging/lustre/lustre/osc/osc_cl_internal.h    |   11 +-
 drivers/staging/lustre/lustre/osc/osc_internal.h   |    4 +
 drivers/staging/lustre/lustre/osc/osc_io.c         |   62 +-
 drivers/staging/lustre/lustre/osc/osc_object.c     |   19 +
 drivers/staging/lustre/lustre/osc/osc_request.c    |   45 +-
 drivers/staging/lustre/lustre/ptlrpc/nrs.c         |    3 -
 .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h |    3 +
 drivers/staging/most/hdm-usb/hdm_usb.c             |    2 +-
 drivers/staging/nvec/nvec_power.c                  |    2 +-
 drivers/staging/olpc_dcon/olpc_dcon.c              |   14 +-
 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |    4 +-
 drivers/staging/rtl8188eu/core/rtw_ap.c            |  144 +-
 drivers/staging/rtl8188eu/core/rtw_cmd.c           |    3 -
 drivers/staging/rtl8188eu/core/rtw_efuse.c         |    8 +-
 drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |    5 +-
 drivers/staging/rtl8188eu/core/rtw_ioctl_set.c     |    5 -
 drivers/staging/rtl8188eu/core/rtw_led.c           |    1 +
 drivers/staging/rtl8188eu/core/rtw_mlme.c          |    3 +
 drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   43 +-
 drivers/staging/rtl8188eu/core/rtw_pwrctrl.c       |    5 +-
 drivers/staging/rtl8188eu/core/rtw_recv.c          |  135 +-
 drivers/staging/rtl8188eu/core/rtw_security.c      |   18 +
 drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |    1 +
 drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |    3 +
 drivers/staging/rtl8188eu/core/rtw_xmit.c          |    5 +-
 drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c     |    2 +-
 drivers/staging/rtl8188eu/include/drv_types.h      |    1 -
 drivers/staging/rtl8188eu/include/osdep_service.h  |    7 -
 drivers/staging/rtl8188eu/include/rtw_debug.h      |    2 +-
 drivers/staging/rtl8188eu/include/rtw_mlme.h       |    8 -
 drivers/staging/rtl8188eu/include/rtw_recv.h       |    2 -
 drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |   15 +-
 drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    2 -
 drivers/staging/rtl8188eu/os_dep/osdep_service.c   |   14 +-
 drivers/staging/rtl8188eu/os_dep/rtw_android.c     |    1 +
 drivers/staging/rtl8188eu/os_dep/usb_intf.c        |    1 +
 drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c   |   19 +-
 drivers/staging/rtl8192u/r819xU_cmdpkt.c           |   31 +-
 drivers/staging/rtl8712/hal_init.c                 |   12 +-
 drivers/staging/rtl8712/ieee80211.c                |   18 +-
 drivers/staging/rtl8712/mlme_linux.c               |    6 +-
 drivers/staging/rtl8712/rtl8712_cmd.c              |    7 +-
 drivers/staging/rtl8712/rtl8712_event.h            |    2 +-
 drivers/staging/rtl8712/rtl8712_recv.c             |   10 +-
 drivers/staging/rtl8712/rtl8712_recv.h             |   28 +-
 drivers/staging/rtl8712/rtl8712_xmit.h             |   16 +-
 drivers/staging/rtl8712/rtl871x_cmd.h              |    6 +-
 drivers/staging/rtl8712/rtl871x_event.h            |    2 +-
 drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    2 +-
 drivers/staging/rtl8712/rtl871x_mlme.c             |   15 +-
 drivers/staging/rtl8712/rtl871x_recv.c             |    2 +-
 drivers/staging/rtl8712/rtl871x_security.c         |   16 +-
 drivers/staging/rtl8712/usb_ops.c                  |   18 +-
 drivers/staging/rtl8712/usb_ops_linux.c            |    5 +-
 drivers/staging/rtl8712/wifi.h                     |    4 +-
 drivers/staging/rtl8712/wlan_bssdef.h              |    2 +-
 drivers/staging/skein/skein_base.c                 |   16 +-
 drivers/staging/sm750fb/ddk750_chip.c              |    6 +-
 drivers/staging/sm750fb/sm750.c                    |    7 +-
 drivers/staging/speakup/kobjects.c                 |   54 +-
 drivers/staging/unisys/include/channel.h           |  134 +-
 drivers/staging/unisys/visorbus/controlvmchannel.h |   87 +-
 drivers/staging/unisys/visorbus/visorbus_main.c    |   48 +-
 drivers/staging/unisys/visorbus/visorchipset.c     |  234 ++-
 drivers/staging/unisys/visorhba/visorhba_main.c    |    4 -
 drivers/staging/unisys/visornic/visornic_main.c    |   11 +-
 .../vc04_services/interface/vchiq_arm/vchiq_2835.h |   42 -
 .../interface/vchiq_arm/vchiq_2835_arm.c           |   49 +-
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |   68 +-
 .../vc04_services/interface/vchiq_arm/vchiq_arm.h  |    2 +-
 .../vc04_services/interface/vchiq_arm/vchiq_core.c |   70 +-
 .../interface/vchiq_arm/vchiq_kern_lib.c           |   14 +-
 .../vc04_services/interface/vchiq_arm/vchiq_shim.c |   24 +-
 .../vc04_services/interface/vchiq_arm/vchiq_util.c |    9 +-
 drivers/staging/vt6656/int.c                       |    2 +-
 drivers/staging/vt6656/key.c                       |   14 +-
 drivers/staging/vt6656/mac.c                       |   42 +-
 drivers/staging/vt6656/main_usb.c                  |   63 +-
 drivers/staging/vt6656/wcmd.h                      |    4 +-
 drivers/staging/wilc1000/linux_wlan.c              |    2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |   19 +-
 drivers/staging/wlan-ng/prism2mib.c                |    2 -
 drivers/staging/xgifb/vb_init.c                    |    3 +-
 186 files changed, 1609 insertions(+), 13196 deletions(-)
 delete mode 100644 drivers/staging/greybus/timesync.c
 delete mode 100644 drivers/staging/greybus/timesync.h
 delete mode 100644 drivers/staging/greybus/timesync_platform.c
 delete mode 100644 drivers/staging/i4l/Documentation/README.act2000
 delete mode 100644 drivers/staging/i4l/Documentation/README.icn
 delete mode 100644 drivers/staging/i4l/Documentation/README.pcbit
 delete mode 100644 drivers/staging/i4l/Documentation/README.sc
 delete mode 100644 drivers/staging/i4l/Kconfig
 delete mode 100644 drivers/staging/i4l/Makefile
 delete mode 100644 drivers/staging/i4l/TODO
 delete mode 100644 drivers/staging/i4l/act2000/Kconfig
 delete mode 100644 drivers/staging/i4l/act2000/Makefile
 delete mode 100644 drivers/staging/i4l/act2000/act2000.h
 delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.c
 delete mode 100644 drivers/staging/i4l/act2000/act2000_isa.h
 delete mode 100644 drivers/staging/i4l/act2000/capi.c
 delete mode 100644 drivers/staging/i4l/act2000/capi.h
 delete mode 100644 drivers/staging/i4l/act2000/module.c
 delete mode 100644 drivers/staging/i4l/icn/Kconfig
 delete mode 100644 drivers/staging/i4l/icn/Makefile
 delete mode 100644 drivers/staging/i4l/icn/icn.c
 delete mode 100644 drivers/staging/i4l/icn/icn.h
 delete mode 100644 drivers/staging/i4l/pcbit/Kconfig
 delete mode 100644 drivers/staging/i4l/pcbit/Makefile
 delete mode 100644 drivers/staging/i4l/pcbit/callbacks.c
 delete mode 100644 drivers/staging/i4l/pcbit/callbacks.h
 delete mode 100644 drivers/staging/i4l/pcbit/capi.c
 delete mode 100644 drivers/staging/i4l/pcbit/capi.h
 delete mode 100644 drivers/staging/i4l/pcbit/drv.c
 delete mode 100644 drivers/staging/i4l/pcbit/edss1.c
 delete mode 100644 drivers/staging/i4l/pcbit/edss1.h
 delete mode 100644 drivers/staging/i4l/pcbit/layer2.c
 delete mode 100644 drivers/staging/i4l/pcbit/layer2.h
 delete mode 100644 drivers/staging/i4l/pcbit/module.c
 delete mode 100644 drivers/staging/i4l/pcbit/pcbit.h
 create mode 100644 drivers/staging/lustre/lustre/include/lustre_obdo.h
 delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h
Merging char-misc/char-misc-next (b0f2d7d546d3 VME: Remove node entry from vme_driver)
$ git merge char-misc/char-misc-next
Auto-merging include/linux/miscdevice.h
Merge made by the 'recursive' strategy.
 drivers/char/Kconfig              |  5 +++-
 drivers/char/apm-emulation.c      |  7 -----
 drivers/char/ds1302.c             |  1 -
 drivers/char/mmtimer.c            |  6 ++--
 drivers/hv/channel.c              | 35 +++++++++++++++++------
 drivers/hv/channel_mgmt.c         | 35 ++++++++++++++++++++---
 drivers/hv/connection.c           | 17 +++++++----
 drivers/hv/hv.c                   | 59 +++++++++++++++++++++++++++++----------
 drivers/hv/hv_fcopy.c             |  4 +++
 drivers/hv/hv_kvp.c               |  4 +++
 drivers/hv/hv_snapshot.c          |  4 +++
 drivers/hv/hyperv_vmbus.h         |  6 ++--
 drivers/hv/ring_buffer.c          |  7 +++++
 drivers/hv/vmbus_drv.c            | 28 ++++++++++---------
 drivers/misc/genwqe/card_base.c   |  1 -
 drivers/misc/mic/vop/vop_vringh.c |  1 -
 drivers/misc/sram.c               |  4 ++-
 include/linux/hyperv.h            |  1 +
 include/linux/miscdevice.h        |  1 +
 include/linux/vme.h               |  1 -
 20 files changed, 164 insertions(+), 63 deletions(-)
Merging extcon/extcon-next (86d6cda68f37 extcon: Modify the name of EXTCON_USB_HOST connector)
$ git merge extcon/extcon-next
Auto-merging drivers/extcon/extcon.c
Merge made by the 'recursive' strategy.
 Documentation/extcon/intel-int3496.txt |  22 ++++
 drivers/extcon/Kconfig                 |  10 ++
 drivers/extcon/Makefile                |   1 +
 drivers/extcon/devres.c                |   2 +-
 drivers/extcon/extcon-adc-jack.c       |   2 +-
 drivers/extcon/extcon-arizona.c        |  20 ++--
 drivers/extcon/extcon-axp288.c         | 110 ++++++++------------
 drivers/extcon/extcon-intel-int3496.c  | 179 +++++++++++++++++++++++++++++++++
 drivers/extcon/extcon-max14577.c       |   6 +-
 drivers/extcon/extcon-max77693.c       |  12 ++-
 drivers/extcon/extcon-max77843.c       |  24 +++--
 drivers/extcon/extcon-palmas.c         |   5 +
 drivers/extcon/extcon-rt8973a.c        |   6 +-
 drivers/extcon/extcon-sm5502.c         |   6 +-
 drivers/extcon/extcon-usb-gpio.c       |   7 ++
 drivers/extcon/extcon.c                |  43 +++-----
 drivers/extcon/extcon.h                |  62 ++++++++++++
 include/linux/extcon.h                 |  71 +++----------
 include/linux/extcon/extcon-adc-jack.h |   2 +-
 19 files changed, 406 insertions(+), 184 deletions(-)
 create mode 100644 Documentation/extcon/intel-int3496.txt
 create mode 100644 drivers/extcon/extcon-intel-int3496.c
 create mode 100644 drivers/extcon/extcon.h
Merging slave-dma/next (ad48bedb7b3f Merge branch 'topic/ste' into next)
$ git merge slave-dma/next
Auto-merging drivers/dma/zx_dma.c
Merge made by the 'recursive' strategy.
 Documentation/ABI/testing/sysfs-platform-hidma     |  2 +-
 .../ABI/testing/sysfs-platform-hidma-mgmt          | 20 ++---
 .../devicetree/bindings/dma/stm32-dma.txt          |  5 +-
 drivers/dma/Kconfig                                |  6 +-
 drivers/dma/Makefile                               |  2 +-
 drivers/dma/dmaengine.c                            | 21 +++---
 drivers/dma/dw/pci.c                               |  3 +-
 drivers/dma/ipu/ipu_irq.c                          |  2 +-
 drivers/dma/ste_dma40.c                            |  7 +-
 drivers/dma/stm32-dma.c                            | 88 +++++++++++++++-------
 drivers/dma/{zx296702_dma.c => zx_dma.c}           |  4 +-
 11 files changed, 97 insertions(+), 63 deletions(-)
 rename drivers/dma/{zx296702_dma.c => zx_dma.c} (99%)
Merging cgroup/for-next (e055b0e58d99 Merge branch 'for-4.11' into for-next)
$ git merge cgroup/for-next
Auto-merging kernel/cgroup/cgroup.c
Auto-merging init/Kconfig
Auto-merging include/rdma/ib_verbs.h
Auto-merging drivers/infiniband/core/uverbs_cmd.c
Merge made by the 'recursive' strategy.
 Documentation/cgroup-v1/rdma.txt              |  109 ++
 Documentation/cgroup-v2.txt                   |   79 +
 drivers/infiniband/core/Makefile              |    1 +
 drivers/infiniband/core/cgroup.c              |   62 +
 drivers/infiniband/core/core_priv.h           |   30 +
 drivers/infiniband/core/device.c              |   10 +
 drivers/infiniband/core/uverbs_cmd.c          |  102 +-
 drivers/infiniband/core/uverbs_main.c         |   20 +
 fs/kernfs/dir.c                               |    2 +-
 fs/kernfs/file.c                              |   53 +-
 fs/kernfs/kernfs-internal.h                   |    2 +-
 include/linux/cgroup-defs.h                   |   57 +-
 include/linux/cgroup.h                        |    2 +-
 include/linux/cgroup_rdma.h                   |   53 +
 include/linux/cgroup_subsys.h                 |    4 +
 include/linux/kernfs.h                        |   12 +-
 include/rdma/ib_verbs.h                       |   14 +
 init/Kconfig                                  |   10 +
 kernel/Makefile                               |    5 +-
 kernel/cgroup/Makefile                        |    6 +
 kernel/cgroup/cgroup-internal.h               |  214 +++
 kernel/cgroup/cgroup-v1.c                     | 1395 ++++++++++++++++
 kernel/{ => cgroup}/cgroup.c                  | 2131 ++++---------------------
 kernel/{ => cgroup}/cpuset.c                  |    0
 kernel/{cgroup_freezer.c => cgroup/freezer.c} |    0
 kernel/cgroup/namespace.c                     |  155 ++
 kernel/{cgroup_pids.c => cgroup/pids.c}       |    0
 kernel/cgroup/rdma.c                          |  619 +++++++
 28 files changed, 3239 insertions(+), 1908 deletions(-)
 create mode 100644 Documentation/cgroup-v1/rdma.txt
 create mode 100644 drivers/infiniband/core/cgroup.c
 create mode 100644 include/linux/cgroup_rdma.h
 create mode 100644 kernel/cgroup/Makefile
 create mode 100644 kernel/cgroup/cgroup-internal.h
 create mode 100644 kernel/cgroup/cgroup-v1.c
 rename kernel/{ => cgroup}/cgroup.c (72%)
 rename kernel/{ => cgroup}/cpuset.c (100%)
 rename kernel/{cgroup_freezer.c => cgroup/freezer.c} (100%)
 create mode 100644 kernel/cgroup/namespace.c
 rename kernel/{cgroup_pids.c => cgroup/pids.c} (100%)
 create mode 100644 kernel/cgroup/rdma.c
Merging scsi/for-next (20101c99824d Merge branch 'misc' into for-next)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
 drivers/block/cciss.h                       |  30 +-
 drivers/message/fusion/mptlan.h             |   1 -
 drivers/scsi/be2iscsi/be.h                  |   3 -
 drivers/scsi/be2iscsi/be_cmds.c             |  41 +-
 drivers/scsi/be2iscsi/be_cmds.h             |  17 +-
 drivers/scsi/be2iscsi/be_iscsi.c            | 165 +++---
 drivers/scsi/be2iscsi/be_main.c             | 344 +++++------
 drivers/scsi/be2iscsi/be_main.h             |  44 +-
 drivers/scsi/be2iscsi/be_mgmt.c             | 117 ++--
 drivers/scsi/be2iscsi/be_mgmt.h             |  98 +---
 drivers/scsi/bfa/bfa_fcs.c                  | 181 ++----
 drivers/scsi/bfa/bfa_fcs.h                  |   4 -
 drivers/scsi/cxlflash/common.h              |  32 +-
 drivers/scsi/cxlflash/lunmgt.c              |  31 +-
 drivers/scsi/cxlflash/main.c                | 465 ++++++++-------
 drivers/scsi/cxlflash/sislite.h             |  19 +-
 drivers/scsi/cxlflash/superpipe.c           | 183 +++---
 drivers/scsi/cxlflash/vlun.c                | 169 +++---
 drivers/scsi/dpt_i2o.c                      |   8 +-
 drivers/scsi/esas2r/esas2r_init.c           |   2 +-
 drivers/scsi/esas2r/esas2r_ioctl.c          |   2 +-
 drivers/scsi/esas2r/esas2r_log.h            |   4 +-
 drivers/scsi/esas2r/esas2r_main.c           |   4 +-
 drivers/scsi/hisi_sas/hisi_sas.h            |   1 +
 drivers/scsi/hisi_sas/hisi_sas_main.c       |   3 +
 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c      |   2 +
 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c      |  26 +-
 drivers/scsi/hpsa.h                         |  40 +-
 drivers/scsi/lpfc/lpfc.h                    |   1 -
 drivers/scsi/lpfc/lpfc_attr.c               |  57 +-
 drivers/scsi/lpfc/lpfc_crtn.h               |   7 +-
 drivers/scsi/lpfc/lpfc_els.c                |   6 +
 drivers/scsi/lpfc/lpfc_hw.h                 |   6 +
 drivers/scsi/lpfc/lpfc_scsi.c               |  18 +-
 drivers/scsi/lpfc/lpfc_sli.c                |  20 +-
 drivers/scsi/lpfc/lpfc_version.h            |   2 +-
 drivers/scsi/lpfc/lpfc_vport.c              |   8 +
 drivers/scsi/megaraid/megaraid_sas.h        | 139 +++--
 drivers/scsi/megaraid/megaraid_sas_base.c   | 240 ++++++--
 drivers/scsi/megaraid/megaraid_sas_fp.c     | 341 +++++++++--
 drivers/scsi/megaraid/megaraid_sas_fusion.c | 746 ++++++++++++++++++++----
 drivers/scsi/megaraid/megaraid_sas_fusion.h | 364 ++++++++++--
 drivers/scsi/pmcraid.c                      |  92 ++-
 drivers/scsi/pmcraid.h                      |   1 -
 drivers/scsi/qedi/qedi_dbg.c                |   9 +-
 drivers/scsi/qla2xxx/qla_attr.c             |  18 +-
 drivers/scsi/qla2xxx/qla_def.h              |   7 +-
 drivers/scsi/qla2xxx/qla_gs.c               |   6 +-
 drivers/scsi/qla2xxx/qla_isr.c              |  98 +---
 drivers/scsi/qla2xxx/qla_os.c               |   2 +-
 drivers/scsi/qla4xxx/ql4_def.h              |   3 -
 drivers/scsi/qla4xxx/ql4_os.c               |   6 +-
 drivers/scsi/storvsc_drv.c                  | 148 ++++-
 drivers/scsi/ufs/ufs-qcom.c                 |   1 +
 drivers/scsi/ufs/ufs.h                      |  12 +
 drivers/scsi/ufs/ufs_quirks.h               |  28 +-
 drivers/scsi/ufs/ufshcd.c                   | 845 +++++++++++++++++++++++++---
 drivers/scsi/ufs/ufshcd.h                   |  77 ++-
 drivers/scsi/ufs/ufshci.h                   |   3 +
 drivers/scsi/vmw_pvscsi.c                   | 104 ++--
 drivers/scsi/vmw_pvscsi.h                   |   5 -
 include/scsi/scsi.h                         |  10 -
 include/trace/events/ufs.h                  | 263 +++++++++
 include/uapi/scsi/cxlflash_ioctl.h          |   1 +
 64 files changed, 4021 insertions(+), 1709 deletions(-)
 create mode 100644 include/trace/events/ufs.h
Merging scsi-mkp/for-next (2c0f83f328fc scsi: qla4xxx: remove two unused MSI-X related #defines)
$ git merge scsi-mkp/for-next
Already up-to-date.
Merging target-updates/for-next (291e3e51a34d target: fix spelling mistake: "limitiation" -> "limitation")
$ git merge target-updates/for-next
Already up-to-date.
Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging target-bva/for-next (7c9d8d0c41b3 ibmvscsis: Fix srp_transfer_data fail return code)
$ git merge target-bva/for-next
Already up-to-date.
Merging libata/for-next (084496c62f5e Merge branch 'for-4.11' into for-next)
$ git merge libata/for-next
Merge made by the 'recursive' strategy.
 drivers/ata/Kconfig           |  19 +++-
 drivers/ata/Makefile          |   1 +
 drivers/ata/ahci_imx.c        | 196 ++++++++++++++++++++++++++++++++++++++
 drivers/ata/ahci_xgene.c      |   6 +-
 drivers/ata/libata-core.c     |  67 +++++++------
 drivers/ata/libata-eh.c       |  44 ++++++---
 drivers/ata/libata-scsi.c     | 217 ++++++++++++++----------------------------
 drivers/ata/libata-sff.c      |  29 +++---
 drivers/ata/libata.h          |   8 --
 drivers/ata/pata_at91.c       |   6 +-
 drivers/ata/pata_bf54x.c      |   7 +-
 drivers/ata/pata_ep93xx.c     |   4 +-
 drivers/ata/pata_falcon.c     | 184 +++++++++++++++++++++++++++++++++++
 drivers/ata/pata_ixp4xx_cf.c  |   4 +-
 drivers/ata/pata_legacy.c     |  15 +--
 drivers/ata/pata_octeon_cf.c  |  12 +--
 drivers/ata/pata_pcmcia.c     |   6 +-
 drivers/ata/pata_samsung_cf.c |   4 +-
 drivers/ata/sata_mv.c         |  12 +--
 drivers/ata/sata_rcar.c       |   4 +-
 include/linux/libata.h        |   8 +-
 21 files changed, 602 insertions(+), 251 deletions(-)
 create mode 100644 drivers/ata/pata_falcon.c
Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation)
$ git merge binfmt_misc/for-next
Already up-to-date.
Merging vhost/linux-next (6bdf1e0efb04 Makefile: drop -D__CHECK_ENDIAN__ from cflags)
$ git merge vhost/linux-next
Already up-to-date.
Merging rpmsg/for-next (b3fe73f333cf Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
$ git merge rpmsg/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/remoteproc/qcom,q6v5.txt   |   4 +-
 drivers/remoteproc/Kconfig                         |   7 +-
 drivers/remoteproc/da8xx_remoteproc.c              |   2 +-
 drivers/remoteproc/omap_remoteproc.c               |   2 +-
 drivers/remoteproc/qcom_q6v5_pil.c                 | 383 ++++++++++++++++-----
 drivers/remoteproc/st_remoteproc.c                 |   2 +-
 drivers/remoteproc/st_slim_rproc.c                 |   2 +-
 drivers/remoteproc/wkup_m3_rproc.c                 |   2 +-
 8 files changed, 307 insertions(+), 97 deletions(-)
Merging gpio/for-next (bb272e8f306a Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/gpio/gpio-pca953x.txt      |  4 ++
 Documentation/devicetree/bindings/gpio/gpio.txt    |  8 +--
 drivers/gpio/devres.c                              | 11 ++--
 drivers/gpio/gpio-davinci.c                        |  3 -
 drivers/gpio/gpio-mm-lantiq.c                      |  2 +-
 drivers/gpio/gpio-mockup.c                         | 23 +++----
 drivers/gpio/gpio-mvebu.c                          |  2 +-
 drivers/gpio/gpio-pca953x.c                        |  9 +++
 drivers/gpio/gpio-rcar.c                           | 21 +++++--
 drivers/gpio/gpio-stp-xway.c                       |  2 +-
 drivers/gpio/gpiolib-acpi.c                        |  5 +-
 drivers/gpio/gpiolib-of.c                          | 31 ++++++----
 drivers/gpio/gpiolib.c                             | 40 +++++--------
 drivers/gpio/gpiolib.h                             |  3 +-
 include/linux/gpio/driver.h                        | 70 +++++++++++++++-------
 include/linux/platform_data/gpio-davinci.h         |  3 -
 tools/gpio/.gitignore                              |  4 ++
 17 files changed, 149 insertions(+), 92 deletions(-)
 create mode 100644 tools/gpio/.gitignore
Merging pinctrl/for-next (83b7a967ce87 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Auto-merging drivers/pinctrl/sunxi/pinctrl-sun5i.c
Removing drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
Removing drivers/pinctrl/sunxi/pinctrl-gr8.c
Merge made by the 'recursive' strategy.
 .../bindings/pinctrl/fsl,imx7d-pinctrl.txt         |    2 +-
 .../bindings/pinctrl/marvell,kirkwood-pinctrl.txt  |   20 +-
 .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt |  131 +-
 .../devicetree/bindings/pinctrl/ti,iodelay.txt     |   47 +
 drivers/pinctrl/Kconfig                            |   12 +-
 drivers/pinctrl/Makefile                           |    1 +
 drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c         | 1115 +++++++++++++-
 drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c         | 1524 +++++++++++++++++++-
 drivers/pinctrl/aspeed/pinctrl-aspeed.c            |  165 ++-
 drivers/pinctrl/aspeed/pinctrl-aspeed.h            |   33 +-
 drivers/pinctrl/core.c                             |  323 ++++-
 drivers/pinctrl/core.h                             |   57 +
 drivers/pinctrl/devicetree.c                       |   31 +-
 drivers/pinctrl/devicetree.h                       |   12 +-
 drivers/pinctrl/freescale/Kconfig                  |    3 +-
 drivers/pinctrl/freescale/pinctrl-imx.c            |  294 ++--
 drivers/pinctrl/freescale/pinctrl-imx.h            |   34 +-
 drivers/pinctrl/intel/pinctrl-baytrail.c           |   45 +-
 drivers/pinctrl/intel/pinctrl-broxton.c            |    3 +-
 drivers/pinctrl/intel/pinctrl-intel.c              |   53 +-
 drivers/pinctrl/intel/pinctrl-intel.h              |    2 -
 drivers/pinctrl/intel/pinctrl-sunrisepoint.c       |    1 -
 drivers/pinctrl/mediatek/pinctrl-mt7623.c          |    2 +-
 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h      |    2 +-
 drivers/pinctrl/pinctrl-amd.c                      |   38 +-
 drivers/pinctrl/pinctrl-amd.h                      |    8 +-
 drivers/pinctrl/pinctrl-da850-pupd.c               |    1 +
 drivers/pinctrl/pinctrl-falcon.c                   |    2 +-
 drivers/pinctrl/pinctrl-lantiq.c                   |    2 +-
 drivers/pinctrl/pinctrl-lantiq.h                   |    2 +-
 drivers/pinctrl/pinctrl-single.c                   |  292 +---
 drivers/pinctrl/pinctrl-xway.c                     |    2 +-
 drivers/pinctrl/pinmux.c                           |  216 ++-
 drivers/pinctrl/pinmux.h                           |   56 +
 drivers/pinctrl/qcom/pinctrl-msm8660.c             |    6 +-
 drivers/pinctrl/sirf/pinctrl-atlas7.c              |   13 +-
 drivers/pinctrl/stm32/pinctrl-stm32.c              |    1 +
 drivers/pinctrl/sunxi/Kconfig                      |   14 +-
 drivers/pinctrl/sunxi/Makefile                     |    5 +-
 drivers/pinctrl/sunxi/pinctrl-gr8.c                |  536 -------
 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c          |  403 ------
 .../{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c}      |  201 ++-
 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c          |  321 +++++
 drivers/pinctrl/sunxi/pinctrl-sunxi.c              |   77 +-
 drivers/pinctrl/sunxi/pinctrl-sunxi.h              |   30 +-
 drivers/pinctrl/ti/Kconfig                         |   10 +
 drivers/pinctrl/ti/Makefile                        |    1 +
 drivers/pinctrl/ti/pinctrl-ti-iodelay.c            |  944 ++++++++++++
 48 files changed, 5282 insertions(+), 1811 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,iodelay.txt
 delete mode 100644 drivers/pinctrl/sunxi/pinctrl-gr8.c
 delete mode 100644 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
 rename drivers/pinctrl/sunxi/{pinctrl-sun5i-a10s.c => pinctrl-sun5i.c} (83%)
 create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
 create mode 100644 drivers/pinctrl/ti/Kconfig
 create mode 100644 drivers/pinctrl/ti/Makefile
 create mode 100644 drivers/pinctrl/ti/pinctrl-ti-iodelay.c
Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (0caf7752a2d0 Merge branch 'for-4.11/core' into for-next)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
 drivers/leds/leds-pwm.c       | 16 +++-------------
 drivers/pwm/core.c            | 12 ------------
 drivers/pwm/pwm-atmel-hlcdc.c |  1 -
 drivers/pwm/pwm-atmel.c       |  1 -
 drivers/pwm/pwm-bcm-kona.c    |  1 -
 drivers/pwm/pwm-berlin.c      |  1 -
 drivers/pwm/pwm-brcmstb.c     |  1 -
 drivers/pwm/pwm-fsl-ftm.c     |  1 -
 drivers/pwm/pwm-imx.c         |  1 -
 drivers/pwm/pwm-lp3943.c      |  1 -
 drivers/pwm/pwm-mxs.c         |  2 +-
 drivers/pwm/pwm-pca9685.c     |  1 -
 drivers/pwm/pwm-sti.c         |  1 -
 drivers/pwm/pwm-sun4i.c       |  1 -
 drivers/pwm/pwm-twl-led.c     |  1 -
 drivers/pwm/pwm-twl.c         |  1 -
 drivers/staging/greybus/pwm.c |  1 -
 include/linux/pwm.h           | 10 ----------
 18 files changed, 4 insertions(+), 50 deletions(-)
Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files)
$ git merge dma-buf/for-next
Resolved 'drivers/dma-buf/Kconfig' using previous resolution.
Auto-merging drivers/dma-buf/Kconfig
CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master ea67d73827ec] Merge remote-tracking branch 'dma-buf/for-next'
$ git diff -M --stat --summary HEAD^..
 MAINTAINERS | 11 +++++++++++
 1 file changed, 11 insertions(+)
Merging userns/for-next (93362fa47fe9 sysctl: Drop reference added by grab_header in proc_sys_readdir)
$ git merge userns/for-next
Merge made by the 'recursive' strategy.
 fs/dcache.c            |  7 ++++--
 fs/libfs.c             |  3 ++-
 fs/namespace.c         | 64 +++++++++++++++++++++++++++++++++++---------------
 fs/proc/proc_sysctl.c  |  3 ++-
 kernel/pid_namespace.c | 10 ++++----
 5 files changed, 60 insertions(+), 27 deletions(-)
Merging ktest/for-next (2dcd0af568b0 Linux 4.6)
$ git merge ktest/for-next
Already up-to-date.
Merging random/dev (59b8d4f1f5d2 random: use for_each_online_node() to iterate over NUMA nodes)
$ git merge random/dev
Already up-to-date.
Merging aio/master (b562e44f507e Linux 4.5)
$ git merge aio/master
Already up-to-date.
Merging kselftest/next (3e91293ffcca selftests: x86 protection_keys remove dead code)
$ git merge kselftest/next
Auto-merging tools/testing/selftests/x86/protection_keys.c
Auto-merging tools/testing/selftests/x86/Makefile
Auto-merging tools/testing/selftests/Makefile
Merge made by the 'recursive' strategy.
 Documentation/kselftest.txt                        | 12 +++++++
 tools/testing/selftests/Makefile                   | 36 ++++++++++++++-----
 tools/testing/selftests/bpf/Makefile               | 10 ++----
 tools/testing/selftests/breakpoints/Makefile       | 10 ++----
 tools/testing/selftests/capabilities/Makefile      | 11 ++----
 tools/testing/selftests/efivarfs/Makefile          |  8 +----
 tools/testing/selftests/exec/Makefile              | 32 ++++++++---------
 tools/testing/selftests/ftrace/Makefile            |  6 ++--
 tools/testing/selftests/futex/Makefile             | 21 ++++++++---
 tools/testing/selftests/futex/functional/Makefile  | 12 ++-----
 tools/testing/selftests/gpio/.gitignore            |  1 +
 tools/testing/selftests/ipc/.gitignore             |  1 +
 tools/testing/selftests/ipc/Makefile               |  7 +---
 tools/testing/selftests/kcmp/Makefile              |  6 ++--
 tools/testing/selftests/lib.mk                     | 36 +++++++++++++++----
 tools/testing/selftests/membarrier/Makefile        |  6 +---
 tools/testing/selftests/memfd/Makefile             | 15 ++------
 tools/testing/selftests/mount/Makefile             |  7 +---
 tools/testing/selftests/mqueue/Makefile            |  6 +---
 tools/testing/selftests/net/Makefile               | 15 +++-----
 tools/testing/selftests/nsfs/Makefile              |  9 +----
 tools/testing/selftests/powerpc/Makefile           | 15 ++++----
 tools/testing/selftests/powerpc/alignment/Makefile |  9 ++---
 .../testing/selftests/powerpc/benchmarks/Makefile  | 15 +++-----
 .../selftests/powerpc/context_switch/Makefile      |  9 ++---
 tools/testing/selftests/powerpc/copyloops/Makefile | 19 ++++------
 tools/testing/selftests/powerpc/dscr/Makefile      | 13 +++----
 tools/testing/selftests/powerpc/math/Makefile      | 25 ++++++-------
 tools/testing/selftests/powerpc/mm/Makefile        | 18 ++++------
 tools/testing/selftests/powerpc/pmu/Makefile       | 26 +++++++-------
 tools/testing/selftests/powerpc/pmu/ebb/Makefile   | 15 +++-----
 .../testing/selftests/powerpc/primitives/Makefile  |  9 ++---
 .../testing/selftests/powerpc/stringloops/Makefile |  9 ++---
 .../selftests/powerpc/switch_endian/Makefile       | 17 ++++-----
 tools/testing/selftests/powerpc/syscalls/Makefile  |  9 ++---
 tools/testing/selftests/powerpc/tm/Makefile        | 17 ++++-----
 tools/testing/selftests/powerpc/vphn/Makefile      | 10 ++----
 tools/testing/selftests/pstore/Makefile            |  4 +--
 tools/testing/selftests/ptrace/Makefile            |  8 +----
 tools/testing/selftests/seccomp/Makefile           |  6 +---
 tools/testing/selftests/sigaltstack/Makefile       |  5 +--
 tools/testing/selftests/size/Makefile              | 10 ++----
 tools/testing/selftests/timers/Makefile            | 10 ++----
 tools/testing/selftests/vm/Makefile                | 41 +++++++++-------------
 tools/testing/selftests/x86/Makefile               | 17 +++++----
 tools/testing/selftests/x86/protection_keys.c      | 15 --------
 tools/testing/selftests/zram/Makefile              |  3 +-
 47 files changed, 249 insertions(+), 372 deletions(-)
 create mode 100644 tools/testing/selftests/gpio/.gitignore
Merging y2038/y2038 (69973b830859 Linux 4.9)
$ git merge y2038/y2038
Already up-to-date.
Merging luto-misc/next (2dcd0af568b0 Linux 4.6)
$ git merge luto-misc/next
Already up-to-date.
Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge borntraeger/linux-next
Already up-to-date.
Merging livepatching/for-next (372e2db7210d livepatch: doc: remove the limitation for schedule() patching)
$ git merge livepatching/for-next
Merge made by the 'recursive' strategy.
 Documentation/livepatch/livepatch.txt | 19 -------------------
 arch/powerpc/include/asm/livepatch.h  |  7 -------
 2 files changed, 26 deletions(-)
Merging coresight/next (7f12a0d4a674 coresight: STM: Balance enable/disable)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
 drivers/hwtracing/coresight/coresight-etm-perf.c |  1 +
 drivers/hwtracing/coresight/coresight-etm4x.c    | 10 +++++++---
 drivers/hwtracing/coresight/coresight-etm4x.h    |  1 +
 drivers/hwtracing/coresight/coresight-stm.c      |  2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
Merging rtc/rtc-next (45e21c4c3e6b rtc: tegra: Implement clock handling)
$ git merge rtc/rtc-next
Merge made by the 'recursive' strategy.
 .../devicetree/bindings/rtc/imxdi-rtc.txt          |   5 +-
 .../devicetree/bindings/rtc/st,stm32-rtc.txt       |  27 +
 drivers/rtc/Kconfig                                |  11 +
 drivers/rtc/Makefile                               |   1 +
 drivers/rtc/rtc-armada38x.c                        | 141 +++-
 drivers/rtc/rtc-au1xxx.c                           |   2 +-
 drivers/rtc/rtc-bfin.c                             |   2 +-
 drivers/rtc/rtc-dm355evm.c                         |   2 +-
 drivers/rtc/rtc-imxdi.c                            |  33 +-
 drivers/rtc/rtc-ls1x.c                             |   2 +-
 drivers/rtc/rtc-mcp795.c                           | 183 +++++-
 drivers/rtc/rtc-mxc.c                              |   2 +-
 drivers/rtc/rtc-rx8010.c                           |  24 +-
 drivers/rtc/rtc-sh.c                               |   2 +-
 drivers/rtc/rtc-stm32.c                            | 725 +++++++++++++++++++++
 drivers/rtc/rtc-tegra.c                            |  41 +-
 drivers/rtc/rtc-tps65910.c                         | 146 ++++-
 include/linux/mfd/tps65910.h                       |   1 +
 18 files changed, 1267 insertions(+), 83 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/st,stm32-rtc.txt
 create mode 100644 drivers/rtc/rtc-stm32.c
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 (1f19b983a887 libnvdimm, namespace: fix pmem namespace leak, delete when size set to zero)
$ git merge nvdimm/libnvdimm-for-next
Merge made by the 'recursive' strategy.
 drivers/nvdimm/namespace_devs.c | 23 ++++++++++-------------
 drivers/nvdimm/pmem.c           |  4 +++-
 2 files changed, 13 insertions(+), 14 deletions(-)
Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection)
$ git merge dax-misc/dax-misc
Already up-to-date.
Merging akpm-current/current (17392e0a2afb ipc/sem: add hysteresis)
$ git merge --no-ff akpm-current/current
Resolved 'tools/testing/selftests/vm/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/vm/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/vm/Makefile
Auto-merging lib/Makefile
Auto-merging lib/Kconfig.debug
Auto-merging lib/Kconfig
Auto-merging include/linux/mm.h
Auto-merging include/linux/kernel.h
Auto-merging fs/proc/base.c
Auto-merging fs/binfmt_elf.c
Removing arch/m32r/include/asm/current.h
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 770327da69e2] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
 .../trace/postprocess/trace-vmscan-postprocess.pl  |  26 +-
 Documentation/vm/transhuge.txt                     |   8 +-
 MAINTAINERS                                        |   5 +-
 arch/arm/include/asm/page.h                        |   2 +
 arch/m32r/include/asm/Kbuild                       |   1 +
 arch/m32r/include/asm/current.h                    |  15 -
 arch/powerpc/include/asm/page.h                    |   4 +-
 arch/x86/kernel/machine_kexec_64.c                 |   1 +
 arch/x86/mm/init_64.c                              |   2 +-
 block/genhd.c                                      |   2 +-
 drivers/base/memory.c                              |   4 +-
 drivers/dax/dax.c                                  |  26 +-
 drivers/memstick/core/memstick.c                   |   2 +-
 drivers/rapidio/devices/rio_mport_cdev.c           |  11 +-
 fs/Kconfig                                         |   1 +
 fs/binfmt_elf.c                                    |  30 +-
 fs/dax.c                                           | 116 +--
 fs/ext2/Kconfig                                    |   1 -
 fs/ext4/Kconfig                                    |   1 -
 fs/ext4/file.c                                     |  13 +-
 fs/nfs/write.c                                     |   2 -
 fs/ocfs2/dlm/dlmmaster.c                           |  66 +-
 fs/proc/base.c                                     | 144 ++--
 fs/proc/generic.c                                  |  11 +-
 fs/userfaultfd.c                                   | 498 +++++++++++-
 fs/xfs/xfs_file.c                                  |  15 +-
 include/linux/dax.h                                |   6 +-
 include/linux/gfp.h                                |   2 +-
 include/linux/huge_mm.h                            |   1 +
 include/linux/hugetlb.h                            |  12 +-
 include/linux/kasan.h                              |   4 +-
 include/linux/kernel.h                             |  10 +-
 include/linux/kexec.h                              |   2 +
 include/linux/memblock.h                           |   1 +
 include/linux/memory_hotplug.h                     |   4 +-
 include/linux/mm.h                                 |  43 +-
 include/linux/mmzone.h                             |   3 +-
 include/linux/nmi.h                                |   1 +
 include/linux/pagemap.h                            |  12 +-
 include/linux/pfn_t.h                              |   6 +
 include/linux/rbtree_augmented.h                   |   4 +-
 include/linux/sem.h                                |   2 +-
 include/linux/shmem_fs.h                           |  11 +
 include/linux/swap.h                               |  37 +-
 include/linux/swap_slots.h                         |  30 +
 include/linux/trace_events.h                       |   4 +
 include/linux/userfaultfd_k.h                      |  42 +
 include/linux/vm_event_item.h                      |   1 +
 include/trace/events/compaction.h                  |  60 +-
 include/trace/events/fs_dax.h                      | 156 ++++
 include/trace/events/mmflags.h                     |  98 +++
 include/trace/events/oom.h                         |  81 ++
 include/trace/events/vmscan.h                      | 150 +++-
 include/trace/trace_events.h                       |  11 +
 include/uapi/asm-generic/ioctl.h                   |  10 +-
 include/uapi/linux/userfaultfd.h                   |  67 +-
 ipc/sem.c                                          | 109 +--
 kernel/configs/android-base.config                 |   2 +
 kernel/configs/android-recommended.config          |   1 +
 kernel/fork.c                                      |  10 +-
 kernel/notifier.c                                  |   2 +-
 kernel/trace/trace_output.c                        |  38 +
 kernel/watchdog.c                                  |   9 +
 kernel/watchdog_hld.c                              |  28 +-
 lib/Kconfig                                        |   6 +-
 lib/Kconfig.debug                                  |  13 +-
 lib/Makefile                                       |   2 +
 lib/atomic64_test.c                                |  10 +-
 lib/crc32.c                                        | 824 --------------------
 lib/crc32test.c                                    | 856 +++++++++++++++++++++
 lib/debugobjects.c                                 |  57 +-
 lib/find_bit.c                                     |   4 +-
 lib/fonts/Kconfig                                  |  16 +-
 lib/glob.c                                         | 164 ----
 lib/globtest.c                                     | 167 ++++
 lib/rbtree.c                                       |   4 +-
 lib/sort.c                                         |  41 +-
 lib/test_kasan.c                                   |  34 +
 lib/timerqueue.c                                   |   3 +-
 mm/Makefile                                        |   2 +-
 mm/bootmem.c                                       |   2 +-
 mm/compaction.c                                    |  29 +-
 mm/filemap.c                                       |  12 +-
 mm/gup.c                                           |   2 +-
 mm/huge_memory.c                                   | 164 ++--
 mm/hugetlb.c                                       | 162 +++-
 mm/internal.h                                      |   6 +-
 mm/kasan/kasan.c                                   |   2 +-
 mm/kasan/quarantine.c                              |   1 +
 mm/madvise.c                                       |   2 +
 mm/memblock.c                                      |  34 +-
 mm/memory.c                                        |  43 +-
 mm/memory_hotplug.c                                |  34 +-
 mm/mmap.c                                          |  24 +-
 mm/mmzone.c                                        |   2 +-
 mm/mprotect.c                                      |  44 +-
 mm/mremap.c                                        |  17 +-
 mm/page_alloc.c                                    | 136 ++--
 mm/page_isolation.c                                |  10 +-
 mm/page_owner.c                                    |   4 +-
 mm/shmem.c                                         | 150 +++-
 mm/slab_common.c                                   |   9 +-
 mm/sparse.c                                        |   4 +-
 mm/swap.c                                          |   6 -
 mm/swap_slots.c                                    | 333 ++++++++
 mm/swap_state.c                                    |  80 +-
 mm/swapfile.c                                      | 540 ++++++++++---
 mm/userfaultfd.c                                   | 235 +++++-
 mm/vmalloc.c                                       |   2 +-
 mm/vmscan.c                                        | 128 +--
 mm/vmstat.c                                        |   2 +
 mm/z3fold.c                                        |  10 +-
 mm/zsmalloc.c                                      |   6 +-
 scripts/Lindent                                    |  14 +-
 scripts/checkpatch.pl                              |  28 +-
 scripts/gdb/linux/constants.py.in                  |   7 +
 scripts/gdb/linux/proc.py                          |  73 ++
 scripts/spelling.txt                               |  37 +
 tools/lib/find_bit.c                               |   2 +-
 tools/testing/selftests/vm/Makefile                |   4 +
 tools/testing/selftests/vm/run_vmtests             |  24 +
 tools/testing/selftests/vm/userfaultfd.c           | 486 ++++++++++--
 122 files changed, 5190 insertions(+), 2000 deletions(-)
 delete mode 100644 arch/m32r/include/asm/current.h
 create mode 100644 include/linux/swap_slots.h
 create mode 100644 include/trace/events/fs_dax.h
 create mode 100644 lib/crc32test.c
 create mode 100644 lib/globtest.c
 create mode 100644 mm/swap_slots.c
$ git clone -s -l -n -q . ../rebase-tmp
$ cd ../rebase-tmp
$ git checkout -b akpm remotes/origin/akpm/master
Switched to a new branch 'akpm'
$ git rebase --onto master remotes/origin/akpm/master-base
First, rewinding head to replay your work on top of it...
Applying: fs: add i_blocksize()
Applying: Reimplement IDR and IDA using the radix tree
Applying: idr: support storing NULL in the IDR
Applying: reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr-checkpatch-fixes
Applying: mm: merge fixup for "fix use-after-free in shadow node shrinker"
Applying: scripts/spelling.txt: add "swith" pattern and fix typo instances
Applying: scripts/spelling.txt: add "swithc" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an user" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an union" pattern and fix typo instances
Applying: scripts/spelling.txt: add "an one" pattern and fix typo instances
Applying: scripts/spelling.txt: add "partiton" pattern and fix typo instances
Applying: scripts/spelling.txt: add "aligment" pattern and fix typo instances
Applying: scripts/spelling.txt: add "algined" pattern and fix typo instances
Applying: scripts/spelling.txt: add "efective" pattern and fix typo instances
Applying: scripts/spelling.txt: add "varible" pattern and fix typo instances
Applying: scripts/spelling.txt: add "embeded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "againt" pattern and fix typo instances
Applying: scripts/spelling.txt: add "neded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "unneded" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialization" pattern and fix typo instances
Applying: scripts/spelling.txt: add "initialiazation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disble(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overide" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overrided" pattern and fix typo instances
Applying: scripts/spelling.txt: add "configuartion" pattern and fix typo instances
Applying: scripts/spelling.txt: add "applys" pattern and fix typo instances
Applying: scripts/spelling.txt: add "explictely" pattern and fix typo instances
Applying: scripts/spelling.txt: add "omited" pattern and fix typo instances
Applying: scripts/spelling.txt: add "disassocation" pattern and fix typo instances
Applying: scripts/spelling.txt: add "deintialize(d)" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwritting" pattern and fix typo instances
Applying: scripts/spelling.txt: add "overwriten" pattern and fix typo instances
Applying: scripts/spelling.txt: add "therfore" pattern and fix typo instances
Applying: scripts/spelling.txt: add "followings" pattern and fix typo instances
Applying: lib/vsprintf.c: remove %Z support
Applying: checkpatch: warn when formats use %Z and suggest %z
Applying: checkpatchpl-warn-against-using-%z-fix
Applying: kernel/exit: compute current directly
Applying: drivers/tty: compute current directly
Applying: kernel/locking: compute current directly
Applying: sched: remove set_task_state()
Applying: mm: add new mmgrab() helper
Applying: mm: add new mmget() helper
Applying: mm: use mmget_not_zero() helper
Applying: mm: clarify mm_struct.mm_{users,count} documentation
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
 + b687dacc315b...ff650916d94b akpm       -> akpm/master  (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (ff650916d94b mm: clarify mm_struct.mm_{users,count} documentation)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
 Documentation/DocBook/libata.tmpl                  |    2 +-
 Documentation/acpi/method-customizing.txt          |    2 +-
 Documentation/acpi/method-tracing.txt              |    2 +-
 Documentation/admin-guide/ras.rst                  |    2 +-
 Documentation/blockdev/mflash.txt                  |    2 +-
 Documentation/dev-tools/kcov.rst                   |    2 +-
 Documentation/device-mapper/dm-raid.txt            |    2 +-
 Documentation/devicetree/bindings/mfd/qcom-rpm.txt |    2 +-
 .../bindings/net/marvell-armada-370-neta.txt       |    2 +-
 Documentation/devicetree/bindings/opp/opp.txt      |    2 +-
 .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt   |    2 +-
 .../devicetree/bindings/power/pd-samsung.txt       |    2 +-
 .../bindings/regulator/ti-abb-regulator.txt        |    2 +-
 .../devicetree/bindings/soc/rockchip/grf.txt       |    4 +-
 .../devicetree/bindings/sound/rockchip-i2s.txt     |    4 +-
 .../devicetree/bindings/sound/sun4i-codec.txt      |    2 +-
 .../devicetree/bindings/sound/sun4i-i2s.txt        |    4 +-
 Documentation/filesystems/quota.txt                |    2 +-
 Documentation/kselftest.txt                        |    4 +-
 Documentation/media/dvb-drivers/ci.rst             |    2 +-
 .../media/uapi/dvb/dvb-frontend-parameters.rst     |    4 +-
 Documentation/memory-hotplug.txt                   |    4 +-
 Documentation/networking/cdc_mbim.txt              |    4 +-
 Documentation/scsi/ChangeLog.megaraid_sas          |    2 +-
 Documentation/sound/hd-audio/notes.rst             |    2 +-
 Documentation/vm/userfaultfd.txt                   |    2 +-
 arch/Kconfig                                       |    2 +-
 arch/alpha/kernel/smp.c                            |    2 +-
 arch/arc/kernel/smp.c                              |    4 +-
 arch/arc/kernel/unwind.c                           |    4 +-
 arch/arm/boot/compressed/head.S                    |    2 +-
 arch/arm/include/asm/mach/flash.h                  |    2 +-
 arch/arm/kernel/smp.c                              |    2 +-
 arch/arm/mach-omap2/omap_twl.c                     |    2 +-
 arch/arm/mm/cache-v7.S                             |    2 +-
 arch/arm/mm/cache-v7m.S                            |    2 +-
 arch/arm64/kernel/smp.c                            |    2 +-
 arch/arm64/lib/copy_template.S                     |    2 +-
 arch/blackfin/mach-common/smp.c                    |    4 +-
 arch/cris/arch-v32/drivers/cryptocop.c             |    2 +-
 arch/frv/mm/mmu-context.c                          |    2 +-
 arch/hexagon/kernel/smp.c                          |    2 +-
 arch/ia64/kernel/setup.c                           |    2 +-
 arch/ia64/sn/kernel/sn2/sn_hwperf.c                |    2 +-
 arch/m32r/kernel/setup.c                           |    2 +-
 arch/m68k/ifpsp060/src/isp.S                       |    2 +-
 arch/metag/kernel/smp.c                            |    4 +-
 arch/mips/kernel/traps.c                           |    2 +-
 arch/mn10300/kernel/smp.c                          |    2 +-
 arch/openrisc/kernel/entry.S                       |    6 +-
 arch/openrisc/kernel/head.S                        |    6 +-
 arch/openrisc/kernel/vmlinux.lds.S                 |    4 +-
 arch/parisc/kernel/smp.c                           |    2 +-
 arch/powerpc/boot/dts/fsl/mpc8569mds.dts           |    2 +-
 arch/powerpc/include/asm/book3s/64/mmu.h           |    2 +-
 arch/powerpc/include/asm/fsl_hcalls.h              |    2 +-
 arch/powerpc/kernel/smp.c                          |    2 +-
 arch/powerpc/platforms/powernv/pci-ioda.c          |    2 +-
 arch/powerpc/platforms/pseries/iommu.c             |    2 +-
 arch/powerpc/xmon/ppc-opc.c                        |    2 +-
 arch/s390/kernel/processor.c                       |    2 +-
 arch/s390/kernel/vtime.c                           |    2 +-
 arch/score/kernel/traps.c                          |    2 +-
 arch/sh/kernel/irq.c                               |    2 +-
 arch/sh/kernel/smp.c                               |    4 +-
 arch/sparc/include/asm/switch_to_32.h              |    2 +-
 arch/sparc/kernel/leon_smp.c                       |    2 +-
 arch/sparc/kernel/smp_64.c                         |    2 +-
 arch/sparc/kernel/sun4d_smp.c                      |    2 +-
 arch/sparc/kernel/sun4m_smp.c                      |    2 +-
 arch/sparc/kernel/traps_32.c                       |    2 +-
 arch/sparc/kernel/traps_64.c                       |    2 +-
 arch/sparc/kernel/visemul.c                        |    2 +-
 arch/tile/kernel/smpboot.c                         |    2 +-
 arch/um/drivers/random.c                           |    2 +-
 arch/x86/include/asm/desc_defs.h                   |    2 +-
 arch/x86/kernel/cpu/common.c                       |    4 +-
 arch/x86/kernel/ftrace.c                           |    2 +-
 arch/x86/kvm/mmu.c                                 |    2 +-
 arch/xtensa/kernel/smp.c                           |    4 +-
 block/blk-throttle.c                               |    2 +-
 block/bsg.c                                        |    6 +-
 certs/blacklist.c                                  |    2 +-
 drivers/acpi/acpica/acmacros.h                     |    2 +-
 drivers/acpi/acpica/dbconvert.c                    |    2 +-
 drivers/acpi/acpica/nspredef.c                     |    2 +-
 drivers/acpi/acpica/nsxfeval.c                     |    4 +-
 drivers/acpi/resource.c                            |    2 +-
 drivers/acpi/spcr.c                                |    2 +-
 drivers/ata/libata-eh.c                            |    2 +-
 drivers/atm/ambassador.c                           |    7 +-
 drivers/atm/eni.c                                  |    6 +-
 drivers/atm/firestream.c                           |   12 +-
 drivers/atm/horizon.c                              |    7 +-
 drivers/atm/iphase.c                               |    2 +-
 drivers/atm/iphase.h                               |    2 +-
 drivers/atm/lanai.c                                |   16 +-
 drivers/block/loop.c                               |    2 +-
 drivers/block/paride/pcd.c                         |    2 +-
 drivers/block/paride/pd.c                          |    2 +-
 drivers/block/paride/pf.c                          |    2 +-
 drivers/block/paride/pg.c                          |    2 +-
 drivers/block/paride/pt.c                          |    2 +-
 drivers/char/pcmcia/cm4000_cs.c                    |    4 +-
 drivers/char/pcmcia/cm4040_cs.c                    |    2 +-
 drivers/char/sonypi.c                              |    2 +-
 drivers/crypto/caam/ctrl.c                         |    2 +-
 drivers/crypto/ux500/cryp/cryp.c                   |    2 +-
 drivers/devfreq/devfreq.c                          |    2 +-
 drivers/extcon/extcon-rt8973a.c                    |    2 +-
 drivers/firewire/core-device.c                     |    4 +-
 drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c             |    2 +-
 drivers/gpu/drm/amd/amdkfd/kfd_process.c           |    2 +-
 drivers/gpu/drm/amd/include/atombios.h             |    8 +-
 .../gpu/drm/amd/powerplay/inc/hardwaremanager.h    |    2 +-
 drivers/gpu/drm/drm_probe_helper.c                 |    4 +-
 drivers/gpu/drm/i915/i915_gem_render_state.c       |    2 +-
 drivers/gpu/drm/i915/i915_gem_userptr.c            |    4 +-
 drivers/gpu/drm/mga/mga_drv.h                      |    4 +-
 drivers/gpu/drm/radeon/atombios.h                  |    6 +-
 drivers/hid/hid-kye.c                              |    2 +-
 drivers/hv/channel.c                               |    2 +-
 drivers/hwmon/g762.c                               |    2 +-
 drivers/ide/ide-acpi.c                             |    2 +-
 drivers/ide/ide-tape.c                             |    4 +-
 drivers/infiniband/hw/hfi1/file_ops.c              |    2 +-
 drivers/infiniband/hw/qib/qib_iba6120.c            |    2 +-
 drivers/infiniband/hw/qib/qib_iba7220.c            |    2 +-
 drivers/infiniband/hw/qib/qib_iba7322.c            |    2 +-
 drivers/infiniband/sw/rdmavt/mad.c                 |    6 +-
 drivers/input/touchscreen/cyttsp4_core.c           |   62 +-
 drivers/iommu/intel-svm.c                          |    2 +-
 drivers/isdn/hardware/eicon/debug.c                |    2 +-
 drivers/isdn/hardware/mISDN/mISDNipac.c            |    2 +-
 drivers/isdn/hisax/st5481_b.c                      |    2 +-
 drivers/isdn/mISDN/dsp_core.c                      |    2 +-
 drivers/md/dm-bufio.c                              |    2 +-
 drivers/md/dm-crypt.c                              |    4 +-
 drivers/md/persistent-data/dm-block-manager.c      |    4 +-
 drivers/media/dvb-core/dvb_ringbuffer.h            |    4 +-
 drivers/media/dvb-frontends/drx39xyj/drx_driver.h  |   12 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.c        |   16 +-
 drivers/media/dvb-frontends/drx39xyj/drxj.h        |    4 +-
 drivers/media/dvb-frontends/drxk_hard.c            |    2 +-
 drivers/media/dvb-frontends/helene.c               |    2 +-
 drivers/media/dvb-frontends/or51132.c              |    2 +-
 drivers/media/dvb-frontends/tda10048.c             |    2 +-
 drivers/media/i2c/adv7183_regs.h                   |    2 +-
 drivers/media/pci/saa7164/saa7164-fw.c             |    2 +-
 drivers/media/platform/exynos4-is/fimc-core.h      |    2 +-
 drivers/media/tuners/xc5000.c                      |    2 +-
 drivers/media/usb/dvb-usb/dib0700_devices.c        |    4 +-
 drivers/media/usb/gspca/t613.c                     |    6 +-
 drivers/media/usb/tm6000/tm6000-input.c            |    2 +-
 drivers/media/v4l2-core/tuner-core.c               |    4 +-
 drivers/misc/vmw_vmci/vmci_context.c               |    2 +-
 drivers/misc/vmw_vmci/vmci_queue_pair.c            |    2 +-
 drivers/mmc/host/mmci_qcom_dml.c                   |    2 +-
 drivers/mtd/spi-nor/spi-nor.c                      |    2 +-
 drivers/net/arcnet/arcnet.c                        |    2 +-
 drivers/net/can/flexcan.c                          |    2 +-
 drivers/net/ethernet/adi/bfin_mac.c                |    2 +-
 drivers/net/ethernet/broadcom/bcm63xx_enet.c       |    2 +-
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c   |    2 +-
 drivers/net/ethernet/cadence/macb.c                |    2 +-
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c |    2 +-
 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |    4 +-
 drivers/net/ethernet/intel/igb/e1000_phy.c         |    2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c     |    2 +-
 drivers/net/ethernet/micrel/ksz884x.c              |    8 +-
 .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c    |    2 +-
 drivers/net/ethernet/qlogic/qlge/qlge.h            |    4 +-
 drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c    |    8 +-
 drivers/net/ethernet/sfc/mcdi_pcol.h               |    2 +-
 drivers/net/ethernet/sis/sis900.c                  |    2 +-
 drivers/net/gtp.c                                  |    2 +-
 drivers/net/usb/kalmia.c                           |    2 +-
 drivers/net/usb/rndis_host.c                       |    2 +-
 drivers/net/usb/sierra_net.c                       |    2 +-
 drivers/net/wimax/i2400m/usb-fw.c                  |    2 +-
 drivers/net/wireless/ath/ath9k/ani.c               |    4 +-
 .../broadcom/brcm80211/brcmfmac/cfg80211.c         |    2 +-
 drivers/net/wireless/intel/ipw2x00/ipw2100.c       |    6 +-
 drivers/net/wireless/intel/ipw2x00/ipw2200.c       |    4 +-
 drivers/net/wireless/intel/iwlegacy/4965-mac.c     |   30 +-
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c       |   16 +-
 drivers/net/wireless/marvell/mwifiex/wmm.c         |    4 +-
 .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c    |    4 +-
 drivers/net/wireless/rsi/rsi_91x_usb.c             |    2 +-
 drivers/net/wireless/ti/wl18xx/main.c              |    2 +-
 drivers/net/wireless/ti/wlcore/init.c              |    2 +-
 drivers/nfc/pn533/pn533.c                          |    2 +-
 drivers/nvme/host/rdma.c                           |    2 +-
 drivers/parport/ieee1284_ops.c                     |    2 +-
 drivers/parport/parport_pc.c                       |    2 +-
 drivers/pci/quirks.c                               |    2 +-
 drivers/pinctrl/bcm/Kconfig                        |    2 +-
 drivers/power/avs/smartreflex.c                    |    6 +-
 drivers/scsi/aacraid/linit.c                       |    2 +-
 drivers/scsi/aic7xxx/aic79xx_core.c                |    2 +-
 drivers/scsi/bfa/bfi_ms.h                          |    2 +-
 drivers/scsi/fcoe/fcoe_ctlr.c                      |    2 +-
 drivers/scsi/ipr.c                                 |    2 +-
 drivers/scsi/lpfc/lpfc_attr.c                      |    2 +-
 drivers/scsi/lpfc/lpfc_sli.c                       |   18 +-
 drivers/scsi/mpt3sas/mpt3sas_ctl.c                 |    2 +-
 drivers/scsi/mpt3sas/mpt3sas_ctl.h                 |    2 +-
 drivers/scsi/osd/osd_initiator.c                   |    4 +-
 drivers/scsi/osst.c                                |    6 +-
 drivers/scsi/qla2xxx/qla_init.c                    |   10 +-
 drivers/scsi/scsi_transport_sas.c                  |    2 +-
 drivers/scsi/storvsc_drv.c                         |    2 +-
 drivers/staging/gs_fpgaboot/gs_fpgaboot.h          |    2 +-
 .../staging/lustre/lnet/libcfs/linux/linux-debug.c |    2 +-
 .../lustre/lustre/include/lustre/lustre_idl.h      |    2 +-
 drivers/staging/rtl8192u/ieee80211/ieee80211.h     |    4 +-
 .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    2 +-
 .../vc04_services/interface/vchiq_arm/vchiq_arm.c  |    4 +-
 drivers/staging/wilc1000/linux_wlan.c              |    2 +-
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |    2 +-
 drivers/tty/n_hdlc.c                               |    2 +-
 drivers/tty/serial/ioc4_serial.c                   |    2 +-
 drivers/tty/tty_ldsem.c                            |   18 +-
 drivers/usb/core/devio.c                           |    2 +-
 drivers/usb/gadget/legacy/inode.c                  |    5 +-
 drivers/usb/gadget/udc/fsl_udc_core.c              |    4 +-
 drivers/usb/gadget/udc/renesas_usb3.c              |    4 +-
 drivers/usb/host/ehci-hcd.c                        |    2 +-
 drivers/usb/host/fotg210-hcd.c                     |    2 +-
 drivers/usb/host/ohci-hcd.c                        |    2 +-
 drivers/usb/host/xhci.c                            |    4 +-
 drivers/usb/misc/adutux.c                          |    6 +-
 drivers/usb/misc/legousbtower.c                    |    2 +-
 drivers/usb/misc/uss720.c                          |    8 +-
 drivers/usb/usbip/usbip_common.c                   |    2 +-
 drivers/video/fbdev/aty/radeon_monitor.c           |    2 +-
 drivers/video/fbdev/intelfb/intelfbdrv.c           |    2 +-
 drivers/video/fbdev/metronomefb.c                  |    2 +-
 drivers/watchdog/bcm2835_wdt.c                     |    6 +-
 fs/afs/dir.c                                       |   14 +-
 fs/block_dev.c                                     |    2 +-
 fs/btrfs/file.c                                    |    2 +-
 fs/buffer.c                                        |   12 +-
 fs/ceph/addr.c                                     |    2 +-
 fs/direct-io.c                                     |    2 +-
 fs/ecryptfs/kthread.c                              |    2 +-
 fs/ext4/extents_status.c                           |    2 +-
 fs/ext4/inode.c                                    |    6 +-
 fs/ext4/mballoc.c                                  |    2 +-
 fs/ext4/move_extent.c                              |    2 +-
 fs/inode.c                                         |    2 +-
 fs/iomap.c                                         |   10 +-
 fs/jfs/super.c                                     |    4 +-
 fs/mpage.c                                         |    2 +-
 fs/ncpfs/sock.c                                    |    4 +-
 fs/nfs/blocklayout/blocklayout.c                   |    2 +-
 fs/nfs/filelayout/filelayout.c                     |    4 +-
 fs/nfs/flexfilelayout/flexfilelayout.c             |    4 +-
 fs/nfs/objlayout/objlayout.c                       |    2 +-
 fs/nfsd/blocklayout.c                              |    6 +-
 fs/nfsd/nfscache.c                                 |    2 +-
 fs/nilfs2/btnode.c                                 |    2 +-
 fs/nilfs2/inode.c                                  |    4 +-
 fs/nilfs2/mdt.c                                    |    4 +-
 fs/nilfs2/segment.c                                |    2 +-
 fs/ocfs2/aops.c                                    |    2 +-
 fs/ocfs2/dlm/dlmmaster.c                           |    2 +-
 fs/ocfs2/file.c                                    |    2 +-
 fs/orangefs/orangefs-utils.c                       |    4 +-
 fs/proc/base.c                                     |    8 +-
 fs/proc/task_mmu.c                                 |    4 +-
 fs/proc/task_nommu.c                               |    2 +-
 fs/reiserfs/file.c                                 |    2 +-
 fs/reiserfs/inode.c                                |    2 +-
 fs/stat.c                                          |    2 +-
 fs/udf/inode.c                                     |    2 +-
 fs/userfaultfd.c                                   |    8 +-
 fs/xfs/xfs_aops.c                                  |   16 +-
 fs/xfs/xfs_file.c                                  |    4 +-
 fs/xfs/xfs_log_recover.c                           |    2 +-
 include/dt-bindings/sound/cs42l42.h                |    2 +-
 include/linux/dcache.h                             |    4 +-
 include/linux/fs.h                                 |    5 +
 include/linux/idr.h                                |  138 ++-
 include/linux/kconfig.h                            |    2 +-
 include/linux/mm_types.h                           |   23 +-
 include/linux/mtd/qinfo.h                          |    2 +-
 include/linux/radix-tree.h                         |   53 +-
 include/linux/regulator/machine.h                  |    2 +-
 include/linux/sched.h                              |   70 +-
 include/linux/spi/flash.h                          |    2 +-
 include/media/v4l2-ctrls.h                         |    4 +-
 include/net/cfg80211.h                             |    2 +-
 include/net/irda/timer.h                           |    2 +-
 include/net/mac80211.h                             |    2 +-
 include/xen/interface/grant_table.h                |    2 +-
 init/main.c                                        |    3 +-
 kernel/cgroup/cgroup.c                             |    2 +-
 kernel/events/core.c                               |    2 +-
 kernel/events/uprobes.c                            |    2 +-
 kernel/exit.c                                      |   24 +-
 kernel/fork.c                                      |    4 +-
 kernel/futex.c                                     |    2 +-
 kernel/irq/manage.c                                |    2 +-
 kernel/locking/mutex.c                             |   19 +-
 kernel/locking/rwsem-spinlock.c                    |   18 +-
 kernel/locking/rwsem-xadd.c                        |    7 +-
 kernel/locking/semaphore.c                         |    7 +-
 kernel/relay.c                                     |    2 +-
 kernel/sched/core.c                                |    4 +-
 kernel/torture.c                                   |    2 +-
 kernel/trace/trace_stack.c                         |    2 +-
 lib/idr.c                                          | 1145 ++++----------------
 lib/radix-tree.c                                   |  347 ++++--
 lib/vsprintf.c                                     |    8 +-
 mm/dmapool.c                                       |    2 +-
 mm/khugepaged.c                                    |    2 +-
 mm/ksm.c                                           |    2 +-
 mm/mmu_context.c                                   |    2 +-
 mm/mmu_notifier.c                                  |    2 +-
 mm/oom_kill.c                                      |    4 +-
 mm/page-writeback.c                                |    2 +-
 mm/page_alloc.c                                    |    2 +-
 mm/percpu.c                                        |    2 +-
 mm/swapfile.c                                      |   12 +-
 net/appletalk/ddp.c                                |    4 +-
 net/atm/mpc.c                                      |    2 +-
 net/bluetooth/hci_sock.c                           |    6 +-
 net/bridge/netfilter/ebt_among.c                   |    2 +-
 net/ieee802154/socket.c                            |    4 +-
 net/ipv4/fib_trie.c                                |    2 +-
 net/ipv4/ipmr.c                                    |    2 +-
 net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c     |    2 +-
 net/ipv4/netfilter/nf_log_arp.c                    |    2 +-
 net/ipv6/netfilter/nf_log_ipv6.c                   |    2 +-
 net/irda/irnet/irnet_ppp.c                         |   12 +-
 net/l2tp/l2tp_core.c                               |    4 +-
 net/mac80211/mesh.c                                |    2 +-
 net/netfilter/ipvs/ip_vs_conn.c                    |    2 +-
 net/netfilter/ipvs/ip_vs_dh.c                      |    4 +-
 net/netfilter/ipvs/ip_vs_lblc.c                    |    4 +-
 net/netfilter/ipvs/ip_vs_lblcr.c                   |    4 +-
 net/netfilter/ipvs/ip_vs_sh.c                      |    4 +-
 net/netfilter/ipvs/ip_vs_sync.c                    |    2 +-
 net/netfilter/nf_conntrack_ftp.c                   |    2 +-
 net/netfilter/nfnetlink_cthelper.c                 |    2 +-
 net/netfilter/x_tables.c                           |    2 +-
 net/sctp/output.c                                  |    2 +-
 net/sctp/transport.c                               |    4 +-
 net/sunrpc/auth_gss/auth_gss.c                     |    2 +-
 net/sunrpc/svc.c                                   |    2 +-
 net/sunrpc/svcsock.c                               |    4 +-
 net/sunrpc/xprtsock.c                              |    8 +-
 scripts/checkpatch.pl                              |   29 +-
 scripts/recordmcount.pl                            |    2 +-
 scripts/spelling.txt                               |   44 +
 security/selinux/ss/ebitmap.c                      |    2 +-
 security/selinux/ss/policydb.c                     |    2 +-
 sound/pci/ac97/ac97_patch.c                        |    2 +-
 sound/pci/cs46xx/cs46xx_dsp_task_types.h           |    2 +-
 sound/pci/hda/patch_ca0132.c                       |    2 +-
 sound/pci/ice1712/wm8766.c                         |    2 +-
 sound/pci/ice1712/wm8776.c                         |    2 +-
 sound/pci/korg1212/korg1212.c                      |    4 +-
 sound/pci/pcxhr/pcxhr_hwdep.c                      |    2 +-
 sound/pcmcia/vx/vxp_ops.c                          |    2 +-
 sound/ppc/snd_ps3.c                                |    2 +-
 sound/soc/amd/acp-pcm-dma.c                        |    4 +-
 sound/soc/codecs/wm_hubs.c                         |    2 +-
 sound/soc/fsl/fsl_asrc.c                           |    2 +-
 sound/soc/qcom/lpass.h                             |    2 +-
 sound/soc/soc-core.c                               |    2 +-
 sound/soc/soc-topology.c                           |    4 +-
 tools/include/linux/spinlock.h                     |    4 +
 tools/lguest/lguest.c                              |    2 +-
 tools/lib/bpf/Makefile                             |    2 +-
 tools/lib/bpf/bpf.c                                |    2 +-
 tools/lib/traceevent/Makefile                      |    2 +-
 tools/lib/traceevent/event-parse.h                 |    2 +-
 tools/perf/Documentation/tips.txt                  |    2 +-
 tools/perf/util/dso.c                              |    2 +-
 tools/perf/util/probe-finder.c                     |    4 +-
 tools/perf/util/sort.h                             |    2 +-
 tools/testing/radix-tree/.gitignore                |    1 +
 tools/testing/radix-tree/Makefile                  |   10 +-
 tools/testing/radix-tree/idr-test.c                |  242 +++++
 tools/testing/radix-tree/linux/export.h            |    1 +
 tools/testing/radix-tree/linux/gfp.h               |    8 +-
 tools/testing/radix-tree/linux/idr.h               |    1 +
 tools/testing/radix-tree/linux/kernel.h            |    2 +
 tools/testing/radix-tree/main.c                    |    6 +
 tools/testing/radix-tree/test.h                    |    2 +
 virt/kvm/async_pf.c                                |    2 +-
 virt/kvm/kvm_main.c                                |    2 +-
 394 files changed, 1650 insertions(+), 1806 deletions(-)
 create mode 100644 tools/include/linux/spinlock.h
 create mode 100644 tools/testing/radix-tree/idr-test.c
 create mode 100644 tools/testing/radix-tree/linux/idr.h