Next/merge.log

   1 $ date -R
   2 Thu, 11 Feb 2016 09:44:55 +1100
   3 $ git checkout master
   4 Already on 'master'
   5 $ git reset --hard stable
   6 HEAD is now at 7cf91adc0d38 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
   7 Merging origin/master (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
   8 $ git merge origin/master
   9 Updating 7cf91adc0d38..74c7b2af37ad
  10 Fast-forward
  11  Documentation/cgroup-v2.txt                 |   2 +-
  12  Documentation/kernel-parameters.txt         |  11 +++
  13  drivers/ata/ahci.c                          |  20 +++++
  14  drivers/ata/ahci.h                          |   1 +
  15  drivers/ata/ahci_brcmstb.c                  |   1 +
  16  drivers/ata/libahci.c                       |  27 ++++++-
  17  drivers/ata/libata-core.c                   |   1 +
  18  drivers/ata/libata-sff.c                    |  35 +++-----
  19  drivers/input/joystick/xpad.c               |   1 -
  20  drivers/input/keyboard/adp5589-keys.c       |   7 +-
  21  drivers/input/keyboard/cap11xx.c            |   8 +-
  22  drivers/input/misc/Kconfig                  |   2 +-
  23  drivers/input/misc/sirfsoc-onkey.c          |   2 +-
  24  drivers/input/mouse/vmmouse.c               |  13 +--
  25  drivers/input/serio/serio.c                 |   2 +-
  26  drivers/input/touchscreen/colibri-vf50-ts.c |   1 +
  27  drivers/input/touchscreen/edt-ft5x06.c      |  18 +++--
  28  include/linux/cgroup-defs.h                 |   6 ++
  29  include/linux/cpuset.h                      |   6 ++
  30  include/linux/libata.h                      |   1 +
  31  include/linux/module.h                      |  19 ++---
  32  include/linux/workqueue.h                   |   9 ++-
  33  kernel/cgroup.c                             |  31 +++++--
  34  kernel/cpuset.c                             |  71 +++++++++++-----
  35  kernel/module.c                             | 120 +++++++++++++++++-----------
  36  kernel/workqueue.c                          |  74 +++++++++++++++--
  37  lib/Kconfig.debug                           |  15 ++++
  38  27 files changed, 362 insertions(+), 142 deletions(-)
  39 Merging fixes/master (36f90b0a2ddd Linux 4.5-rc2)
  40 $ git merge fixes/master
  41 Already up-to-date.
  42 Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install)
  43 $ git merge kbuild-current/rc-fixes
  44 Already up-to-date.
  45 Merging arc-current/for-curr (74bf8efb5fa6 Linux 4.4-rc7)
  46 $ git merge arc-current/for-curr
  47 Already up-to-date.
  48 Merging arm-current/fixes (5070fb14a015 ARM: 8517/1: ICST: avoid arithmetic overflow in icst_hz())
  49 $ git merge arm-current/fixes
  50 Merge made by the 'recursive' strategy.
  51  arch/arm/common/icst.c | 8 ++++++--
  52  1 file changed, 6 insertions(+), 2 deletions(-)
  53 Merging m68k-current/for-linus (daf670bc9d36 m68k/defconfig: Update defconfigs for v4.5-rc1)
  54 $ git merge m68k-current/for-linus
  55 Merge made by the 'recursive' strategy.
  56  arch/m68k/configs/amiga_defconfig    | 9 +++++++++
  57  arch/m68k/configs/apollo_defconfig   | 9 +++++++++
  58  arch/m68k/configs/atari_defconfig    | 9 +++++++++
  59  arch/m68k/configs/bvme6000_defconfig | 9 +++++++++
  60  arch/m68k/configs/hp300_defconfig    | 9 +++++++++
  61  arch/m68k/configs/mac_defconfig      | 9 +++++++++
  62  arch/m68k/configs/multi_defconfig    | 9 +++++++++
  63  arch/m68k/configs/mvme147_defconfig  | 9 +++++++++
  64  arch/m68k/configs/mvme16x_defconfig  | 9 +++++++++
  65  arch/m68k/configs/q40_defconfig      | 9 +++++++++
  66  arch/m68k/configs/sun3_defconfig     | 9 +++++++++
  67  arch/m68k/configs/sun3x_defconfig    | 9 +++++++++
  68  arch/m68k/include/asm/unistd.h       | 2 +-
  69  arch/m68k/include/uapi/asm/unistd.h  | 1 +
  70  arch/m68k/kernel/syscalltable.S      | 1 +
  71  15 files changed, 111 insertions(+), 1 deletion(-)
  72 Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
  73 $ git merge metag-fixes/fixes
  74 Already up-to-date.
  75 Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
  76 $ git merge mips-fixes/mips-fixes
  77 Already up-to-date.
  78 Merging powerpc-fixes/fixes (0fe53e8d335b powerpc/powernv: Fix stale PE primary bus)
  79 $ git merge powerpc-fixes/fixes
  80 Auto-merging mm/huge_memory.c
  81 Auto-merging arch/powerpc/kernel/eeh_driver.c
  82 Auto-merging arch/powerpc/Kconfig
  83 Merge made by the 'recursive' strategy.
  84  arch/powerpc/Kconfig                         |  4 ++--
  85  arch/powerpc/include/asm/book3s/64/pgtable.h |  4 ++++
  86  arch/powerpc/include/asm/eeh.h               |  1 +
  87  arch/powerpc/include/asm/trace.h             |  8 +++++--
  88  arch/powerpc/kernel/eeh_driver.c             |  3 +++
  89  arch/powerpc/kernel/eeh_pe.c                 |  2 +-
  90  arch/powerpc/kernel/module_64.c              |  2 +-
  91  arch/powerpc/mm/pgtable_64.c                 | 33 +++++++++++++++++++++++++++-
  92  arch/powerpc/platforms/powernv/eeh-powernv.c |  5 ++++-
  93  arch/powerpc/platforms/powernv/pci-ioda.c    |  1 +
  94  arch/powerpc/platforms/powernv/pci.c         | 20 +++++++++++++++++
  95  arch/powerpc/platforms/powernv/pci.h         |  1 +
  96  include/asm-generic/pgtable.h                |  8 +++++++
  97  mm/huge_memory.c                             |  1 +
  98  14 files changed, 85 insertions(+), 8 deletions(-)
  99 Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2)
 100 $ git merge powerpc-merge-mpe/fixes
 101 Already up-to-date.
 102 Merging sparc/master (ca0bb0798022 Add sun4v_wdt watchdog driver)
 103 $ git merge sparc/master
 104 Auto-merging drivers/watchdog/Kconfig
 105 Merge made by the 'recursive' strategy.
 106  Documentation/watchdog/watchdog-parameters.txt |   4 +
 107  arch/sparc/include/uapi/asm/unistd.h           |   3 +-
 108  arch/sparc/kernel/entry.S                      |  17 +++
 109  arch/sparc/kernel/hvcalls.S                    |   3 +-
 110  arch/sparc/kernel/sparc_ksyms_64.c             |   1 +
 111  arch/sparc/kernel/syscalls.S                   |  36 +++++
 112  arch/sparc/kernel/systbls_32.S                 |   2 +-
 113  arch/sparc/kernel/systbls_64.S                 |   4 +-
 114  drivers/watchdog/Kconfig                       |  11 ++
 115  drivers/watchdog/Makefile                      |   1 +
 116  drivers/watchdog/sun4v_wdt.c                   | 191 +++++++++++++++++++++++++
 117  11 files changed, 268 insertions(+), 5 deletions(-)
 118  create mode 100644 drivers/watchdog/sun4v_wdt.c
 119 Merging net/master (a1b14d27ed09 bpf: fix branch offset adjustment on backjumps after patching ctx expansion)
 120 $ git merge net/master
 121 Auto-merging MAINTAINERS
 122 Merge made by the 'recursive' strategy.
 123  MAINTAINERS                                 |  9 +++---
 124  drivers/net/ethernet/broadcom/tg3.c         | 25 +++++++++++----
 125  drivers/net/ethernet/cisco/enic/enic.h      |  2 +-
 126  drivers/net/ethernet/cisco/enic/vnic_dev.c  | 19 +++++++-----
 127  drivers/net/ethernet/synopsys/dwc_eth_qos.c |  2 +-
 128  drivers/net/geneve.c                        | 31 ++++++++++++++++---
 129  drivers/net/vxlan.c                         | 47 ++++++++++++++++++++---------
 130  drivers/of/of_mdio.c                        |  1 +
 131  include/linux/skbuff.h                      |  1 +
 132  include/net/af_unix.h                       |  4 +--
 133  include/net/ip_tunnels.h                    |  1 +
 134  include/net/scm.h                           |  1 +
 135  include/net/tcp.h                           |  2 +-
 136  kernel/bpf/verifier.c                       |  2 +-
 137  net/core/flow_dissector.c                   |  9 ++++--
 138  net/core/scm.c                              |  7 +++++
 139  net/core/skbuff.c                           |  2 ++
 140  net/core/sysctl_net_core.c                  | 10 ++++++
 141  net/ipv4/ip_gre.c                           |  8 +++++
 142  net/ipv4/ip_tunnel.c                        | 20 ++++++++++--
 143  net/ipv4/tcp.c                              |  4 +--
 144  net/ipv4/tcp_ipv4.c                         | 11 +++++--
 145  net/ipv6/addrconf.c                         |  5 ++-
 146  net/ipv6/ip6_flowlabel.c                    |  5 +--
 147  net/ipv6/tcp_ipv6.c                         |  5 +--
 148  net/openvswitch/vport-vxlan.c               |  2 ++
 149  net/sctp/socket.c                           |  9 ++++--
 150  net/unix/af_unix.c                          |  4 +--
 151  net/unix/garbage.c                          |  8 ++---
 152  security/selinux/nlmsgtab.c                 |  1 +
 153  30 files changed, 191 insertions(+), 66 deletions(-)
 154 Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops)
 155 $ git merge ipsec/master
 156 Already up-to-date.
 157 Merging ipvs/master (b16c29191dc8 netfilter: nf_conntrack: use safer way to lock all buckets)
 158 $ git merge ipvs/master
 159 Already up-to-date.
 160 Merging wireless-drivers/master (d76d65fd2695 rtlwifi: fix broken VHT support)
 161 $ git merge wireless-drivers/master
 162 Merge made by the 'recursive' strategy.
 163  drivers/net/wireless/realtek/rtlwifi/rc.c | 5 +++++
 164  1 file changed, 5 insertions(+)
 165 Merging mac80211/master (212c5a5e6ba6 mac80211: minstrel: Change expected throughput unit back to Kbps)
 166 $ git merge mac80211/master
 167 Merge made by the 'recursive' strategy.
 168  include/net/iw_handler.h           |  6 +++++
 169  net/mac80211/agg-rx.c              |  2 +-
 170  net/mac80211/rc80211_minstrel.c    |  2 +-
 171  net/mac80211/rc80211_minstrel_ht.c | 12 +++++----
 172  net/wireless/core.c                |  2 ++
 173  net/wireless/wext-core.c           | 52 ++++++++++++++++++++++++++++++--------
 174  6 files changed, 58 insertions(+), 18 deletions(-)
 175 Merging sound-current/for-linus (397da2d0ab0d Merge branch 'topic/core-fixes' into for-linus)
 176 $ git merge sound-current/for-linus
 177 Merge made by the 'recursive' strategy.
 178  sound/core/timer.c                         | 40 +++++++++++++++---------------
 179  sound/drivers/dummy.c                      | 37 +++++++++++++--------------
 180  sound/firewire/digi00x/amdtp-dot.c         |  2 +-
 181  sound/firewire/tascam/tascam-transaction.c |  6 +++++
 182  sound/firewire/tascam/tascam.c             | 12 ++++++---
 183  sound/firewire/tascam/tascam.h             |  4 ---
 184  sound/pci/hda/hda_generic.c                |  4 +--
 185  sound/pci/hda/hda_jack.c                   |  2 +-
 186  sound/pci/hda/hda_jack.h                   |  2 +-
 187  sound/pci/hda/patch_ca0132.c               |  5 +++-
 188  sound/pci/hda/patch_hdmi.c                 |  5 ++--
 189  sound/pci/hda/patch_realtek.c              | 11 ++------
 190  sound/pci/hda/patch_sigmatel.c             |  6 ++---
 191  13 files changed, 71 insertions(+), 65 deletions(-)
 192 Merging pci-current/for-linus (0cf1337e0b83 PCI: rcar: Add device tree support for r8a7793)
 193 $ git merge pci-current/for-linus
 194 Merge made by the 'recursive' strategy.
 195  .../devicetree/bindings/pci/pci-rcar-gen2.txt      |  1 +
 196  Documentation/devicetree/bindings/pci/rcar-pci.txt |  1 +
 197  drivers/pci/host/pcie-iproc.c                      | 29 ++++++++--------------
 198  drivers/pci/pcie/aer/aerdrv.c                      |  4 +--
 199  drivers/pci/pcie/aer/aerdrv.h                      |  1 -
 200  drivers/pci/pcie/aer/aerdrv_core.c                 |  2 --
 201  6 files changed, 14 insertions(+), 24 deletions(-)
 202 Merging driver-core.current/driver-core-linus (00cd29b799e3 klist: fix starting point removed bug in klist iterators)
 203 $ git merge driver-core.current/driver-core-linus
 204 Merge made by the 'recursive' strategy.
 205  lib/klist.c | 6 +++---
 206  1 file changed, 3 insertions(+), 3 deletions(-)
 207 Merging tty.current/tty-linus (c8053b587627 Revert "8250: uniphier: allow modular build with 8250 console")
 208 $ git merge tty.current/tty-linus
 209 Merge made by the 'recursive' strategy.
 210  drivers/tty/pty.c                  | 21 ++++++++++++++++++++-
 211  drivers/tty/serial/8250/8250_pci.c | 21 +++++++++++++++++++++
 212  drivers/tty/serial/omap-serial.c   | 10 +++++++---
 213  drivers/tty/tty_io.c               |  3 +--
 214  drivers/tty/tty_mutex.c            |  7 ++++++-
 215  fs/devpts/inode.c                  | 20 ++++++++++++++++++++
 216  include/linux/devpts_fs.h          |  4 ++++
 217  7 files changed, 79 insertions(+), 7 deletions(-)
 218 Merging usb.current/usb-linus (89140fdaf11a xhci: harden xhci_find_next_ext_cap against device removal)
 219 $ git merge usb.current/usb-linus
 220 Already up-to-date.
 221 Merging usb-gadget-fixes/fixes (6a4290cc28be usb: dwc3: gadget: set the OTG flag in dwc3 gadget driver.)
 222 $ git merge usb-gadget-fixes/fixes
 223 Already up-to-date.
 224 Merging usb-serial-fixes/usb-linus (4152b387da81 USB: option: fix Cinterion AHxx enumeration)
 225 $ git merge usb-serial-fixes/usb-linus
 226 Already up-to-date.
 227 Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference)
 228 $ git merge usb-chipidea-fixes/ci-for-usb-stable
 229 Already up-to-date.
 230 Merging staging.current/staging-linus (388f7b1d6e8c Linux 4.5-rc3)
 231 $ git merge staging.current/staging-linus
 232 Already up-to-date.
 233 Merging char-misc.current/char-misc-linus (3b2b9ead3214 nvmem: qfprom: Specify LE device endianness)
 234 $ git merge char-misc.current/char-misc-linus
 235 Merge made by the 'recursive' strategy.
 236  drivers/misc/mei/main.c | 6 +++++-
 237  drivers/nvmem/core.c    | 6 ++++++
 238  drivers/nvmem/qfprom.c  | 1 +
 239  3 files changed, 12 insertions(+), 1 deletion(-)
 240 Merging input-current/for-linus (ff84dabe3c6e Input: colibri-vf50-ts - add missing #include <linux/of.h>)
 241 $ git merge input-current/for-linus
 242 Already up-to-date.
 243 Merging crypto-current/master (8a3978ad55fb crypto: marvell/cesa - fix test in mv_cesa_dev_dma_init())
 244 $ git merge crypto-current/master
 245 Already up-to-date.
 246 Merging ide/master (e04a2bd6d8c9 drivers/ide: make ide-scan-pci.c driver explicitly non-modular)
 247 $ git merge ide/master
 248 Already up-to-date.
 249 Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES)
 250 $ git merge devicetree-current/devicetree/merge
 251 Already up-to-date.
 252 Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.)
 253 $ git merge rr-fixes/fixes
 254 Already up-to-date.
 255 Merging vfio-fixes/for-linus (16ab8a5cbea4 vfio/noiommu: Don't use iommu_present() to track fake groups)
 256 $ git merge vfio-fixes/for-linus
 257 Already up-to-date.
 258 Merging kselftest-fixes/fixes (92e963f50fc7 Linux 4.5-rc1)
 259 $ git merge kselftest-fixes/fixes
 260 Already up-to-date.
 261 Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM)
 262 $ git merge backlight-fixes/for-backlight-fixes
 263 Already up-to-date.
 264 Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct)
 265 $ git merge ftrace-fixes/for-next-urgent
 266 Already up-to-date.
 267 Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error)
 268 $ git merge mfd-fixes/for-mfd-fixes
 269 Already up-to-date.
 270 Merging drm-intel-fixes/for-linux-next-fixes (ed3f9fd1e865 drm/i915: fix error path in intel_setup_gmbus())
 271 $ git merge drm-intel-fixes/for-linux-next-fixes
 272 Merge made by the 'recursive' strategy.
 273  drivers/gpu/drm/i915/i915_drv.h               |  4 +++
 274  drivers/gpu/drm/i915/i915_gem.c               |  3 +-
 275  drivers/gpu/drm/i915/i915_gem_userptr.c       |  3 +-
 276  drivers/gpu/drm/i915/i915_reg.h               |  2 +-
 277  drivers/gpu/drm/i915/i915_suspend.c           |  4 +--
 278  drivers/gpu/drm/i915/intel_ddi.c              |  3 +-
 279  drivers/gpu/drm/i915/intel_dp_link_training.c | 45 +++++++++++++++++++--------
 280  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c    | 21 ++++++++++++-
 281  drivers/gpu/drm/i915/intel_i2c.c              |  2 +-
 282  drivers/gpu/drm/i915/intel_pm.c               | 14 ++++++---
 283  10 files changed, 75 insertions(+), 26 deletions(-)
 284 Merging asm-generic/master (040b323b5012 ARM: asm/div64.h: adjust to generic codde)
 285 $ git merge asm-generic/master
 286 Already up-to-date.
 287 Merging arc/for-next (dec2b2849cfc ARCv2: intc: Allow interruption by lowest priority interrupt)
 288 $ git merge arc/for-next
 289 Auto-merging arch/arc/Kconfig
 290 Merge made by the 'recursive' strategy.
 291  arch/arc/Kconfig                        |  2 +-
 292  arch/arc/configs/vdk_hs38_smp_defconfig |  2 +-
 293  arch/arc/include/asm/arcregs.h          |  3 +--
 294  arch/arc/include/asm/irqflags-arcv2.h   |  7 ++++--
 295  arch/arc/include/asm/mcip.h             |  4 ++--
 296  arch/arc/kernel/entry-arcv2.S           | 19 ++++++++++++++-
 297  arch/arc/kernel/intc-arcv2.c            | 41 +++++++++++++++++++--------------
 298  arch/arc/kernel/mcip.c                  | 10 ++++----
 299  arch/arc/kernel/setup.c                 | 20 ++++++++++------
 300  arch/arc/kernel/time.c                  |  8 +++----
 301  10 files changed, 74 insertions(+), 42 deletions(-)
 302 Merging arm/for-next (f2c5e7deee7f Merge branches 'component', 'fixes', 'misc' and 'tauros2' into for-next)
 303 $ git merge arm/for-next
 304 Merge made by the 'recursive' strategy.
 305  arch/arm/Kconfig                  |   4 +-
 306  arch/arm/include/asm/div64.h      |  14 +-
 307  arch/arm/include/asm/memory.h     |   6 +-
 308  arch/arm/kernel/entry-armv.S      |   5 +-
 309  arch/arm/kernel/hibernate.c       |   4 +-
 310  arch/arm/kernel/irq.c             |   2 +-
 311  arch/arm/kernel/machine_kexec.c   |  16 +-
 312  arch/arm/kernel/reboot.c          |   2 +-
 313  arch/arm/kernel/topology.c        |   4 +-
 314  arch/arm/kernel/vmlinux-xip.lds.S | 322 ++++++++++++++++++++++++++++++++++++++
 315  arch/arm/kernel/vmlinux.lds.S     |  45 ++----
 316  arch/arm/mach-keystone/keystone.c |   2 +-
 317  arch/arm/mm/Kconfig               |  34 ++--
 318  arch/arm/mm/cache-tauros2.c       |  32 ++--
 319  arch/arm/mm/idmap.c               |   2 +-
 320  arch/arm/mm/init.c                |  19 +--
 321  arch/arm/plat-orion/time.c        |  13 ++
 322  arch/arm64/kernel/psci.c          |  99 +-----------
 323  drivers/base/component.c          |  47 +++---
 324  drivers/firmware/psci.c           | 120 ++++++++++++++
 325  include/linux/psci.h              |   3 +
 326  21 files changed, 573 insertions(+), 222 deletions(-)
 327  create mode 100644 arch/arm/kernel/vmlinux-xip.lds.S
 328 Merging arm-perf/for-next/perf (92e963f50fc7 Linux 4.5-rc1)
 329 $ git merge arm-perf/for-next/perf
 330 Already up-to-date.
 331 Merging arm-soc/for-next (ce4785b58783 ARM: SoC: document merges)
 332 $ git merge arm-soc/for-next
 333 Removing arch/arm/mach-zynq/Makefile.boot
 334 Removing arch/arm/mach-ux500/Makefile.boot
 335 Removing arch/arm/mach-u300/Makefile.boot
 336 Removing arch/arm/mach-spear/Makefile.boot
 337 Removing arch/arm/mach-s3c64xx/Makefile.boot
 338 Removing arch/arm/mach-realview/Makefile.boot
 339 Removing arch/arm/mach-prima2/Makefile.boot
 340 Removing arch/arm/mach-orion5x/Makefile.boot
 341 Removing arch/arm/mach-omap2/Makefile.boot
 342 Removing arch/arm/mach-nspire/Makefile.boot
 343 Removing arch/arm/mach-mv78xx0/Makefile.boot
 344 Removing arch/arm/mach-mmp/Makefile.boot
 345 Removing arch/arm/mach-keystone/Makefile.boot
 346 Removing arch/arm/mach-integrator/Makefile.boot
 347 Removing arch/arm/mach-exynos/Makefile.boot
 348 Removing arch/arm/mach-cns3xxx/Makefile.boot
 349 Auto-merging MAINTAINERS
 350 Merge made by the 'recursive' strategy.
 351  MAINTAINERS                                        |   8 +
 352  arch/arm/Kconfig.debug                             |   9 +
 353  arch/arm/arm-soc-for-next-contents.txt             |  51 +++++
 354  arch/arm/configs/multi_v7_defconfig                |   1 +
 355  arch/arm/configs/mvebu_v5_defconfig                |   1 +
 356  arch/arm/configs/mvebu_v7_defconfig                |   1 +
 357  arch/arm/configs/shmobile_defconfig                |   3 +-
 358  arch/arm/include/debug/palmchip.S                  |  11 +
 359  arch/arm/mach-cns3xxx/Makefile.boot                |   3 -
 360  arch/arm/mach-exynos/Makefile.boot                 |   2 -
 361  arch/arm/mach-integrator/Kconfig                   |   6 -
 362  arch/arm/mach-integrator/Makefile.boot             |   4 -
 363  arch/arm/mach-keystone/Makefile.boot               |   1 -
 364  arch/arm/mach-mmp/Makefile.boot                    |   1 -
 365  arch/arm/mach-mv78xx0/Kconfig                      |   3 +-
 366  arch/arm/mach-mv78xx0/Makefile.boot                |   3 -
 367  arch/arm/mach-netx/Kconfig                         |   3 -
 368  arch/arm/mach-nspire/Makefile.boot                 |   0
 369  arch/arm/mach-omap2/Makefile.boot                  |   3 -
 370  arch/arm/mach-orion5x/Makefile.boot                |   3 -
 371  arch/arm/mach-prima2/Makefile.boot                 |   3 -
 372  arch/arm/mach-realview/Makefile.boot               |   9 -
 373  arch/arm/mach-s3c64xx/Makefile.boot                |   2 -
 374  arch/arm/mach-shmobile/cpufreq.c                   |   2 +
 375  arch/arm/mach-shmobile/headsmp-scu.S               |   2 +-
 376  arch/arm/mach-shmobile/setup-rcar-gen2.c           |   7 +-
 377  arch/arm/mach-shmobile/smp-r8a7779.c               |   2 -
 378  arch/arm/mach-shmobile/suspend.c                   |   2 +
 379  arch/arm/mach-shmobile/timer.c                     |   2 +
 380  arch/arm/mach-spear/Makefile.boot                  |   3 -
 381  arch/arm/mach-u300/Makefile.boot                   |   4 -
 382  arch/arm/mach-ux500/Makefile.boot                  |   3 -
 383  arch/arm/mach-zynq/Makefile.boot                   |   3 -
 384  arch/arm64/boot/dts/amd/Makefile                   |   4 +-
 385  arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts   |  87 +++++++
 386  arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts   |  91 ++++++++
 387  arch/arm64/boot/dts/amd/amd-seattle-soc.dtsi       | 105 +++++++--
 388  arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi    | 117 ++++++++++
 389  arch/arm64/boot/dts/amd/husky.dts                  |  83 +++++++
 390  arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |  16 ++
 391  arch/arm64/boot/dts/renesas/r8a7795.dtsi           | 249 ++++++++++++++++++---
 392  arch/arm64/configs/defconfig                       |  13 ++
 393  42 files changed, 812 insertions(+), 114 deletions(-)
 394  create mode 100644 arch/arm/arm-soc-for-next-contents.txt
 395  create mode 100644 arch/arm/include/debug/palmchip.S
 396  delete mode 100644 arch/arm/mach-cns3xxx/Makefile.boot
 397  delete mode 100644 arch/arm/mach-exynos/Makefile.boot
 398  delete mode 100644 arch/arm/mach-integrator/Makefile.boot
 399  delete mode 100644 arch/arm/mach-keystone/Makefile.boot
 400  delete mode 100644 arch/arm/mach-mmp/Makefile.boot
 401  delete mode 100644 arch/arm/mach-mv78xx0/Makefile.boot
 402  delete mode 100644 arch/arm/mach-nspire/Makefile.boot
 403  delete mode 100644 arch/arm/mach-omap2/Makefile.boot
 404  delete mode 100644 arch/arm/mach-orion5x/Makefile.boot
 405  delete mode 100644 arch/arm/mach-prima2/Makefile.boot
 406  delete mode 100644 arch/arm/mach-realview/Makefile.boot
 407  delete mode 100644 arch/arm/mach-s3c64xx/Makefile.boot
 408  delete mode 100644 arch/arm/mach-spear/Makefile.boot
 409  delete mode 100644 arch/arm/mach-u300/Makefile.boot
 410  delete mode 100644 arch/arm/mach-ux500/Makefile.boot
 411  delete mode 100644 arch/arm/mach-zynq/Makefile.boot
 412  create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b0.dts
 413  create mode 100644 arch/arm64/boot/dts/amd/amd-overdrive-rev-b1.dts
 414  create mode 100644 arch/arm64/boot/dts/amd/amd-seattle-xgbe-b.dtsi
 415  create mode 100644 arch/arm64/boot/dts/amd/husky.dts
 416 Merging at91/at91-next (8129febb508f ARM: dts: at91: at91sam9n12ek: fix panel compatible string)
 417 $ git merge at91/at91-next
 418 Merge made by the 'recursive' strategy.
 419 Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
 420 $ git merge bcm2835/for-next
 421 Already up-to-date.
 422 Merging bcm2835-dt/bcm2835-dt-next (5ec6f2cd8ec4 ARM: bcm2835: Add the Raspberry Pi power domain driver to the DT.)
 423 $ git merge bcm2835-dt/bcm2835-dt-next
 424 Merge made by the 'recursive' strategy.
 425  arch/arm/boot/dts/Makefile          |  1 +
 426  arch/arm/boot/dts/bcm2835-rpi-a.dts | 24 ++++++++++++++++++++++++
 427  arch/arm/boot/dts/bcm2835-rpi.dtsi  | 16 ++++++++++++++++
 428  arch/arm/boot/dts/bcm283x.dtsi      | 35 +++++++++++++++++++++++++++++++++--
 429  4 files changed, 74 insertions(+), 2 deletions(-)
 430  create mode 100644 arch/arm/boot/dts/bcm2835-rpi-a.dts
 431 Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1)
 432 $ git merge bcm2835-soc/bcm2835-soc-next
 433 Already up-to-date.
 434 Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1)
 435 $ git merge bcm2835-drivers/bcm2835-drivers-next
 436 Already up-to-date.
 437 Merging bcm2835-defconfig/bcm2835-defconfig-next (92e963f50fc7 Linux 4.5-rc1)
 438 $ git merge bcm2835-defconfig/bcm2835-defconfig-next
 439 Already up-to-date.
 440 Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next)
 441 $ git merge berlin/berlin/for-next
 442 Already up-to-date!
 443 Merge made by the 'recursive' strategy.
 444 Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings)
 445 $ git merge cortex-m/for-next
 446 Already up-to-date.
 447 Merging imx-mxs/for-next (5a2565fb7d09 Merge branch 'imx/defconfig' into for-next)
 448 $ git merge imx-mxs/for-next
 449 Auto-merging arch/arm/boot/dts/Makefile
 450 Merge made by the 'recursive' strategy.
 451  arch/arm/boot/dts/Makefile                         |   1 +
 452  .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts  |   2 +-
 453  arch/arm/boot/dts/imx28-apf28dev.dts               |   2 +-
 454  arch/arm/boot/dts/imx28-eukrea-mbmx28lc.dtsi       |   4 +-
 455  arch/arm/boot/dts/imx28-tx28.dts                   |   4 +-
 456  .../boot/dts/imx35-eukrea-mbimxsd35-baseboard.dts  |   2 +-
 457  arch/arm/boot/dts/imx51-babbage.dts                |   2 +-
 458  arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi  |   2 +-
 459  .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts  |   2 +-
 460  arch/arm/boot/dts/imx53-ard.dts                    |   6 +-
 461  arch/arm/boot/dts/imx53-qsb-common.dtsi            |   4 +-
 462  arch/arm/boot/dts/imx53-tx53-x03x.dts              |   2 +-
 463  arch/arm/boot/dts/imx53-tx53-x13x.dts              |  42 ++-
 464  arch/arm/boot/dts/imx53-tx53.dtsi                  |   4 +-
 465  arch/arm/boot/dts/imx6dl-tx6u-811x.dts             |   2 +-
 466  arch/arm/boot/dts/imx6q-gk802.dts                  |   2 +-
 467  arch/arm/boot/dts/imx6q-icore-rqs.dts              |  78 ++++
 468  arch/arm/boot/dts/imx6q-tx6q-1110.dts              |   2 +-
 469  arch/arm/boot/dts/imx6qdl-apf6dev.dtsi             |   2 +-
 470  arch/arm/boot/dts/imx6qdl-gw51xx.dtsi              |   4 +-
 471  arch/arm/boot/dts/imx6qdl-gw52xx.dtsi              |   2 +-
 472  arch/arm/boot/dts/imx6qdl-gw53xx.dtsi              |   2 +-
 473  arch/arm/boot/dts/imx6qdl-gw54xx.dtsi              |  15 +-
 474  arch/arm/boot/dts/imx6qdl-gw552x.dtsi              |   2 +-
 475  arch/arm/boot/dts/imx6qdl-hummingboard.dtsi        |   8 +-
 476  arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi           | 411 +++++++++++++++++++++
 477  arch/arm/boot/dts/imx6qdl-microsom.dtsi            |   1 +
 478  arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi       |   2 +-
 479  arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi          |   2 +-
 480  arch/arm/boot/dts/imx6qdl-sabrelite.dtsi           |   2 +-
 481  arch/arm/boot/dts/imx6qdl-sabresd.dtsi             |   6 +-
 482  arch/arm/boot/dts/imx6qdl-tx6.dtsi                 |  13 +-
 483  arch/arm/boot/dts/imx6qdl-udoo.dtsi                |  57 +++
 484  arch/arm/boot/dts/imx6qdl.dtsi                     |   1 -
 485  arch/arm/boot/dts/imx6sl-warp.dts                  |   2 +-
 486  arch/arm/boot/dts/imx6sx-sabreauto.dts             |   2 +-
 487  arch/arm/boot/dts/imx6sx-sdb.dtsi                  |  18 +-
 488  arch/arm/boot/dts/imx6ul-14x14-evk.dts             |   4 +-
 489  arch/arm/boot/dts/imx7d-sbc-imx7.dts               |   2 +-
 490  arch/arm/boot/dts/imx7d-sdb.dts                    |   2 +-
 491  arch/arm/boot/dts/imx7d.dtsi                       |   9 +
 492  arch/arm/boot/dts/vf-colibri.dtsi                  |   9 +
 493  arch/arm/boot/dts/vfxxx.dtsi                       |  44 +++
 494  arch/arm/configs/imx_v6_v7_defconfig               |   3 +
 495  arch/arm/configs/mxs_defconfig                     |   2 +
 496  arch/arm/include/debug/imx.S                       |   3 +
 497  arch/arm/mach-imx/3ds_debugboard.c                 |  30 +-
 498  arch/arm/mach-imx/Kconfig                          |   2 +
 499  arch/arm/mach-imx/anatop.c                         |   9 +-
 500  arch/arm/mach-imx/avic.c                           |  30 +-
 501  arch/arm/mach-imx/cpu-imx27.c                      |   3 +-
 502  arch/arm/mach-imx/cpu-imx31.c                      |   2 +-
 503  arch/arm/mach-imx/cpu-imx35.c                      |   2 +-
 504  arch/arm/mach-imx/cpu.c                            |  16 +-
 505  arch/arm/mach-imx/epit.c                           |  22 +-
 506  arch/arm/mach-imx/headsmp.S                        |   2 +
 507  arch/arm/mach-imx/iomux-imx31.c                    |  12 +-
 508  arch/arm/mach-imx/iomux-v1.c                       |   4 +-
 509  arch/arm/mach-imx/iomux-v3.c                       |   6 +-
 510  arch/arm/mach-imx/mach-armadillo5x0.c              |   4 +-
 511  arch/arm/mach-imx/mach-imx51.c                     |   5 +-
 512  arch/arm/mach-imx/mach-mx27ads.c                   |   6 +-
 513  arch/arm/mach-imx/mach-mx31ads.c                   |  16 +-
 514  arch/arm/mach-imx/mach-mx31moboard.c               |   2 +-
 515  arch/arm/mach-imx/mach-qong.c                      |   6 +-
 516  arch/arm/mach-imx/mxc.h                            |   5 +
 517  arch/arm/mach-imx/pm-imx27.c                       |   4 +-
 518  arch/arm/mach-imx/pm-imx3.c                        |   4 +-
 519  arch/arm/mach-imx/pm-imx5.c                        |  26 +-
 520  arch/arm/mach-imx/pm-imx6.c                        |   8 +-
 521  arch/arm/mach-imx/system.c                         |   6 +-
 522  arch/arm/mach-imx/tzic.c                           |  34 +-
 523  72 files changed, 868 insertions(+), 191 deletions(-)
 524  create mode 100644 arch/arm/boot/dts/imx6q-icore-rqs.dts
 525  create mode 100644 arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi
 526 Merging keystone/next (8fdbbde4a16c Merge branch 'for_4.6/keystone_dts' into next)
 527 $ git merge keystone/next
 528 Auto-merging arch/arm/mach-keystone/keystone.c
 529 Auto-merging arch/arm/boot/dts/Makefile
 530 Merge made by the 'recursive' strategy.
 531  .../devicetree/bindings/arm/keystone/keystone.txt  |  5 ++
 532  arch/arm/boot/dts/Makefile                         |  3 +-
 533  arch/arm/boot/dts/k2g-evm.dts                      | 32 ++++++++
 534  arch/arm/boot/dts/k2g.dtsi                         | 89 ++++++++++++++++++++++
 535  arch/arm/mach-keystone/keystone.c                  |  1 +
 536  5 files changed, 129 insertions(+), 1 deletion(-)
 537  create mode 100644 arch/arm/boot/dts/k2g-evm.dts
 538  create mode 100644 arch/arm/boot/dts/k2g.dtsi
 539 Merging mvebu/for-next (84127e66ef4a Merge branch 'mvebu/defconfig' into mvebu/for-next)
 540 $ git merge mvebu/for-next
 541 Removing arch/arm/boot/dts/kirkwood-lswxl.dts
 542 Removing arch/arm/boot/dts/kirkwood-lswvl.dts
 543 Auto-merging arch/arm/boot/dts/Makefile
 544 Merge made by the 'recursive' strategy.
 545  .../devicetree/bindings/arm/marvell,kirkwood.txt   |   7 +-
 546  .../pinctrl/marvell,armada-370-pinctrl.txt         |   5 +-
 547  arch/arm/boot/dts/Makefile                         |   8 +-
 548  arch/arm/boot/dts/armada-370-mirabox.dts           |   2 +-
 549  arch/arm/boot/dts/armada-370-netgear-rn104.dts     |   2 +-
 550  arch/arm/boot/dts/armada-370-synology-ds213j.dts   |   2 +-
 551  arch/arm/boot/dts/armada-385-db-ap.dts             |   3 +
 552  arch/arm/boot/dts/armada-388-gp.dts                |  36 +--
 553  arch/arm/boot/dts/armada-38x.dtsi                  |  30 +-
 554  arch/arm/boot/dts/kirkwood-ds112.dts               |   2 +-
 555  arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi   | 192 +++++++++++++
 556  .../boot/dts/kirkwood-linkstation-duo-6281.dtsi    | 186 +++++++++++++
 557  arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts   | 135 +++++++++
 558  arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts    |  57 ++++
 559  arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts  |  57 ++++
 560  arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts   | 112 ++++++++
 561  arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts   | 116 ++++++++
 562  arch/arm/boot/dts/kirkwood-linkstation.dtsi        | 202 ++++++++++++++
 563  arch/arm/boot/dts/kirkwood-lswvl.dts               | 302 ---------------------
 564  arch/arm/boot/dts/kirkwood-lswxl.dts               | 302 ---------------------
 565  arch/arm/boot/dts/kirkwood-openrd-client.dts       |   6 +-
 566  arch/arm/boot/dts/kirkwood-openrd.dtsi             |  41 ++-
 567  arch/arm/boot/dts/kirkwood.dtsi                    |   2 +-
 568  arch/arm/boot/dts/mvebu-linkstation-fan.dtsi       |  72 +++++
 569  .../boot/dts/mvebu-linkstation-gpio-simple.dtsi    | 105 +++++++
 570  arch/arm/boot/dts/orion5x-linkstation-lsgl.dts     |  87 ++++++
 571  arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts   | 214 ++++-----------
 572  arch/arm/boot/dts/orion5x-linkstation.dtsi         | 180 ++++++++++++
 573  arch/arm/mach-mvebu/platsmp.c                      |   1 +
 574  29 files changed, 1654 insertions(+), 812 deletions(-)
 575  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-6282.dtsi
 576  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-duo-6281.dtsi
 577  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsqvl.dts
 578  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lsvl.dts
 579  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswsxl.dts
 580  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswvl.dts
 581  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation-lswxl.dts
 582  create mode 100644 arch/arm/boot/dts/kirkwood-linkstation.dtsi
 583  delete mode 100644 arch/arm/boot/dts/kirkwood-lswvl.dts
 584  delete mode 100644 arch/arm/boot/dts/kirkwood-lswxl.dts
 585  create mode 100644 arch/arm/boot/dts/mvebu-linkstation-fan.dtsi
 586  create mode 100644 arch/arm/boot/dts/mvebu-linkstation-gpio-simple.dtsi
 587  create mode 100644 arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
 588  create mode 100644 arch/arm/boot/dts/orion5x-linkstation.dtsi
 589 Merging omap/for-next (d56817ce2533 Merge branch 'omap-for-v4.6/dt' into for-next)
 590 $ git merge omap/for-next
 591 Merge made by the 'recursive' strategy.
 592  arch/arm/boot/dts/am335x-cm-t335.dts | 171 +++++++++++++++++++++++++++++++++++
 593  arch/arm/boot/dts/omap3-n900.dts     |  15 +++
 594  arch/arm/boot/dts/omap3-n950-n9.dtsi |  15 +++
 595  arch/arm/boot/dts/omap3-n950.dts     |  29 ++++++
 596  arch/arm/boot/dts/omap34xx.dtsi      |   6 ++
 597  arch/arm/boot/dts/omap36xx.dtsi      |   6 ++
 598  6 files changed, 242 insertions(+)
 599 Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
 600 $ git merge omap-pending/for-next
 601 Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
 602 Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution.
 603 Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c
 604 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c
 605 Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
 606 CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
 607 Automatic merge failed; fix conflicts and then commit the result.
 608 $ git commit -v -a
 609 [master d9485ee2e4c2] Merge remote-tracking branch 'omap-pending/for-next'
 610 $ git diff -M --stat --summary HEAD^..
 611 Merging qcom/for-next (2ccea21d797f ARM: qcom: Drop ARCH_MSM* configs)
 612 $ git merge qcom/for-next
 613 Resolved 'MAINTAINERS' using previous resolution.
 614 Auto-merging MAINTAINERS
 615 CONFLICT (content): Merge conflict in MAINTAINERS
 616 Automatic merge failed; fix conflicts and then commit the result.
 617 $ git commit -v -a
 618 [master af27b6031a7d] Merge remote-tracking branch 'qcom/for-next'
 619 $ git diff -M --stat --summary HEAD^..
 620  Documentation/devicetree/bindings/arm/cpus.txt     |   1 +
 621  .../devicetree/bindings/firmware/qcom,scm.txt      |  25 ++
 622  .../devicetree/bindings/mtd/qcom_nandc.txt         |  86 +++++++
 623  MAINTAINERS                                        |   2 +
 624  arch/arm/Makefile                                  |   3 +-
 625  arch/arm/boot/dts/qcom-apq8064.dtsi                |   5 +
 626  arch/arm/boot/dts/qcom-apq8084.dtsi                |  14 ++
 627  arch/arm/boot/dts/qcom-ipq8064.dtsi                |  12 +
 628  arch/arm/boot/dts/qcom-msm8660.dtsi                |  20 ++
 629  arch/arm/boot/dts/qcom-msm8974.dtsi                | 132 ++++++++++
 630  arch/arm/mach-qcom/Kconfig                         |  17 +-
 631  arch/arm64/boot/dts/qcom/Makefile                  |   1 +
 632  arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi          | 132 +++++++++-
 633  arch/arm64/boot/dts/qcom/msm8916-pins.dtsi         |  24 +-
 634  arch/arm64/boot/dts/qcom/msm8916.dtsi              |  19 +-
 635  arch/arm64/boot/dts/qcom/msm8996-mtp.dts           |  21 ++
 636  arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi          |  30 +++
 637  arch/arm64/boot/dts/qcom/msm8996.dtsi              | 267 ++++++++++++++++++++
 638  arch/arm64/boot/dts/qcom/pm8004.dtsi               |  19 ++
 639  arch/arm64/boot/dts/qcom/pm8994.dtsi               |  62 +++++
 640  arch/arm64/boot/dts/qcom/pmi8994.dtsi              |  19 ++
 641  drivers/firmware/qcom_scm-32.c                     |  82 +++++++
 642  drivers/firmware/qcom_scm-64.c                     |  25 ++
 643  drivers/firmware/qcom_scm.c                        | 271 ++++++++++++++++++++-
 644  drivers/firmware/qcom_scm.h                        |  12 +
 645  drivers/soc/qcom/smd.c                             | 228 ++++++++++++-----
 646  drivers/soc/qcom/spm.c                             |   8 +-
 647  drivers/spmi/spmi-pmic-arb.c                       | 153 ++++++++----
 648  include/linux/qcom_scm.h                           |   6 +
 649  include/linux/soc/qcom/smd.h                       |   8 +-
 650  include/linux/soc/qcom/smem_state.h                |  35 +++
 651  31 files changed, 1597 insertions(+), 142 deletions(-)
 652  create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt
 653  create mode 100644 Documentation/devicetree/bindings/mtd/qcom_nandc.txt
 654  create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts
 655  create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi
 656  create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi
 657  create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi
 658  create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi
 659  create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi
 660 Merging renesas/next (74eb2716fe71 Merge branches 'heads/arm64-dt-for-v4.6', 'heads/defconfig-for-v4.6', 'heads/dt-for-v4.6' and 'heads/soc-for-v4.6' into next)
 661 $ git merge renesas/next
 662 Auto-merging arch/arm/mach-shmobile/smp-r8a7779.c
 663 Merge made by the 'recursive' strategy.
 664  arch/arm/boot/dts/emev2.dtsi              |  39 +-
 665  arch/arm/boot/dts/r7s72100.dtsi           | 177 +++----
 666  arch/arm/boot/dts/r8a73a4.dtsi            | 224 ++++-----
 667  arch/arm/boot/dts/r8a7740.dtsi            | 161 +++----
 668  arch/arm/boot/dts/r8a7778-bockw.dts       |  13 +
 669  arch/arm/boot/dts/r8a7778.dtsi            | 144 +++---
 670  arch/arm/boot/dts/r8a7779-marzen.dts      |  13 +
 671  arch/arm/boot/dts/r8a7779.dtsi            | 135 +++---
 672  arch/arm/boot/dts/r8a7790-lager.dts       |  13 +
 673  arch/arm/boot/dts/r8a7790.dtsi            | 441 +++++++++--------
 674  arch/arm/boot/dts/r8a7791-koelsch.dts     |  13 +
 675  arch/arm/boot/dts/r8a7791-porter.dts      | 165 +++++++
 676  arch/arm/boot/dts/r8a7791.dtsi            | 514 ++++++++++----------
 677  arch/arm/boot/dts/r8a7793-gose.dts        | 304 ++++++++++++
 678  arch/arm/boot/dts/r8a7793.dtsi            | 758 ++++++++++++++++++++++++------
 679  arch/arm/boot/dts/r8a7794-alt.dts         |  59 +++
 680  arch/arm/boot/dts/r8a7794-silk.dts        | 122 +++++
 681  arch/arm/boot/dts/r8a7794.dtsi            | 362 +++++++-------
 682  arch/arm/boot/dts/sh73a0.dtsi             | 186 ++++----
 683  arch/arm/mach-shmobile/common.h           |   5 +-
 684  arch/arm/mach-shmobile/emev2.h            |   6 +
 685  arch/arm/mach-shmobile/headsmp-scu.S      |   6 -
 686  arch/arm/mach-shmobile/platsmp-scu.c      |  11 +-
 687  arch/arm/mach-shmobile/setup-emev2.c      |  22 +-
 688  arch/arm/mach-shmobile/setup-r8a7740.c    |  39 +-
 689  arch/arm/mach-shmobile/smp-emev2.c        |   5 +-
 690  arch/arm/mach-shmobile/smp-r8a7779.c      |   3 +-
 691  arch/arm/mach-shmobile/smp-sh73a0.c       |   3 +-
 692  arch/arm64/boot/dts/renesas/r8a7795.dtsi  |  12 +-
 693  include/dt-bindings/clock/r8a7793-clock.h |   2 +
 694  30 files changed, 2605 insertions(+), 1352 deletions(-)
 695  create mode 100644 arch/arm/mach-shmobile/emev2.h
 696 Merging rockchip/for-next (b24b8204ad7d Merge branch 'v4.6-armsoc/dts64' into for-next)
 697 $ git merge rockchip/for-next
 698 Merge made by the 'recursive' strategy.
 699  .../devicetree/bindings/mmc/rockchip-dw-mshc.txt   |   2 +
 700  .../bindings/soc/rockchip/power_domain.txt         |  21 +++++
 701  arch/arm/boot/dts/rk3036-kylin.dts                 | 104 +++++++++++++++++++++
 702  arch/arm/boot/dts/rk3036.dtsi                      |  69 +++++++++++---
 703  arch/arm/boot/dts/rk3066a-bqcurie2.dts             |  19 +++-
 704  arch/arm/boot/dts/rk3066a-marsboard.dts            |  16 ++++
 705  arch/arm/boot/dts/rk3066a-rayeager.dts             |  18 +++-
 706  arch/arm/boot/dts/rk3066a.dtsi                     |  24 ++++-
 707  arch/arm/boot/dts/rk3188-radxarock.dts             |   2 +-
 708  arch/arm/boot/dts/rk3188.dtsi                      |   2 +
 709  arch/arm/boot/dts/rk3288-evb.dtsi                  |   2 +-
 710  arch/arm/boot/dts/rk3288-firefly.dtsi              |  26 +++++-
 711  arch/arm/boot/dts/rk3288-popmetal.dts              |   2 +-
 712  arch/arm/boot/dts/rk3288-r89.dts                   |   2 +-
 713  arch/arm/boot/dts/rk3288-rock2-som.dtsi            |  26 ++++++
 714  arch/arm/boot/dts/rk3288-rock2-square.dts          |  48 +++++++++-
 715  arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi    |   2 +-
 716  arch/arm/boot/dts/rk3288-veyron.dtsi               |   9 +-
 717  arch/arm/boot/dts/rk3288.dtsi                      |  48 ++++++++++
 718  arch/arm/boot/dts/rk3xxx.dtsi                      |   3 +
 719  arch/arm64/Kconfig.platforms                       |   1 +
 720  arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   2 +-
 721  arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   2 +-
 722  arch/arm64/boot/dts/rockchip/rk3368.dtsi           |  10 +-
 723  drivers/clk/rockchip/clk-rk3036.c                  |  33 ++-----
 724  drivers/clk/rockchip/clk-rk3188.c                  |  27 ++----
 725  drivers/clk/rockchip/clk-rk3228.c                  |  38 ++------
 726  drivers/clk/rockchip/clk-rk3288.c                  |  38 ++------
 727  drivers/clk/rockchip/clk-rk3368.c                  |  82 +++++++---------
 728  drivers/clk/rockchip/clk.c                         |  64 ++++++++++++-
 729  drivers/clk/rockchip/clk.h                         |  28 ++++++
 730  drivers/soc/rockchip/pm_domains.c                  |  34 +++++++
 731  include/dt-bindings/clock/rk3188-cru-common.h      |   1 +
 732  include/dt-bindings/power/rk3368-power.h           |  28 ++++++
 733  34 files changed, 638 insertions(+), 195 deletions(-)
 734  create mode 100644 include/dt-bindings/power/rk3368-power.h
 735 Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2)
 736 $ git merge rpi/for-rpi-next
 737 Already up-to-date.
 738 Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1)
 739 $ git merge samsung/for-next
 740 Already up-to-date.
 741 Merging samsung-krzk/for-next (3a9cb5f4a9a7 Merge branch 'next/defconfig' into for-next)
 742 $ git merge samsung-krzk/for-next
 743 Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h
 744 Auto-merging include/linux/soc/samsung/exynos-pmu.h
 745 Removing drivers/rtc/rtc-max77802.c
 746 Removing arch/arm/mach-exynos/regs-srom.h
 747 Removing arch/arm/mach-exynos/pmu.c
 748 Auto-merging arch/arm/configs/multi_v7_defconfig
 749 Auto-merging MAINTAINERS
 750 Merge made by the 'recursive' strategy.
 751  .../bindings/arm/samsung/exynos-srom.txt           |  81 ++
 752  MAINTAINERS                                        |   1 +
 753  arch/arm/boot/dts/exynos3250-monk.dts              |   6 +-
 754  arch/arm/boot/dts/exynos3250-rinato.dts            |   6 +-
 755  arch/arm/boot/dts/exynos4.dtsi                     |   5 +
 756  arch/arm/boot/dts/exynos4210-origen.dts            |  10 +-
 757  arch/arm/boot/dts/exynos4210-smdkv310.dts          |   2 +-
 758  arch/arm/boot/dts/exynos4210-trats.dts             |   2 +-
 759  arch/arm/boot/dts/exynos4210-universal_c210.dts    |   4 +-
 760  arch/arm/boot/dts/exynos4412-odroid-common.dtsi    |   2 +-
 761  arch/arm/boot/dts/exynos4412-odroidx.dts           |   2 +-
 762  arch/arm/boot/dts/exynos4412-origen.dts            |   2 +-
 763  arch/arm/boot/dts/exynos4412-smdk4412.dts          |   2 +-
 764  arch/arm/boot/dts/exynos4412-trats2.dts            |   4 +-
 765  arch/arm/boot/dts/exynos5.dtsi                     |   5 +
 766  arch/arm/boot/dts/exynos5250-arndale.dts           |  12 +-
 767  arch/arm/boot/dts/exynos5250-snow-common.dtsi      |   4 +-
 768  arch/arm/boot/dts/exynos5250-spring.dts            |   4 +-
 769  arch/arm/boot/dts/exynos5250.dtsi                  |   2 +-
 770  arch/arm/boot/dts/exynos5410-pinctrl.dtsi          | 406 +++++++++
 771  arch/arm/boot/dts/exynos5410-smdk5410.dts          |  41 +
 772  arch/arm/boot/dts/exynos5410.dtsi                  |  47 +
 773  arch/arm/boot/dts/exynos5420-arndale-octa.dts      |  11 +-
 774  arch/arm/boot/dts/exynos5420-cpus.dtsi             | 102 +++
 775  arch/arm/boot/dts/exynos5420-peach-pit.dts         |  13 +-
 776  arch/arm/boot/dts/exynos5420-smdk5420.dts          |   9 +
 777  arch/arm/boot/dts/exynos5420.dtsi                  | 170 ++--
 778  arch/arm/boot/dts/exynos5422-cpus.dtsi             | 140 +--
 779  arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi |   8 +
 780  arch/arm/boot/dts/exynos5800-peach-pi.dts          |  13 +-
 781  arch/arm/boot/dts/exynos5800.dtsi                  | 108 +++
 782  arch/arm/boot/dts/s5pv210-aquila.dts               |   4 +-
 783  arch/arm/boot/dts/s5pv210-goni.dts                 |   4 +-
 784  arch/arm/boot/dts/s5pv210-smdkv210.dts             |   2 +-
 785  arch/arm/configs/exynos_defconfig                  |  10 +-
 786  arch/arm/configs/multi_v7_defconfig                |   1 -
 787  arch/arm/mach-exynos/Kconfig                       |   3 +
 788  arch/arm/mach-exynos/Makefile                      |   2 +-
 789  arch/arm/mach-exynos/exynos.c                      |  30 +-
 790  arch/arm/mach-exynos/include/mach/map.h            |   8 -
 791  arch/arm/mach-exynos/mcpm-exynos.c                 |   2 +-
 792  arch/arm/mach-exynos/platsmp.c                     |   2 +-
 793  arch/arm/mach-exynos/pm.c                          |   4 +-
 794  arch/arm/mach-exynos/pmu.c                         | 967 ---------------------
 795  arch/arm/mach-exynos/regs-srom.h                   |  53 --
 796  arch/arm/mach-exynos/suspend.c                     |  24 +-
 797  arch/arm/mach-s3c64xx/Kconfig                      |   3 +-
 798  arch/arm/plat-samsung/adc.c                        |   6 +-
 799  arch/arm/plat-samsung/include/plat/map-s5p.h       |   1 -
 800  drivers/cpufreq/s5pv210-cpufreq.c                  |   2 -
 801  drivers/rtc/Kconfig                                |  10 -
 802  drivers/rtc/Makefile                               |   1 -
 803  drivers/rtc/rtc-max77686.c                         | 362 ++++++--
 804  drivers/rtc/rtc-max77802.c                         | 502 -----------
 805  drivers/soc/Kconfig                                |   1 +
 806  drivers/soc/Makefile                               |   1 +
 807  drivers/soc/samsung/Kconfig                        |  17 +
 808  drivers/soc/samsung/Makefile                       |   3 +
 809  drivers/soc/samsung/exynos-pmu.c                   | 141 +++
 810  drivers/soc/samsung/exynos-pmu.h                   |  44 +
 811  drivers/soc/samsung/exynos-srom.c                  | 232 +++++
 812  drivers/soc/samsung/exynos-srom.h                  |  51 ++
 813  drivers/soc/samsung/exynos3250-pmu.c               | 175 ++++
 814  drivers/soc/samsung/exynos4-pmu.c                  | 222 +++++
 815  drivers/soc/samsung/exynos5250-pmu.c               | 195 +++++
 816  drivers/soc/samsung/exynos5420-pmu.c               | 280 ++++++
 817  .../linux/soc/samsung}/exynos-pmu.h                |   6 +-
 818  .../linux/soc/samsung/exynos-regs-pmu.h            |   6 +-
 819  68 files changed, 2745 insertions(+), 1856 deletions(-)
 820  create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-srom.txt
 821  create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi
 822  create mode 100644 arch/arm/boot/dts/exynos5420-cpus.dtsi
 823  delete mode 100644 arch/arm/mach-exynos/pmu.c
 824  delete mode 100644 arch/arm/mach-exynos/regs-srom.h
 825  delete mode 100644 drivers/rtc/rtc-max77802.c
 826  create mode 100644 drivers/soc/samsung/Kconfig
 827  create mode 100644 drivers/soc/samsung/Makefile
 828  create mode 100644 drivers/soc/samsung/exynos-pmu.c
 829  create mode 100644 drivers/soc/samsung/exynos-pmu.h
 830  create mode 100644 drivers/soc/samsung/exynos-srom.c
 831  create mode 100644 drivers/soc/samsung/exynos-srom.h
 832  create mode 100644 drivers/soc/samsung/exynos3250-pmu.c
 833  create mode 100644 drivers/soc/samsung/exynos4-pmu.c
 834  create mode 100644 drivers/soc/samsung/exynos5250-pmu.c
 835  create mode 100644 drivers/soc/samsung/exynos5420-pmu.c
 836  rename {arch/arm/mach-exynos => include/linux/soc/samsung}/exynos-pmu.h (81%)
 837  rename arch/arm/mach-exynos/regs-pmu.h => include/linux/soc/samsung/exynos-regs-pmu.h (99%)
 838 Merging sunxi/sunxi/for-next (06902a8895d5 Merge branches 'sunxi/clocks-for-4.6', 'sunxi/core-for-4.6', 'sunxi/drivers-for-4.6' and 'sunxi/dt-for-4.6' into sunxi/for-next)
 839 $ git merge sunxi/sunxi/for-next
 840 Auto-merging arch/arm/boot/dts/Makefile
 841 Merge made by the 'recursive' strategy.
 842  Documentation/arm/sunxi/README                     |   1 -
 843  Documentation/devicetree/bindings/arm/sunxi.txt    |   1 +
 844  Documentation/devicetree/bindings/clock/sunxi.txt  |   4 +-
 845  arch/arm/boot/dts/Makefile                         |   3 +
 846  arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts    |  10 +
 847  arch/arm/boot/dts/sun4i-a10-inet97fv2.dts          |  10 +
 848  arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts       |   9 +
 849  .../boot/dts/sun4i-a10-itead-iteaduino-plus.dts    |  86 +--
 850  arch/arm/boot/dts/sun5i-r8-chip.dts                |   4 +
 851  arch/arm/boot/dts/sun6i-a31.dtsi                   |  46 +-
 852  arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi     |   6 +-
 853  arch/arm/boot/dts/sun7i-a20-itead-ibox.dts         | 125 +++
 854  arch/arm/boot/dts/sun8i-a23-a33.dtsi               |  27 +-
 855  arch/arm/boot/dts/sun8i-a23.dtsi                   |   2 +-
 856  arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts     |   3 +
 857  arch/arm/boot/dts/sun8i-a33.dtsi                   |   4 +-
 858  .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts  |  64 ++
 859  arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts   |  65 ++
 860  arch/arm/boot/dts/sun8i-a83t.dtsi                  | 228 ++++++
 861  arch/arm/boot/dts/sun8i-h3.dtsi                    |  37 +-
 862  arch/arm/boot/dts/sun9i-a80-cubieboard4.dts        |   6 +
 863  arch/arm/boot/dts/sun9i-a80-optimus.dts            |  28 +-
 864  arch/arm/boot/dts/sun9i-a80.dtsi                   |  11 +-
 865  arch/arm/boot/dts/sunxi-itead-core-common.dtsi     | 136 ++++
 866  arch/arm/mach-sunxi/sunxi.c                        |   1 +
 867  drivers/bus/sunxi-rsb.c                            |   4 +-
 868  drivers/clk/sunxi/clk-a10-hosc.c                   |   3 +-
 869  drivers/clk/sunxi/clk-a20-gmac.c                   |   2 -
 870  drivers/clk/sunxi/clk-factors.c                    | 123 ++-
 871  drivers/clk/sunxi/clk-factors.h                    |  26 +-
 872  drivers/clk/sunxi/clk-mod0.c                       |  23 +-
 873  drivers/clk/sunxi/clk-simple-gates.c               |   2 +
 874  drivers/clk/sunxi/clk-sun6i-apb0-gates.c           |   2 -
 875  drivers/clk/sunxi/clk-sun6i-ar100.c                | 235 ++----
 876  drivers/clk/sunxi/clk-sun8i-bus-gates.c            |   3 +-
 877  drivers/clk/sunxi/clk-sun8i-mbus.c                 | 127 ++--
 878  drivers/clk/sunxi/clk-sun9i-core.c                 |  86 +--
 879  drivers/clk/sunxi/clk-sunxi.c                      | 835 +++++++++------------
 880  drivers/clk/sunxi/clk-usb.c                        |  24 +-
 881  drivers/soc/sunxi/sunxi_sram.c                     |   5 +-
 882  40 files changed, 1408 insertions(+), 1009 deletions(-)
 883  create mode 100644 arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
 884  create mode 100644 arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
 885  create mode 100644 arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
 886  create mode 100644 arch/arm/boot/dts/sun8i-a83t.dtsi
 887  create mode 100644 arch/arm/boot/dts/sunxi-itead-core-common.dtsi
 888 Merging tegra/for-next (025e08f78501 Merge branch for-4.6/arm64 into for-next)
 889 $ git merge tegra/for-next
 890 Merge made by the 'recursive' strategy.
 891  arch/arm/boot/dts/tegra114.dtsi           |   2 +-
 892  arch/arm/boot/dts/tegra124-jetson-tk1.dts |  26 ++++++
 893  arch/arm/boot/dts/tegra124.dtsi           |   2 +-
 894  arch/arm/boot/dts/tegra20.dtsi            |   2 +-
 895  arch/arm/boot/dts/tegra30.dtsi            |   2 +-
 896  arch/arm64/boot/dts/nvidia/tegra132.dtsi  |   2 +-
 897  arch/arm64/boot/dts/nvidia/tegra210.dtsi  |   2 +-
 898  drivers/clk/tegra/clk-emc.c               |   6 +-
 899  drivers/clk/tegra/clk-id.h                |   1 +
 900  drivers/clk/tegra/clk-pll.c               |  50 +++++++----
 901  drivers/clk/tegra/clk-tegra-periph.c      |   5 +-
 902  drivers/clk/tegra/clk-tegra-super-gen4.c  |   6 +-
 903  drivers/clk/tegra/clk-tegra210.c          | 132 ++++++++++++++----------------
 904  drivers/soc/tegra/Kconfig                 |   2 -
 905  drivers/soc/tegra/pmc.c                   |  19 ++---
 906  include/dt-bindings/clock/tegra210-car.h  |   2 +-
 907  16 files changed, 145 insertions(+), 116 deletions(-)
 908 Merging arm64/for-next/core (f4d92287583b arm64: Fix build with CONFIG_DEBUG_PAGEALLOC=n)
 909 $ git merge arm64/for-next/core
 910 Merge made by the 'recursive' strategy.
 911  Documentation/arm64/booting.txt                    |  20 +-
 912  .../features/vm/huge-vmap/arch-support.txt         |   2 +-
 913  arch/arm/include/asm/kvm_asm.h                     |   2 +
 914  arch/arm/kvm/arm.c                                 |   8 +-
 915  arch/arm64/Kconfig                                 |  14 +
 916  arch/arm64/include/asm/acpi.h                      |  19 +-
 917  arch/arm64/include/asm/boot.h                      |   6 +
 918  arch/arm64/include/asm/cpufeature.h                |   3 +-
 919  arch/arm64/include/asm/cputype.h                   |  17 +-
 920  arch/arm64/include/asm/fixmap.h                    |  10 +
 921  arch/arm64/include/asm/hardirq.h                   |   2 +-
 922  arch/arm64/include/asm/kasan.h                     |   5 +-
 923  arch/arm64/include/asm/kernel-pgtable.h            |  12 +
 924  arch/arm64/include/asm/kvm_asm.h                   |   2 +
 925  arch/arm64/include/asm/kvm_host.h                  |   8 +-
 926  arch/arm64/include/asm/memory.h                    |  44 +-
 927  arch/arm64/include/asm/mmu_context.h               |  62 ++-
 928  arch/arm64/include/asm/pgalloc.h                   |  26 +-
 929  arch/arm64/include/asm/pgtable.h                   | 110 +++--
 930  arch/arm64/include/asm/processor.h                 |   8 +-
 931  arch/arm64/include/asm/smp.h                       |   9 +
 932  arch/arm64/kernel/Makefile                         |   1 +
 933  arch/arm64/kernel/acpi_parking_protocol.c          | 153 +++++++
 934  arch/arm64/kernel/cpu_errata.c                     |  18 +-
 935  arch/arm64/kernel/cpu_ops.c                        |  27 +-
 936  arch/arm64/kernel/cpufeature.c                     |  17 +
 937  arch/arm64/kernel/debug-monitors.c                 |  21 +-
 938  arch/arm64/kernel/head.S                           |   9 +-
 939  arch/arm64/kernel/image.h                          |  13 +-
 940  arch/arm64/kernel/setup.c                          |   7 +
 941  arch/arm64/kernel/smp.c                            |  32 +-
 942  arch/arm64/kernel/suspend.c                        |  20 +-
 943  arch/arm64/kernel/vmlinux.lds.S                    |   9 +-
 944  arch/arm64/kvm/hyp.S                               |   6 +-
 945  arch/arm64/lib/copy_page.S                         |  63 ++-
 946  arch/arm64/mm/dump.c                               |  17 +-
 947  arch/arm64/mm/init.c                               |  78 +++-
 948  arch/arm64/mm/kasan_init.c                         |  63 ++-
 949  arch/arm64/mm/mmu.c                                | 483 +++++++++++++--------
 950  arch/arm64/mm/pageattr.c                           |  46 +-
 951  arch/arm64/mm/proc.S                               |  28 ++
 952  drivers/of/fdt.c                                   |   5 +-
 953  include/asm-generic/fixmap.h                       |  12 +-
 954  43 files changed, 1136 insertions(+), 381 deletions(-)
 955  create mode 100644 arch/arm64/kernel/acpi_parking_protocol.c
 956 Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
 957 $ git merge blackfin/for-linus
 958 Already up-to-date.
 959 Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header)
 960 $ git merge c6x/for-linux-next
 961 Already up-to-date.
 962 Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code)
 963 $ git merge cris/for-next
 964 Already up-to-date.
 965 Merging h8300/h8300-next (11943fdd17d2 h8300: dts: Rename the serial port clock to fck)
 966 $ git merge h8300/h8300-next
 967 Merge made by the 'recursive' strategy.
 968  arch/h8300/boot/dts/edosk2674.dts  | 6 +++---
 969  arch/h8300/boot/dts/h8300h_sim.dts | 4 ++--
 970  arch/h8300/boot/dts/h8s_sim.dts    | 4 ++--
 971  3 files changed, 7 insertions(+), 7 deletions(-)
 972 Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error")
 973 $ git merge hexagon/linux-next
 974 Already up-to-date.
 975 Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted())
 976 $ git merge ia64/next
 977 Already up-to-date.
 978 Merging m68k/for-next (a9c9d9aca4e7 zorro: Use kobj_to_dev())
 979 $ git merge m68k/for-next
 980 Merge made by the 'recursive' strategy.
 981  drivers/zorro/zorro-sysfs.c | 3 +--
 982  1 file changed, 1 insertion(+), 2 deletions(-)
 983 Merging m68knommu/for-next (9d4c9e5064d7 m68knommu: fix FEC platform device registration when driver is modular)
 984 $ git merge m68knommu/for-next
 985 Merge made by the 'recursive' strategy.
 986  arch/m68k/coldfire/device.c | 4 ++--
 987  1 file changed, 2 insertions(+), 2 deletions(-)
 988 Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init)
 989 $ git merge metag/for-next
 990 Auto-merging arch/metag/kernel/ftrace.c
 991 Merge made by the 'recursive' strategy.
 992  arch/metag/kernel/ftrace.c | 1 -
 993  1 file changed, 1 deletion(-)
 994 Merging microblaze/next (c937adb7ec91 microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls)
 995 $ git merge microblaze/next
 996 Merge made by the 'recursive' strategy.
 997  arch/microblaze/include/asm/unistd.h      | 2 +-
 998  arch/microblaze/include/uapi/asm/unistd.h | 3 +++
 999  arch/microblaze/kernel/syscall_table.S    | 3 +++
1000  3 files changed, 7 insertions(+), 1 deletion(-)
1001 Merging mips/mips-for-linux-next (a13d2abd8e61 MIPS: highmem: Turn flush_cache_kmaps into a no-op.)
1002 $ git merge mips/mips-for-linux-next
1003 Merge made by the 'recursive' strategy.
1004  arch/mips/Kconfig                     |  2 +-
1005  arch/mips/ath79/Kconfig               | 12 ------------
1006  arch/mips/ath79/setup.c               | 13 ++++++-------
1007  arch/mips/boot/compressed/Makefile    | 12 +++++++++---
1008  arch/mips/boot/dts/qca/Makefile       |  3 ---
1009  arch/mips/cavium-octeon/smp.c         |  2 +-
1010  arch/mips/include/asm/highmem.h       |  4 +++-
1011  arch/mips/loongson64/loongson-3/smp.c |  1 -
1012  arch/mips/pmcs-msp71xx/msp_setup.c    |  2 +-
1013  arch/mips/vr41xx/common/pmu.c         |  2 +-
1014  10 files changed, 22 insertions(+), 31 deletions(-)
1015 Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency)
1016 $ git merge nios2/for-next
1017 Already up-to-date.
1018 Merging parisc-hd/for-next (afd2ff9b7e1b Linux 4.4)
1019 $ git merge parisc-hd/for-next
1020 Already up-to-date.
1021 Merging powerpc/next (388f7b1d6e8c Linux 4.5-rc3)
1022 $ git merge powerpc/next
1023 Already up-to-date.
1024 Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2)
1025 $ git merge powerpc-mpe/next
1026 Already up-to-date.
1027 Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address)
1028 $ git merge fsl/next
1029 Already up-to-date.
1030 Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc)
1031 $ git merge mpc5xxx/next
1032 Already up-to-date.
1033 Merging s390/features (232f5dd78586 s390/oprofile: fix address range for asynchronous stack)
1034 $ git merge s390/features
1035 Merge made by the 'recursive' strategy.
1036  arch/s390/kernel/perf_event.c  |  8 ++++---
1037  arch/s390/kernel/stacktrace.c  | 47 ++++++++++++++++++++++++++++++------------
1038  arch/s390/oprofile/backtrace.c |  8 ++++---
1039  3 files changed, 44 insertions(+), 19 deletions(-)
1040 Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
1041 $ git merge sparc-next/master
1042 Already up-to-date.
1043 Merging tile/master (f1c3418ed4e6 tile kgdb: fix bug in copy to gdb regs, and optimize memset)
1044 $ git merge tile/master
1045 Merge made by the 'recursive' strategy.
1046  arch/tile/kernel/kgdb.c | 8 ++++----
1047  1 file changed, 4 insertions(+), 4 deletions(-)
1048 Merging uml/linux-next (288b31a382d2 um: use %lx format specifiers for unsigned longs)
1049 $ git merge uml/linux-next
1050 Merge made by the 'recursive' strategy.
1051  arch/x86/um/os-Linux/task_size.c | 4 ++--
1052  1 file changed, 2 insertions(+), 2 deletions(-)
1053 Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
1054 $ git merge unicore32/unicore32
1055 Already up-to-date.
1056 Merging xtensa/for_next (bb2f3486041a Merge tag 'xtensa-for-next-20160111' of git://github.com/jcmvbkbc/linux-xtensa)
1057 $ git merge xtensa/for_next
1058 Auto-merging arch/xtensa/Kconfig
1059 Merge made by the 'recursive' strategy.
1060  arch/xtensa/Kconfig                 | 16 +++++++++
1061  arch/xtensa/include/asm/io.h        | 16 +++++++--
1062  arch/xtensa/include/asm/processor.h | 12 +++----
1063  arch/xtensa/include/asm/timex.h     |  9 ++---
1064  arch/xtensa/kernel/traps.c          | 27 +++++++++++++++
1065  arch/xtensa/mm/Makefile             |  2 +-
1066  arch/xtensa/mm/ioremap.c            | 68 +++++++++++++++++++++++++++++++++++++
1067  7 files changed, 133 insertions(+), 17 deletions(-)
1068  create mode 100644 arch/xtensa/mm/ioremap.c
1069 Merging btrfs/next (988f1f576d4f Merge branch 'for-chris-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5)
1070 $ git merge btrfs/next
1071 Already up-to-date.
1072 Merging btrfs-kdave/for-next (4c9aeec066dd Merge branch 'for-next-4.6-20160203' into for-next-20160203)
1073 $ git merge btrfs-kdave/for-next
1074 Resolved 'fs/btrfs/file.c' using previous resolution.
1075 Auto-merging fs/btrfs/scrub.c
1076 Auto-merging fs/btrfs/ioctl.c
1077 Auto-merging fs/btrfs/inode.c
1078 Auto-merging fs/btrfs/file.c
1079 CONFLICT (content): Merge conflict in fs/btrfs/file.c
1080 Auto-merging fs/btrfs/ctree.h
1081 Automatic merge failed; fix conflicts and then commit the result.
1082 $ git commit -v -a
1083 [master 109808b2be9c] Merge remote-tracking branch 'btrfs-kdave/for-next'
1084 $ git diff -M --stat --summary HEAD^..
1085  fs/btrfs/ctree.c     |  34 +++----
1086  fs/btrfs/ctree.h     |   5 +-
1087  fs/btrfs/extent_io.c |   3 +-
1088  fs/btrfs/file-item.c |  92 ++++++++++++-------
1089  fs/btrfs/file.c      |  99 ++++++++++++--------
1090  fs/btrfs/inode.c     | 248 ++++++++++++++++++++++++++++++++++++---------------
1091  fs/btrfs/ioctl.c     |   5 +-
1092  fs/btrfs/reada.c     |  10 +--
1093  fs/btrfs/scrub.c     |  24 ++---
1094  fs/btrfs/send.c      |  36 ++++----
1095  10 files changed, 357 insertions(+), 199 deletions(-)
1096 Merging ceph/master (bbadd4529b09 libceph: MOSDOpReply v7 encoding)
1097 $ git merge ceph/master
1098 Merge made by the 'recursive' strategy.
1099 Merging cifs/for-next (74c7b2af37ad Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
1100 $ git merge cifs/for-next
1101 Already up-to-date.
1102 Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree)
1103 $ git merge configfs/for-next
1104 Already up-to-date.
1105 Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions)
1106 $ git merge ecryptfs/next
1107 Auto-merging fs/ecryptfs/main.c
1108 Merge made by the 'recursive' strategy.
1109  fs/ecryptfs/main.c | 3 +--
1110  1 file changed, 1 insertion(+), 2 deletions(-)
1111 Merging ext3/for_next (5a9530e498ed ocfs2: Implement get_next_id())
1112 $ git merge ext3/for_next
1113 Merge made by the 'recursive' strategy.
1114  fs/ext4/super.c                |   1 +
1115  fs/ocfs2/ocfs2_trace.h         |   2 +
1116  fs/ocfs2/quota_global.c        |  25 ++
1117  fs/quota/dquot.c               |  39 +++
1118  fs/quota/quota.c               |  67 ++++-
1119  fs/quota/quota_tree.c          |  67 ++++-
1120  fs/quota/quota_v2.c            |   6 +
1121  fs/reiserfs/super.c            |   1 +
1122  fs/udf/dir.c                   |  13 +-
1123  fs/udf/namei.c                 |  29 +-
1124  fs/udf/super.c                 |  38 +--
1125  fs/udf/udfdecl.h               |  21 +-
1126  fs/udf/unicode.c               | 630 ++++++++++++++++-------------------------
1127  fs/xfs/libxfs/xfs_quota_defs.h |   3 +-
1128  fs/xfs/xfs_dquot.c             | 129 ++++++++-
1129  fs/xfs/xfs_file.c              |  82 ++++--
1130  fs/xfs/xfs_inode.h             |   2 +
1131  fs/xfs/xfs_qm.c                |  55 +++-
1132  fs/xfs/xfs_qm.h                |  48 +++-
1133  fs/xfs/xfs_qm_syscalls.c       |  27 +-
1134  fs/xfs/xfs_quotaops.c          |  36 ++-
1135  fs/xfs/xfs_trans_dquot.c       |  15 +-
1136  include/linux/dqblk_qtree.h    |   2 +
1137  include/linux/quota.h          |   5 +
1138  include/linux/quotaops.h       |   3 +
1139  include/uapi/linux/dqblk_xfs.h |   1 +
1140  include/uapi/linux/quota.h     |  14 +
1141  27 files changed, 844 insertions(+), 517 deletions(-)
1142 Merging ext4/dev (6df2762f3f76 ext4 crypto: move context consistency check to ext4_file_open())
1143 $ git merge ext4/dev
1144 Merge made by the 'recursive' strategy.
1145  fs/ext4/crypto.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1146  fs/ext4/dir.c    |  6 ++++++
1147  fs/ext4/ext4.h   |  1 +
1148  fs/ext4/file.c   |  9 +++++++++
1149  fs/ext4/namei.c  | 26 ++++++++++++++++++++++++--
1150  5 files changed, 84 insertions(+), 2 deletions(-)
1151 Merging f2fs/dev (108daea1bd02 f2fs: increase i_size to avoid missing data)
1152 $ git merge f2fs/dev
1153 Merge made by the 'recursive' strategy.
1154  Documentation/ABI/testing/sysfs-fs-f2fs |  14 ++
1155  fs/f2fs/checkpoint.c                    |  29 ++-
1156  fs/f2fs/data.c                          | 373 +++++++++++++++++---------------
1157  fs/f2fs/dir.c                           |   8 +-
1158  fs/f2fs/extent_cache.c                  | 167 ++++++--------
1159  fs/f2fs/f2fs.h                          |  38 +++-
1160  fs/f2fs/file.c                          |  43 ++--
1161  fs/f2fs/gc.c                            | 201 +++++++++--------
1162  fs/f2fs/inline.c                        |  19 +-
1163  fs/f2fs/inode.c                         |   8 +-
1164  fs/f2fs/node.c                          | 120 ++++++++--
1165  fs/f2fs/node.h                          |  26 ++-
1166  fs/f2fs/recovery.c                      |  12 +-
1167  fs/f2fs/segment.c                       |  64 ++----
1168  fs/f2fs/segment.h                       |   2 +-
1169  fs/f2fs/super.c                         |  48 +++-
1170  fs/f2fs/xattr.c                         |   6 +-
1171  include/linux/f2fs_fs.h                 |  24 +-
1172  18 files changed, 712 insertions(+), 490 deletions(-)
1173 Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
1174 $ git merge fscache/fscache
1175 Merge made by the 'recursive' strategy.
1176 Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek)
1177 $ git merge fuse/for-next
1178 Already up-to-date.
1179 Merging gfs2/for-next (00bf5636b147 GFS2: Prevent delete work from occurring on glocks used for create)
1180 $ git merge gfs2/for-next
1181 Auto-merging fs/gfs2/inode.c
1182 Merge made by the 'recursive' strategy.
1183  fs/gfs2/aops.c   |  2 +-
1184  fs/gfs2/dir.c    |  4 ++--
1185  fs/gfs2/glock.c  |  8 ++++++++
1186  fs/gfs2/incore.h |  1 +
1187  fs/gfs2/inode.c  |  7 ++++++-
1188  fs/gfs2/super.c  | 26 ++++++++++++++++----------
1189  6 files changed, 34 insertions(+), 14 deletions(-)
1190 Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock)
1191 $ git merge jfs/jfs-next
1192 Already up-to-date.
1193 Merging nfs/linux-next (50ab8ec74a15 nfs: fix nfs_size_to_loff_t)
1194 $ git merge nfs/linux-next
1195 Merge made by the 'recursive' strategy.
1196  include/linux/nfs_fs.h | 4 +---
1197  1 file changed, 1 insertion(+), 3 deletions(-)
1198 Merging nfsd/nfsd-next (ee2bf98bbe90 NFSv4: fix getacl ERANGE for some ACL buffer sizes)
1199 $ git merge nfsd/nfsd-next
1200 Auto-merging fs/nfs/nfs4proc.c
1201 Merge made by the 'recursive' strategy.
1202  fs/nfs/nfs4proc.c | 40 +++++++++++++++-------------------------
1203  1 file changed, 15 insertions(+), 25 deletions(-)
1204 Merging orangefs/for-next (6ebcc3fcdac1 Orangefs: added a couple of WARN_ONs, perhaps just temporarily.)
1205 $ git merge orangefs/for-next
1206 Auto-merging fs/Kconfig
1207 Auto-merging MAINTAINERS
1208 Merge made by the 'recursive' strategy.
1209  Documentation/ABI/stable/sysfs-fs-orangefs |   87 ++
1210  Documentation/filesystems/orangefs.txt     |  353 ++++++
1211  MAINTAINERS                                |    8 +
1212  fs/Kconfig                                 |    1 +
1213  fs/Makefile                                |    1 +
1214  fs/orangefs/Kconfig                        |    6 +
1215  fs/orangefs/Makefile                       |   10 +
1216  fs/orangefs/acl.c                          |  175 +++
1217  fs/orangefs/dcache.c                       |  145 +++
1218  fs/orangefs/devorangefs-req.c              |  933 +++++++++++++++
1219  fs/orangefs/dir.c                          |  446 +++++++
1220  fs/orangefs/downcall.h                     |  133 +++
1221  fs/orangefs/file.c                         |  738 ++++++++++++
1222  fs/orangefs/inode.c                        |  487 ++++++++
1223  fs/orangefs/namei.c                        |  447 +++++++
1224  fs/orangefs/orangefs-bufmap.c              |  577 +++++++++
1225  fs/orangefs/orangefs-bufmap.h              |   47 +
1226  fs/orangefs/orangefs-cache.c               |  161 +++
1227  fs/orangefs/orangefs-debug.h               |   92 ++
1228  fs/orangefs/orangefs-debugfs.c             |  457 +++++++
1229  fs/orangefs/orangefs-debugfs.h             |    3 +
1230  fs/orangefs/orangefs-dev-proto.h           |   63 +
1231  fs/orangefs/orangefs-kernel.h              |  689 +++++++++++
1232  fs/orangefs/orangefs-mod.c                 |  277 +++++
1233  fs/orangefs/orangefs-sysfs.c               | 1773 ++++++++++++++++++++++++++++
1234  fs/orangefs/orangefs-sysfs.h               |    2 +
1235  fs/orangefs/orangefs-utils.c               | 1263 ++++++++++++++++++++
1236  fs/orangefs/protocol.h                     |  453 +++++++
1237  fs/orangefs/super.c                        |  544 +++++++++
1238  fs/orangefs/symlink.c                      |   32 +
1239  fs/orangefs/upcall.h                       |  246 ++++
1240  fs/orangefs/waitqueue.c                    |  506 ++++++++
1241  fs/orangefs/xattr.c                        |  540 +++++++++
1242  33 files changed, 11695 insertions(+)
1243  create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs
1244  create mode 100644 Documentation/filesystems/orangefs.txt
1245  create mode 100644 fs/orangefs/Kconfig
1246  create mode 100644 fs/orangefs/Makefile
1247  create mode 100644 fs/orangefs/acl.c
1248  create mode 100644 fs/orangefs/dcache.c
1249  create mode 100644 fs/orangefs/devorangefs-req.c
1250  create mode 100644 fs/orangefs/dir.c
1251  create mode 100644 fs/orangefs/downcall.h
1252  create mode 100644 fs/orangefs/file.c
1253  create mode 100644 fs/orangefs/inode.c
1254  create mode 100644 fs/orangefs/namei.c
1255  create mode 100644 fs/orangefs/orangefs-bufmap.c
1256  create mode 100644 fs/orangefs/orangefs-bufmap.h
1257  create mode 100644 fs/orangefs/orangefs-cache.c
1258  create mode 100644 fs/orangefs/orangefs-debug.h
1259  create mode 100644 fs/orangefs/orangefs-debugfs.c
1260  create mode 100644 fs/orangefs/orangefs-debugfs.h
1261  create mode 100644 fs/orangefs/orangefs-dev-proto.h
1262  create mode 100644 fs/orangefs/orangefs-kernel.h
1263  create mode 100644 fs/orangefs/orangefs-mod.c
1264  create mode 100644 fs/orangefs/orangefs-sysfs.c
1265  create mode 100644 fs/orangefs/orangefs-sysfs.h
1266  create mode 100644 fs/orangefs/orangefs-utils.c
1267  create mode 100644 fs/orangefs/protocol.h
1268  create mode 100644 fs/orangefs/super.c
1269  create mode 100644 fs/orangefs/symlink.c
1270  create mode 100644 fs/orangefs/upcall.h
1271  create mode 100644 fs/orangefs/waitqueue.c
1272  create mode 100644 fs/orangefs/xattr.c
1273 $ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch
1274 Applying: orangfs: update for follow_link to get_link change
1275 $ git reset HEAD^
1276 Unstaged changes after reset:
1277 M       fs/orangefs/symlink.c
1278 $ git add -A .
1279 $ git commit -v -a --amend
1280 [master c017d5afa8f7] Merge remote-tracking branch 'orangefs/for-next'
1281  Date: Thu Feb 11 11:12:33 2016 +1100
1282 Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts())
1283 $ git merge overlayfs/overlayfs-next
1284 Already up-to-date.
1285 Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
1286 $ git merge squashfs/master
1287 Already up-to-date.
1288 Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock)
1289 $ git merge v9fs/for-next
1290 Already up-to-date.
1291 Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN)
1292 $ git merge ubifs/linux-next
1293 Already up-to-date.
1294 Merging xfs/for-next (63a1962bea7d Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next)
1295 $ git merge xfs/for-next
1296 Auto-merging include/linux/fs.h
1297 Auto-merging fs/dax.c
1298 Merge made by the 'recursive' strategy.
1299  fs/dax.c                         |   9 +-
1300  fs/direct-io.c                   |   9 +-
1301  fs/ext4/inode.c                  |   9 +-
1302  fs/ocfs2/aops.c                  |   7 +-
1303  fs/xfs/libxfs/xfs_alloc_btree.c  |   2 -
1304  fs/xfs/libxfs/xfs_attr_sf.h      |  16 ---
1305  fs/xfs/libxfs/xfs_bmap.c         |   6 +-
1306  fs/xfs/libxfs/xfs_bmap_btree.c   |   1 -
1307  fs/xfs/libxfs/xfs_btree.c        |  32 +++--
1308  fs/xfs/libxfs/xfs_da_format.h    |  16 +++
1309  fs/xfs/libxfs/xfs_dir2.c         |  12 +-
1310  fs/xfs/libxfs/xfs_ialloc_btree.c |  12 +-
1311  fs/xfs/libxfs/xfs_inode_buf.c    | 170 +++++++++++++++---------
1312  fs/xfs/libxfs/xfs_inode_buf.h    |  38 +++++-
1313  fs/xfs/libxfs/xfs_inode_fork.c   |   3 +-
1314  fs/xfs/libxfs/xfs_log_format.h   |  19 +--
1315  fs/xfs/libxfs/xfs_rtbitmap.c     |  32 ++++-
1316  fs/xfs/libxfs/xfs_sb.h           |   1 -
1317  fs/xfs/libxfs/xfs_shared.h       |   1 +
1318  fs/xfs/xfs_aops.c                | 274 +++++++++++++++------------------------
1319  fs/xfs/xfs_bmap_util.c           |   8 +-
1320  fs/xfs/xfs_buf.c                 |   2 +-
1321  fs/xfs/xfs_buf.h                 |  26 +---
1322  fs/xfs/xfs_buf_item.c            |  10 +-
1323  fs/xfs/xfs_dir2_readdir.c        |   2 +-
1324  fs/xfs/xfs_export.c              |   2 +-
1325  fs/xfs/xfs_file.c                |   6 +-
1326  fs/xfs/xfs_filestream.c          |   4 +-
1327  fs/xfs/xfs_fsops.h               |   1 -
1328  fs/xfs/xfs_icache.c              |  43 +++++-
1329  fs/xfs/xfs_inode.c               | 174 ++++++++++---------------
1330  fs/xfs/xfs_inode.h               |   8 +-
1331  fs/xfs/xfs_inode_item.c          |  82 +++++++++++-
1332  fs/xfs/xfs_ioctl.c               |  16 +--
1333  fs/xfs/xfs_iops.c                |  53 ++------
1334  fs/xfs/xfs_itable.c              |  22 ++--
1335  fs/xfs/xfs_log.c                 |  20 ++-
1336  fs/xfs/xfs_log_recover.c         |  79 +++++------
1337  fs/xfs/xfs_mount.c               |   4 +-
1338  fs/xfs/xfs_mount.h               |   1 -
1339  fs/xfs/xfs_rtalloc.c             |   2 +-
1340  fs/xfs/xfs_trace.h               |   9 +-
1341  fs/xfs/xfs_trans_ail.c           |   5 +-
1342  fs/xfs/xfs_trans_buf.c           |  10 +-
1343  fs/xfs/xfs_trans_inode.c         |  14 +-
1344  include/linux/fs.h               |   2 +-
1345  46 files changed, 678 insertions(+), 596 deletions(-)
1346 Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew))
1347 $ git merge file-locks/linux-next
1348 Already up-to-date.
1349 Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next)
1350 $ git merge vfs/for-next
1351 Merge made by the 'recursive' strategy.
1352 Merging pci/next (a314966fad61 Merge branches 'pci/host-designware', 'pci/host-imx6', 'pci/host-layerscape' and 'pci/host-rcar' into next)
1353 $ git merge pci/next
1354 Removing include/asm-generic/pci-bridge.h
1355 Merge made by the 'recursive' strategy.
1356  arch/alpha/include/asm/pci.h               |   1 -
1357  arch/arm/include/asm/pci.h                 |   3 -
1358  arch/arm64/include/asm/Kbuild              |   3 -
1359  arch/arm64/include/asm/pci.h               |   1 -
1360  arch/arm64/kernel/pci.c                    |   2 -
1361  arch/mips/include/asm/pci.h                |   1 -
1362  arch/powerpc/include/asm/pci-bridge.h      |   1 -
1363  arch/unicore32/include/asm/pci.h           |   2 -
1364  arch/x86/pci/common.c                      |   1 -
1365  drivers/ata/pata_macio.c                   |   2 +-
1366  drivers/char/agp/uninorth-agp.c            |   1 -
1367  drivers/gpu/drm/radeon/radeon_combios.c    |   1 -
1368  drivers/ide/pdc202xx_new.c                 |   1 -
1369  drivers/ide/pmac.c                         |   1 -
1370  drivers/macintosh/macio_asic.c             |   1 -
1371  drivers/misc/cxl/pci.c                     |   1 -
1372  drivers/net/ethernet/sun/sungem.c          |   1 -
1373  drivers/net/ethernet/toshiba/spider_net.c  |   1 -
1374  drivers/of/of_pci.c                        |   1 -
1375  drivers/pci/bus.c                          |   7 +-
1376  drivers/pci/host/pci-imx6.c                | 137 ++++++++++++-----------------
1377  drivers/pci/host/pci-layerscape.c          |   1 +
1378  drivers/pci/host/pcie-designware.c         |  15 ++--
1379  drivers/pci/host/pcie-rcar.c               |  14 ++-
1380  drivers/pci/pci.c                          |   1 -
1381  drivers/pci/pcie/aer/aer_inject.c          |  61 +++++++++----
1382  drivers/pci/pcie/pme.c                     |  11 +--
1383  drivers/pci/probe.c                        |   8 +-
1384  drivers/pci/quirks.c                       |  15 ++++
1385  drivers/pci/setup-bus.c                    |   1 -
1386  drivers/scsi/mac53c94.c                    |   2 +-
1387  drivers/scsi/mesh.c                        |   2 +-
1388  drivers/usb/core/hcd-pci.c                 |   1 -
1389  drivers/video/fbdev/aty/aty128fb.c         |   1 -
1390  drivers/video/fbdev/aty/radeon_base.c      |   1 -
1391  drivers/video/fbdev/imsttfb.c              |   1 -
1392  drivers/video/fbdev/matrox/matroxfb_base.h |   1 -
1393  drivers/video/fbdev/offb.c                 |   4 -
1394  include/asm-generic/pci-bridge.h           |  74 ----------------
1395  include/linux/pci.h                        |  22 +++++
1396  sound/ppc/pmac.c                           |   1 -
1397  41 files changed, 170 insertions(+), 237 deletions(-)
1398  delete mode 100644 include/asm-generic/pci-bridge.h
1399 Merging hid/for-next (bc1db4af59b2 Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next)
1400 $ git merge hid/for-next
1401 Merge made by the 'recursive' strategy.
1402  drivers/hid/hid-core.c           |  94 ++++--
1403  drivers/hid/hid-dr.c             |   4 +-
1404  drivers/hid/hid-ids.h            |   9 +-
1405  drivers/hid/hid-lg.c             |  10 +-
1406  drivers/hid/hid-logitech-hidpp.c | 701 +++++++++++++++++++++++++++++++++------
1407  drivers/hid/hid-multitouch.c     |   3 +
1408  drivers/hid/hid-rmi.c            |  11 +
1409  drivers/hid/hid-sony.c           | 182 +++++-----
1410  drivers/hid/usbhid/hid-quirks.c  |   2 +
1411  drivers/hid/wacom_wac.c          |  87 ++---
1412  10 files changed, 842 insertions(+), 261 deletions(-)
1413 Merging i2c/i2c/for-next (36f90b0a2ddd Linux 4.5-rc2)
1414 $ git merge i2c/i2c/for-next
1415 Already up-to-date.
1416 Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440)
1417 $ git merge jdelvare-hwmon/master
1418 Merge made by the 'recursive' strategy.
1419  Documentation/hwmon/max34440 | 6 +++---
1420  drivers/hwmon/emc2103.c      | 2 +-
1421  2 files changed, 4 insertions(+), 4 deletions(-)
1422 Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots)
1423 $ git merge dmi/master
1424 Merge made by the 'recursive' strategy.
1425 Merging hwmon-staging/hwmon-next (972d7d17b6bb hwmon: Add LTC2990 sensor driver)
1426 $ git merge hwmon-staging/hwmon-next
1427 Merge made by the 'recursive' strategy.
1428  Documentation/hwmon/ltc2990                    |  43 +++++++
1429  drivers/hwmon/Kconfig                          |  14 +++
1430  drivers/hwmon/Makefile                         |   3 +-
1431  drivers/hwmon/ltc2990.c                        | 161 +++++++++++++++++++++++++
1432  drivers/hwmon/{vexpress.c => vexpress-hwmon.c} |   0
1433  5 files changed, 220 insertions(+), 1 deletion(-)
1434  create mode 100644 Documentation/hwmon/ltc2990
1435  create mode 100644 drivers/hwmon/ltc2990.c
1436  rename drivers/hwmon/{vexpress.c => vexpress-hwmon.c} (100%)
1437 Merging v4l-dvb/master (0d8f3357897d Merge branch 'v4l_for_linus' into to_next)
1438 $ git merge v4l-dvb/master
1439 Auto-merging MAINTAINERS
1440 Removing Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
1441 Merge made by the 'recursive' strategy.
1442  Documentation/DocBook/device-drivers.tmpl          |    1 +
1443  .../DocBook/media/v4l/media-ioc-g-topology.xml     |    3 -
1444  Documentation/DocBook/media/v4l/media-types.xml    |   29 +-
1445  Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml |   26 +-
1446  Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml |  154 --
1447  Documentation/DocBook/media/v4l/pixfmt.xml         |    1 -
1448  .../DocBook/media/v4l/vidioc-query-dv-timings.xml  |   14 +-
1449  .../DocBook/media/v4l/vidioc-querystd.xml          |   10 +
1450  .../devicetree/bindings/media/i2c/mt9v032.txt      |    2 +
1451  .../devicetree/bindings/media/i2c/tvp5150.txt      |   45 +
1452  .../devicetree/bindings/media/rcar_vin.txt         |    1 +
1453  .../devicetree/bindings/media/renesas,jpu.txt      |   13 +-
1454  Documentation/devicetree/bindings/media/ti-cal.txt |   72 +
1455  Documentation/dvb/README.dvb-usb                   |    2 +-
1456  MAINTAINERS                                        |    8 +
1457  drivers/media/common/b2c2/flexcop-fe-tuner.c       |    4 +-
1458  drivers/media/common/b2c2/flexcop.c                |    4 +-
1459  drivers/media/common/cypress_firmware.c            |    2 +-
1460  drivers/media/common/cypress_firmware.h            |    2 +-
1461  drivers/media/dvb-core/dvb-usb-ids.h               |    8 +-
1462  drivers/media/dvb-core/dvb_frontend.c              |   28 +-
1463  drivers/media/dvb-core/dvbdev.c                    |   13 +-
1464  drivers/media/dvb-frontends/af9013.c               |    4 +
1465  drivers/media/dvb-frontends/af9033.c               |    3 +
1466  drivers/media/dvb-frontends/bcm3510.c              |    4 +-
1467  drivers/media/dvb-frontends/bcm3510.h              |    2 +-
1468  drivers/media/dvb-frontends/bcm3510_priv.h         |    2 +-
1469  drivers/media/dvb-frontends/cxd2820r_core.c        |   11 +-
1470  drivers/media/dvb-frontends/dib0070.c              |    2 +-
1471  drivers/media/dvb-frontends/dib0090.c              |    4 +-
1472  drivers/media/dvb-frontends/dib3000.h              |    6 +-
1473  drivers/media/dvb-frontends/dib3000mb.c            |    8 +-
1474  drivers/media/dvb-frontends/dib3000mb_priv.h       |    2 +-
1475  drivers/media/dvb-frontends/dib3000mc.c            |    4 +-
1476  drivers/media/dvb-frontends/dib3000mc.h            |    2 +-
1477  drivers/media/dvb-frontends/dib7000m.c             |    2 +-
1478  drivers/media/dvb-frontends/dib7000p.c             |    4 +-
1479  drivers/media/dvb-frontends/dib8000.c              |    2 +-
1480  drivers/media/dvb-frontends/dib9000.c              |    4 +-
1481  drivers/media/dvb-frontends/dibx000_common.c       |    2 +-
1482  drivers/media/dvb-frontends/rtl2830.c              |    3 +
1483  drivers/media/dvb-frontends/si2165.c               |   28 +-
1484  drivers/media/dvb-frontends/stv0299.c              |    4 +-
1485  drivers/media/dvb-frontends/stv6110x.c             |    4 +-
1486  drivers/media/dvb-frontends/stv6110x.h             |    4 +-
1487  drivers/media/dvb-frontends/stv6110x_priv.h        |    2 +-
1488  drivers/media/dvb-frontends/ts2020.c               |    4 +
1489  drivers/media/i2c/adv7604.c                        |   28 +-
1490  drivers/media/i2c/msp3400-driver.c                 |   14 +
1491  drivers/media/i2c/msp3400-driver.h                 |    5 +
1492  drivers/media/i2c/mt9v011.c                        |   15 +
1493  drivers/media/i2c/mt9v032.c                        |   28 +
1494  drivers/media/i2c/ov2659.c                         |    8 +-
1495  drivers/media/i2c/s5c73m3/s5c73m3-core.c           |    4 +-
1496  drivers/media/i2c/s5c73m3/s5c73m3-spi.c            |    1 -
1497  drivers/media/i2c/s5k5baf.c                        |    5 +-
1498  drivers/media/i2c/saa7115.c                        |   19 +
1499  drivers/media/i2c/soc_camera/mt9m001.c             |    2 +-
1500  drivers/media/i2c/soc_camera/mt9t031.c             |    2 +-
1501  drivers/media/i2c/soc_camera/mt9v022.c             |    2 +-
1502  drivers/media/i2c/tc358743.c                       |   25 +-
1503  drivers/media/i2c/tvp514x.c                        |    6 +-
1504  drivers/media/i2c/tvp5150.c                        |  274 ++-
1505  drivers/media/i2c/tvp7002.c                        |    6 +-
1506  drivers/media/i2c/vpx3220.c                        |    2 +-
1507  drivers/media/media-device.c                       |    7 +-
1508  drivers/media/media-devnode.c                      |    1 +
1509  drivers/media/media-entity.c                       |   18 +-
1510  drivers/media/pci/b2c2/flexcop-pci.c               |    2 +-
1511  drivers/media/pci/bt8xx/bttv-driver.c              |   27 +-
1512  drivers/media/pci/bt8xx/dvb-bt8xx.c                |    4 +-
1513  drivers/media/pci/ddbridge/ddbridge-core.c         |    2 +-
1514  drivers/media/pci/netup_unidvb/netup_unidvb_core.c |    3 +-
1515  drivers/media/pci/ngene/ngene-cards.c              |    2 +-
1516  drivers/media/pci/saa7134/saa7134-empress.c        |    3 +-
1517  drivers/media/pci/saa7134/saa7134-go7007.c         |    2 +-
1518  drivers/media/pci/saa7134/saa7134-video.c          |    3 +-
1519  drivers/media/pci/ttpci/av7110.c                   |    2 +-
1520  drivers/media/pci/ttpci/budget.c                   |    4 +-
1521  drivers/media/platform/Kconfig                     |   12 +
1522  drivers/media/platform/Makefile                    |    2 +
1523  drivers/media/platform/coda/coda-bit.c             |    2 +-
1524  drivers/media/platform/davinci/dm644x_ccdc.c       |    2 +-
1525  drivers/media/platform/exynos-gsc/gsc-m2m.c        |    2 +-
1526  drivers/media/platform/exynos4-is/media-dev.c      |   20 +-
1527  drivers/media/platform/exynos4-is/mipi-csis.c      |   10 +-
1528  drivers/media/platform/omap3isp/isp.c              |   13 +-
1529  drivers/media/platform/omap3isp/ispccdc.c          |    2 +-
1530  drivers/media/platform/omap3isp/isppreview.c       |   14 +-
1531  drivers/media/platform/omap3isp/ispvideo.c         |  103 +-
1532  drivers/media/platform/omap3isp/omap3isp.h         |    8 +-
1533  drivers/media/platform/rcar_jpu.c                  |    1 +
1534  drivers/media/platform/soc_camera/rcar_vin.c       |    2 +
1535  .../platform/soc_camera/sh_mobile_ceu_camera.c     |   14 +-
1536  .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c   |    2 +-
1537  drivers/media/platform/ti-vpe/Makefile             |    4 +
1538  drivers/media/platform/ti-vpe/cal.c                | 1970 ++++++++++++++++++++
1539  drivers/media/platform/ti-vpe/cal_regs.h           |  479 +++++
1540  drivers/media/platform/vim2m.c                     |    2 +-
1541  drivers/media/platform/vivid/vivid-tpg.h           |    2 +
1542  drivers/media/radio/radio-si476x.c                 |    4 +-
1543  drivers/media/radio/wl128x/fmdrv_common.c          |    2 +-
1544  drivers/media/rc/nuvoton-cir.c                     |  252 +--
1545  drivers/media/rc/nuvoton-cir.h                     |   12 +-
1546  drivers/media/rc/rc-core-priv.h                    |    6 +-
1547  drivers/media/rc/rc-ir-raw.c                       |   23 +-
1548  drivers/media/tuners/m88rs6000t.c                  |   11 +-
1549  drivers/media/tuners/r820t.c                       |    2 +-
1550  drivers/media/tuners/si2157.c                      |    7 +-
1551  drivers/media/tuners/tuner-xc2028.c                |    3 +-
1552  drivers/media/usb/as102/as102_drv.h                |    2 +-
1553  drivers/media/usb/as102/as102_usb_drv.c            |    2 +-
1554  drivers/media/usb/au0828/au0828-core.c             |    2 +-
1555  drivers/media/usb/au0828/au0828-dvb.c              |   12 +-
1556  drivers/media/usb/b2c2/flexcop-usb.c               |    2 +-
1557  drivers/media/usb/cx231xx/cx231xx-417.c            |    2 +
1558  drivers/media/usb/cx231xx/cx231xx-audio.c          |    5 +
1559  drivers/media/usb/cx231xx/cx231xx-cards.c          |    2 +-
1560  drivers/media/usb/dvb-usb-v2/af9035.c              |    4 +-
1561  drivers/media/usb/dvb-usb-v2/af9035.h              |    3 +-
1562  drivers/media/usb/dvb-usb-v2/dvb_usb.h             |    2 +-
1563  drivers/media/usb/dvb-usb-v2/dvb_usb_common.h      |    2 +-
1564  drivers/media/usb/dvb-usb-v2/dvb_usb_core.c        |    4 +-
1565  drivers/media/usb/dvb-usb-v2/dvb_usb_urb.c         |    2 +-
1566  drivers/media/usb/dvb-usb-v2/dvbsky.c              |    7 +
1567  drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.c      |    6 +-
1568  drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h      |    8 +-
1569  drivers/media/usb/dvb-usb-v2/mxl111sf.c            |    4 +-
1570  drivers/media/usb/dvb-usb-v2/rtl28xxu.c            |    8 +
1571  drivers/media/usb/dvb-usb-v2/usb_urb.c             |    2 +-
1572  drivers/media/usb/dvb-usb/a800.c                   |    4 +-
1573  drivers/media/usb/dvb-usb/cxusb.c                  |    4 +-
1574  drivers/media/usb/dvb-usb/dib0700_core.c           |    2 +-
1575  drivers/media/usb/dvb-usb/dib0700_devices.c        |   77 +-
1576  drivers/media/usb/dvb-usb/dibusb-common.c          |    2 +-
1577  drivers/media/usb/dvb-usb/dibusb-mb.c              |    6 +-
1578  drivers/media/usb/dvb-usb/dibusb-mc.c              |    6 +-
1579  drivers/media/usb/dvb-usb/dibusb.h                 |    2 +-
1580  drivers/media/usb/dvb-usb/digitv.c                 |    4 +-
1581  drivers/media/usb/dvb-usb/dtt200u-fe.c             |    2 +-
1582  drivers/media/usb/dvb-usb/dtt200u.c                |    4 +-
1583  drivers/media/usb/dvb-usb/dtt200u.h                |    2 +-
1584  drivers/media/usb/dvb-usb/dvb-usb-common.h         |    2 +-
1585  drivers/media/usb/dvb-usb/dvb-usb-dvb.c            |    2 +-
1586  drivers/media/usb/dvb-usb/dvb-usb-firmware.c       |    2 +-
1587  drivers/media/usb/dvb-usb/dvb-usb-i2c.c            |    2 +-
1588  drivers/media/usb/dvb-usb/dvb-usb-init.c           |    4 +-
1589  drivers/media/usb/dvb-usb/dvb-usb-remote.c         |    2 +-
1590  drivers/media/usb/dvb-usb/dvb-usb-urb.c            |    2 +-
1591  drivers/media/usb/dvb-usb/dvb-usb.h                |    2 +-
1592  drivers/media/usb/dvb-usb/dw2102.c                 |   12 +-
1593  drivers/media/usb/dvb-usb/nova-t-usb2.c            |    4 +-
1594  drivers/media/usb/dvb-usb/technisat-usb2.c         |    2 +-
1595  drivers/media/usb/dvb-usb/ttusb2.c                 |    2 +-
1596  drivers/media/usb/dvb-usb/umt-010.c                |    4 +-
1597  drivers/media/usb/dvb-usb/usb-urb.c                |    2 +-
1598  drivers/media/usb/dvb-usb/vp702x-fe.c              |    2 +-
1599  drivers/media/usb/dvb-usb/vp702x.c                 |    4 +-
1600  drivers/media/usb/dvb-usb/vp7045-fe.c              |    2 +-
1601  drivers/media/usb/dvb-usb/vp7045.c                 |    4 +-
1602  drivers/media/usb/dvb-usb/vp7045.h                 |    2 +-
1603  drivers/media/usb/em28xx/em28xx-camera.c           |    4 +
1604  drivers/media/usb/em28xx/em28xx-cards.c            |  201 +-
1605  drivers/media/usb/em28xx/em28xx-dvb.c              |   10 +
1606  drivers/media/usb/em28xx/em28xx-video.c            |  339 +++-
1607  drivers/media/usb/em28xx/em28xx.h                  |   21 +-
1608  drivers/media/usb/go7007/go7007-priv.h             |    2 +-
1609  drivers/media/usb/go7007/go7007-usb.c              |    4 +-
1610  drivers/media/usb/hdpvr/hdpvr-core.c               |    2 +
1611  drivers/media/usb/hdpvr/hdpvr-video.c              |    6 +-
1612  drivers/media/usb/msi2500/msi2500.c                |    2 -
1613  drivers/media/usb/pwc/pwc-if.c                     |    6 +
1614  drivers/media/usb/stk1160/stk1160-video.c          |    1 -
1615  drivers/media/usb/usbtv/usbtv-video.c              |   37 +-
1616  drivers/media/usb/usbtv/usbtv.h                    |    1 +
1617  drivers/media/usb/usbvision/usbvision-video.c      |   29 +-
1618  drivers/media/v4l2-core/Kconfig                    |    1 -
1619  drivers/media/v4l2-core/tuner-core.c               |   26 +-
1620  drivers/media/v4l2-core/v4l2-compat-ioctl32.c      |   21 +-
1621  drivers/media/v4l2-core/v4l2-dv-timings.c          |    3 +-
1622  drivers/media/v4l2-core/v4l2-of.c                  |    2 +-
1623  drivers/media/v4l2-core/videobuf2-core.c           |    1 +
1624  .../staging/media/davinci_vpfe/davinci_vpfe_user.h |    2 +-
1625  drivers/staging/media/lirc/lirc_parallel.c         |   24 +-
1626  include/media/tuner.h                              |    9 +-
1627  include/media/v4l2-mc.h                            |   91 +
1628  include/uapi/linux/media.h                         |   23 +-
1629  include/uapi/linux/v4l2-common.h                   |   46 +-
1630  188 files changed, 4374 insertions(+), 867 deletions(-)
1631  delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml
1632  create mode 100644 Documentation/devicetree/bindings/media/i2c/tvp5150.txt
1633  create mode 100644 Documentation/devicetree/bindings/media/ti-cal.txt
1634  create mode 100644 drivers/media/platform/ti-vpe/cal.c
1635  create mode 100644 drivers/media/platform/ti-vpe/cal_regs.h
1636  create mode 100644 include/media/v4l2-mc.h
1637 Merging kbuild/for-next (f6f756ddd65f Merge branch 'kbuild/kbuild' into kbuild/for-next)
1638 $ git merge kbuild/for-next
1639 Merge made by the 'recursive' strategy.
1640  include/linux/compiler-clang.h |  5 +++++
1641  scripts/Makefile.dtbinst       |  2 --
1642  scripts/kconfig/Makefile       |  4 +++-
1643  scripts/kconfig/confdata.c     | 12 +++++++-----
1644  scripts/link-vmlinux.sh        |  7 ++++---
1645  5 files changed, 19 insertions(+), 11 deletions(-)
1646 Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too)
1647 $ git merge kconfig/for-next
1648 Already up-to-date.
1649 Merging libata/for-next (3d3cafda9a56 Merge branch 'for-4.6' into for-next)
1650 $ git merge libata/for-next
1651 Merge made by the 'recursive' strategy.
1652  drivers/ata/ahci.h       |  5 +--
1653  drivers/ata/ahci_xgene.c | 85 +++++++++++++++++++++++++++++++++++++++++++++++-
1654  drivers/ata/libahci.c    | 60 +++++++++-------------------------
1655  3 files changed, 103 insertions(+), 47 deletions(-)
1656 Merging pm/linux-next (45bb976de29f Merge branch 'pm-cpufreq' into linux-next)
1657 $ git merge pm/linux-next
1658 Merge made by the 'recursive' strategy.
1659  drivers/base/power/opp/core.c          | 420 +++++++++++++++++++++++++++++++++
1660  drivers/base/power/opp/opp.h           |  13 +
1661  drivers/cpufreq/cpufreq.c              |  37 +--
1662  drivers/cpufreq/cpufreq_conservative.c |  10 +-
1663  drivers/cpufreq/cpufreq_ondemand.c     |  36 +--
1664  drivers/cpufreq/cpufreq_performance.c  |  18 +-
1665  drivers/cpufreq/cpufreq_powersave.c    |  10 +-
1666  drivers/cpufreq/cpufreq_userspace.c    |  10 +-
1667  drivers/cpufreq/powernv-cpufreq.c      | 116 +++++----
1668  include/linux/cpufreq.h                |  25 +-
1669  include/linux/pm_opp.h                 |  27 +++
1670  include/trace/events/power.h           |  22 ++
1671  kernel/trace/power-traces.c            |   1 +
1672  13 files changed, 622 insertions(+), 123 deletions(-)
1673 Merging idle/next (31ade3b83e18 Linux 4.4-rc3)
1674 $ git merge idle/next
1675 Already up-to-date.
1676 Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
1677 $ git merge apm/for-next
1678 Already up-to-date.
1679 Merging thermal/next (98d94507e10c Merge branches 'thermal-intel', 'thermal-suspend-fix' and 'thermal-soc' into next)
1680 $ git merge thermal/next
1681 Already up-to-date.
1682 Merging thermal-soc/next (26716ce124fc thermal: allow u8500-thermal driver to be a module)
1683 $ git merge thermal-soc/next
1684 Merge made by the 'recursive' strategy.
1685  .../devicetree/bindings/thermal/rcar-thermal.txt   | 37 +++++++++++++++++-
1686  drivers/mfd/db8500-prcmu.c                         |  3 ++
1687  drivers/thermal/Kconfig                            |  6 +--
1688  drivers/thermal/of-thermal.c                       | 18 ++-------
1689  drivers/thermal/rcar_thermal.c                     | 45 +++++++++++++++++++---
1690  drivers/thermal/spear_thermal.c                    |  6 +--
1691  6 files changed, 86 insertions(+), 29 deletions(-)
1692 Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery)
1693 $ git merge ieee1394/for-next
1694 Already up-to-date.
1695 Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible)
1696 $ git merge dlm/next
1697 Already up-to-date.
1698 Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible)
1699 $ git merge swiotlb/linux-next
1700 Already up-to-date.
1701 Merging slave-dma/next (64509b4ad81c Merge branch 'topic/pl330' into next)
1702 $ git merge slave-dma/next
1703 Merge made by the 'recursive' strategy.
1704  .../devicetree/bindings/dma/arm-pl330.txt          |   1 +
1705  drivers/dma/dmaengine.c                            |   1 +
1706  drivers/dma/dw/pci.c                               |   4 +
1707  drivers/dma/dw/regs.h                              |   2 +-
1708  drivers/dma/edma.c                                 |  41 +++++++-
1709  drivers/dma/ep93xx_dma.c                           |  28 +++---
1710  drivers/dma/ioat/dma.c                             |  34 ++++---
1711  drivers/dma/ioat/prep.c                            |   2 +-
1712  drivers/dma/pl330.c                                | 106 +++++++++++++++------
1713  drivers/dma/sh/Kconfig                             |   6 +-
1714  drivers/spi/spi-rockchip.c                         |  12 ++-
1715  include/linux/dmaengine.h                          |   4 +
1716  12 files changed, 178 insertions(+), 63 deletions(-)
1717 Merging net-next/master (aaa5672052cb sxgbe: remove unused code)
1718 $ git merge net-next/master
1719 Recorded preimage for 'drivers/net/vxlan.c'
1720 Auto-merging net/unix/af_unix.c
1721 Auto-merging net/ipv4/tcp_ipv4.c
1722 Auto-merging net/ipv4/tcp.c
1723 Auto-merging include/net/tcp.h
1724 Auto-merging drivers/net/vxlan.c
1725 CONFLICT (content): Merge conflict in drivers/net/vxlan.c
1726 Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
1727 Removing drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
1728 Auto-merging MAINTAINERS
1729 Automatic merge failed; fix conflicts and then commit the result.
1730 $ git commit -v -a
1731 Recorded resolution for 'drivers/net/vxlan.c'.
1732 [master 6213ab36ad22] Merge remote-tracking branch 'net-next/master'
1733 $ git diff -M --stat --summary HEAD^..
1734  Documentation/networking/batman-adv.txt            |   2 +-
1735  MAINTAINERS                                        |   2 +-
1736  drivers/net/bonding/bond_3ad.c                     |  40 +-
1737  drivers/net/bonding/bond_main.c                    |  15 +-
1738  drivers/net/bonding/bond_options.c                 |   4 +
1739  drivers/net/ethernet/broadcom/bgmac.c              |  30 +-
1740  drivers/net/ethernet/emulex/benet/be.h             |   9 +
1741  drivers/net/ethernet/emulex/benet/be_cmds.c        |  32 +-
1742  drivers/net/ethernet/emulex/benet/be_cmds.h        |   3 +-
1743  drivers/net/ethernet/emulex/benet/be_ethtool.c     |  23 +-
1744  drivers/net/ethernet/emulex/benet/be_main.c        |  93 +++--
1745  drivers/net/ethernet/intel/i40e/i40e.h             |   2 +
1746  drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h  |  26 +-
1747  drivers/net/ethernet/intel/i40e/i40e_common.c      |  87 ++--
1748  drivers/net/ethernet/intel/i40e/i40e_dcb.c         |  12 +-
1749  drivers/net/ethernet/intel/i40e/i40e_devids.h      |   2 +
1750  drivers/net/ethernet/intel/i40e/i40e_ethtool.c     |  38 +-
1751  drivers/net/ethernet/intel/i40e/i40e_main.c        |  97 ++++-
1752  drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c |  12 +
1753  .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h    |  26 +-
1754  drivers/net/ethernet/intel/i40evf/i40e_txrx.c      |  16 +
1755  drivers/net/ethernet/intel/i40evf/i40evf.h         |   1 +
1756  drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c |  57 ++-
1757  drivers/net/ethernet/intel/i40evf/i40evf_main.c    |  34 +-
1758  .../net/ethernet/intel/i40evf/i40evf_virtchnl.c    |   2 +
1759  drivers/net/ethernet/renesas/ravb.h                |   4 +-
1760  drivers/net/ethernet/renesas/ravb_main.c           |  68 ++--
1761  drivers/net/ethernet/renesas/ravb_ptp.c            |  25 +-
1762  drivers/net/ethernet/renesas/sh_eth.c              |  53 ++-
1763  drivers/net/ethernet/samsung/sxgbe/Makefile        |   2 +-
1764  drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c    |  91 -----
1765  drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h    |  38 --
1766  drivers/net/ethernet/sun/sunvnet.c                 |  24 +-
1767  drivers/net/ipvlan/ipvlan_main.c                   |   1 +
1768  drivers/net/team/team.c                            |  10 +-
1769  drivers/net/virtio_net.c                           |  60 +++
1770  drivers/net/vrf.c                                  |  21 +
1771  drivers/net/vxlan.c                                | 231 ++++-------
1772  drivers/net/xen-netback/common.h                   |   1 +
1773  drivers/net/xen-netback/xenbus.c                   |  89 ++++-
1774  include/linux/bpf.h                                |  24 ++
1775  include/linux/if_team.h                            |   1 +
1776  include/linux/netdevice.h                          |   5 +-
1777  include/linux/tcp.h                                |   1 +
1778  include/net/bond_3ad.h                             |   1 +
1779  include/net/netns/ipv4.h                           |  10 +
1780  include/net/tcp.h                                  |  19 +-
1781  include/net/vxlan.h                                | 115 +++---
1782  include/trace/events/sunvnet.h                     | 139 +++++++
1783  include/uapi/linux/bpf.h                           |   2 +
1784  include/uapi/linux/ethtool.h                       |  34 ++
1785  include/uapi/linux/if_bridge.h                     |   2 +
1786  include/uapi/linux/if_link.h                       |  12 +
1787  kernel/bpf/arraymap.c                              | 166 +++++++-
1788  kernel/bpf/hashtab.c                               | 340 +++++++++++++---
1789  kernel/bpf/syscall.c                               |  57 ++-
1790  net/batman-adv/Kconfig                             |   2 +-
1791  net/batman-adv/Makefile                            |   2 +-
1792  net/batman-adv/bat_algo.h                          |   2 +-
1793  net/batman-adv/bat_iv_ogm.c                        |  29 +-
1794  net/batman-adv/bitarray.c                          |  14 +-
1795  net/batman-adv/bitarray.h                          |  14 +-
1796  net/batman-adv/bridge_loop_avoidance.c             | 231 ++++++++---
1797  net/batman-adv/bridge_loop_avoidance.h             |   2 +-
1798  net/batman-adv/debugfs.c                           |   8 +-
1799  net/batman-adv/debugfs.h                           |   2 +-
1800  net/batman-adv/distributed-arp-table.c             |  43 +-
1801  net/batman-adv/distributed-arp-table.h             |   2 +-
1802  net/batman-adv/fragmentation.c                     |  20 +-
1803  net/batman-adv/fragmentation.h                     |   4 +-
1804  net/batman-adv/gateway_client.c                    |  16 +-
1805  net/batman-adv/gateway_client.h                    |   2 +-
1806  net/batman-adv/gateway_common.c                    |   4 +-
1807  net/batman-adv/gateway_common.h                    |   2 +-
1808  net/batman-adv/hard-interface.c                    |   9 +-
1809  net/batman-adv/hard-interface.h                    |   2 +-
1810  net/batman-adv/hash.c                              |   2 +-
1811  net/batman-adv/hash.h                              |  24 +-
1812  net/batman-adv/icmp_socket.c                       |   2 +-
1813  net/batman-adv/icmp_socket.h                       |   2 +-
1814  net/batman-adv/main.c                              |  30 +-
1815  net/batman-adv/main.h                              |  19 +-
1816  net/batman-adv/multicast.c                         |  37 +-
1817  net/batman-adv/multicast.h                         |   4 +-
1818  net/batman-adv/network-coding.c                    |  57 +--
1819  net/batman-adv/network-coding.h                    |   2 +-
1820  net/batman-adv/originator.c                        |  56 +--
1821  net/batman-adv/originator.h                        |   2 +-
1822  net/batman-adv/packet.h                            |  19 +-
1823  net/batman-adv/routing.c                           |  38 +-
1824  net/batman-adv/routing.h                           |   2 +-
1825  net/batman-adv/send.c                              |  31 +-
1826  net/batman-adv/send.h                              |   6 +-
1827  net/batman-adv/soft-interface.c                    |  20 +-
1828  net/batman-adv/soft-interface.h                    |   2 +-
1829  net/batman-adv/sysfs.c                             |  17 +-
1830  net/batman-adv/sysfs.h                             |   2 +-
1831  net/batman-adv/translation-table.c                 | 119 +++---
1832  net/batman-adv/translation-table.h                 |   2 +-
1833  net/batman-adv/types.h                             |  30 +-
1834  net/bridge/br_mdb.c                                |  63 +--
1835  net/bridge/br_multicast.c                          |  18 +-
1836  net/bridge/br_private.h                            |  11 +-
1837  net/core/dev.c                                     |  25 +-
1838  net/core/ethtool.c                                 |   2 +-
1839  net/core/net-sysfs.c                               |   2 +
1840  net/core/rtnetlink.c                               |   2 +
1841  net/ipv4/inet_connection_sock.c                    |   7 +-
1842  net/ipv4/syncookies.c                              |   4 +-
1843  net/ipv4/sysctl_net_ipv4.c                         | 136 +++----
1844  net/ipv4/tcp.c                                     |  20 +-
1845  net/ipv4/tcp_fastopen.c                            |  70 ++--
1846  net/ipv4/tcp_input.c                               | 176 ++++++---
1847  net/ipv4/tcp_ipv4.c                                |  11 +-
1848  net/ipv4/tcp_metrics.c                             |   3 +-
1849  net/ipv4/tcp_minisocks.c                           |   3 -
1850  net/ipv4/tcp_output.c                              |   6 +-
1851  net/ipv4/tcp_timer.c                               |  23 +-
1852  net/ipv6/syncookies.c                              |   2 +-
1853  net/packet/af_packet.c                             | 440 ++++++++++++---------
1854  net/tipc/link.c                                    |  37 +-
1855  net/tipc/link.h                                    |   6 +-
1856  net/tipc/name_table.c                              |  14 +-
1857  net/tipc/node.c                                    |   9 +-
1858  net/tipc/server.c                                  |   4 +-
1859  net/tipc/subscr.c                                  | 130 +++---
1860  net/tipc/subscr.h                                  |  11 +-
1861  net/unix/af_unix.c                                 |   5 +-
1862  samples/bpf/test_maps.c                            | 188 +++++++++
1863  samples/bpf/tracex2_kern.c                         |   2 +-
1864  samples/bpf/tracex2_user.c                         |   7 +-
1865  samples/bpf/tracex3_kern.c                         |   8 +-
1866  samples/bpf/tracex3_user.c                         |  21 +-
1867  133 files changed, 3093 insertions(+), 1619 deletions(-)
1868  delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.c
1869  delete mode 100644 drivers/net/ethernet/samsung/sxgbe/sxgbe_xpcs.h
1870  create mode 100644 include/trace/events/sunvnet.h
1871 Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error)
1872 $ git merge ipsec-next/master
1873 Already up-to-date.
1874 Merging ipvs-next/master (6709d1f4ece5 netfilter: ipvs/SIP: handle ip_vs_fill_iph_skb_off failure)
1875 $ git merge ipvs-next/master
1876 Merge made by the 'recursive' strategy.
1877  net/netfilter/ipvs/ip_vs_app.c    |  8 ++------
1878  net/netfilter/ipvs/ip_vs_ctl.c    | 17 ++++++-----------
1879  net/netfilter/ipvs/ip_vs_pe_sip.c |  4 ++--
1880  3 files changed, 10 insertions(+), 19 deletions(-)
1881 Merging wireless-drivers-next/master (11e70824e75f mwifiex: firmware dump support for w8997 chipset)
1882 $ git merge wireless-drivers-next/master
1883 Auto-merging drivers/net/wireless/ralink/rt2x00/rt2x00.h
1884 Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c
1885 Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c
1886 Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rs.c
1887 Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
1888 Auto-merging drivers/bcma/driver_gpio.c
1889 Merge made by the 'recursive' strategy.
1890  .../bindings/net/wireless/ti,wlcore,spi.txt        |  36 ++
1891  drivers/bcma/bcma_private.h                        |   1 -
1892  drivers/bcma/driver_chipcommon.c                   |  16 +-
1893  drivers/bcma/driver_chipcommon_pmu.c               |  94 ++--
1894  drivers/bcma/driver_chipcommon_sflash.c            |   1 +
1895  drivers/bcma/driver_gpio.c                         |   1 +
1896  drivers/bcma/driver_mips.c                         |   3 -
1897  drivers/bcma/host_pci.c                            |   2 +-
1898  drivers/bcma/scan.c                                |   5 +
1899  drivers/net/wireless/broadcom/b43/main.c           |   8 +-
1900  .../broadcom/brcm80211/brcmfmac/cfg80211.c         |  23 +-
1901  .../wireless/broadcom/brcm80211/brcmfmac/chip.c    |  45 +-
1902  .../wireless/broadcom/brcm80211/brcmfmac/chip.h    |   3 +
1903  .../broadcom/brcm80211/brcmfmac/firmware.c         |   2 +-
1904  .../wireless/broadcom/brcm80211/brcmfmac/pcie.c    |   4 +
1905  .../wireless/broadcom/brcm80211/brcmfmac/sdio.c    |  13 +-
1906  drivers/net/wireless/intel/iwlwifi/Kconfig         |  12 +
1907  drivers/net/wireless/intel/iwlwifi/dvm/led.c       |   5 +-
1908  drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c  |   4 +-
1909  drivers/net/wireless/intel/iwlwifi/iwl-9000.c      |   3 +-
1910  drivers/net/wireless/intel/iwlwifi/iwl-config.h    |   2 +
1911  drivers/net/wireless/intel/iwlwifi/iwl-fh.h        |  77 +++
1912  .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h |   3 +
1913  drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h   |  21 +
1914  drivers/net/wireless/intel/iwlwifi/iwl-modparams.h |   2 +
1915  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c |   7 +-
1916  drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h |   2 +-
1917  drivers/net/wireless/intel/iwlwifi/iwl-trans.h     |  20 +-
1918  drivers/net/wireless/intel/iwlwifi/mvm/constants.h |   8 +-
1919  drivers/net/wireless/intel/iwlwifi/mvm/d3.c        |  73 ++-
1920  .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c   |  75 ++-
1921  drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c   |  58 ++-
1922  drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h |   1 +
1923  drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h |  42 +-
1924  .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h    |  69 ++-
1925  drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h    |  31 ++
1926  drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c    |   6 +-
1927  drivers/net/wireless/intel/iwlwifi/mvm/fw.c        |  29 ++
1928  drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c  |  43 +-
1929  drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   4 +-
1930  drivers/net/wireless/intel/iwlwifi/mvm/mvm.h       |  36 +-
1931  drivers/net/wireless/intel/iwlwifi/mvm/nvm.c       |   8 +-
1932  drivers/net/wireless/intel/iwlwifi/mvm/ops.c       |  28 +-
1933  drivers/net/wireless/intel/iwlwifi/mvm/power.c     | 131 +++--
1934  drivers/net/wireless/intel/iwlwifi/mvm/quota.c     |  16 +
1935  drivers/net/wireless/intel/iwlwifi/mvm/rs.c        |   3 +-
1936  drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c      |  13 +-
1937  drivers/net/wireless/intel/iwlwifi/mvm/scan.c      |   9 +-
1938  drivers/net/wireless/intel/iwlwifi/mvm/sta.c       |  50 +-
1939  drivers/net/wireless/intel/iwlwifi/mvm/sta.h       |   2 +-
1940  drivers/net/wireless/intel/iwlwifi/mvm/tt.c        |  17 +-
1941  drivers/net/wireless/intel/iwlwifi/mvm/tx.c        |  33 ++
1942  drivers/net/wireless/intel/iwlwifi/mvm/utils.c     |   6 +-
1943  drivers/net/wireless/intel/iwlwifi/pcie/drv.c      | 134 +++++-
1944  drivers/net/wireless/intel/iwlwifi/pcie/internal.h |  42 +-
1945  drivers/net/wireless/intel/iwlwifi/pcie/rx.c       | 536 ++++++++++++++-------
1946  drivers/net/wireless/intel/iwlwifi/pcie/trans.c    | 155 ++++--
1947  drivers/net/wireless/intel/iwlwifi/pcie/tx.c       |  87 +++-
1948  drivers/net/wireless/intersil/hostap/hostap_hw.c   |  15 +-
1949  drivers/net/wireless/marvell/libertas/cfg.c        |  38 ++
1950  drivers/net/wireless/marvell/libertas/cmd.c        |  40 +-
1951  drivers/net/wireless/marvell/libertas/cmdresp.c    |   9 +-
1952  drivers/net/wireless/marvell/libertas/dev.h        |   1 +
1953  drivers/net/wireless/marvell/libertas/if_sdio.c    |   2 +-
1954  drivers/net/wireless/marvell/libertas/if_usb.c     |   1 +
1955  drivers/net/wireless/marvell/libertas/main.c       |   7 +-
1956  drivers/net/wireless/marvell/mwifiex/README        |  10 +
1957  drivers/net/wireless/marvell/mwifiex/cfg80211.c    | 248 +++++++++-
1958  drivers/net/wireless/marvell/mwifiex/cmdevt.c      |  13 +
1959  drivers/net/wireless/marvell/mwifiex/debugfs.c     |  51 +-
1960  drivers/net/wireless/marvell/mwifiex/decl.h        |  24 +
1961  drivers/net/wireless/marvell/mwifiex/fw.h          |  90 +++-
1962  drivers/net/wireless/marvell/mwifiex/init.c        |  16 +-
1963  drivers/net/wireless/marvell/mwifiex/ioctl.h       |   5 +
1964  drivers/net/wireless/marvell/mwifiex/join.c        |  15 +
1965  drivers/net/wireless/marvell/mwifiex/main.c        |  14 +
1966  drivers/net/wireless/marvell/mwifiex/main.h        |  44 +-
1967  drivers/net/wireless/marvell/mwifiex/pcie.c        | 321 ++++++++----
1968  drivers/net/wireless/marvell/mwifiex/pcie.h        |  50 +-
1969  drivers/net/wireless/marvell/mwifiex/scan.c        | 310 ++++++++++++
1970  drivers/net/wireless/marvell/mwifiex/sdio.c        |  35 +-
1971  drivers/net/wireless/marvell/mwifiex/sta_cmd.c     |  23 +
1972  drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c |   6 +
1973  drivers/net/wireless/marvell/mwifiex/sta_event.c   |  20 +-
1974  drivers/net/wireless/marvell/mwifiex/sta_ioctl.c   |  33 +-
1975  drivers/net/wireless/marvell/mwifiex/wmm.c         |   7 +-
1976  drivers/net/wireless/ralink/rt2x00/rt2x00.h        |  18 +-
1977  drivers/net/wireless/ralink/rt2x00/rt2x00debug.c   |   4 +-
1978  drivers/net/wireless/ralink/rt2x00/rt61pci.h       |  20 +-
1979  drivers/net/wireless/ti/wlcore/Kconfig             |   2 +-
1980  drivers/net/wireless/ti/wlcore/event.c             |   2 +-
1981  drivers/net/wireless/ti/wlcore/spi.c               |  86 +++-
1982  include/linux/bcma/bcma.h                          |   3 +
1983  include/linux/bcma/bcma_driver_chipcommon.h        |  31 +-
1984  94 files changed, 3046 insertions(+), 728 deletions(-)
1985  create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wlcore,spi.txt
1986 Merging bluetooth/master (9a6a1c77e1fc Bluetooth: Use managed version of led_trigger_register in LED trigger)
1987 $ git merge bluetooth/master
1988 Merge made by the 'recursive' strategy.
1989  drivers/bluetooth/ath3k.c        |  1 +
1990  include/net/bluetooth/hci_core.h |  3 ++
1991  net/bluetooth/Kconfig            |  9 +++++
1992  net/bluetooth/Makefile           |  1 +
1993  net/bluetooth/hci_core.c         |  6 ++++
1994  net/bluetooth/leds.c             | 74 ++++++++++++++++++++++++++++++++++++++++
1995  net/bluetooth/leds.h             | 16 +++++++++
1996  7 files changed, 110 insertions(+)
1997  create mode 100644 net/bluetooth/leds.c
1998  create mode 100644 net/bluetooth/leds.h
1999 Merging mac80211-next/master (94106d26c380 mac80211: fix VHT MU-MIMO frame processing)
2000 $ git merge mac80211-next/master
2001 Resolved 'net/mac80211/debugfs.c' using previous resolution.
2002 Auto-merging net/wireless/reg.c
2003 Auto-merging net/wireless/core.c
2004 Auto-merging net/rfkill/core.c
2005 Auto-merging net/mac80211/util.c
2006 Auto-merging net/mac80211/sta_info.c
2007 Auto-merging net/mac80211/mlme.c
2008 Auto-merging net/mac80211/mesh.h
2009 Auto-merging net/mac80211/mesh.c
2010 Auto-merging net/mac80211/ibss.c
2011 Auto-merging net/mac80211/debugfs.c
2012 CONFLICT (content): Merge conflict in net/mac80211/debugfs.c
2013 Auto-merging net/mac80211/agg-rx.c
2014 Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800lib.c
2015 Auto-merging drivers/net/wireless/mac80211_hwsim.c
2016 Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
2017 Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c
2018 Automatic merge failed; fix conflicts and then commit the result.
2019 $ git commit -v -a
2020 [master dec7730df6ef] Merge remote-tracking branch 'mac80211-next/master'
2021 $ git diff -M --stat --summary HEAD^..
2022  Documentation/ABI/obsolete/sysfs-class-rfkill      |   9 -
2023  Documentation/ABI/removed/sysfs-class-rfkill       |  13 ++
2024  Documentation/networking/mac80211-injection.txt    |  17 ++
2025  drivers/net/wireless/ath/ath10k/mac.c              |   7 +-
2026  drivers/net/wireless/ath/ath9k/htc_drv_main.c      |   7 +-
2027  drivers/net/wireless/ath/ath9k/main.c              |   8 +-
2028  drivers/net/wireless/ath/carl9170/main.c           |   8 +-
2029  drivers/net/wireless/ath/wcn36xx/main.c            |   8 +-
2030  drivers/net/wireless/ath/wil6210/cfg80211.c        |  10 +
2031  .../broadcom/brcm80211/brcmsmac/mac80211_if.c      |   8 +-
2032  drivers/net/wireless/intel/iwlegacy/4965-mac.c     |   8 +-
2033  drivers/net/wireless/intel/iwlegacy/4965.h         |   4 +-
2034  drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c  |   9 +-
2035  drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c  |   9 +-
2036  drivers/net/wireless/mac80211_hwsim.c              |  12 +-
2037  drivers/net/wireless/marvell/mwl8k.c               |  10 +-
2038  drivers/net/wireless/mediatek/mt7601u/main.c       |   8 +-
2039  drivers/net/wireless/ralink/rt2x00/rt2800lib.c     |   7 +-
2040  drivers/net/wireless/ralink/rt2x00/rt2800lib.h     |   4 +-
2041  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c   |   6 +-
2042  drivers/net/wireless/realtek/rtlwifi/core.c        |   8 +-
2043  drivers/net/wireless/rsi/rsi_91x_mac80211.c        |  19 +-
2044  drivers/net/wireless/st/cw1200/sta.c               |   4 +-
2045  drivers/net/wireless/st/cw1200/sta.h               |   4 +-
2046  drivers/net/wireless/ti/wlcore/main.c              |   8 +-
2047  include/linux/ieee80211.h                          |  26 +++
2048  include/linux/rfkill.h                             |   3 +-
2049  include/net/cfg80211.h                             |   8 +
2050  include/net/mac80211.h                             | 138 ++++++++++++--
2051  include/uapi/linux/nl80211.h                       |   6 +
2052  include/uapi/linux/rfkill.h                        |   2 +
2053  net/mac80211/agg-rx.c                              |  50 ++++-
2054  net/mac80211/agg-tx.c                              |  53 ++++--
2055  net/mac80211/cfg.c                                 |  29 +++
2056  net/mac80211/chan.c                                |   2 +-
2057  net/mac80211/debugfs.c                             |   1 +
2058  net/mac80211/driver-ops.c                          |  10 +-
2059  net/mac80211/driver-ops.h                          |   4 +-
2060  net/mac80211/ht.c                                  |   5 +
2061  net/mac80211/ibss.c                                |  32 ++--
2062  net/mac80211/ieee80211_i.h                         |  35 ++--
2063  net/mac80211/iface.c                               |  14 ++
2064  net/mac80211/mesh.c                                |   9 +-
2065  net/mac80211/mesh.h                                |   3 -
2066  net/mac80211/mesh_pathtbl.c                        | 111 +++++++++--
2067  net/mac80211/mesh_plink.c                          |  10 +-
2068  net/mac80211/mlme.c                                |  68 +++----
2069  net/mac80211/rx.c                                  | 139 ++++++++++++--
2070  net/mac80211/sta_info.c                            |  35 ++--
2071  net/mac80211/sta_info.h                            |  24 ++-
2072  net/mac80211/trace.h                               |  43 +++--
2073  net/mac80211/tx.c                                  |  85 ++++++++-
2074  net/mac80211/util.c                                | 116 +++++++++---
2075  net/mac80211/vht.c                                 |  44 +++++
2076  net/rfkill/core.c                                  |  71 ++++---
2077  net/wireless/Kconfig                               |  25 +--
2078  net/wireless/core.c                                |  10 +
2079  net/wireless/mlme.c                                |   3 +-
2080  net/wireless/nl80211.c                             |  11 ++
2081  net/wireless/reg.c                                 | 122 ++++---------
2082  net/wireless/sme.c                                 |   9 +-
2083  net/wireless/util.c                                | 203 +++++++++++----------
2084  62 files changed, 1189 insertions(+), 585 deletions(-)
2085  create mode 100644 Documentation/ABI/removed/sysfs-class-rfkill
2086 Merging rdma/for-next (34356f64ac0d IB/mlx5: Unify CQ create flags check)
2087 $ git merge rdma/for-next
2088 Already up-to-date.
2089 Merging mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case)
2090 $ git merge mtd/master
2091 Already up-to-date.
2092 Merging l2-mtd/master (ed4eeba7338b driver/memory: Removal of deprecated NO_IRQ)
2093 $ git merge l2-mtd/master
2094 Merge made by the 'recursive' strategy.
2095  arch/arm/plat-samsung/devs.c                    |   9 -
2096  arch/mips/include/asm/mach-jz4740/jz4740_nand.h |   2 -
2097  drivers/memory/fsl_ifc.c                        |   2 +-
2098  drivers/mtd/bcm47xxpart.c                       |  42 ++--
2099  drivers/mtd/nand/Kconfig                        |   3 +
2100  drivers/mtd/nand/atmel_nand.c                   |  12 +-
2101  drivers/mtd/nand/gpmi-nand/gpmi-nand.c          |  73 ++++--
2102  drivers/mtd/nand/jz4740_nand.c                  |   3 -
2103  drivers/mtd/nand/lpc32xx_mlc.c                  |   2 +-
2104  drivers/mtd/nand/mpc5121_nfc.c                  |   7 +-
2105  drivers/mtd/nand/nand_bbt.c                     |   2 -
2106  drivers/mtd/nand/nand_ids.c                     |   4 +-
2107  drivers/mtd/nand/nuc900_nand.c                  |   2 +-
2108  drivers/mtd/nand/plat_nand.c                    |   1 -
2109  drivers/mtd/nand/pxa3xx_nand.c                  |  22 +-
2110  drivers/mtd/nand/s3c2410.c                      |   3 -
2111  drivers/mtd/nand/sunxi_nand.c                   | 287 +++++++++++++++++++++---
2112  drivers/mtd/nand/vf610_nfc.c                    |   2 -
2113  drivers/mtd/onenand/onenand_bbt.c               |   5 +-
2114  drivers/mtd/spi-nor/Kconfig                     |   1 +
2115  drivers/mtd/spi-nor/mtk-quadspi.c               |   4 +-
2116  drivers/staging/mt29f_spinand/mt29f_spinand.h   |   1 -
2117  include/linux/mtd/bbm.h                         |   1 -
2118  include/linux/mtd/inftl.h                       |   1 -
2119  include/linux/mtd/nand.h                        |   8 +-
2120  include/linux/mtd/nftl.h                        |   1 -
2121  include/linux/platform_data/mtd-nand-s3c2410.h  |   1 -
2122  27 files changed, 387 insertions(+), 114 deletions(-)
2123 Merging crypto/master (f75516a81548 crypto: keys - Revert "convert public key to akcipher api")
2124 $ git merge crypto/master
2125 Auto-merging net/sctp/socket.c
2126 Auto-merging net/ipv6/tcp_ipv6.c
2127 Auto-merging net/ipv4/tcp_ipv4.c
2128 Auto-merging net/ipv4/tcp_fastopen.c
2129 Auto-merging net/ipv4/tcp.c
2130 Auto-merging net/bluetooth/smp.c
2131 Auto-merging include/net/tcp.h
2132 Auto-merging include/net/sctp/structs.h
2133 Removing include/crypto/internal/compress.h
2134 Removing include/crypto/compress.h
2135 Auto-merging fs/ext4/crypto.c
2136 Auto-merging fs/ecryptfs/main.c
2137 Auto-merging drivers/crypto/atmel-sha.c
2138 Auto-merging drivers/crypto/atmel-aes.c
2139 Auto-merging drivers/char/hw_random/Kconfig
2140 Removing crypto/zlib.c
2141 Auto-merging crypto/shash.c
2142 Removing crypto/pcompress.c
2143 Auto-merging crypto/crc32_generic.c
2144 Auto-merging crypto/Kconfig
2145 Merge made by the 'recursive' strategy.
2146  Documentation/DocBook/crypto-API.tmpl              |  13 -
2147  Documentation/crypto/api-intro.txt                 |  23 +-
2148  .../devicetree/bindings/rng/brcm,bcm6368.txt       |  17 +
2149  .../devicetree/bindings/sparc_sun_oracle_rng.txt   |  30 ++
2150  .../devicetree/bindings/vendor-prefixes.txt        |   2 +
2151  arch/x86/crypto/sha-mb/sha1_mb.c                   |  35 ++
2152  arch/x86/crypto/sha-mb/sha1_mb_mgr_submit_avx2.S   |   2 +-
2153  crypto/Kconfig                                     |  23 +-
2154  crypto/Makefile                                    |   5 +-
2155  crypto/ahash.c                                     |  24 +-
2156  crypto/algapi.c                                    |  15 +
2157  crypto/{crc32.c => crc32_generic.c}                |   3 +-
2158  crypto/crypto_engine.c                             | 355 +++++++++++++++++++
2159  crypto/drbg.c                                      |  64 ----
2160  crypto/internal.h                                  |   3 +
2161  crypto/keywrap.c                                   |   4 +-
2162  crypto/mcryptd.c                                   |   1 +
2163  crypto/pcompress.c                                 | 115 -------
2164  crypto/shash.c                                     | 147 --------
2165  crypto/skcipher.c                                  |   4 +-
2166  crypto/tcrypt.c                                    | 239 +------------
2167  crypto/testmgr.c                                   | 369 ++++++++------------
2168  crypto/testmgr.h                                   | 144 --------
2169  crypto/zlib.c                                      | 381 ---------------------
2170  drivers/block/cryptoloop.c                         |  48 +--
2171  drivers/block/drbd/drbd_int.h                      |  16 +-
2172  drivers/block/drbd/drbd_main.c                     |  16 +-
2173  drivers/block/drbd/drbd_nl.c                       |  59 ++--
2174  drivers/block/drbd/drbd_receiver.c                 |  56 ++-
2175  drivers/block/drbd/drbd_worker.c                   |  43 ++-
2176  drivers/char/hw_random/Kconfig                     |   2 +-
2177  drivers/char/hw_random/bcm63xx-rng.c               |   9 +-
2178  drivers/char/hw_random/n2-drv.c                    |  10 +
2179  drivers/crypto/Kconfig                             |   3 +-
2180  drivers/crypto/atmel-aes.c                         |   6 -
2181  drivers/crypto/atmel-sha-regs.h                    |   4 +
2182  drivers/crypto/atmel-sha.c                         | 192 +++++++++--
2183  drivers/crypto/caam/ctrl.c                         |   2 +-
2184  drivers/crypto/caam/regs.h                         |   3 +-
2185  drivers/crypto/ccp/ccp-crypto-aes-cmac.c           |  35 ++
2186  drivers/crypto/ccp/ccp-crypto-sha.c                |  39 +++
2187  drivers/crypto/ccp/ccp-crypto.h                    |  22 ++
2188  drivers/crypto/ixp4xx_crypto.c                     |  26 +-
2189  drivers/crypto/omap-aes.c                          |  97 +++---
2190  drivers/crypto/qat/qat_common/adf_accel_devices.h  |   4 +-
2191  drivers/crypto/qat/qat_common/adf_aer.c            |   1 -
2192  drivers/crypto/qat/qat_common/adf_cfg_user.h       |   6 +-
2193  drivers/crypto/qat/qat_common/qat_algs.c           |   6 +-
2194  drivers/crypto/s5p-sss.c                           |  12 +-
2195  drivers/crypto/sahara.c                            |  19 +-
2196  drivers/crypto/sunxi-ss/sun4i-ss-cipher.c          |   5 +-
2197  drivers/md/dm-crypt.c                              |  93 ++---
2198  drivers/net/ppp/ppp_mppe.c                         |  99 +++---
2199  drivers/net/wireless/intersil/orinoco/mic.c        |  29 +-
2200  drivers/net/wireless/intersil/orinoco/mic.h        |   4 +-
2201  drivers/net/wireless/intersil/orinoco/orinoco.h    |   4 +-
2202  drivers/nfc/s3fwrn5/firmware.c                     |  36 +-
2203  drivers/scsi/iscsi_tcp.c                           |  54 +--
2204  drivers/scsi/iscsi_tcp.h                           |   4 +-
2205  drivers/scsi/libiscsi_tcp.c                        |  29 +-
2206  .../lustre/lustre/libcfs/linux/linux-crypto.c      |  92 ++---
2207  drivers/staging/rtl8192e/rtllib_crypt_tkip.c       |  99 +++---
2208  drivers/staging/rtl8192e/rtllib_crypt_wep.c        |  48 +--
2209  .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c      |  92 ++---
2210  .../rtl8192u/ieee80211/ieee80211_crypt_wep.c       |  46 ++-
2211  drivers/target/iscsi/iscsi_target.c                |  86 ++---
2212  drivers/target/iscsi/iscsi_target_auth.c           |  98 ++----
2213  drivers/target/iscsi/iscsi_target_login.c          |  45 ++-
2214  drivers/usb/wusbcore/crypto.c                      |  30 +-
2215  fs/cifs/cifsencrypt.c                              |  32 +-
2216  fs/cifs/smbencrypt.c                               |  26 +-
2217  fs/ecryptfs/crypto.c                               | 107 +++---
2218  fs/ecryptfs/ecryptfs_kernel.h                      |  12 +-
2219  fs/ecryptfs/inode.c                                |   1 -
2220  fs/ecryptfs/keystore.c                             | 218 +++++++-----
2221  fs/ecryptfs/main.c                                 |   1 -
2222  fs/ecryptfs/mmap.c                                 |   1 -
2223  fs/ecryptfs/super.c                                |   1 -
2224  fs/ext4/crypto.c                                   |  24 +-
2225  fs/ext4/crypto_fname.c                             |  32 +-
2226  fs/ext4/crypto_key.c                               |  42 ++-
2227  fs/ext4/ext4_crypto.h                              |   2 +-
2228  fs/f2fs/crypto.c                                   |  24 +-
2229  fs/f2fs/crypto_fname.c                             |  32 +-
2230  fs/f2fs/crypto_key.c                               |  40 +--
2231  fs/f2fs/f2fs_crypto.h                              |   2 +-
2232  fs/nfsd/nfs4recover.c                              |  28 +-
2233  include/crypto/algapi.h                            |  92 ++++-
2234  include/crypto/compress.h                          | 145 --------
2235  include/crypto/drbg.h                              |   4 -
2236  include/crypto/hash.h                              |  45 +++
2237  include/crypto/internal/aead.h                     |   6 +
2238  include/crypto/internal/compress.h                 |  28 --
2239  include/crypto/internal/hash.h                     |   3 -
2240  include/crypto/skcipher.h                          |  24 +-
2241  include/linux/crypto.h                             | 252 --------------
2242  include/linux/sunrpc/gss_krb5.h                    |  32 +-
2243  include/net/sctp/auth.h                            |   4 +-
2244  include/net/sctp/structs.h                         |   6 +-
2245  include/net/tcp.h                                  |   6 +-
2246  include/scsi/libiscsi_tcp.h                        |  13 +-
2247  include/target/iscsi/iscsi_target_core.h           |   4 +-
2248  net/bluetooth/smp.c                                | 135 ++++----
2249  net/ceph/crypto.c                                  | 101 +++---
2250  net/ipv4/tcp.c                                     |  41 ++-
2251  net/ipv4/tcp_fastopen.c                            |   1 +
2252  net/ipv4/tcp_ipv4.c                                |  23 +-
2253  net/ipv6/tcp_ipv6.c                                |  23 +-
2254  net/mac802154/llsec.c                              |  41 ++-
2255  net/mac802154/llsec.h                              |   3 +-
2256  net/rxrpc/ar-internal.h                            |   2 +-
2257  net/rxrpc/ar-key.c                                 |  12 +-
2258  net/rxrpc/rxkad.c                                  | 172 ++++++----
2259  net/sctp/auth.c                                    |  36 +-
2260  net/sctp/endpointola.c                             |   1 -
2261  net/sctp/sm_make_chunk.c                           |  51 +--
2262  net/sctp/socket.c                                  |   8 +-
2263  net/sunrpc/auth_gss/gss_krb5_crypto.c              | 350 +++++++++++--------
2264  net/sunrpc/auth_gss/gss_krb5_keys.c                |  12 +-
2265  net/sunrpc/auth_gss/gss_krb5_mech.c                |  89 ++---
2266  net/sunrpc/auth_gss/gss_krb5_seqnum.c              |  22 +-
2267  net/sunrpc/auth_gss/gss_krb5_wrap.c                |  24 +-
2268  net/wireless/lib80211_crypt_tkip.c                 |  99 +++---
2269  net/wireless/lib80211_crypt_wep.c                  |  46 ++-
2270  net/xfrm/xfrm_algo.c                               |   7 +-
2271  security/keys/encrypted-keys/encrypted.c           |  82 +++--
2272  126 files changed, 2975 insertions(+), 3442 deletions(-)
2273  create mode 100644 Documentation/devicetree/bindings/rng/brcm,bcm6368.txt
2274  create mode 100644 Documentation/devicetree/bindings/sparc_sun_oracle_rng.txt
2275  rename crypto/{crc32.c => crc32_generic.c} (98%)
2276  create mode 100644 crypto/crypto_engine.c
2277  delete mode 100644 crypto/pcompress.c
2278  delete mode 100644 crypto/zlib.c
2279  delete mode 100644 include/crypto/compress.h
2280  delete mode 100644 include/crypto/internal/compress.h
2281 Merging drm/drm-next (5443ce86fa37 drm: virtio-gpu: set atomic flag)
2282 $ git merge drm/drm-next
2283 Auto-merging drivers/gpu/drm/i915/intel_pm.c
2284 Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
2285 Auto-merging drivers/gpu/drm/i915/intel_ddi.c
2286 Auto-merging drivers/gpu/drm/i915/i915_reg.h
2287 Auto-merging drivers/gpu/drm/i915/i915_gem.c
2288 Auto-merging drivers/gpu/drm/i915/i915_drv.h
2289 Auto-merging MAINTAINERS
2290 Merge made by the 'recursive' strategy.
2291  Documentation/DocBook/gpu.tmpl                 |   54 +-
2292  MAINTAINERS                                    |    6 +
2293  drivers/gpu/drm/Kconfig                        |    2 +
2294  drivers/gpu/drm/Makefile                       |    1 +
2295  drivers/gpu/drm/arm/Kconfig                    |   27 +
2296  drivers/gpu/drm/arm/Makefile                   |    2 +
2297  drivers/gpu/drm/arm/hdlcd_crtc.c               |  327 ++++++++
2298  drivers/gpu/drm/arm/hdlcd_drv.c                |  550 ++++++++++++
2299  drivers/gpu/drm/arm/hdlcd_drv.h                |   42 +
2300  drivers/gpu/drm/arm/hdlcd_regs.h               |   87 ++
2301  drivers/gpu/drm/armada/armada_drv.c            |    3 -
2302  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c |   18 -
2303  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c   |   10 -
2304  drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h   |    3 -
2305  drivers/gpu/drm/drm_atomic.c                   |   44 +-
2306  drivers/gpu/drm/drm_atomic_helper.c            |    5 +-
2307  drivers/gpu/drm/drm_crtc.c                     |   36 +-
2308  drivers/gpu/drm/drm_crtc_helper.c              |   13 +-
2309  drivers/gpu/drm/drm_fb_cma_helper.c            |    3 +-
2310  drivers/gpu/drm/drm_fb_helper.c                |   21 +
2311  drivers/gpu/drm/drm_fops.c                     |  305 ++++++-
2312  drivers/gpu/drm/drm_irq.c                      |   18 +-
2313  drivers/gpu/drm/exynos/exynos_drm_drv.c        |   14 -
2314  drivers/gpu/drm/exynos/exynos_drm_g2d.c        |   37 +-
2315  drivers/gpu/drm/exynos/exynos_drm_ipp.c        |   29 +-
2316  drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c      |    5 -
2317  drivers/gpu/drm/gma500/framebuffer.c           |   20 +-
2318  drivers/gpu/drm/gma500/mdfld_dsi_output.c      |   12 +-
2319  drivers/gpu/drm/gma500/psb_drv.c               |    9 -
2320  drivers/gpu/drm/i915/i915_debugfs.c            |   56 +-
2321  drivers/gpu/drm/i915/i915_dma.c                |    2 -
2322  drivers/gpu/drm/i915/i915_drv.c                |   15 +-
2323  drivers/gpu/drm/i915/i915_drv.h                |  108 +--
2324  drivers/gpu/drm/i915/i915_gem.c                |   95 ++-
2325  drivers/gpu/drm/i915/i915_gem_context.c        |   29 +-
2326  drivers/gpu/drm/i915/i915_gem_execbuffer.c     |  163 ++--
2327  drivers/gpu/drm/i915/i915_gem_gtt.c            |    8 +-
2328  drivers/gpu/drm/i915/i915_gem_gtt.h            |    1 -
2329  drivers/gpu/drm/i915/i915_gem_shrinker.c       |   60 +-
2330  drivers/gpu/drm/i915/i915_gem_stolen.c         |    3 +
2331  drivers/gpu/drm/i915/i915_gpu_error.c          |    2 +-
2332  drivers/gpu/drm/i915/i915_guc_reg.h            |    1 +
2333  drivers/gpu/drm/i915/i915_guc_submission.c     |  146 +++-
2334  drivers/gpu/drm/i915/i915_irq.c                |  254 +++---
2335  drivers/gpu/drm/i915/i915_params.c             |    1 +
2336  drivers/gpu/drm/i915/i915_params.h             |   68 ++
2337  drivers/gpu/drm/i915/i915_reg.h                |    5 +
2338  drivers/gpu/drm/i915/i915_sysfs.c              |    8 +-
2339  drivers/gpu/drm/i915/intel_atomic.c            |    2 +-
2340  drivers/gpu/drm/i915/intel_atomic_plane.c      |   14 +-
2341  drivers/gpu/drm/i915/intel_bios.c              |  412 +++++----
2342  drivers/gpu/drm/i915/intel_bios.h              |   60 +-
2343  drivers/gpu/drm/i915/intel_csr.c               |   14 +-
2344  drivers/gpu/drm/i915/intel_ddi.c               |  291 +++----
2345  drivers/gpu/drm/i915/intel_display.c           | 1066 +++++++++++++-----------
2346  drivers/gpu/drm/i915/intel_dp.c                |   30 +-
2347  drivers/gpu/drm/i915/intel_dp_mst.c            |    4 +-
2348  drivers/gpu/drm/i915/intel_drv.h               |   52 +-
2349  drivers/gpu/drm/i915/intel_dsi.c               |    9 +-
2350  drivers/gpu/drm/i915/intel_dsi.h               |    3 +-
2351  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c     |  153 ++--
2352  drivers/gpu/drm/i915/intel_dsi_pll.c           |   93 +--
2353  drivers/gpu/drm/i915/intel_fbdev.c             |    4 +-
2354  drivers/gpu/drm/i915/intel_guc.h               |    4 +
2355  drivers/gpu/drm/i915/intel_guc_fwif.h          |  113 ++-
2356  drivers/gpu/drm/i915/intel_guc_loader.c        |   13 +-
2357  drivers/gpu/drm/i915/intel_hdmi.c              |    6 +
2358  drivers/gpu/drm/i915/intel_lrc.c               |  562 +++++++------
2359  drivers/gpu/drm/i915/intel_lrc.h               |   23 +-
2360  drivers/gpu/drm/i915/intel_overlay.c           |   24 +-
2361  drivers/gpu/drm/i915/intel_pm.c                |   93 ++-
2362  drivers/gpu/drm/i915/intel_ringbuffer.c        |   38 +-
2363  drivers/gpu/drm/i915/intel_ringbuffer.h        |   19 +-
2364  drivers/gpu/drm/i915/intel_runtime_pm.c        |   31 +-
2365  drivers/gpu/drm/i915/intel_sdvo_regs.h         |   76 +-
2366  drivers/gpu/drm/i915/intel_sprite.c            |  161 ++--
2367  drivers/gpu/drm/i915/intel_uncore.c            |  139 ++-
2368  drivers/gpu/drm/imx/imx-drm-core.c             |   13 -
2369  drivers/gpu/drm/imx/ipuv3-crtc.c               |    4 -
2370  drivers/gpu/drm/msm/adreno/adreno_gpu.c        |    3 +
2371  drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c       |    7 -
2372  drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c        |   11 -
2373  drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h        |    1 -
2374  drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c       |    6 -
2375  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c        |   11 -
2376  drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h        |    1 -
2377  drivers/gpu/drm/omapdrm/omap_crtc.c            |   13 +-
2378  drivers/gpu/drm/omapdrm/omap_drv.c             |   42 -
2379  drivers/gpu/drm/omapdrm/omap_drv.h             |    1 -
2380  drivers/gpu/drm/rcar-du/rcar_du_crtc.c         |   20 -
2381  drivers/gpu/drm/rcar-du/rcar_du_crtc.h         |    2 -
2382  drivers/gpu/drm/rcar-du/rcar_du_drv.c          |   10 -
2383  drivers/gpu/drm/shmobile/shmob_drm_crtc.c      |   20 -
2384  drivers/gpu/drm/shmobile/shmob_drm_crtc.h      |    2 -
2385  drivers/gpu/drm/shmobile/shmob_drm_drv.c       |    8 -
2386  drivers/gpu/drm/tegra/dc.c                     |   17 -
2387  drivers/gpu/drm/tegra/drm.c                    |    4 -
2388  drivers/gpu/drm/tegra/drm.h                    |    1 -
2389  drivers/gpu/drm/tilcdc/tilcdc_crtc.c           |   20 -
2390  drivers/gpu/drm/tilcdc/tilcdc_drv.c            |    8 -
2391  drivers/gpu/drm/tilcdc/tilcdc_drv.h            |    1 -
2392  drivers/gpu/drm/vc4/vc4_crtc.c                 |   20 -
2393  drivers/gpu/drm/vc4/vc4_drv.c                  |   10 -
2394  drivers/gpu/drm/vc4/vc4_drv.h                  |    1 -
2395  drivers/gpu/drm/virtio/virtgpu_drv.c           |    2 +-
2396  drivers/gpu/drm/virtio/virtgpu_plane.c         |   16 +-
2397  drivers/gpu/drm/vmwgfx/vmwgfx_drv.c            |   11 -
2398  drivers/gpu/drm/vmwgfx/vmwgfx_drv.h            |    1 -
2399  drivers/gpu/drm/vmwgfx/vmwgfx_fence.c          |   87 +-
2400  drivers/gpu/drm/vmwgfx/vmwgfx_fence.h          |    2 -
2401  include/drm/drmP.h                             |   30 +-
2402  include/uapi/drm/i915_drm.h                    |   33 +-
2403  include/uapi/drm/msm_drm.h                     |    1 +
2404  mm/swapfile.c                                  |    6 +
2405  114 files changed, 4162 insertions(+), 2521 deletions(-)
2406  create mode 100644 drivers/gpu/drm/arm/Kconfig
2407  create mode 100644 drivers/gpu/drm/arm/Makefile
2408  create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c
2409  create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c
2410  create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h
2411  create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
2412  create mode 100644 drivers/gpu/drm/i915/i915_params.h
2413  mode change 100644 => 100755 drivers/gpu/drm/i915/intel_hdmi.c
2414 Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location)
2415 $ git merge drm-panel/drm/panel/for-next
2416 Merge made by the 'recursive' strategy.
2417 Merging drm-intel/for-linux-next (2417c8c03f50 drm/i915: fix error path in intel_setup_gmbus())
2418 $ git merge drm-intel/for-linux-next
2419 Auto-merging drivers/gpu/drm/i915/intel_pm.c
2420 Auto-merging drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
2421 Auto-merging drivers/gpu/drm/i915/intel_drv.h
2422 Auto-merging drivers/gpu/drm/i915/intel_display.c
2423 Auto-merging drivers/gpu/drm/i915/intel_ddi.c
2424 Auto-merging drivers/gpu/drm/i915/i915_suspend.c
2425 Auto-merging drivers/gpu/drm/i915/i915_reg.h
2426 Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c
2427 Auto-merging drivers/gpu/drm/i915/i915_gem.c
2428 Auto-merging drivers/gpu/drm/i915/i915_drv.h
2429 Auto-merging drivers/gpu/drm/i915/i915_dma.c
2430 Auto-merging drivers/gpu/drm/i915/Kconfig
2431 Merge made by the 'recursive' strategy.
2432  drivers/char/agp/intel-gtt.c               |   8 +-
2433  drivers/gpu/drm/i915/Kconfig               |   2 -
2434  drivers/gpu/drm/i915/i915_debugfs.c        |  31 +-
2435  drivers/gpu/drm/i915/i915_dma.c            | 262 ++++----
2436  drivers/gpu/drm/i915/i915_drv.h            |  75 ++-
2437  drivers/gpu/drm/i915/i915_gem.c            |  38 +-
2438  drivers/gpu/drm/i915/i915_gem_context.c    |  34 +-
2439  drivers/gpu/drm/i915/i915_gem_execbuffer.c |   3 +-
2440  drivers/gpu/drm/i915/i915_gem_gtt.c        |  50 +-
2441  drivers/gpu/drm/i915/i915_gem_gtt.h        |   4 +-
2442  drivers/gpu/drm/i915/i915_gem_shrinker.c   |  16 +-
2443  drivers/gpu/drm/i915/i915_gem_stolen.c     |   3 +
2444  drivers/gpu/drm/i915/i915_gem_userptr.c    | 181 ++----
2445  drivers/gpu/drm/i915/i915_gpu_error.c      |   4 +
2446  drivers/gpu/drm/i915/i915_guc_submission.c |  65 +-
2447  drivers/gpu/drm/i915/i915_params.c         |   3 +-
2448  drivers/gpu/drm/i915/i915_reg.h            |  46 +-
2449  drivers/gpu/drm/i915/i915_suspend.c        |   2 +-
2450  drivers/gpu/drm/i915/intel_csr.c           |   3 +-
2451  drivers/gpu/drm/i915/intel_ddi.c           |   8 +-
2452  drivers/gpu/drm/i915/intel_display.c       | 164 +++--
2453  drivers/gpu/drm/i915/intel_dp.c            |   7 +-
2454  drivers/gpu/drm/i915/intel_drv.h           |  33 +-
2455  drivers/gpu/drm/i915/intel_dsi.c           |   2 +-
2456  drivers/gpu/drm/i915/intel_dsi_panel_vbt.c |   5 +-
2457  drivers/gpu/drm/i915/intel_fbc.c           | 950 +++++++++++++++++------------
2458  drivers/gpu/drm/i915/intel_guc.h           |   6 +-
2459  drivers/gpu/drm/i915/intel_guc_fwif.h      |  17 +-
2460  drivers/gpu/drm/i915/intel_hdmi.c          |   0
2461  drivers/gpu/drm/i915/intel_lrc.c           |  78 ++-
2462  drivers/gpu/drm/i915/intel_lrc.h           |   3 +-
2463  drivers/gpu/drm/i915/intel_pm.c            | 181 ++++--
2464  drivers/gpu/drm/i915/intel_psr.c           |  54 +-
2465  drivers/gpu/drm/i915/intel_ringbuffer.c    |  61 ++
2466  drivers/gpu/drm/i915/intel_ringbuffer.h    |   1 +
2467  drivers/gpu/drm/i915/intel_sideband.c      |  23 +-
2468  drivers/gpu/drm/i915/intel_sprite.c        |  40 +-
2469  drivers/gpu/drm/i915/intel_tv.c            |   1 +
2470  drivers/gpu/drm/i915/intel_uncore.c        |   2 +
2471  include/drm/i915_pciids.h                  |   6 +-
2472  include/uapi/drm/i915_drm.h                |  10 +-
2473  41 files changed, 1435 insertions(+), 1047 deletions(-)
2474  mode change 100755 => 100644 drivers/gpu/drm/i915/intel_hdmi.c
2475 Merging drm-tegra/drm/tegra/for-next (d50bbe33efb5 gpu: host1x: Use a signed return type for do_relocs())
2476 $ git merge drm-tegra/drm/tegra/for-next
2477 Merge made by the 'recursive' strategy.
2478  drivers/gpu/host1x/bus.c | 4 +++-
2479  drivers/gpu/host1x/job.c | 2 +-
2480  2 files changed, 4 insertions(+), 2 deletions(-)
2481 Merging drm-misc/topic/drm-misc (e24bfdd5052c apple-gmux: Fix build breakage if !CONFIG_ACPI)
2482 $ git merge drm-misc/topic/drm-misc
2483 Auto-merging drivers/gpu/drm/i915/intel_display.c
2484 Merge made by the 'recursive' strategy.
2485  Documentation/DocBook/gpu.tmpl                   |   5 +
2486  Documentation/dma-buf-sharing.txt                |  19 ++--
2487  drivers/dma-buf/dma-buf.c                        |  13 +--
2488  drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c |   3 +-
2489  drivers/gpu/drm/drm_atomic_helper.c              |  57 +++++++++--
2490  drivers/gpu/drm/drm_crtc.c                       |  65 +++++++++++++
2491  drivers/gpu/drm/drm_crtc_helper.c                |  10 +-
2492  drivers/gpu/drm/drm_edid.c                       |  26 +++++
2493  drivers/gpu/drm/drm_encoder_slave.c              |   3 +
2494  drivers/gpu/drm/drm_modes.c                      |   3 +-
2495  drivers/gpu/drm/drm_prime.c                      |  10 +-
2496  drivers/gpu/drm/gma500/intel_gmbus.c             |   2 +-
2497  drivers/gpu/drm/i2c/ch7006_drv.c                 |   2 +
2498  drivers/gpu/drm/i915/i915_drv.c                  |  12 +++
2499  drivers/gpu/drm/i915/i915_gem_dmabuf.c           |  42 +++++++-
2500  drivers/gpu/drm/i915/intel_display.c             |   5 +-
2501  drivers/gpu/drm/i915/intel_lvds.c                |   8 +-
2502  drivers/gpu/drm/msm/msm_fbdev.c                  |   3 -
2503  drivers/gpu/drm/nouveau/nouveau_acpi.c           |   2 +-
2504  drivers/gpu/drm/nouveau/nouveau_connector.c      |  21 +++-
2505  drivers/gpu/drm/nouveau/nouveau_drm.c            |  11 +++
2506  drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c        |   4 +-
2507  drivers/gpu/drm/radeon/radeon_atpx_handler.c     |   3 +-
2508  drivers/gpu/drm/radeon/radeon_connectors.c       |   6 ++
2509  drivers/gpu/drm/radeon/radeon_drv.c              |  11 +++
2510  drivers/gpu/drm/udl/udl_fb.c                     |   2 -
2511  drivers/gpu/vga/vga_switcheroo.c                 | 119 ++++++++++++++++++++++-
2512  drivers/platform/x86/apple-gmux.c                | 111 ++++++++++++++++-----
2513  drivers/staging/android/ion/ion.c                |   6 +-
2514  drivers/staging/android/ion/ion_test.c           |   4 +-
2515  include/drm/drm_crtc.h                           |  18 ++++
2516  include/linux/apple-gmux.h                       |  50 ++++++++++
2517  include/linux/dma-buf.h                          |  12 +--
2518  include/linux/vga_switcheroo.h                   |  36 ++++++-
2519  include/uapi/drm/drm.h                           |   1 +
2520  35 files changed, 607 insertions(+), 98 deletions(-)
2521  create mode 100644 include/linux/apple-gmux.h
2522 Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid)
2523 $ git merge drm-exynos/exynos-drm/for-next
2524 Already up-to-date.
2525 Merging drm-msm/msm-next (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON())
2526 $ git merge drm-msm/msm-next
2527 Already up-to-date.
2528 Merging hdlcd/for-upstream/hdlcd (8bb912e606b7 arm64: Juno: Add HDLCD support to the Juno boards.)
2529 $ git merge hdlcd/for-upstream/hdlcd
2530 Merge made by the 'recursive' strategy.
2531  .../devicetree/bindings/display/arm,hdlcd.txt      | 79 ++++++++++++++++++++++
2532  arch/arm64/boot/dts/arm/juno-base.dtsi             | 46 +++++++++++--
2533  2 files changed, 121 insertions(+), 4 deletions(-)
2534  create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt
2535 Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code)
2536 $ git merge drm-vc4/drm-vc4-next
2537 Already up-to-date.
2538 Merging sound/for-next (fa9a435debad Merge branch 'topic/hda-mst' into for-next)
2539 $ git merge sound/for-next
2540 Removing sound/mips/au1x00.c
2541 Merge made by the 'recursive' strategy.
2542  Documentation/sound/alsa/ALSA-Configuration.txt    |   9 +
2543  Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt |  74 +++
2544  sound/firewire/dice/dice-midi.c                    |  23 +-
2545  sound/firewire/dice/dice-pcm.c                     | 199 ++----
2546  sound/firewire/dice/dice-stream.c                  |  69 +-
2547  sound/firewire/dice/dice-transaction.c             |  54 --
2548  sound/firewire/dice/dice.c                         |  67 +-
2549  sound/firewire/dice/dice.h                         |   8 -
2550  sound/mips/Kconfig                                 |  12 -
2551  sound/mips/Makefile                                |   2 -
2552  sound/mips/au1x00.c                                | 734 ---------------------
2553  sound/pci/hda/patch_hdmi.c                         | 548 +++++++++++++--
2554  sound/usb/card.c                                   |  56 +-
2555  sound/usb/midi.c                                   |  15 +-
2556  sound/usb/midi.h                                   |  14 +-
2557  sound/usb/quirks.c                                 |  36 +-
2558  sound/usb/quirks.h                                 |   3 +-
2559  17 files changed, 778 insertions(+), 1145 deletions(-)
2560  create mode 100644 Documentation/sound/alsa/HD-Audio-DP-MST-audio.txt
2561  delete mode 100644 sound/mips/au1x00.c
2562 Merging sound-asoc/for-next (00d2170519d9 Merge remote-tracking branch 'asoc/topic/wm8974' into asoc-next)
2563 $ git merge sound-asoc/for-next
2564 Merge made by the 'recursive' strategy.
2565  .../devicetree/bindings/sound/fsl-asoc-card.txt    |  11 +
2566  .../devicetree/bindings/sound/max98926.txt         |  32 +
2567  .../devicetree/bindings/sound/pcm179x.txt          |  11 +-
2568  Documentation/devicetree/bindings/sound/rt5514.txt |  25 +
2569  Documentation/devicetree/bindings/sound/rt5616.txt |   6 +
2570  include/sound/pcm.h                                |   2 +
2571  sound/core/pcm_misc.c                              |  30 +
2572  sound/soc/amd/acp-pcm-dma.c                        |   1 +
2573  sound/soc/bcm/bcm2835-i2s.c                        | 284 ++----
2574  sound/soc/codecs/Kconfig                           |  31 +-
2575  sound/soc/codecs/Makefile                          |   8 +
2576  sound/soc/codecs/ab8500-codec.c                    |   1 -
2577  sound/soc/codecs/adau1761.c                        |   8 +
2578  sound/soc/codecs/arizona.c                         | 105 ++-
2579  sound/soc/codecs/arizona.h                         |   4 +-
2580  sound/soc/codecs/cs42xx8.c                         |  10 +-
2581  sound/soc/codecs/cs47l24.c                         | 123 ++-
2582  sound/soc/codecs/max98926.c                        | 604 +++++++++++++
2583  sound/soc/codecs/max98926.h                        | 848 ++++++++++++++++++
2584  sound/soc/codecs/pcm179x-i2c.c                     |  73 ++
2585  sound/soc/codecs/pcm179x-spi.c                     |  72 ++
2586  sound/soc/codecs/pcm179x.c                         |  56 +-
2587  sound/soc/codecs/pcm179x.h                         |   9 +-
2588  sound/soc/codecs/pcm3168a.c                        |   5 +
2589  sound/soc/codecs/rt286.c                           |  26 +-
2590  sound/soc/codecs/rt5514.c                          | 982 +++++++++++++++++++++
2591  sound/soc/codecs/rt5514.h                          | 252 ++++++
2592  sound/soc/codecs/rt5616.c                          | 412 +++++----
2593  sound/soc/codecs/rt5645.c                          |   2 +-
2594  sound/soc/codecs/rt5659.c                          |  33 +-
2595  sound/soc/codecs/rt5659.h                          |   1 -
2596  sound/soc/codecs/sigmadsp-i2c.c                    |   5 +-
2597  sound/soc/codecs/ssm4567.c                         |   5 +
2598  sound/soc/codecs/wm5102.c                          |  93 +-
2599  sound/soc/codecs/wm5110.c                          |  76 +-
2600  sound/soc/codecs/wm8960.c                          |  40 +-
2601  sound/soc/codecs/wm8974.c                          |  93 ++
2602  sound/soc/codecs/wm8997.c                          |   2 +-
2603  sound/soc/codecs/wm8998.c                          |   2 +-
2604  sound/soc/codecs/wm_adsp.c                         |  85 +-
2605  sound/soc/codecs/wm_adsp.h                         |   8 +-
2606  sound/soc/davinci/davinci-mcasp.c                  |   2 +
2607  sound/soc/dwc/designware_i2s.c                     |   5 +-
2608  sound/soc/fsl/Kconfig                              |   4 +-
2609  sound/soc/fsl/fsl-asoc-card.c                      |  26 +-
2610  sound/soc/fsl/fsl_sai.c                            |   3 +-
2611  sound/soc/fsl/fsl_ssi.c                            |  42 +-
2612  sound/soc/fsl/imx-spdif.c                          |   2 -
2613  sound/soc/fsl/mpc5200_psc_ac97.c                   |   3 +-
2614  sound/soc/generic/simple-card.c                    |   2 +-
2615  sound/soc/intel/Kconfig                            |  13 +-
2616  sound/soc/intel/atom/sst-mfld-platform-pcm.c       |   1 +
2617  sound/soc/intel/boards/cht_bsw_max98090_ti.c       |  17 +-
2618  sound/soc/intel/boards/cht_bsw_rt5645.c            |  13 +-
2619  sound/soc/intel/boards/skl_rt286.c                 |   5 +-
2620  sound/soc/intel/common/Makefile                    |   9 +-
2621  sound/soc/intel/common/sst-acpi.c                  |   4 +
2622  sound/soc/intel/common/sst-match-acpi.c            |  19 +-
2623  sound/soc/intel/skylake/skl-messages.c             |  68 +-
2624  sound/soc/intel/skylake/skl-pcm.c                  |  21 +
2625  sound/soc/intel/skylake/skl-topology.c             | 268 +++++-
2626  sound/soc/intel/skylake/skl-topology.h             |  27 +
2627  sound/soc/intel/skylake/skl-tplg-interface.h       |   3 +-
2628  sound/soc/intel/skylake/skl.c                      |  28 +-
2629  sound/soc/mediatek/Kconfig                         |   4 +-
2630  sound/soc/mediatek/mtk-afe-common.h                |   1 +
2631  sound/soc/mediatek/mtk-afe-pcm.c                   |  22 +-
2632  sound/soc/mxs/mxs-saif.c                           |  15 +-
2633  sound/soc/qcom/lpass-platform.c                    |  15 +-
2634  sound/soc/samsung/s3c-i2s-v2.c                     |   2 +-
2635  sound/soc/samsung/s3c-i2s-v2.h                     |   2 +-
2636  sound/soc/sh/rcar/adg.c                            |   9 +-
2637  sound/soc/sh/rcar/cmd.c                            |  18 +-
2638  sound/soc/sh/rcar/core.c                           |  84 +-
2639  sound/soc/sh/rcar/ctu.c                            |  72 +-
2640  sound/soc/sh/rcar/dma.c                            |  56 +-
2641  sound/soc/sh/rcar/dvc.c                            |   2 +-
2642  sound/soc/sh/rcar/gen.c                            |  35 +
2643  sound/soc/sh/rcar/mix.c                            |   2 +-
2644  sound/soc/sh/rcar/rsnd.h                           |  80 +-
2645  sound/soc/sh/rcar/src.c                            |  71 +-
2646  sound/soc/sh/rcar/ssi.c                            | 192 ++--
2647  sound/soc/sh/rcar/ssiu.c                           |   3 +-
2648  sound/soc/soc-dapm.c                               |   8 +-
2649  sound/soc/soc-pcm.c                                |  27 +-
2650  85 files changed, 4751 insertions(+), 1030 deletions(-)
2651  create mode 100644 Documentation/devicetree/bindings/sound/max98926.txt
2652  create mode 100644 Documentation/devicetree/bindings/sound/rt5514.txt
2653  create mode 100644 sound/soc/codecs/max98926.c
2654  create mode 100644 sound/soc/codecs/max98926.h
2655  create mode 100644 sound/soc/codecs/pcm179x-i2c.c
2656  create mode 100644 sound/soc/codecs/pcm179x-spi.c
2657  create mode 100644 sound/soc/codecs/rt5514.c
2658  create mode 100644 sound/soc/codecs/rt5514.h
2659 Merging modules/modules-next (b37a05c083c8 Merge branch 'akpm' (patches from Andrew))
2660 $ git merge modules/modules-next
2661 Already up-to-date.
2662 Merging input/next (1261d013daea Input: Allow compile test of Goodix and Colibri VF50 if !GPIOLIB)
2663 $ git merge input/next
2664 Auto-merging drivers/input/touchscreen/Kconfig
2665 Merge made by the 'recursive' strategy.
2666  .../bindings/input/touchscreen/cyttsp.txt          |  95 ++++++
2667  drivers/input/mouse/Kconfig                        |  10 +
2668  drivers/input/mouse/Makefile                       |   1 +
2669  drivers/input/mouse/byd.c                          | 337 +++++++++++++++++++++
2670  drivers/input/mouse/byd.h                          |  18 ++
2671  drivers/input/mouse/psmouse-base.c                 |  14 +
2672  drivers/input/mouse/psmouse.h                      |   1 +
2673  drivers/input/touchscreen/Kconfig                  |   5 +-
2674  drivers/input/touchscreen/cyttsp_core.c            | 194 ++++++++----
2675  drivers/input/touchscreen/cyttsp_core.h            |  10 +-
2676  drivers/input/touchscreen/cyttsp_i2c.c             |  10 -
2677  drivers/input/touchscreen/cyttsp_spi.c             |  10 -
2678  include/linux/input/cyttsp.h                       |  15 -
2679  13 files changed, 614 insertions(+), 106 deletions(-)
2680  create mode 100644 Documentation/devicetree/bindings/input/touchscreen/cyttsp.txt
2681  create mode 100644 drivers/input/mouse/byd.c
2682  create mode 100644 drivers/input/mouse/byd.h
2683 Merging block/for-next (0124663be268 Merge branch 'for-4.6/drivers' into for-next)
2684 $ git merge block/for-next
2685 Merge made by the 'recursive' strategy.
2686  block/blk-mq-sysfs.c       |   9 +--
2687  block/blk-mq.c             | 173 +++++++++++++++++++++++++++------------------
2688  block/blk-mq.h             |   1 +
2689  block/cfq-iosched.c        |  43 ++++++++---
2690  drivers/nvme/host/Kconfig  |   6 +-
2691  drivers/nvme/host/Makefile |  10 +--
2692  drivers/nvme/host/core.c   |  84 +++++++++++++++++-----
2693  drivers/nvme/host/nvme.h   |   3 +-
2694  drivers/nvme/host/pci.c    |  78 +++++++++-----------
2695  include/linux/blk-mq.h     |   2 +
2696  10 files changed, 255 insertions(+), 154 deletions(-)
2697 Merging device-mapper/for-next (aa8c484be790 dm thin metadata: remove needless newline from subtree_dec() DMERR message)
2698 $ git merge device-mapper/for-next
2699 Auto-merging drivers/md/dm-crypt.c
2700 Merge made by the 'recursive' strategy.
2701  block/blk-core.c              |   2 +-
2702  drivers/md/dm-cache-target.c  |   2 +-
2703  drivers/md/dm-crypt.c         |   2 +-
2704  drivers/md/dm-delay.c         |   2 +-
2705  drivers/md/dm-flakey.c        |   2 +-
2706  drivers/md/dm-ioctl.c         |   5 +-
2707  drivers/md/dm-log-writes.c    |   2 +-
2708  drivers/md/dm-mpath.c         | 101 ++++++++++++------
2709  drivers/md/dm-raid1.c         |   2 +-
2710  drivers/md/dm-snap.c          |   2 +-
2711  drivers/md/dm-table.c         |  30 +++++-
2712  drivers/md/dm-target.c        |   3 +-
2713  drivers/md/dm-thin-metadata.c |   2 +-
2714  drivers/md/dm-thin.c          |   2 +-
2715  drivers/md/dm-verity-fec.c    |   2 +-
2716  drivers/md/dm-verity-target.c |  12 +--
2717  drivers/md/dm.c               | 239 +++++++++++++++++++++++-------------------
2718  drivers/md/dm.h               |   4 +-
2719  include/linux/device-mapper.h |  13 ++-
2720  19 files changed, 263 insertions(+), 166 deletions(-)
2721 Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards)
2722 $ git merge pcmcia/master
2723 Already up-to-date.
2724 Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
2725 $ git merge mmc/mmc-next
2726 Already up-to-date.
2727 Merging mmc-uh/next (4e2918512024 Merge branch 'fixes' into next)
2728 $ git merge mmc-uh/next
2729 Merge made by the 'recursive' strategy.
2730  .../devicetree/bindings/mmc/brcm,sdhci-iproc.txt   |   5 +-
2731  .../bindings/mmc/microchip,sdhci-pic32.txt         |  29 +++
2732  drivers/mmc/card/block.c                           |  14 +-
2733  drivers/mmc/card/mmc_test.c                        |   1 +
2734  drivers/mmc/core/core.c                            |  29 ++-
2735  drivers/mmc/core/debugfs.c                         |   2 +-
2736  drivers/mmc/core/host.c                            |   1 +
2737  drivers/mmc/core/mmc.c                             |   4 +-
2738  drivers/mmc/core/mmc_ops.c                         |  19 +-
2739  drivers/mmc/core/pwrseq_simple.c                   |   1 -
2740  drivers/mmc/core/sd_ops.c                          |   7 +-
2741  drivers/mmc/core/sdio_ops.c                        |   3 +-
2742  drivers/mmc/host/Kconfig                           |  19 +-
2743  drivers/mmc/host/Makefile                          |   1 +
2744  drivers/mmc/host/atmel-mci.c                       |   9 +-
2745  drivers/mmc/host/bfin_sdh.c                        |   3 -
2746  drivers/mmc/host/davinci_mmc.c                     |  15 +-
2747  drivers/mmc/host/dw_mmc-exynos.c                   |  31 +--
2748  drivers/mmc/host/dw_mmc-pltfm.c                    |  19 +-
2749  drivers/mmc/host/dw_mmc-rockchip.c                 |   7 -
2750  drivers/mmc/host/dw_mmc.c                          | 101 ++++----
2751  drivers/mmc/host/dw_mmc.h                          |   6 +-
2752  drivers/mmc/host/jz4740_mmc.c                      |   2 -
2753  drivers/mmc/host/mmc_spi.c                         |  15 +-
2754  drivers/mmc/host/mxcmmc.c                          |   3 -
2755  drivers/mmc/host/omap_hsmmc.c                      |   9 +-
2756  drivers/mmc/host/pxamci.c                          |  43 +---
2757  drivers/mmc/host/s3cmci.c                          |   3 +-
2758  drivers/mmc/host/sdhci-acpi.c                      |   2 +
2759  drivers/mmc/host/sdhci-iproc.c                     |  40 +++-
2760  drivers/mmc/host/sdhci-of-arasan.c                 |   5 -
2761  drivers/mmc/host/sdhci-of-at91.c                   |   1 +
2762  drivers/mmc/host/sdhci-pic32.c                     | 257 +++++++++++++++++++++
2763  drivers/mmc/host/sdricoh_cs.c                      |  26 +--
2764  drivers/mmc/host/sh_mmcif.c                        |   4 +-
2765  drivers/mmc/host/sh_mobile_sdhi.c                  |   7 +-
2766  drivers/mmc/host/sunxi-mmc.c                       |  95 ++++++--
2767  drivers/mmc/host/tmio_mmc_dma.c                    |  11 -
2768  drivers/mmc/host/tmio_mmc_pio.c                    |  27 ++-
2769  drivers/mmc/host/usdhi6rol0.c                      |   2 +-
2770  include/linux/mfd/tmio.h                           |   4 +
2771  include/linux/mmc/core.h                           |   1 -
2772  include/linux/mmc/dw_mmc.h                         |  12 +-
2773  include/linux/mmc/tmio.h                           |   5 +
2774  44 files changed, 603 insertions(+), 297 deletions(-)
2775  create mode 100644 Documentation/devicetree/bindings/mmc/microchip,sdhci-pic32.txt
2776  create mode 100644 drivers/mmc/host/sdhci-pic32.c
2777 Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
2778 $ git merge kgdb/kgdb-next
2779 Merge made by the 'recursive' strategy.
2780  kernel/debug/kdb/kdb_io.c | 2 +-
2781  1 file changed, 1 insertion(+), 1 deletion(-)
2782 Merging md/for-next (fc2561ec0afc md-cluster: delete useless code)
2783 $ git merge md/for-next
2784 Already up-to-date.
2785 Merging mfd/for-mfd-next (84a6c45ae136 mfd: syscon: Make syscon_regmap_config const)
2786 $ git merge mfd/for-mfd-next
2787 Auto-merging drivers/mfd/db8500-prcmu.c
2788 Merge made by the 'recursive' strategy.
2789  Documentation/devicetree/bindings/mfd/tps65086.txt |  55 ++++++++
2790  drivers/mfd/Kconfig                                |  27 +++-
2791  drivers/mfd/Makefile                               |   1 +
2792  drivers/mfd/ab8500-core.c                          | 106 +++++----------
2793  drivers/mfd/db8500-prcmu.c                         |   7 +-
2794  drivers/mfd/intel-lpss-pci.c                       |  19 ++-
2795  drivers/mfd/intel-lpss.c                           |   1 +
2796  drivers/mfd/lpc_ich.c                              |   5 +-
2797  drivers/mfd/syscon.c                               |  19 ++-
2798  drivers/mfd/tps65010.c                             |  21 +--
2799  drivers/mfd/tps65086.c                             | 149 +++++++++++++++++++++
2800  include/linux/mfd/core.h                           |  26 ++++
2801  include/linux/mfd/tps65086.h                       | 117 ++++++++++++++++
2802  13 files changed, 441 insertions(+), 112 deletions(-)
2803  create mode 100644 Documentation/devicetree/bindings/mfd/tps65086.txt
2804  create mode 100644 drivers/mfd/tps65086.c
2805  create mode 100644 include/linux/mfd/tps65086.h
2806 Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path)
2807 $ git merge backlight/for-backlight-next
2808 Already up-to-date.
2809 Merging battery/master (265b60497a57 power: bq27xxx_battery: Fix bq27541 AveragePower register address)
2810 $ git merge battery/master
2811 Already up-to-date.
2812 Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb)
2813 $ git merge omap_dss2/for-next
2814 Already up-to-date.
2815 Merging regulator/for-next (18c4766e2e9f Merge remote-tracking branches 'regulator/topic/mt6397' and 'regulator/topic/qcom-saw' into regulator-next)
2816 $ git merge regulator/for-next
2817 Merge made by the 'recursive' strategy.
2818  .../bindings/regulator/act8945a-regulator.txt      |  80 +++++++
2819  .../devicetree/bindings/regulator/lp872x.txt       |   1 +
2820  .../devicetree/bindings/regulator/max77802.txt     |   2 +-
2821  .../bindings/regulator/qcom,saw-regulator.txt      |  31 +++
2822  drivers/regulator/Kconfig                          |  21 ++
2823  drivers/regulator/Makefile                         |   2 +
2824  drivers/regulator/act8945a-regulator.c             | 165 +++++++++++++++
2825  drivers/regulator/axp20x-regulator.c               |  46 ++---
2826  drivers/regulator/core.c                           |  29 ++-
2827  drivers/regulator/da9210-regulator.c               |   5 +
2828  drivers/regulator/fan53555.c                       |  18 ++
2829  drivers/regulator/lp872x.c                         |  38 +++-
2830  drivers/regulator/mt6397-regulator.c               |  15 +-
2831  drivers/regulator/qcom_saw-regulator.c             | 229 +++++++++++++++++++++
2832  include/linux/regulator/lp872x.h                   |   5 +
2833  15 files changed, 639 insertions(+), 48 deletions(-)
2834  create mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt
2835  create mode 100644 Documentation/devicetree/bindings/regulator/qcom,saw-regulator.txt
2836  create mode 100644 drivers/regulator/act8945a-regulator.c
2837  create mode 100644 drivers/regulator/qcom_saw-regulator.c
2838 Merging security/next (388f7b1d6e8c Linux 4.5-rc3)
2839 $ git merge security/next
2840 Already up-to-date.
2841 Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix)
2842 $ git merge integrity/next
2843 Already up-to-date.
2844 Merging selinux/next (9090a2d5e3e6 selinux: use absolute path to include directory)
2845 $ git merge selinux/next
2846 Merge made by the 'recursive' strategy.
2847  security/selinux/Makefile | 2 +-
2848  1 file changed, 1 insertion(+), 1 deletion(-)
2849 Merging lblnet/next (b2776bf7149b Linux 3.18)
2850 $ git merge lblnet/next
2851 Already up-to-date.
2852 Merging watchdog/master (388f7b1d6e8c Linux 4.5-rc3)
2853 $ git merge watchdog/master
2854 Already up-to-date.
2855 Merging iommu/next (fd6b6b40c17e Merge branches 'iommu/fixes' and 'arm/rockchip' into next)
2856 $ git merge iommu/next
2857 Merge made by the 'recursive' strategy.
2858  drivers/iommu/rockchip-iommu.c | 214 ++++++++++++++++++++++++++---------------
2859  1 file changed, 135 insertions(+), 79 deletions(-)
2860 Merging dwmw2-iommu/master (fda3bec12d09 iommu/vt-d: Fix 64-bit accesses to 32-bit DMAR_GSTS_REG)
2861 $ git merge dwmw2-iommu/master
2862 Auto-merging drivers/iommu/intel_irq_remapping.c
2863 Auto-merging drivers/iommu/dmar.c
2864 Merge made by the 'recursive' strategy.
2865  drivers/iommu/dmar.c                |  2 +-
2866  drivers/iommu/intel-svm.c           | 33 +++++++++++++++++++++++++++------
2867  drivers/iommu/intel_irq_remapping.c |  2 +-
2868  3 files changed, 29 insertions(+), 8 deletions(-)
2869 Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags)
2870 $ git merge vfio/next
2871 Already up-to-date.
2872 Merging jc_docs/docs-next (5645a717c6ee Documentation: HOWTO: remove obsolete info about regression postings)
2873 $ git merge jc_docs/docs-next
2874 Auto-merging Documentation/DocBook/device-drivers.tmpl
2875 Merge made by the 'recursive' strategy.
2876  Documentation/CodingStyle                 |  2 +-
2877  Documentation/DocBook/device-drivers.tmpl |  2 +-
2878  Documentation/HOWTO                       |  7 +------
2879  Documentation/SubmittingPatches           |  2 +-
2880  Documentation/features/list-arch.sh       |  2 +-
2881  Documentation/i2c/dev-interface           |  2 +-
2882  Documentation/i2c/slave-eeprom-backend    |  4 ++--
2883  Documentation/ja_JP/HOWTO                 |  2 +-
2884  README                                    | 14 +++++++-------
2885  9 files changed, 16 insertions(+), 21 deletions(-)
2886 Merging trivial/for-next (e9bf1d57f0a0 drivers/rtc: broken link fix)
2887 $ git merge trivial/for-next
2888 Auto-merging net/openvswitch/vport-geneve.c
2889 Auto-merging mm/balloon_compaction.c
2890 Auto-merging lib/842/842_decompress.c
2891 Auto-merging kernel/time/timekeeping.c
2892 Auto-merging include/linux/device.h
2893 Auto-merging drivers/usb/host/uhci-q.c
2894 Auto-merging drivers/usb/gadget/legacy/Kconfig
2895 Auto-merging drivers/usb/dwc3/gadget.c
2896 Auto-merging drivers/usb/dwc3/ep0.c
2897 Auto-merging drivers/scsi/ufs/ufshcd.c
2898 Auto-merging drivers/rtc/rtc-rx8025.c
2899 Auto-merging drivers/phy/phy-core.c
2900 Auto-merging drivers/media/platform/exynos4-is/mipi-csis.c
2901 Auto-merging drivers/media/platform/exynos4-is/fimc-is.c
2902 Auto-merging drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c
2903 Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c
2904 Auto-merging drivers/dma/ioat/init.c
2905 Auto-merging drivers/dma/dw/core.c
2906 Auto-merging drivers/base/core.c
2907 Merge made by the 'recursive' strategy.
2908  REPORTING-BUGS                                     |  2 +-
2909  drivers/atm/firestream.c                           |  2 +-
2910  drivers/base/core.c                                |  2 +-
2911  drivers/crypto/nx/nx-842.c                         |  2 +-
2912  drivers/dma/dw/core.c                              |  6 +-
2913  drivers/dma/ioat/init.c                            |  2 +-
2914  drivers/gpu/drm/i915/i915_gem_fence.c              | 10 +--
2915  drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c      |  2 +-
2916  drivers/input/touchscreen/wdt87xx_i2c.c            |  2 +-
2917  drivers/media/platform/exynos4-is/fimc-is.c        |  6 +-
2918  drivers/media/platform/exynos4-is/mipi-csis.c      |  2 +-
2919  drivers/net/ethernet/nuvoton/w90p910_ether.c       |  2 +-
2920  .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c    |  2 +-
2921  drivers/pci/host/pci-mvebu.c                       |  6 +-
2922  drivers/phy/phy-core.c                             |  4 +-
2923  drivers/regulator/pbias-regulator.c                |  2 +-
2924  drivers/rtc/rtc-rx8025.c                           |  2 +-
2925  drivers/scsi/ufs/ufshcd.c                          |  6 +-
2926  drivers/thunderbolt/ctl.c                          |  2 +-
2927  drivers/thunderbolt/nhi.c                          | 74 ++++++++++------------
2928  drivers/thunderbolt/path.c                         |  2 +-
2929  drivers/thunderbolt/tb.h                           |  2 +-
2930  drivers/usb/core/urb.c                             |  8 +--
2931  drivers/usb/dwc3/dwc3-omap.c                       |  4 +-
2932  drivers/usb/dwc3/ep0.c                             |  5 +-
2933  drivers/usb/dwc3/gadget.c                          |  2 +-
2934  drivers/usb/gadget/legacy/Kconfig                  |  3 +-
2935  drivers/usb/host/uhci-q.c                          | 20 +++---
2936  include/linux/device.h                             |  5 +-
2937  kernel/time/timekeeping.c                          |  2 +-
2938  lib/842/842_decompress.c                           |  2 +-
2939  lib/flex_proportions.c                             |  2 +-
2940  lib/percpu-refcount.c                              |  2 +-
2941  mm/balloon_compaction.c                            |  4 +-
2942  net/openvswitch/vport-geneve.c                     |  2 +-
2943  .../testing/selftests/timers/alarmtimer-suspend.c  |  2 +-
2944  36 files changed, 98 insertions(+), 107 deletions(-)
2945 $ git am -3 ../patches/kernel-memremapc-add-new-arg-to-dev_warn.patch
2946 Applying: kernel/memremap.c: add new arg to dev_WARN
2947 $ git reset HEAD^
2948 Unstaged changes after reset:
2949 M       kernel/memremap.c
2950 $ git add -A .
2951 $ git commit -v -a --amend
2952 [master ed4704d10ccb] Merge remote-tracking branch 'trivial/for-next'
2953  Date: Thu Feb 11 12:47:49 2016 +1100
2954 Merging audit/next (fd97646b0595 audit: Fix typo in comment)
2955 $ git merge audit/next
2956 Auto-merging kernel/audit_watch.c
2957 Auto-merging kernel/audit.c
2958 Merge made by the 'recursive' strategy.
2959  include/uapi/linux/audit.h |  1 +
2960  kernel/audit.c             | 20 +++++++++++++++++++-
2961  kernel/audit_watch.c       |  2 +-
2962  kernel/auditfilter.c       |  6 +++---
2963  4 files changed, 24 insertions(+), 5 deletions(-)
2964 Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh)
2965 $ git merge devicetree/devicetree/next
2966 Already up-to-date.
2967 Merging dt-rh/for-next (b8c15a91f1fe Merge branches 'dt/next' and 'dt/linus' into for-next)
2968 $ git merge dt-rh/for-next
2969 Merge made by the 'recursive' strategy.
2970  scripts/dtc/dtx_diff | 343 +++++++++++++++++++++++++++++++++++++++++++++++++++
2971  1 file changed, 343 insertions(+)
2972  create mode 100755 scripts/dtc/dtx_diff
2973 Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure)
2974 $ git merge mailbox/mailbox-for-next
2975 Already up-to-date.
2976 Merging spi/for-next (e908e75fc383 Merge remote-tracking branch 'spi/topic/ti-qspi' into spi-next)
2977 $ git merge spi/for-next
2978 Merge made by the 'recursive' strategy.
2979  .../devicetree/bindings/spi/adi,axi-spi-engine.txt |  31 ++
2980  drivers/spi/Kconfig                                |  79 +--
2981  drivers/spi/Makefile                               |   4 +-
2982  drivers/spi/spi-atmel.c                            |   1 +
2983  drivers/spi/spi-axi-spi-engine.c                   | 591 +++++++++++++++++++++
2984  drivers/spi/spi-bcm2835aux.c                       |  10 +-
2985  drivers/spi/spi-dw-mid.c                           |   4 +-
2986  drivers/spi/spi-dw-mmio.c                          |   5 -
2987  drivers/spi/spi-fsl-espi.c                         |   4 +-
2988  drivers/spi/spi-imx.c                              |   8 +-
2989  drivers/spi/spi-loopback-test.c                    |   1 +
2990  drivers/spi/spi-pxa2xx.c                           | 143 +++--
2991  drivers/spi/spi-pxa2xx.h                           |  35 --
2992  drivers/spi/spi-ti-qspi.c                          | 139 ++++-
2993  drivers/spi/spi.c                                  | 398 +++++++++++++-
2994  include/linux/pxa2xx_ssp.h                         |   1 +
2995  include/linux/spi/spi.h                            | 144 +++++
2996  17 files changed, 1440 insertions(+), 158 deletions(-)
2997  create mode 100644 Documentation/devicetree/bindings/spi/adi,axi-spi-engine.txt
2998  create mode 100644 drivers/spi/spi-axi-spi-engine.c
2999 Merging tip/auto-latest (f864fe9a9259 Merge branch 'x86/mm')
3000 $ git merge tip/auto-latest
3001 Auto-merging kernel/memremap.c
3002 Auto-merging arch/x86/events/core.c
3003 Auto-merging arch/x86/events/amd/uncore.c
3004 Auto-merging arch/x86/events/amd/iommu.c
3005 Auto-merging arch/x86/events/amd/ibs.c
3006 Auto-merging arch/x86/events/amd/core.c
3007 Auto-merging arch/mips/Kconfig
3008 Auto-merging arch/arm64/kernel/setup.c
3009 Auto-merging MAINTAINERS
3010 Auto-merging Documentation/kernel-parameters.txt
3011 Merge made by the 'recursive' strategy.
3012  Documentation/efi-stub.txt                         |   4 +-
3013  Documentation/kernel-parameters.txt                |  18 +-
3014  Documentation/sysctl/kernel.txt                    |  21 +
3015  Documentation/x86/early-microcode.txt              |  25 +
3016  Documentation/x86/x86_64/mm.txt                    |  12 +-
3017  MAINTAINERS                                        |   1 +
3018  arch/arm/kernel/setup.c                            |   6 +-
3019  arch/arm/plat-samsung/pm-check.c                   |   4 +-
3020  arch/arm64/kernel/setup.c                          |   6 +-
3021  arch/avr32/kernel/setup.c                          |   6 +-
3022  arch/c6x/kernel/setup.c                            |   2 -
3023  arch/ia64/kernel/efi.c                             |  13 +-
3024  arch/ia64/kernel/setup.c                           |   6 +-
3025  arch/m32r/kernel/setup.c                           |   4 +-
3026  arch/microblaze/kernel/setup.c                     |   2 -
3027  arch/mips/Kconfig                                  |   1 +
3028  arch/mips/bmips/irq.c                              |  10 +-
3029  arch/mips/kernel/setup.c                           |  10 +-
3030  arch/parisc/mm/init.c                              |   6 +-
3031  arch/powerpc/kernel/setup_32.c                     |   2 -
3032  arch/powerpc/kernel/setup_64.c                     |   3 -
3033  arch/powerpc/mm/mem.c                              |   2 +-
3034  arch/s390/kernel/early.c                           |   1 -
3035  arch/s390/kernel/setup.c                           |   8 +-
3036  arch/score/kernel/setup.c                          |   2 +-
3037  arch/sh/kernel/setup.c                             |   8 +-
3038  arch/sparc/kernel/head_64.S                        |   8 -
3039  arch/sparc/mm/init_64.c                            |   8 +-
3040  arch/tile/kernel/setup.c                           |  11 +-
3041  arch/unicore32/kernel/setup.c                      |   6 +-
3042  arch/x86/Kbuild                                    |   3 +-
3043  arch/x86/Kconfig                                   |  27 +-
3044  arch/x86/Kconfig.debug                             |  10 -
3045  arch/x86/boot/cpuflags.h                           |   2 +-
3046  arch/x86/boot/mkcpustr.c                           |   2 +-
3047  arch/x86/crypto/crc32-pclmul_glue.c                |   2 +-
3048  arch/x86/crypto/crc32c-intel_glue.c                |   2 +-
3049  arch/x86/crypto/crct10dif-pclmul_glue.c            |   2 +-
3050  arch/x86/entry/calling.h                           |  31 -
3051  arch/x86/entry/common.c                            |  27 +
3052  arch/x86/entry/entry_32.S                          |   2 +-
3053  arch/x86/entry/entry_64.S                          | 276 +++------
3054  arch/x86/entry/syscall_32.c                        |  10 +-
3055  arch/x86/entry/syscall_64.c                        |  13 +-
3056  arch/x86/entry/syscalls/syscall_64.tbl             |  20 +-
3057  arch/x86/entry/syscalls/syscalltbl.sh              |  58 +-
3058  arch/x86/entry/vdso/vdso2c.h                       |   7 -
3059  arch/x86/entry/vdso/vdso32-setup.c                 |   1 -
3060  arch/x86/entry/vdso/vdso32/system_call.S           |   2 +-
3061  arch/x86/entry/vdso/vma.c                          | 127 ++--
3062  arch/x86/entry/vsyscall/vsyscall_gtod.c            |   9 +-
3063  arch/x86/events/Makefile                           |   7 +
3064  .../cpu/perf_event_amd.c => events/amd/core.c}     |   2 +-
3065  .../cpu/perf_event_amd_ibs.c => events/amd/ibs.c}  |  12 +-
3066  .../perf_event_amd_iommu.c => events/amd/iommu.c}  |   4 +-
3067  .../perf_event_amd_iommu.h => events/amd/iommu.h}  |   0
3068  .../amd/uncore.c}                                  |   4 +-
3069  .../x86/{kernel/cpu/perf_event.c => events/core.c} |  11 +-
3070  arch/x86/include/asm/alternative.h                 |   6 -
3071  arch/x86/include/asm/apic.h                        |   1 -
3072  arch/x86/include/asm/arch_hweight.h                |   2 +
3073  arch/x86/include/asm/barrier.h                     |  15 +-
3074  arch/x86/include/asm/bitops.h                      |  36 +-
3075  arch/x86/include/asm/clocksource.h                 |   9 +-
3076  arch/x86/include/asm/cmpxchg.h                     |   1 +
3077  arch/x86/include/asm/cpufeature.h                  | 445 +-------------
3078  arch/x86/include/asm/cpufeatures.h                 | 288 +++++++++
3079  arch/x86/include/asm/dmi.h                         |   2 +-
3080  arch/x86/include/asm/efi.h                         |  26 +
3081  arch/x86/include/asm/elf.h                         |   2 +-
3082  arch/x86/include/asm/fixmap.h                      |   2 +-
3083  arch/x86/include/asm/fpu/internal.h                |  18 +-
3084  arch/x86/include/asm/frame.h                       |  59 +-
3085  arch/x86/include/asm/irq_work.h                    |   2 +-
3086  arch/x86/include/asm/microcode.h                   |  26 +
3087  arch/x86/include/asm/mmu.h                         |   3 +-
3088  arch/x86/include/asm/msr-index.h                   |   4 +
3089  arch/x86/include/asm/mwait.h                       |   2 +
3090  arch/x86/include/asm/processor.h                   |   5 +-
3091  arch/x86/include/asm/smap.h                        |   2 +-
3092  arch/x86/include/asm/smp.h                         |   1 -
3093  arch/x86/include/asm/thread_info.h                 |   2 +-
3094  arch/x86/include/asm/tlbflush.h                    |  58 ++
3095  arch/x86/include/asm/uaccess_64.h                  |   2 +-
3096  arch/x86/include/asm/vdso.h                        |   3 -
3097  arch/x86/include/asm/vgtod.h                       |   6 +
3098  arch/x86/kernel/apic/apic_numachip.c               |   4 +-
3099  arch/x86/kernel/asm-offsets_32.c                   |   2 +-
3100  arch/x86/kernel/asm-offsets_64.c                   |  10 +-
3101  arch/x86/kernel/cpu/Makefile                       |  10 +-
3102  arch/x86/kernel/cpu/amd.c                          |  23 +-
3103  arch/x86/kernel/cpu/bugs_64.c                      |   2 +-
3104  arch/x86/kernel/cpu/centaur.c                      |  12 +-
3105  arch/x86/kernel/cpu/common.c                       |  72 +--
3106  arch/x86/kernel/cpu/cyrix.c                        |  11 +-
3107  arch/x86/kernel/cpu/hypervisor.c                   |   2 +-
3108  arch/x86/kernel/cpu/intel.c                        |  12 +-
3109  arch/x86/kernel/cpu/intel_cacheinfo.c              |   4 +-
3110  arch/x86/kernel/cpu/match.c                        |   2 +-
3111  arch/x86/kernel/cpu/mcheck/mce-inject.c            |  15 +-
3112  arch/x86/kernel/cpu/mcheck/mce.c                   |   2 +-
3113  arch/x86/kernel/cpu/mcheck/mce_amd.c               | 111 +++-
3114  arch/x86/kernel/cpu/mcheck/p5.c                    |  18 +-
3115  arch/x86/kernel/cpu/mcheck/therm_throt.c           |  15 +-
3116  arch/x86/kernel/cpu/mcheck/threshold.c             |   4 +-
3117  arch/x86/kernel/cpu/mcheck/winchip.c               |   5 +-
3118  arch/x86/kernel/cpu/microcode/amd.c                |  13 +-
3119  arch/x86/kernel/cpu/microcode/core.c               |  17 +-
3120  arch/x86/kernel/cpu/microcode/intel.c              | 281 +++++----
3121  arch/x86/kernel/cpu/mkcapflags.sh                  |   6 +-
3122  arch/x86/kernel/cpu/mshyperv.c                     |   8 +-
3123  arch/x86/kernel/cpu/mtrr/centaur.c                 |   2 +-
3124  arch/x86/kernel/cpu/mtrr/cleanup.c                 |  44 +-
3125  arch/x86/kernel/cpu/mtrr/generic.c                 |  23 +-
3126  arch/x86/kernel/cpu/mtrr/main.c                    |  22 +-
3127  arch/x86/kernel/cpu/perf_event_intel_ds.c          |   6 +-
3128  arch/x86/kernel/cpu/rdrand.c                       |   2 +-
3129  arch/x86/kernel/cpu/topology.c                     |   4 +-
3130  arch/x86/kernel/cpu/transmeta.c                    |  10 +-
3131  arch/x86/kernel/cpu/vmware.c                       |   5 +-
3132  arch/x86/kernel/crash.c                            |  41 +-
3133  arch/x86/kernel/e820.c                             |  39 +-
3134  arch/x86/kernel/fpu/core.c                         |  52 +-
3135  arch/x86/kernel/fpu/init.c                         |  13 +-
3136  arch/x86/kernel/head64.c                           |  14 +-
3137  arch/x86/kernel/head_32.S                          |   8 +-
3138  arch/x86/kernel/head_64.S                          |   5 +-
3139  arch/x86/kernel/hpet.c                             |   1 +
3140  arch/x86/kernel/mpparse.c                          |   2 +-
3141  arch/x86/kernel/msr.c                              |   2 +-
3142  arch/x86/kernel/pmem.c                             |   4 +-
3143  arch/x86/kernel/process.c                          |   4 +-
3144  arch/x86/kernel/setup.c                            |   6 +-
3145  arch/x86/kernel/signal.c                           |  13 +-
3146  arch/x86/kernel/traps.c                            |  50 +-
3147  arch/x86/kernel/verify_cpu.S                       |   2 +-
3148  arch/x86/kernel/vm86_32.c                          |   2 +-
3149  arch/x86/kernel/vmlinux.lds.S                      |  12 +
3150  arch/x86/lguest/boot.c                             |   8 +-
3151  arch/x86/lib/clear_page_64.S                       |   2 +-
3152  arch/x86/lib/cmdline.c                             |  60 +-
3153  arch/x86/lib/copy_page_64.S                        |   2 +-
3154  arch/x86/lib/copy_user_64.S                        |   2 +-
3155  arch/x86/lib/memcpy_64.S                           |   2 +-
3156  arch/x86/lib/memmove_64.S                          |   2 +-
3157  arch/x86/lib/memset_64.S                           |   2 +-
3158  arch/x86/mm/init_32.c                              |   3 -
3159  arch/x86/mm/init_64.c                              |  24 +-
3160  arch/x86/mm/kasan_init_64.c                        |  17 +-
3161  arch/x86/mm/numa.c                                 |  67 +-
3162  arch/x86/mm/pageattr.c                             |  17 +-
3163  arch/x86/mm/pat.c                                  |   4 +-
3164  arch/x86/mm/setup_nx.c                             |   6 +-
3165  arch/x86/oprofile/op_model_amd.c                   |   1 -
3166  arch/x86/platform/efi/efi-bgrt.c                   |  52 +-
3167  arch/x86/platform/efi/efi.c                        |  58 +-
3168  arch/x86/platform/efi/efi_32.c                     |   5 +
3169  arch/x86/platform/efi/efi_64.c                     | 159 +++--
3170  arch/x86/platform/efi/efi_stub_64.S                |  43 --
3171  arch/x86/platform/efi/quirks.c                     |  37 +-
3172  arch/x86/um/asm/barrier.h                          |   2 +-
3173  arch/x86/um/sys_call_table_32.c                    |   4 +-
3174  arch/x86/um/sys_call_table_64.c                    |   7 +-
3175  arch/x86/um/user-offsets.c                         |   6 +-
3176  arch/x86/xen/enlighten.c                           |   2 +-
3177  drivers/acpi/acpi_platform.c                       |   2 +-
3178  drivers/acpi/apei/einj.c                           |  15 +-
3179  drivers/cpufreq/intel_pstate.c                     |   2 +-
3180  drivers/firmware/efi/efi.c                         |  41 +-
3181  drivers/firmware/efi/efivars.c                     |   2 +-
3182  drivers/firmware/efi/esrt.c                        |   5 +-
3183  drivers/firmware/efi/runtime-wrappers.c            |  80 +--
3184  drivers/firmware/efi/vars.c                        |  16 +-
3185  drivers/irqchip/Kconfig                            |   5 +
3186  drivers/irqchip/Makefile                           |   1 +
3187  drivers/irqchip/irq-atmel-aic-common.c             |  14 +-
3188  drivers/irqchip/irq-atmel-aic-common.h             |   7 +-
3189  drivers/irqchip/irq-atmel-aic.c                    |   9 +-
3190  drivers/irqchip/irq-atmel-aic5.c                   |   9 +-
3191  drivers/irqchip/irq-bcm6345-l1.c                   | 364 +++++++++++
3192  drivers/irqchip/irq-gic-v3-its.c                   |  17 +-
3193  drivers/irqchip/irq-sun4i.c                        |   1 -
3194  drivers/nvdimm/e820.c                              |   2 +-
3195  drivers/parisc/eisa_enumerator.c                   |   4 +-
3196  drivers/rapidio/rio.c                              |   8 +-
3197  drivers/sh/superhyway/superhyway.c                 |   2 +-
3198  drivers/xen/balloon.c                              |   2 +-
3199  fs/btrfs/disk-io.c                                 |   2 +-
3200  include/asm-generic/cputime_nsecs.h                |   5 +-
3201  include/linux/clockchips.h                         |   4 +-
3202  include/linux/compiler.h                           |   5 +-
3203  include/linux/efi.h                                |  22 +-
3204  include/linux/hrtimer.h                            |   1 +
3205  include/linux/ioport.h                             |  33 +-
3206  include/linux/latencytop.h                         |   3 +
3207  include/linux/lockdep.h                            |   6 +-
3208  include/linux/mm.h                                 |   5 +-
3209  include/linux/mm_types.h                           |  22 +-
3210  include/linux/sched.h                              |   4 +
3211  include/linux/sched/sysctl.h                       |   4 +
3212  init/main.c                                        |   5 -
3213  kernel/irq/irqdesc.c                               |  21 +-
3214  kernel/kexec_core.c                                |   8 +-
3215  kernel/kexec_file.c                                |   8 +-
3216  kernel/latencytop.c                                |  14 +-
3217  kernel/locking/lockdep.c                           | 113 +---
3218  kernel/memremap.c                                  |  13 +-
3219  kernel/profile.c                                   |   1 +
3220  kernel/resource.c                                  |  93 +--
3221  kernel/sched/core.c                                |  79 ++-
3222  kernel/sched/debug.c                               | 102 ++--
3223  kernel/sched/fair.c                                | 200 +++---
3224  kernel/sched/sched.h                               |   1 +
3225  kernel/sched/stats.h                               |   8 +-
3226  kernel/sysctl.c                                    |  13 +-
3227  kernel/time/clocksource.c                          |  52 +-
3228  kernel/time/hrtimer.c                              |  18 +-
3229  kernel/trace/trace_kprobe.c                        |  19 +-
3230  lib/atomic64_test.c                                |   2 +-
3231  lib/test_static_keys.c                             |  62 +-
3232  mm/memory.c                                        |  25 +-
3233  mm/memory_hotplug.c                                |   2 +-
3234  mm/mmap.c                                          |  13 +-
3235  tools/build/Makefile.feature                       |  31 +-
3236  tools/build/feature/Makefile                       |   4 +
3237  tools/build/feature/test-all.c                     |   5 +
3238  tools/build/feature/test-compile.c                 |   2 +
3239  tools/build/feature/test-libcrypto.c               |  17 +
3240  tools/lib/bpf/libbpf.c                             |  34 +-
3241  tools/lib/lockdep/common.c                         |   5 -
3242  tools/lib/lockdep/include/liblockdep/common.h      |   1 -
3243  tools/lib/lockdep/preload.c                        |   2 -
3244  tools/perf/Documentation/perf-config.txt           | 343 ++++++++++-
3245  tools/perf/Documentation/perf-inject.txt           |   7 +
3246  tools/perf/Documentation/perf-report.txt           |  37 +-
3247  tools/perf/Documentation/perfconfig.example        |   2 +-
3248  tools/perf/Makefile                                |  25 +-
3249  tools/perf/Makefile.perf                           |  14 +-
3250  tools/perf/arch/powerpc/Makefile                   |   2 +
3251  tools/perf/arch/powerpc/util/Build                 |   1 +
3252  tools/perf/arch/powerpc/util/book3s_hcalls.h       | 123 ++++
3253  tools/perf/arch/powerpc/util/book3s_hv_exits.h     |  33 +
3254  tools/perf/arch/powerpc/util/kvm-stat.c            | 170 ++++++
3255  tools/perf/arch/s390/util/kvm-stat.c               |  10 +-
3256  tools/perf/arch/x86/util/intel-bts.c               |   4 +-
3257  tools/perf/arch/x86/util/intel-pt.c                |   4 +-
3258  tools/perf/arch/x86/util/kvm-stat.c                |  16 +-
3259  tools/perf/builtin-annotate.c                      |   2 +-
3260  tools/perf/builtin-buildid-cache.c                 |  14 +-
3261  tools/perf/builtin-inject.c                        | 107 +++-
3262  tools/perf/builtin-kvm.c                           |  38 +-
3263  tools/perf/builtin-record.c                        |  12 +-
3264  tools/perf/builtin-report.c                        |  29 +-
3265  tools/perf/builtin-top.c                           |  24 +-
3266  tools/perf/config/Makefile                         | 112 ++--
3267  tools/perf/jvmti/Makefile                          |  76 +++
3268  tools/perf/jvmti/jvmti_agent.c                     | 465 ++++++++++++++
3269  tools/perf/jvmti/jvmti_agent.h                     |  36 ++
3270  tools/perf/jvmti/libjvmti.c                        | 304 ++++++++++
3271  tools/perf/tests/.gitignore                        |   1 +
3272  tools/perf/tests/Build                             |   9 +-
3273  tools/perf/tests/bp_signal.c                       | 140 ++++-
3274  tools/perf/tests/bpf-script-test-relocation.c      |  50 ++
3275  tools/perf/tests/bpf.c                             |  63 +-
3276  tools/perf/tests/hists_cumulate.c                  |   2 +-
3277  tools/perf/tests/hists_filter.c                    |   2 +-
3278  tools/perf/tests/hists_output.c                    |  10 +-
3279  tools/perf/tests/llvm.c                            |  17 +-
3280  tools/perf/tests/llvm.h                            |   5 +-
3281  tools/perf/tests/make                              |  50 +-
3282  tools/perf/tests/vmlinux-kallsyms.c                |  24 +-
3283  tools/perf/ui/browser.c                            |   4 +-
3284  tools/perf/ui/browser.h                            |   2 +-
3285  tools/perf/ui/browsers/annotate.c                  |   2 +-
3286  tools/perf/ui/browsers/hists.c                     | 214 +++++--
3287  tools/perf/ui/gtk/hists.c                          |   6 +-
3288  tools/perf/ui/hist.c                               | 170 +++---
3289  tools/perf/ui/stdio/hist.c                         |  85 +--
3290  tools/perf/util/Build                              |   6 +
3291  tools/perf/util/auxtrace.c                         |   7 +-
3292  tools/perf/util/auxtrace.h                         |   6 +-
3293  tools/perf/util/build-id.c                         |   6 +-
3294  tools/perf/util/cpumap.c                           |  30 +
3295  tools/perf/util/cpumap.h                           |  32 +-
3296  tools/perf/util/demangle-java.c                    | 199 ++++++
3297  tools/perf/util/demangle-java.h                    |  10 +
3298  tools/perf/util/dso.c                              |   5 +
3299  tools/perf/util/event.c                            |   2 +-
3300  tools/perf/util/evsel.c                            |  15 +-
3301  tools/perf/util/genelf.c                           | 449 ++++++++++++++
3302  tools/perf/util/genelf.h                           |  67 ++
3303  tools/perf/util/genelf_debug.c                     | 610 +++++++++++++++++++
3304  tools/perf/util/hist.c                             | 163 ++---
3305  tools/perf/util/hist.h                             |  65 +-
3306  tools/perf/util/intel-pt.c                         |   9 +
3307  tools/perf/util/jit.h                              |  15 +
3308  tools/perf/util/jitdump.c                          | 672 +++++++++++++++++++++
3309  tools/perf/util/jitdump.h                          | 124 ++++
3310  tools/perf/util/kvm-stat.h                         |   8 +-
3311  tools/perf/util/machine.h                          |  10 +
3312  tools/perf/util/parse-events.c                     |   3 +
3313  tools/perf/util/pmu.c                              |   2 +-
3314  tools/perf/util/probe-finder.c                     |  62 +-
3315  tools/perf/util/probe-finder.h                     |   5 +-
3316  tools/perf/util/sort.c                             | 208 +++++--
3317  tools/perf/util/sort.h                             |   2 +
3318  tools/perf/util/stat.c                             |  24 +-
3319  tools/perf/util/stat.h                             |  10 -
3320  tools/perf/util/symbol-elf.c                       |   3 +
3321  tools/perf/util/symbol.c                           |   6 +-
3322  tools/perf/util/util.c                             |  27 +
3323  tools/perf/util/util.h                             |   2 +
3324  tools/testing/selftests/x86/Makefile               |  14 +-
3325  .../selftests/x86/check_initial_reg_state.c        | 109 ++++
3326  virt/kvm/arm/arch_timer.c                          |   4 +-
3327  315 files changed, 8281 insertions(+), 2833 deletions(-)
3328  create mode 100644 arch/x86/events/Makefile
3329  rename arch/x86/{kernel/cpu/perf_event_amd.c => events/amd/core.c} (99%)
3330  rename arch/x86/{kernel/cpu/perf_event_amd_ibs.c => events/amd/ibs.c} (98%)
3331  rename arch/x86/{kernel/cpu/perf_event_amd_iommu.c => events/amd/iommu.c} (99%)
3332  rename arch/x86/{kernel/cpu/perf_event_amd_iommu.h => events/amd/iommu.h} (100%)
3333  rename arch/x86/{kernel/cpu/perf_event_amd_uncore.c => events/amd/uncore.c} (99%)
3334  rename arch/x86/{kernel/cpu/perf_event.c => events/core.c} (99%)
3335  create mode 100644 arch/x86/include/asm/cpufeatures.h
3336  create mode 100644 drivers/irqchip/irq-bcm6345-l1.c
3337  create mode 100644 tools/build/feature/test-libcrypto.c
3338  create mode 100644 tools/perf/arch/powerpc/util/book3s_hcalls.h
3339  create mode 100644 tools/perf/arch/powerpc/util/book3s_hv_exits.h
3340  create mode 100644 tools/perf/arch/powerpc/util/kvm-stat.c
3341  create mode 100644 tools/perf/jvmti/Makefile
3342  create mode 100644 tools/perf/jvmti/jvmti_agent.c
3343  create mode 100644 tools/perf/jvmti/jvmti_agent.h
3344  create mode 100644 tools/perf/jvmti/libjvmti.c
3345  create mode 100644 tools/perf/tests/bpf-script-test-relocation.c
3346  create mode 100644 tools/perf/util/demangle-java.c
3347  create mode 100644 tools/perf/util/demangle-java.h
3348  create mode 100644 tools/perf/util/genelf.c
3349  create mode 100644 tools/perf/util/genelf.h
3350  create mode 100644 tools/perf/util/genelf_debug.c
3351  create mode 100644 tools/perf/util/jit.h
3352  create mode 100644 tools/perf/util/jitdump.c
3353  create mode 100644 tools/perf/util/jitdump.h
3354  create mode 100644 tools/testing/selftests/x86/check_initial_reg_state.c
3355 Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite)
3356 $ git merge clockevents/clockevents/next
3357 Resolved 'drivers/clocksource/h8300_timer16.c' using previous resolution.
3358 Auto-merging drivers/clocksource/h8300_timer16.c
3359 CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c
3360 Automatic merge failed; fix conflicts and then commit the result.
3361 $ git commit -v -a
3362 [master ef50ea502803] Merge remote-tracking branch 'clockevents/clockevents/next'
3363 $ git diff -M --stat --summary HEAD^..
3364 Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell)
3365 $ git merge edac/linux_next
3366 Already up-to-date.
3367 Merging edac-amd/for-next (9bf4f0056720 EDAC: Use edac_debugfs_remove_recursive() in edac_debugfs_exit())
3368 $ git merge edac-amd/for-next
3369 Merge made by the 'recursive' strategy.
3370  .../devicetree/bindings/edac/apm-xgene-edac.txt    | 10 ++++
3371  arch/arm64/boot/dts/apm/apm-storm.dtsi             |  6 ++
3372  drivers/edac/amd64_edac.c                          |  2 +-
3373  drivers/edac/debugfs.c                             |  2 +-
3374  drivers/edac/edac_mc.c                             | 64 ++++----------------
3375  drivers/edac/edac_pci.c                            | 67 ++++++---------------
3376  drivers/edac/mpc85xx_edac.c                        |  2 +-
3377  drivers/edac/xgene_edac.c                          | 70 +++++++++++++++++++++-
3378  8 files changed, 120 insertions(+), 103 deletions(-)
3379 Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next)
3380 $ git merge irqchip/irqchip/for-next
3381 Already up-to-date!
3382 Merge made by the 'recursive' strategy.
3383 Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
3384 $ git merge tiny/tiny/next
3385 Already up-to-date.
3386 Merging ftrace/for-next (7fd13615992a tracing/dma-buf/fence: Fix timeline str value on fence_annotate_wait_on)
3387 $ git merge ftrace/for-next
3388 Already up-to-date.
3389 Merging rcu/rcu/next (0dd1befbc663 rcu: Remove expedited GP funnel-lock bypass)
3390 $ git merge rcu/rcu/next
3391 Auto-merging lib/Kconfig.debug
3392 Auto-merging include/linux/compiler.h
3393 Auto-merging Documentation/kernel-parameters.txt
3394 Merge made by the 'recursive' strategy.
3395  .../Design/Data-Structures/BigTreeClassicRCU.svg   |  474 +++++++
3396  .../Design/Data-Structures/BigTreeClassicRCUBH.svg |  499 +++++++
3397  .../Data-Structures/BigTreeClassicRCUBHdyntick.svg |  695 ++++++++++
3398  .../Data-Structures/BigTreePreemptRCUBHdyntick.svg |  741 +++++++++++
3399  .../BigTreePreemptRCUBHdyntickCB.svg               |  858 ++++++++++++
3400  .../Design/Data-Structures/Data-Structures.html    | 1372 ++++++++++++++++++++
3401  .../Design/Data-Structures/Data-Structures.htmlx   | 1272 ++++++++++++++++++
3402  .../Design/Data-Structures/HugeTreeClassicRCU.svg  |  939 ++++++++++++++
3403  .../RCU/Design/Data-Structures/TreeLevel.svg       |  828 ++++++++++++
3404  .../RCU/Design/Data-Structures/TreeMapping.svg     |  305 +++++
3405  .../Design/Data-Structures/TreeMappingLevel.svg    |  380 ++++++
3406  .../RCU/Design/Data-Structures/blkd_task.svg       |  843 ++++++++++++
3407  .../RCU/Design/Data-Structures/nxtlist.svg         |  396 ++++++
3408  .../RCU/Design/Requirements/Requirements.html      |  102 +-
3409  .../RCU/Design/Requirements/Requirements.htmlx     |   90 ++
3410  Documentation/RCU/trace.txt                        |   10 +-
3411  Documentation/kernel-parameters.txt                |   32 +
3412  Documentation/memory-barriers.txt                  |  135 +-
3413  include/linux/compiler.h                           |   12 +-
3414  include/linux/irq.h                                |    6 +-
3415  include/linux/rcutiny.h                            |   16 +
3416  include/linux/rcutree.h                            |    2 +
3417  include/linux/srcu.h                               |   19 +-
3418  include/trace/events/rcu.h                         |   78 +-
3419  kernel/irq/internals.h                             |    4 +
3420  kernel/locking/mutex.c                             |   11 +-
3421  kernel/rcu/Makefile                                |    1 +
3422  kernel/rcu/rcuperf.c                               |  642 +++++++++
3423  kernel/rcu/rcutorture.c                            |   16 +-
3424  kernel/rcu/tiny_plugin.h                           |   15 +-
3425  kernel/rcu/tree.c                                  |  306 +++--
3426  kernel/rcu/tree.h                                  |   45 +-
3427  kernel/rcu/tree_plugin.h                           |   53 +-
3428  kernel/rcu/tree_trace.c                            |    7 +-
3429  kernel/rcu/update.c                                |    1 +
3430  lib/Kconfig.debug                                  |   33 +
3431  scripts/checkpatch.pl                              |    3 +-
3432  .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh   |  121 ++
3433  .../rcutorture/bin/kvm-recheck-rcuperf.sh          |   96 ++
3434  .../selftests/rcutorture/bin/kvm-recheck.sh        |    5 +-
3435  tools/testing/selftests/rcutorture/bin/kvm.sh      |    2 +-
3436  .../selftests/rcutorture/bin/parse-console.sh      |    6 +-
3437  .../selftests/rcutorture/configs/rcuperf/CFLIST    |    1 +
3438  .../selftests/rcutorture/configs/rcuperf/CFcommon  |    2 +
3439  .../selftests/rcutorture/configs/rcuperf/TREE      |   20 +
3440  .../rcutorture/configs/rcuperf/ver_functions.sh    |   52 +
3441  46 files changed, 11334 insertions(+), 212 deletions(-)
3442  create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCU.svg
3443  create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg
3444  create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg
3445  create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg
3446  create mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntickCB.svg
3447  create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.html
3448  create mode 100644 Documentation/RCU/Design/Data-Structures/Data-Structures.htmlx
3449  create mode 100644 Documentation/RCU/Design/Data-Structures/HugeTreeClassicRCU.svg
3450  create mode 100644 Documentation/RCU/Design/Data-Structures/TreeLevel.svg
3451  create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMapping.svg
3452  create mode 100644 Documentation/RCU/Design/Data-Structures/TreeMappingLevel.svg
3453  create mode 100644 Documentation/RCU/Design/Data-Structures/blkd_task.svg
3454  create mode 100644 Documentation/RCU/Design/Data-Structures/nxtlist.svg
3455  create mode 100644 kernel/rcu/rcuperf.c
3456  create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh
3457  create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-rcuperf.sh
3458  create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFLIST
3459  create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/CFcommon
3460  create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/TREE
3461  create mode 100644 tools/testing/selftests/rcutorture/configs/rcuperf/ver_functions.sh
3462 Merging kvm/linux-next (bce87cce88c7 KVM: x86: consolidate different ways to test for in-kernel LAPIC)
3463 $ git merge kvm/linux-next
3464 Merge made by the 'recursive' strategy.
3465  arch/x86/include/asm/kvm_host.h |   2 +
3466  arch/x86/kvm/irq.c              |   9 ++-
3467  arch/x86/kvm/irq.h              |   8 ---
3468  arch/x86/kvm/irq_comm.c         |  25 +++++--
3469  arch/x86/kvm/lapic.c            | 147 +++++++++++++++++++++++++++++-----------
3470  arch/x86/kvm/lapic.h            |  10 +--
3471  arch/x86/kvm/pmu.c              |   2 +-
3472  arch/x86/kvm/trace.h            |  12 ++--
3473  arch/x86/kvm/vmx.c              |  17 ++++-
3474  arch/x86/kvm/x86.c              |  36 +++++-----
3475  arch/x86/kvm/x86.h              |  16 +++++
3476  11 files changed, 203 insertions(+), 81 deletions(-)
3477 Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime)
3478 $ git merge kvm-arm/next
3479 Already up-to-date.
3480 Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling)
3481 $ git merge kvm-ppc/kvm-ppc-next
3482 Already up-to-date.
3483 Merging kvm-ppc-paulus/kvm-ppc-next (b4d7f161feb3 KVM: PPC: Fix ONE_REG AltiVec support)
3484 $ git merge kvm-ppc-paulus/kvm-ppc-next
3485 Already up-to-date.
3486 Merging kvms390/next (1763f8d09d52 KVM: s390: bail out early on fatal signal in dirty logging)
3487 $ git merge kvms390/next
3488 Merge made by the 'recursive' strategy.
3489  Documentation/virtual/kvm/devices/s390_flic.txt |  2 +
3490  Documentation/virtual/kvm/devices/vm.txt        | 52 +++++++++++++++++
3491  arch/s390/include/asm/kvm_host.h                |  8 +--
3492  arch/s390/include/uapi/asm/kvm.h                |  8 ++-
3493  arch/s390/kvm/gaccess.c                         | 57 +++++++++---------
3494  arch/s390/kvm/gaccess.h                         | 38 ++++++++++--
3495  arch/s390/kvm/intercept.c                       | 78 +++++++++++++++----------
3496  arch/s390/kvm/interrupt.c                       | 40 ++++++-------
3497  arch/s390/kvm/kvm-s390.c                        | 55 +++++++++++------
3498  arch/s390/kvm/kvm-s390.h                        | 17 +++++-
3499  arch/s390/kvm/priv.c                            | 13 +++--
3500  include/uapi/linux/kvm.h                        |  8 ++-
3501  12 files changed, 254 insertions(+), 122 deletions(-)
3502 Merging xen-tip/linux-next (a4cdb556cae0 xen/gntdev: add ioctl for grant copy)
3503 $ git merge xen-tip/linux-next
3504 Already up-to-date.
3505 Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition)
3506 $ git merge percpu/for-next
3507 Already up-to-date.
3508 Merging workqueues/for-next (d6e022f1d207 workqueue: handle NUMA_NO_NODE for unbound pool_workqueue lookup)
3509 $ git merge workqueues/for-next
3510 Already up-to-date.
3511 Merging drivers-x86/for-next (9df7fc9a9657 toshiba_acpi: Add a module parameter to disable hotkeys registration)
3512 $ git merge drivers-x86/for-next
3513 Merge made by the 'recursive' strategy.
3514  .../ABI/testing/sysfs-driver-toshiba_acpi          |  16 ++
3515  drivers/platform/x86/alienware-wmi.c               | 286 ++++++++++++++++++---
3516  drivers/platform/x86/thinkpad_acpi.c               |   4 +-
3517  drivers/platform/x86/toshiba_acpi.c                | 115 +++++++++
3518  4 files changed, 378 insertions(+), 43 deletions(-)
3519 Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name)
3520 $ git merge chrome-platform/for-next
3521 Already up-to-date.
3522 Merging regmap/for-next (02ce716f8000 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/irq' into regmap-next)
3523 $ git merge regmap/for-next
3524 Merge made by the 'recursive' strategy.
3525  .../devicetree/bindings/regmap/regmap.txt          |  11 +-
3526  arch/mips/boot/dts/brcm/bcm6328.dtsi               |   2 +-
3527  arch/mips/boot/dts/brcm/bcm6368.dtsi               |   2 +-
3528  arch/mips/boot/dts/brcm/bcm7125.dtsi               |   2 +-
3529  arch/mips/boot/dts/brcm/bcm7346.dtsi               |   2 +-
3530  arch/mips/boot/dts/brcm/bcm7358.dtsi               |   2 +-
3531  arch/mips/boot/dts/brcm/bcm7360.dtsi               |   2 +-
3532  arch/mips/boot/dts/brcm/bcm7362.dtsi               |   2 +-
3533  arch/mips/boot/dts/brcm/bcm7420.dtsi               |   2 +-
3534  arch/mips/boot/dts/brcm/bcm7425.dtsi               |   2 +-
3535  arch/mips/boot/dts/brcm/bcm7435.dtsi               |   2 +-
3536  drivers/base/regmap/regcache.c                     |  45 ++--
3537  drivers/base/regmap/regmap-irq.c                   |  21 ++
3538  drivers/base/regmap/regmap-mmio.c                  | 259 +++++++++++----------
3539  drivers/base/regmap/regmap.c                       |   5 +
3540  include/linux/regmap.h                             |   2 +-
3541  16 files changed, 215 insertions(+), 148 deletions(-)
3542 Merging hsi/for-next (87d99063be01 HSI: ssi-protocol: Use handshake logic from n950)
3543 $ git merge hsi/for-next
3544 Merge made by the 'recursive' strategy.
3545  Documentation/devicetree/bindings/hsi/nokia-modem.txt | 12 +++++++-----
3546  drivers/hsi/clients/nokia-modem.c                     |  2 ++
3547  drivers/hsi/clients/ssi_protocol.c                    | 16 +++++-----------
3548  3 files changed, 14 insertions(+), 16 deletions(-)
3549 Merging leds/for-next (ee2e1c2d18a4 leds: leds-gpio: Fix return value check in create_gpio_led())
3550 $ git merge leds/for-next
3551 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
3552 Merge made by the 'recursive' strategy.
3553  .../devicetree/bindings/leds/leds-sn3218.txt       |  41 +++
3554  .../devicetree/bindings/vendor-prefixes.txt        |   1 +
3555  drivers/leds/Kconfig                               |  12 +
3556  drivers/leds/Makefile                              |   1 +
3557  drivers/leds/led-class.c                           |   2 +
3558  drivers/leds/led-core.c                            |   5 +-
3559  drivers/leds/leds-gpio.c                           |   4 +-
3560  drivers/leds/leds-lp3944.c                         |   7 +-
3561  drivers/leds/leds-sn3218.c                         | 306 +++++++++++++++++++++
3562  include/linux/leds.h                               |   8 +-
3563  10 files changed, 380 insertions(+), 7 deletions(-)
3564  create mode 100644 Documentation/devicetree/bindings/leds/leds-sn3218.txt
3565  create mode 100644 drivers/leds/leds-sn3218.c
3566 Merging ipmi/for-next (7f8df84ecba8 ipmi_si: Avoid a wrong long timeout on transaction done)
3567 $ git merge ipmi/for-next
3568 Merge made by the 'recursive' strategy.
3569  drivers/char/ipmi/ipmi_si_intf.c |  8 ++++----
3570  drivers/char/ipmi/ipmi_ssif.c    | 13 ++++---------
3571  2 files changed, 8 insertions(+), 13 deletions(-)
3572 Merging driver-core/driver-core-next (67d02a1bbb33 driver-core: platform: probe of-devices only using list of compatibles)
3573 $ git merge driver-core/driver-core-next
3574 Auto-merging drivers/base/component.c
3575 Merge made by the 'recursive' strategy.
3576  .../ABI/testing/sysfs-firmware-qemu_fw_cfg         | 100 +++
3577  Documentation/devicetree/bindings/arm/fw-cfg.txt   |  38 +-
3578  Documentation/driver-model/platform.txt            |   2 +-
3579  drivers/base/bus.c                                 |  15 +-
3580  drivers/base/component.c                           |   2 +-
3581  drivers/base/dma-coherent.c                        |  28 +-
3582  drivers/base/platform.c                            |   4 +-
3583  drivers/firmware/Kconfig                           |  19 +
3584  drivers/firmware/Makefile                          |   1 +
3585  drivers/firmware/qemu_fw_cfg.c                     | 751 +++++++++++++++++++++
3586  fs/kernfs/dir.c                                    |  19 +-
3587  include/linux/debugfs.h                            |   8 +
3588  lib/kobject.c                                      |   1 +
3589  13 files changed, 916 insertions(+), 72 deletions(-)
3590  create mode 100644 Documentation/ABI/testing/sysfs-firmware-qemu_fw_cfg
3591  create mode 100644 drivers/firmware/qemu_fw_cfg.c
3592 Merging tty/tty-next (54573c4a073f xen/hvc: constify hv_ops structures)
3593 $ git merge tty/tty-next
3594 Resolved 'drivers/tty/tty_io.c' using previous resolution.
3595 Auto-merging kernel/audit.c
3596 Auto-merging include/linux/sched.h
3597 Auto-merging drivers/tty/tty_mutex.c
3598 Auto-merging drivers/tty/tty_io.c
3599 CONFLICT (content): Merge conflict in drivers/tty/tty_io.c
3600 Auto-merging drivers/tty/serial/omap-serial.c
3601 Removing drivers/tty/serial/m32r_sio.h
3602 Auto-merging drivers/tty/serial/8250/8250_pci.c
3603 Removing drivers/tty/serial/68328serial.c
3604 Auto-merging drivers/tty/pty.c
3605 Auto-merging drivers/of/fdt.c
3606 Automatic merge failed; fix conflicts and then commit the result.
3607 $ git commit -v -a
3608 [master 2292705bd6c2] Merge remote-tracking branch 'tty/tty-next'
3609 $ git diff -M --stat --summary HEAD^..
3610  .../bindings/serial/brcm,bcm2835-aux-uart.txt      |   18 +
3611  .../bindings/serial/renesas,sci-serial.txt         |    2 +
3612  Documentation/serial/tty.txt                       |    3 -
3613  arch/alpha/include/asm/serial.h                    |    8 +-
3614  arch/arm/mach-omap2/serial.c                       |    2 +-
3615  arch/frv/include/asm/serial.h                      |    2 +-
3616  arch/ia64/kernel/unaligned.c                       |    7 +-
3617  arch/m68k/include/asm/serial.h                     |    8 +-
3618  arch/mips/pmcs-msp71xx/msp_serial.c                |    2 +-
3619  arch/mn10300/include/asm/serial.h                  |   10 +-
3620  arch/xtensa/platforms/iss/console.c                |    4 -
3621  arch/xtensa/platforms/xt2000/setup.c               |    2 +-
3622  drivers/char/pcmcia/synclink_cs.c                  |   21 +-
3623  drivers/char/ttyprintk.c                           |    2 +-
3624  drivers/isdn/i4l/isdn_tty.c                        |   12 +-
3625  drivers/mmc/card/sdio_uart.c                       |   14 +-
3626  drivers/net/irda/irtty-sir.c                       |   10 -
3627  drivers/of/fdt.c                                   |   32 +-
3628  drivers/of/fdt_address.c                           |   11 +-
3629  drivers/s390/char/con3215.c                        |    3 +-
3630  drivers/staging/dgap/dgap.c                        |   36 +-
3631  drivers/staging/dgnc/dgnc_tty.c                    |   20 +-
3632  drivers/tty/Kconfig                                |    2 +-
3633  drivers/tty/amiserial.c                            |   28 +-
3634  drivers/tty/cyclades.c                             |   22 +-
3635  drivers/tty/ehv_bytechan.c                         |   40 +-
3636  drivers/tty/goldfish.c                             |    2 +-
3637  drivers/tty/hvc/hvc_vio.c                          |   29 +-
3638  drivers/tty/hvc/hvc_xen.c                          |    6 +-
3639  drivers/tty/isicom.c                               |    3 +-
3640  drivers/tty/mxser.c                                |   21 +-
3641  drivers/tty/n_gsm.c                                |   22 +-
3642  drivers/tty/n_hdlc.c                               |   19 +-
3643  drivers/tty/n_tty.c                                |  117 +-
3644  drivers/tty/nozomi.c                               |    2 +-
3645  drivers/tty/pty.c                                  |   30 +-
3646  drivers/tty/rocket.c                               |   18 +-
3647  drivers/tty/rocket_int.h                           |    1 -
3648  drivers/tty/serial/68328serial.c                   | 1322 --------------------
3649  drivers/tty/serial/8250/8250.h                     |   14 +
3650  drivers/tty/serial/8250/8250_accent.c              |   13 +-
3651  drivers/tty/serial/8250/8250_acorn.c               |    2 +-
3652  drivers/tty/serial/8250/8250_bcm2835aux.c          |  146 +++
3653  drivers/tty/serial/8250/8250_boca.c                |   41 +-
3654  drivers/tty/serial/8250/8250_core.c                |   21 +-
3655  drivers/tty/serial/8250/8250_dw.c                  |  126 +-
3656  drivers/tty/serial/8250/8250_early.c               |   37 +-
3657  drivers/tty/serial/8250/8250_exar_st16c554.c       |   17 +-
3658  drivers/tty/serial/8250/8250_fourport.c            |   28 +-
3659  drivers/tty/serial/8250/8250_gsc.c                 |    7 +-
3660  drivers/tty/serial/8250/8250_hp300.c               |   27 +-
3661  drivers/tty/serial/8250/8250_hub6.c                |    2 +-
3662  drivers/tty/serial/8250/8250_ingenic.c             |   40 +-
3663  drivers/tty/serial/8250/8250_of.c                  |    1 +
3664  drivers/tty/serial/8250/8250_omap.c                |   31 +
3665  drivers/tty/serial/8250/8250_pci.c                 |   96 +-
3666  drivers/tty/serial/8250/8250_pnp.c                 |   48 +-
3667  drivers/tty/serial/8250/8250_port.c                |  453 +++++--
3668  drivers/tty/serial/8250/Kconfig                    |   24 +
3669  drivers/tty/serial/8250/Makefile                   |    1 +
3670  drivers/tty/serial/8250/serial_cs.c                |   90 +-
3671  drivers/tty/serial/Kconfig                         |   18 +-
3672  drivers/tty/serial/Makefile                        |    1 -
3673  drivers/tty/serial/amba-pl011.c                    |   20 +-
3674  drivers/tty/serial/arc_uart.c                      |    1 -
3675  drivers/tty/serial/atmel_serial.c                  |  134 +-
3676  drivers/tty/serial/crisv10.c                       |   33 +-
3677  drivers/tty/serial/earlycon.c                      |  118 +-
3678  drivers/tty/serial/imx.c                           |    5 +-
3679  drivers/tty/serial/jsm/jsm_tty.c                   |   13 +-
3680  drivers/tty/serial/m32r_sio.c                      |  134 +-
3681  drivers/tty/serial/m32r_sio.h                      |   49 -
3682  drivers/tty/serial/mpc52xx_uart.c                  |    8 +-
3683  drivers/tty/serial/mpsc.c                          |  178 ++-
3684  drivers/tty/serial/msm_serial.c                    |    2 -
3685  drivers/tty/serial/omap-serial.c                   |    2 +-
3686  drivers/tty/serial/samsung.c                       |    6 -
3687  drivers/tty/serial/sc16is7xx.c                     |   12 +-
3688  drivers/tty/serial/serial_core.c                   |  125 +-
3689  drivers/tty/serial/serial_ks8695.c                 |    2 +-
3690  drivers/tty/serial/sh-sci.c                        |  183 ++-
3691  drivers/tty/serial/sh-sci.h                        |   15 +
3692  drivers/tty/serial/sprd_serial.c                   |    2 -
3693  drivers/tty/serial/uartlite.c                      |   45 +
3694  drivers/tty/serial/xilinx_uartps.c                 |  539 ++++----
3695  drivers/tty/serial/zs.c                            |    4 +
3696  drivers/tty/synclink.c                             |   23 +-
3697  drivers/tty/synclink_gt.c                          |   19 +-
3698  drivers/tty/synclinkmp.c                           |   63 +-
3699  drivers/tty/tty_audit.c                            |  231 +---
3700  drivers/tty/tty_buffer.c                           |   39 +-
3701  drivers/tty/tty_io.c                               |  266 ++--
3702  drivers/tty/tty_ioctl.c                            |   12 +-
3703  drivers/tty/tty_ldisc.c                            |  198 +--
3704  drivers/tty/tty_mutex.c                            |    8 +-
3705  drivers/tty/tty_port.c                             |   11 +-
3706  drivers/tty/vt/keyboard.c                          |   14 +-
3707  drivers/tty/vt/selection.c                         |    2 +
3708  drivers/tty/vt/vt.c                                |    2 +-
3709  drivers/usb/serial/console.c                       |    6 +-
3710  drivers/usb/serial/cypress_m8.c                    |    3 +-
3711  drivers/usb/serial/digi_acceleport.c               |    8 +-
3712  drivers/usb/serial/io_edgeport.c                   |    4 +-
3713  drivers/usb/serial/mct_u232.c                      |    2 +-
3714  drivers/usb/serial/mos7720.c                       |    4 +-
3715  drivers/usb/serial/mos7840.c                       |    4 +-
3716  include/asm-generic/vmlinux.lds.h                  |    6 +-
3717  include/linux/audit.h                              |    4 +
3718  include/linux/isdn.h                               |    1 +
3719  include/linux/of_fdt.h                             |    2 +-
3720  include/linux/platform_data/serial-omap.h          |    2 +-
3721  include/linux/sched.h                              |    1 -
3722  include/linux/serial_8250.h                        |    8 +
3723  include/linux/serial_core.h                        |   25 +-
3724  include/linux/tty.h                                |   58 +-
3725  include/linux/tty_ldisc.h                          |   13 -
3726  kernel/audit.c                                     |   27 +-
3727  net/irda/ircomm/ircomm_tty.c                       |   15 +-
3728  net/irda/ircomm/ircomm_tty_ioctl.c                 |   13 +-
3729  net/nfc/nci/uart.c                                 |    9 +-
3730  security/selinux/hooks.c                           |    4 +-
3731  121 files changed, 2338 insertions(+), 3596 deletions(-)
3732  create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt
3733  delete mode 100644 drivers/tty/serial/68328serial.c
3734  create mode 100644 drivers/tty/serial/8250/8250_bcm2835aux.c
3735  delete mode 100644 drivers/tty/serial/m32r_sio.h
3736 Merging usb/usb-next (a44007a42dfd drivers: usb: removed assignment of 0 to static variables)
3737 $ git merge usb/usb-next
3738 Auto-merging include/linux/device.h
3739 Auto-merging drivers/usb/host/xhci.h
3740 Auto-merging drivers/usb/host/xhci.c
3741 Auto-merging drivers/usb/host/xhci-ring.c
3742 Auto-merging drivers/usb/core/urb.c
3743 Auto-merging drivers/usb/core/hcd-pci.c
3744 Merge made by the 'recursive' strategy.
3745  drivers/usb/atm/cxacru.c            |    2 +
3746  drivers/usb/chipidea/debug.c        |    5 +-
3747  drivers/usb/class/usbtmc.c          |  330 ++++++++
3748  drivers/usb/common/common.c         |    1 +
3749  drivers/usb/core/config.c           |    3 +-
3750  drivers/usb/core/devices.c          |   26 +-
3751  drivers/usb/core/devio.c            |   13 +-
3752  drivers/usb/core/file.c             |    9 +-
3753  drivers/usb/core/hcd-pci.c          |    2 +-
3754  drivers/usb/core/hcd.c              |   98 ++-
3755  drivers/usb/core/hub.c              |  106 ++-
3756  drivers/usb/core/hub.h              |    7 +
3757  drivers/usb/core/sysfs.c            |   68 +-
3758  drivers/usb/core/urb.c              |    3 +-
3759  drivers/usb/core/usb.c              |    5 +-
3760  drivers/usb/core/usb.h              |    2 +-
3761  drivers/usb/gadget/function/rndis.c |   20 +-
3762  drivers/usb/host/bcma-hcd.c         |   83 +-
3763  drivers/usb/host/ehci-dbg.c         |  477 ++++++-----
3764  drivers/usb/host/ehci-fsl.c         |   24 +-
3765  drivers/usb/host/ehci-hcd.c         |   22 +-
3766  drivers/usb/host/ehci-hub.c         |    6 +-
3767  drivers/usb/host/ehci-msm.c         |   66 +-
3768  drivers/usb/host/ehci-pci.c         |    8 +-
3769  drivers/usb/host/ehci-platform.c    |    6 +-
3770  drivers/usb/host/ehci-q.c           |  104 ++-
3771  drivers/usb/host/ehci-sched.c       |  524 ++++++------
3772  drivers/usb/host/ehci-st.c          |    6 +-
3773  drivers/usb/host/ehci-timer.c       |    5 +-
3774  drivers/usb/host/ehci.h             |   97 +--
3775  drivers/usb/host/fotg210-hcd.c      |   15 +-
3776  drivers/usb/host/fsl-mph-dr-of.c    |    7 +-
3777  drivers/usb/host/max3421-hcd.c      |   16 +-
3778  drivers/usb/host/ohci-nxp.c         |    7 -
3779  drivers/usb/host/ohci-platform.c    |    6 +-
3780  drivers/usb/host/ohci-st.c          |    6 +-
3781  drivers/usb/host/oxu210hp-hcd.c     |   15 +-
3782  drivers/usb/host/r8a66597-hcd.c     |   11 +-
3783  drivers/usb/host/u132-hcd.c         |   18 +-
3784  drivers/usb/host/xhci-hub.c         |   27 +-
3785  drivers/usb/host/xhci-mem.c         |   12 +-
3786  drivers/usb/host/xhci-ring.c        |    3 +-
3787  drivers/usb/host/xhci.c             |    8 +-
3788  drivers/usb/host/xhci.h             |    1 +
3789  drivers/usb/misc/sisusbvga/sisusb.c | 1543 +++++++++++++++++------------------
3790  drivers/usb/mon/mon_main.c          |    9 +-
3791  drivers/usb/renesas_usbhs/fifo.c    |   20 +-
3792  drivers/usb/renesas_usbhs/fifo.h    |   20 +-
3793  drivers/usb/renesas_usbhs/pipe.h    |    2 +-
3794  drivers/usb/storage/ene_ub6250.c    |    4 +-
3795  drivers/usb/storage/uas.c           |   36 +-
3796  drivers/usb/usbip/usbip_event.c     |    5 +-
3797  drivers/usb/usbip/vhci_hcd.c        |   88 +-
3798  drivers/usb/usbip/vhci_rx.c         |   30 +-
3799  drivers/usb/usbip/vhci_sysfs.c      |   19 +-
3800  drivers/usb/usbip/vhci_tx.c         |   14 +-
3801  drivers/usb/wusbcore/wusbhc.h       |    2 +-
3802  include/linux/device.h              |    5 +
3803  include/linux/usb.h                 |    8 +-
3804  include/linux/usb/hcd.h             |    5 +-
3805  include/linux/usb/msm_hsusb_hw.h    |    1 +
3806  include/linux/usb/storage.h         |   12 +-
3807  include/uapi/linux/usb/ch11.h       |   21 +
3808  include/uapi/linux/usb/ch9.h        |    1 +
3809  include/uapi/linux/usb/tmc.h        |   29 +-
3810  65 files changed, 2396 insertions(+), 1758 deletions(-)
3811 Merging usb-gadget/next (36f90b0a2ddd Linux 4.5-rc2)
3812 $ git merge usb-gadget/next
3813 Already up-to-date.
3814 Merging usb-serial/usb-next (92e963f50fc7 Linux 4.5-rc1)
3815 $ git merge usb-serial/usb-next
3816 Already up-to-date.
3817 Merging usb-chipidea-next/ci-for-usb-next (6b8bc9c6fb26 usb: chipidea: udc: remove unused value assignment)
3818 $ git merge usb-chipidea-next/ci-for-usb-next
3819 Merge made by the 'recursive' strategy.
3820  Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt | 7 +++++++
3821  drivers/usb/chipidea/ci_hdrc_imx.c                     | 6 ++++++
3822  drivers/usb/chipidea/udc.c                             | 1 -
3823  3 files changed, 13 insertions(+), 1 deletion(-)
3824 Merging staging/staging-next (8c79c49c803d staging: iio: Remove parantheses around right hand side of assignment)
3825 $ git merge staging/staging-next
3826 Removing drivers/staging/staging.c
3827 Removing drivers/staging/panel/TODO
3828 Removing drivers/staging/panel/Makefile
3829 Removing drivers/staging/panel/Kconfig
3830 Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
3831 Removing drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
3832 Removing drivers/staging/olpc_dcon/olpc_dcon.h
3833 Removing drivers/staging/olpc_dcon/olpc_dcon.c
3834 Removing drivers/staging/olpc_dcon/TODO
3835 Removing drivers/staging/olpc_dcon/Makefile
3836 Removing drivers/staging/olpc_dcon/Kconfig
3837 Auto-merging drivers/staging/lustre/lustre/obdclass/kernelcomm.c
3838 Auto-merging drivers/staging/lustre/lustre/include/uapi_kernelcomm.h
3839 Removing drivers/staging/dgap/dgap.h
3840 CONFLICT (modify/delete): drivers/staging/dgap/dgap.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/dgap/dgap.c left in tree.
3841 Removing drivers/staging/dgap/Makefile
3842 Removing drivers/staging/dgap/Kconfig
3843 Auto-merging drivers/staging/android/ion/ion.c
3844 Auto-merging drivers/misc/panel.c
3845 Auto-merging MAINTAINERS
3846 Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
3847 Automatic merge failed; fix conflicts and then commit the result.
3848 $ git rm -f drivers/staging/dgap/dgap.c
3849 drivers/staging/dgap/dgap.c: needs merge
3850 rm 'drivers/staging/dgap/dgap.c'
3851 $ git commit -v -a
3852 [master b53df41716d2] Merge remote-tracking branch 'staging/staging-next'
3853 $ git diff -M --stat --summary HEAD^..
3854  CREDITS                                            |    1 +
3855  Documentation/ABI/testing/sysfs-bus-iio            |    9 +
3856  .../devicetree/bindings/iio/accel/mma8452.txt      |    4 +-
3857  .../bindings/iio/adc/at91-sama5d2_adc.txt          |   28 +
3858  .../devicetree/bindings/iio/adc/mcp3422.txt        |    1 +
3859  .../bindings/iio/chemical/atlas,ph-sm.txt          |   22 +
3860  .../devicetree/bindings/iio/health/max30100.txt    |    8 +
3861  .../devicetree/bindings/iio/light/opt3001.txt      |   26 +
3862  .../devicetree/bindings/vendor-prefixes.txt        |    1 +
3863  .../misc-devices}/lcd-panel-cgram.txt              |    0
3864  MAINTAINERS                                        |   33 +-
3865  drivers/android/binder.c                           |    5 +
3866  drivers/iio/accel/Kconfig                          |    2 +-
3867  drivers/iio/accel/mma8452.c                        |  206 +-
3868  drivers/iio/accel/st_accel_core.c                  |   16 +
3869  drivers/iio/adc/Kconfig                            |   16 +-
3870  drivers/iio/adc/Makefile                           |    1 +
3871  drivers/iio/adc/at91-sama5d2_adc.c                 |  508 ++
3872  drivers/iio/adc/axp288_adc.c                       |    2 +-
3873  drivers/iio/adc/mcp320x.c                          |   31 +-
3874  drivers/iio/adc/mcp3422.c                          |    7 +-
3875  drivers/iio/chemical/Kconfig                       |   13 +
3876  drivers/iio/chemical/Makefile                      |    1 +
3877  drivers/iio/chemical/atlas-ph-sensor.c             |  511 ++
3878  drivers/iio/common/st_sensors/st_sensors_core.c    |    6 +-
3879  drivers/iio/common/st_sensors/st_sensors_core.h    |    8 +
3880  drivers/iio/common/st_sensors/st_sensors_trigger.c |   52 +-
3881  drivers/iio/dac/Kconfig                            |   14 +-
3882  drivers/iio/dac/Makefile                           |    1 +
3883  drivers/iio/dac/ad5761.c                           |  430 ++
3884  drivers/iio/dac/mcp4725.c                          |   87 +-
3885  drivers/iio/gyro/st_gyro_core.c                    |   15 +
3886  drivers/iio/health/max30100.c                      |   81 +-
3887  drivers/iio/humidity/Kconfig                       |    6 +-
3888  drivers/iio/humidity/dht11.c                       |   77 +-
3889  drivers/iio/humidity/si7005.c                      |    1 +
3890  drivers/iio/humidity/si7020.c                      |    1 +
3891  drivers/iio/imu/inv_mpu6050/inv_mpu_core.c         |    5 +-
3892  drivers/iio/industrialio-core.c                    |    1 +
3893  drivers/iio/light/opt3001.c                        |  156 +-
3894  drivers/iio/magnetometer/ak8975.c                  |    4 +-
3895  drivers/iio/magnetometer/st_magn_core.c            |    4 +
3896  drivers/iio/pressure/Kconfig                       |   41 +-
3897  drivers/iio/pressure/Makefile                      |    2 +
3898  drivers/iio/pressure/mpl115.c                      |   66 +-
3899  drivers/iio/pressure/mpl115.h                      |   24 +
3900  drivers/iio/pressure/mpl115_i2c.c                  |   67 +
3901  drivers/iio/pressure/mpl115_spi.c                  |  106 +
3902  drivers/iio/pressure/st_pressure_core.c            |    8 +
3903  drivers/misc/Kconfig                               |  278 +
3904  drivers/misc/Makefile                              |    1 +
3905  drivers/{staging/panel => misc}/panel.c            |   49 +-
3906  drivers/staging/Kconfig                            |    6 -
3907  drivers/staging/Makefile                           |    6 -
3908  drivers/staging/android/Kconfig                    |    9 -
3909  drivers/staging/android/ashmem.c                   |    4 +-
3910  drivers/staging/android/ion/ion.c                  |   74 +-
3911  drivers/staging/android/ion/ion.h                  |   20 +-
3912  drivers/staging/android/ion/ion_carveout_heap.c    |    2 +-
3913  drivers/staging/android/ion/ion_page_pool.c        |    4 +-
3914  drivers/staging/android/ion/ion_system_heap.c      |    2 +-
3915  drivers/staging/android/lowmemorykiller.c          |   24 +-
3916  drivers/staging/android/sw_sync.c                  |  191 +-
3917  drivers/staging/android/sw_sync.h                  |    8 +-
3918  drivers/staging/android/sync.c                     |  467 +-
3919  drivers/staging/android/sync.h                     |  241 +-
3920  drivers/staging/android/sync_debug.c               |  229 +-
3921  drivers/staging/android/trace/sync.h               |   44 -
3922  drivers/staging/android/uapi/ashmem.h              |    1 +
3923  drivers/staging/android/uapi/sync.h                |   37 +-
3924  drivers/staging/board/armadillo800eva.c            |    1 -
3925  drivers/staging/board/board.c                      |    1 -
3926  .../clocking-wizard/clk-xlnx-clock-wizard.c        |    9 +-
3927  drivers/staging/comedi/comedi.h                    |    2 +-
3928  drivers/staging/comedi/comedi_pcmcia.h             |    3 +-
3929  drivers/staging/comedi/drivers/dt2801.c            |   18 +-
3930  drivers/staging/comedi/drivers/mite.c              |   72 +-
3931  drivers/staging/comedi/drivers/mite.h              |    3 +
3932  drivers/staging/comedi/drivers/ni_mio_common.c     |  576 +-
3933  drivers/staging/comedi/drivers/ni_pcimio.c         |   20 +-
3934  drivers/staging/comedi/drivers/ni_tiocmd.c         |    2 +-
3935  drivers/staging/dgap/Kconfig                       |    6 -
3936  drivers/staging/dgap/Makefile                      |    1 -
3937  drivers/staging/dgap/dgap.c                        | 7057 --------------------
3938  drivers/staging/dgap/dgap.h                        | 1229 ----
3939  drivers/staging/emxx_udc/emxx_udc.c                |   38 +-
3940  drivers/staging/fbtft/Kconfig                      |   12 +
3941  drivers/staging/fbtft/Makefile                     |    2 +
3942  drivers/staging/fbtft/fb_hx8340bn.c                |   25 +-
3943  drivers/staging/fbtft/fb_hx8353d.c                 |   21 +-
3944  drivers/staging/fbtft/fb_hx8357d.c                 |   38 +-
3945  drivers/staging/fbtft/fb_hx8357d.h                 |   32 -
3946  drivers/staging/fbtft/fb_ili9163.c                 |   86 +-
3947  drivers/staging/fbtft/fb_ili9340.c                 |   26 +-
3948  drivers/staging/fbtft/fb_ili9341.c                 |   50 +-
3949  drivers/staging/fbtft/fb_ili9481.c                 |   30 +-
3950  drivers/staging/fbtft/fb_ili9486.c                 |   35 +-
3951  drivers/staging/fbtft/fb_s6d02a1.c                 |   42 +-
3952  drivers/staging/fbtft/fb_ssd1305.c                 |  216 +
3953  drivers/staging/fbtft/fb_ssd1325.c                 |  205 +
3954  drivers/staging/fbtft/fb_st7735r.c                 |   42 +-
3955  drivers/staging/fbtft/fb_tinylcd.c                 |   28 +-
3956  drivers/staging/fbtft/fb_uc1701.c                  |   27 +-
3957  drivers/staging/fbtft/fbtft-core.c                 |   18 +-
3958  drivers/staging/fbtft/fbtft.h                      |    8 -
3959  drivers/staging/fbtft/fbtft_device.c               |   75 +-
3960  drivers/staging/fsl-mc/bus/Kconfig                 |    1 +
3961  drivers/staging/fsl-mc/bus/Makefile                |    2 +
3962  drivers/staging/fsl-mc/bus/dprc-driver.c           |  331 +-
3963  .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c |  127 +
3964  drivers/staging/fsl-mc/bus/mc-allocator.c          |  199 +
3965  drivers/staging/fsl-mc/bus/mc-bus.c                |   15 +-
3966  drivers/staging/fsl-mc/bus/mc-msi.c                |  276 +
3967  drivers/staging/fsl-mc/include/dprc.h              |    2 +-
3968  drivers/staging/fsl-mc/include/mc-private.h        |   39 +-
3969  drivers/staging/fsl-mc/include/mc.h                |   26 +
3970  drivers/staging/fwserial/dma_fifo.c                |   10 +-
3971  drivers/staging/fwserial/fwserial.c                |   17 +-
3972  drivers/staging/fwserial/fwserial.h                |    1 -
3973  drivers/staging/gdm72xx/gdm_qos.c                  |    2 +-
3974  drivers/staging/gdm72xx/gdm_qos.h                  |    2 +-
3975  drivers/staging/gdm72xx/gdm_sdio.h                 |    4 +-
3976  drivers/staging/gdm72xx/gdm_usb.c                  |    1 -
3977  drivers/staging/gdm72xx/gdm_usb.h                  |    8 +-
3978  drivers/staging/gdm72xx/gdm_wimax.c                |    2 +-
3979  drivers/staging/gdm72xx/hci.h                      |    9 +-
3980  drivers/staging/gdm72xx/netlink_k.c                |    2 +-
3981  drivers/staging/gdm72xx/usb_ids.h                  |   64 +-
3982  drivers/staging/goldfish/goldfish_audio.c          |    6 +-
3983  drivers/staging/gs_fpgaboot/gs_fpgaboot.c          |    6 +-
3984  .../staging/iio/Documentation/sysfs-bus-iio-light  |   28 -
3985  drivers/staging/iio/adc/ad7192.c                   |    2 +-
3986  drivers/staging/iio/adc/ad7280a.c                  |    4 +-
3987  drivers/staging/iio/cdc/ad7150.c                   |   34 +-
3988  drivers/staging/iio/light/tsl2x7x_core.c           |    6 +-
3989  .../staging/lustre/include/linux/libcfs/libcfs.h   |    4 +-
3990  .../lustre/include/linux/libcfs/libcfs_debug.h     |    2 +-
3991  .../lustre/include/linux/libcfs/libcfs_ioctl.h     |   13 +-
3992  .../lustre/include/linux/libcfs/libcfs_private.h   |    5 -
3993  .../lustre/include/linux/libcfs/libcfs_string.h    |    2 -
3994  drivers/staging/lustre/include/linux/lnet/api.h    |    1 +
3995  .../staging/lustre/include/linux/lnet/lib-lnet.h   |    2 -
3996  drivers/staging/lustre/include/linux/lnet/lnetst.h |  104 +-
3997  .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    3 +-
3998  .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    1 +
3999  drivers/staging/lustre/lnet/lnet/api-ni.c          |   53 +-
4000  drivers/staging/lustre/lnet/lnet/config.c          |   18 +-
4001  drivers/staging/lustre/lnet/lnet/lib-eq.c          |    3 +-
4002  drivers/staging/lustre/lnet/selftest/conrpc.c      |    4 +-
4003  drivers/staging/lustre/lnet/selftest/conrpc.h      |    5 +-
4004  drivers/staging/lustre/lnet/selftest/console.c     |   96 +-
4005  drivers/staging/lustre/lnet/selftest/console.h     |   56 +-
4006  drivers/staging/lustre/lustre/fid/lproc_fid.c      |    2 +
4007  .../staging/lustre/lustre/include/lprocfs_status.h |    2 +-
4008  drivers/staging/lustre/lustre/include/lu_object.h  |    4 +-
4009  drivers/staging/lustre/lustre/include/lustre_cfg.h |    4 -
4010  .../staging/lustre/lustre/include/lustre_export.h  |    7 +
4011  .../lustre/lustre/include/lustre_kernelcomm.h      |   55 +
4012  drivers/staging/lustre/lustre/include/lustre_lib.h |   16 +-
4013  drivers/staging/lustre/lustre/include/obd.h        |    3 +-
4014  drivers/staging/lustre/lustre/include/obd_class.h  |    2 +-
4015  .../include/uapi_kernelcomm.h}                     |   72 +-
4016  drivers/staging/lustre/lustre/lclient/lcommon_cl.c |   11 -
4017  drivers/staging/lustre/lustre/libcfs/Makefile      |    5 +-
4018  drivers/staging/lustre/lustre/libcfs/debug.c       |    2 +
4019  drivers/staging/lustre/lustre/libcfs/libcfs_cpu.c  |    8 +
4020  drivers/staging/lustre/lustre/libcfs/libcfs_lock.c |    2 +
4021  .../lustre/lustre/libcfs/linux/linux-module.c      |   22 +-
4022  drivers/staging/lustre/lustre/libcfs/module.c      |  185 +-
4023  drivers/staging/lustre/lustre/llite/dcache.c       |   10 +-
4024  drivers/staging/lustre/lustre/llite/dir.c          |   86 +-
4025  drivers/staging/lustre/lustre/llite/file.c         |   78 +-
4026  .../staging/lustre/lustre/llite/llite_internal.h   |    4 +-
4027  drivers/staging/lustre/lustre/llite/llite_lib.c    |   14 +-
4028  drivers/staging/lustre/lustre/llite/llite_nfs.c    |    2 +-
4029  drivers/staging/lustre/lustre/llite/lloop.c        |    4 +-
4030  drivers/staging/lustre/lustre/llite/rw.c           |    1 -
4031  drivers/staging/lustre/lustre/lmv/lmv_obd.c        |   40 +-
4032  drivers/staging/lustre/lustre/lov/lov_dev.c        |    2 +-
4033  drivers/staging/lustre/lustre/lov/lov_internal.h   |    2 +-
4034  drivers/staging/lustre/lustre/lov/lov_obd.c        |    6 +-
4035  drivers/staging/lustre/lustre/lov/lov_pack.c       |    2 +-
4036  drivers/staging/lustre/lustre/mdc/mdc_request.c    |   23 +-
4037  drivers/staging/lustre/lustre/obdclass/Makefile    |   10 +-
4038  drivers/staging/lustre/lustre/obdclass/class_obd.c |   14 +-
4039  drivers/staging/lustre/lustre/obdclass/genops.c    |    1 +
4040  .../kernel_user_comm.c => obdclass/kernelcomm.c}   |   80 +-
4041  .../lustre/lustre/obdclass/linux/linux-module.c    |   20 +-
4042  drivers/staging/lustre/lustre/obdclass/llog_swab.c |    3 -
4043  .../lustre/lustre/obdclass/lprocfs_status.c        |   22 +-
4044  .../staging/lustre/lustre/obdecho/echo_client.c    |  349 +-
4045  drivers/staging/lustre/lustre/osc/lproc_osc.c      |   25 +-
4046  drivers/staging/lustre/lustre/osc/osc_cache.c      |    3 +
4047  drivers/staging/lustre/lustre/osc/osc_page.c       |    4 +-
4048  drivers/staging/lustre/lustre/osc/osc_request.c    |    5 +-
4049  drivers/staging/lustre/lustre/ptlrpc/client.c      |    3 +-
4050  drivers/staging/lustre/lustre/ptlrpc/events.c      |   11 -
4051  drivers/staging/lustre/lustre/ptlrpc/nrs.c         |   14 +-
4052  drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c    |    1 -
4053  drivers/staging/most/aim-cdev/cdev.c               |  372 +-
4054  drivers/staging/most/aim-network/networking.c      |   11 +-
4055  drivers/staging/most/hdm-dim2/dim2_hal.c           |    4 +-
4056  drivers/staging/most/hdm-dim2/dim2_hal.h           |    7 +-
4057  drivers/staging/most/hdm-dim2/dim2_hdm.c           |   10 +-
4058  drivers/staging/most/hdm-dim2/dim2_hdm.h           |    2 +-
4059  drivers/staging/most/mostcore/core.c               |  168 +-
4060  drivers/staging/most/mostcore/mostcore.h           |    3 +-
4061  drivers/staging/mt29f_spinand/mt29f_spinand.c      |   77 +-
4062  drivers/staging/nvec/nvec.c                        |    8 +-
4063  drivers/staging/nvec/nvec_paz00.c                  |   12 +-
4064  drivers/staging/nvec/nvec_power.c                  |   14 +-
4065  drivers/staging/octeon-usb/octeon-hcd.c            |    3 +-
4066  drivers/staging/octeon/ethernet-rgmii.c            |    4 -
4067  drivers/staging/octeon/ethernet-tx.c               |    4 +-
4068  drivers/staging/olpc_dcon/Kconfig                  |   35 -
4069  drivers/staging/olpc_dcon/Makefile                 |    6 -
4070  drivers/staging/olpc_dcon/TODO                     |    9 -
4071  drivers/staging/olpc_dcon/olpc_dcon.c              |  813 ---
4072  drivers/staging/olpc_dcon/olpc_dcon.h              |  111 -
4073  drivers/staging/olpc_dcon/olpc_dcon_xo_1.c         |  205 -
4074  drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c       |  161 -
4075  drivers/staging/panel/Kconfig                      |  278 -
4076  drivers/staging/panel/Makefile                     |    1 -
4077  drivers/staging/panel/TODO                         |    8 -
4078  drivers/staging/rdma/hfi1/chip.c                   |    1 -
4079  drivers/staging/rdma/hfi1/chip_registers.h         |   11 +
4080  drivers/staging/rdma/hfi1/diag.c                   |    2 +-
4081  drivers/staging/rdma/hfi1/driver.c                 |    2 +-
4082  drivers/staging/rdma/hfi1/efivar.c                 |    3 +-
4083  drivers/staging/rdma/hfi1/hfi.h                    |    8 +-
4084  drivers/staging/rdma/hfi1/mad.c                    |   33 +-
4085  drivers/staging/rdma/hfi1/pcie.c                   |   84 +-
4086  drivers/staging/rdma/hfi1/ud.c                     |    2 +-
4087  drivers/staging/rtl8188eu/Makefile                 |    2 +-
4088  drivers/staging/rtl8188eu/core/rtw_ap.c            |    4 +-
4089  drivers/staging/rtl8188eu/core/rtw_cmd.c           |   12 +-
4090  drivers/staging/rtl8188eu/core/rtw_debug.c         |   14 +-
4091  drivers/staging/rtl8188eu/core/rtw_efuse.c         |    8 +-
4092  drivers/staging/rtl8188eu/core/rtw_ieee80211.c     |    4 +-
4093  drivers/staging/rtl8188eu/core/rtw_mlme.c          |   19 +-
4094  drivers/staging/rtl8188eu/core/rtw_mlme_ext.c      |   11 +-
4095  drivers/staging/rtl8188eu/core/rtw_recv.c          |   54 +-
4096  drivers/staging/rtl8188eu/core/rtw_security.c      |   28 +-
4097  drivers/staging/rtl8188eu/core/rtw_sta_mgt.c       |   23 +-
4098  drivers/staging/rtl8188eu/core/rtw_wlan_util.c     |    5 +-
4099  drivers/staging/rtl8188eu/core/rtw_xmit.c          |   84 +-
4100  drivers/staging/rtl8188eu/include/drv_types.h      |    2 +-
4101  drivers/staging/rtl8188eu/include/rtw_mlme_ext.h   |    2 +-
4102  drivers/staging/rtl8188eu/os_dep/ioctl_linux.c     |    2 +-
4103  drivers/staging/rtl8188eu/os_dep/os_intfs.c        |    4 +-
4104  drivers/staging/rtl8192e/dot11d.h                  |    3 -
4105  drivers/staging/rtl8192e/rtllib.h                  |    2 +-
4106  drivers/staging/rtl8192e/rtllib_module.c           |    5 -
4107  drivers/staging/rtl8192e/rtllib_softmac.c          |    2 +-
4108  drivers/staging/rtl8192e/rtllib_wx.c               |    2 +-
4109  drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c  |   13 +-
4110  .../staging/rtl8192u/ieee80211/ieee80211_softmac.c |    6 +-
4111  drivers/staging/rtl8192u/r8190_rtl8256.c           |   24 +-
4112  drivers/staging/rtl8192u/r8192U_core.c             |   30 +-
4113  drivers/staging/rtl8192u/r8192U_dm.c               |    4 +-
4114  drivers/staging/rtl8192u/r8192U_wx.c               |   38 +-
4115  drivers/staging/rtl8192u/r819xU_phy.c              |    3 +-
4116  drivers/staging/rtl8712/drv_types.h                |    1 +
4117  drivers/staging/rtl8712/ieee80211.h                |  112 +-
4118  drivers/staging/rtl8712/rtl8712_cmd.c              |    2 +-
4119  drivers/staging/rtl8712/rtl8712_io.c               |   77 +-
4120  drivers/staging/rtl8712/rtl871x_cmd.c              |   13 +-
4121  drivers/staging/rtl8712/rtl871x_ioctl_linux.c      |    5 +-
4122  drivers/staging/rtl8712/rtl871x_ioctl_rtl.c        |   45 +-
4123  drivers/staging/rtl8712/rtl871x_mlme.c             |   15 +-
4124  drivers/staging/rtl8712/rtl871x_recv.c             |   16 +-
4125  drivers/staging/rtl8712/rtl871x_sta_mgt.c          |   25 +-
4126  drivers/staging/rtl8712/rtl871x_xmit.c             |   33 +-
4127  drivers/staging/rtl8712/usb_intf.c                 |   12 +
4128  drivers/staging/rtl8712/usb_ops_linux.c            |    5 +-
4129  drivers/staging/rtl8723au/core/rtw_mlme_ext.c      |   20 -
4130  drivers/staging/rtl8723au/core/rtw_recv.c          |   32 +-
4131  drivers/staging/rtl8723au/hal/odm.c                |    2 +-
4132  .../staging/rtl8723au/hal/rtl8723a_bt-coexist.c    |   24 +-
4133  drivers/staging/rtl8723au/hal/rtl8723a_cmd.c       |    6 +-
4134  drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c  |    8 +-
4135  drivers/staging/rtl8723au/hal/usb_halinit.c        |    6 +-
4136  drivers/staging/rtl8723au/include/rtl8723a_cmd.h   |    2 +-
4137  drivers/staging/rts5208/rtsx.c                     |    2 -
4138  drivers/staging/rts5208/rtsx_transport.c           |    4 +-
4139  drivers/staging/rts5208/spi.c                      |    2 -
4140  drivers/staging/slicoss/slic.h                     |    2 +
4141  drivers/staging/slicoss/slicoss.c                  |   41 +-
4142  drivers/staging/sm750fb/ddk750_chip.c              |   83 +-
4143  drivers/staging/sm750fb/ddk750_display.c           |   24 +-
4144  drivers/staging/sm750fb/ddk750_hwi2c.c             |   11 +-
4145  drivers/staging/sm750fb/ddk750_mode.c              |   30 +-
4146  drivers/staging/sm750fb/ddk750_power.c             |   43 +-
4147  drivers/staging/sm750fb/ddk750_power.h             |   11 +-
4148  drivers/staging/sm750fb/ddk750_reg.h               |  503 +-
4149  drivers/staging/sm750fb/ddk750_sii164.c            |    4 +-
4150  drivers/staging/sm750fb/ddk750_sii164.h            |    5 +-
4151  drivers/staging/sm750fb/sm750.c                    |  185 +-
4152  drivers/staging/sm750fb/sm750.h                    |    4 +-
4153  drivers/staging/sm750fb/sm750_accel.c              |    4 +-
4154  drivers/staging/sm750fb/sm750_accel.h              |    2 +-
4155  drivers/staging/sm750fb/sm750_cursor.c             |    3 +-
4156  drivers/staging/sm750fb/sm750_hw.c                 |   59 +-
4157  drivers/staging/speakup/buffers.c                  |    4 +-
4158  drivers/staging/speakup/devsynth.c                 |    4 +-
4159  drivers/staging/speakup/fakekey.c                  |    6 +-
4160  drivers/staging/speakup/keyhelp.c                  |   22 +-
4161  drivers/staging/speakup/main.c                     |    4 -
4162  drivers/staging/speakup/speakup_acntpc.c           |    5 -
4163  drivers/staging/speakup/speakup_acntsa.c           |    4 -
4164  drivers/staging/speakup/speakup_apollo.c           |    4 -
4165  drivers/staging/speakup/speakup_audptr.c           |    4 -
4166  drivers/staging/speakup/speakup_bns.c              |    4 -
4167  drivers/staging/speakup/speakup_decext.c           |   28 +-
4168  drivers/staging/speakup/speakup_decpc.c            |    4 -
4169  drivers/staging/speakup/speakup_dectlk.c           |    4 -
4170  drivers/staging/speakup/speakup_dtlk.c             |    4 -
4171  drivers/staging/speakup/speakup_dummy.c            |    4 -
4172  drivers/staging/speakup/speakup_keypc.c            |    4 -
4173  drivers/staging/speakup/speakup_ltlk.c             |    4 -
4174  drivers/staging/speakup/speakup_soft.c             |    3 -
4175  drivers/staging/speakup/speakup_spkout.c           |    4 -
4176  drivers/staging/speakup/speakup_txprt.c            |    4 -
4177  drivers/staging/speakup/spk_priv.h                 |    4 -
4178  drivers/staging/speakup/spk_priv_keyinfo.h         |    4 -
4179  drivers/staging/speakup/spkguide.txt               |    1 -
4180  drivers/staging/speakup/varhandlers.c              |   50 +-
4181  drivers/staging/staging.c                          |   19 -
4182  drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c      |    9 +-
4183  drivers/staging/unisys/visorbus/visorchipset.c     |   15 +-
4184  drivers/staging/unisys/visorhba/visorhba_main.c    |    2 +-
4185  drivers/staging/unisys/visornic/visornic_main.c    |   20 +-
4186  drivers/staging/vt6655/card.c                      |   18 +-
4187  drivers/staging/vt6655/channel.c                   |   67 +-
4188  drivers/staging/vt6655/channel.h                   |    2 +-
4189  drivers/staging/vt6655/device_main.c               |   24 +-
4190  drivers/staging/vt6655/key.c                       |    8 +-
4191  drivers/staging/vt6655/mac.c                       |  108 +-
4192  drivers/staging/vt6655/mac.h                       |   58 +-
4193  drivers/staging/vt6655/power.c                     |   66 +-
4194  drivers/staging/vt6655/power.h                     |    8 +-
4195  drivers/staging/vt6655/rf.c                        |  174 +-
4196  drivers/staging/vt6656/device.h                    |    4 +-
4197  drivers/staging/vt6656/main_usb.c                  |   14 +-
4198  drivers/staging/vt6656/power.c                     |    2 +-
4199  drivers/staging/wilc1000/Makefile                  |    6 +-
4200  drivers/staging/wilc1000/coreconfigurator.c        |  418 +-
4201  drivers/staging/wilc1000/coreconfigurator.h        |   73 +-
4202  drivers/staging/wilc1000/host_interface.c          | 1075 ++-
4203  drivers/staging/wilc1000/host_interface.h          |  113 +-
4204  drivers/staging/wilc1000/linux_mon.c               |   64 +-
4205  drivers/staging/wilc1000/linux_wlan.c              |  492 +-
4206  drivers/staging/wilc1000/linux_wlan_common.h       |   27 +-
4207  drivers/staging/wilc1000/wilc_debugfs.c            |    9 +-
4208  drivers/staging/wilc1000/wilc_msgqueue.c           |  142 +-
4209  drivers/staging/wilc1000/wilc_msgqueue.h           |  110 +-
4210  drivers/staging/wilc1000/wilc_sdio.c               |  112 +-
4211  drivers/staging/wilc1000/wilc_spi.c                |    6 +-
4212  drivers/staging/wilc1000/wilc_wfi_cfgoperations.c  |  773 +--
4213  drivers/staging/wilc1000/wilc_wfi_netdevice.h      |   13 +-
4214  drivers/staging/wilc1000/wilc_wlan.c               |  507 +-
4215  drivers/staging/wilc1000/wilc_wlan.h               |   20 +-
4216  drivers/staging/wilc1000/wilc_wlan_cfg.c           |   16 +-
4217  drivers/staging/wilc1000/wilc_wlan_if.h            |   14 +-
4218  drivers/staging/wlan-ng/cfg80211.c                 |   41 +-
4219  drivers/staging/wlan-ng/hfa384x_usb.c              |   44 +-
4220  drivers/staging/wlan-ng/p80211conv.c               |  132 +-
4221  drivers/staging/wlan-ng/p80211wep.c                |    4 +-
4222  drivers/staging/wlan-ng/prism2usb.c                |   15 +-
4223  drivers/staging/xgifb/XGI_main_26.c                |    2 -
4224  drivers/staging/xgifb/vgatypes.h                   |    7 +-
4225  include/linux/fence.h                              |    2 +
4226  include/linux/iio/common/st_sensors.h              |    4 +
4227  include/linux/irqdomain.h                          |    1 +
4228  include/linux/msi.h                                |    9 +
4229  include/linux/platform_data/ad5761.h               |   44 +
4230  include/uapi/linux/iio/types.h                     |    1 +
4231  377 files changed, 9444 insertions(+), 17325 deletions(-)
4232  create mode 100644 Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt
4233  create mode 100644 Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt
4234  create mode 100644 Documentation/devicetree/bindings/iio/light/opt3001.txt
4235  rename {drivers/staging/panel => Documentation/misc-devices}/lcd-panel-cgram.txt (100%)
4236  create mode 100644 drivers/iio/adc/at91-sama5d2_adc.c
4237  create mode 100644 drivers/iio/chemical/atlas-ph-sensor.c
4238  create mode 100644 drivers/iio/common/st_sensors/st_sensors_core.h
4239  create mode 100644 drivers/iio/dac/ad5761.c
4240  create mode 100644 drivers/iio/pressure/mpl115.h
4241  create mode 100644 drivers/iio/pressure/mpl115_i2c.c
4242  create mode 100644 drivers/iio/pressure/mpl115_spi.c
4243  rename drivers/{staging/panel => misc}/panel.c (98%)
4244  delete mode 100644 drivers/staging/dgap/Kconfig
4245  delete mode 100644 drivers/staging/dgap/Makefile
4246  delete mode 100644 drivers/staging/dgap/dgap.c
4247  delete mode 100644 drivers/staging/dgap/dgap.h
4248  create mode 100644 drivers/staging/fbtft/fb_ssd1305.c
4249  create mode 100644 drivers/staging/fbtft/fb_ssd1325.c
4250  create mode 100644 drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c
4251  create mode 100644 drivers/staging/fsl-mc/bus/mc-msi.c
4252  create mode 100644 drivers/staging/lustre/lustre/include/lustre_kernelcomm.h
4253  rename drivers/staging/lustre/{include/linux/libcfs/libcfs_kernelcomm.h => lustre/include/uapi_kernelcomm.h} (51%)
4254  rename drivers/staging/lustre/lustre/{libcfs/kernel_user_comm.c => obdclass/kernelcomm.c} (81%)
4255  delete mode 100644 drivers/staging/olpc_dcon/Kconfig
4256  delete mode 100644 drivers/staging/olpc_dcon/Makefile
4257  delete mode 100644 drivers/staging/olpc_dcon/TODO
4258  delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.c
4259  delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon.h
4260  delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
4261  delete mode 100644 drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c
4262  delete mode 100644 drivers/staging/panel/Kconfig
4263  delete mode 100644 drivers/staging/panel/Makefile
4264  delete mode 100644 drivers/staging/panel/TODO
4265  delete mode 100644 drivers/staging/staging.c
4266  create mode 100644 include/linux/platform_data/ad5761.h
4267 Merging char-misc/char-misc-next (990162f03840 char: nwbutton: avoid unused variable warning)
4268 $ git merge char-misc/char-misc-next
4269 Auto-merging fs/compat_ioctl.c
4270 Auto-merging drivers/watchdog/Makefile
4271 Auto-merging drivers/watchdog/Kconfig
4272 Auto-merging drivers/staging/goldfish/goldfish_audio.c
4273 Auto-merging drivers/misc/mic/vop/vop_main.h
4274 Removing drivers/misc/mic/host/mic_virtio.c
4275 Removing drivers/misc/mic/host/mic_fops.h
4276 Removing drivers/misc/mic/host/mic_fops.c
4277 Removing drivers/misc/mic/card/mic_virtio.h
4278 Removing drivers/misc/mic/card/mic_virtio.c
4279 Removing drivers/misc/mei/wd.c
4280 Auto-merging drivers/misc/mei/main.c
4281 Auto-merging drivers/misc/Kconfig
4282 Auto-merging MAINTAINERS
4283 Merge made by the 'recursive' strategy.
4284  Documentation/ABI/stable/sysfs-bus-vmbus           |   14 +
4285  .../devicetree/bindings/goldfish/pipe.txt          |   17 +
4286  .../devicetree/bindings/misc/eeprom-93xx46.txt     |   25 +
4287  .../devicetree/bindings/nvmem/lpc1857-eeprom.txt   |   28 +
4288  .../devicetree/bindings/nvmem/mtk-efuse.txt        |   36 +
4289  Documentation/mic/mic_overview.txt                 |   54 +-
4290  Documentation/mic/mpssd/mpss                       |    2 +-
4291  Documentation/mic/mpssd/mpssd.c                    |    2 +-
4292  Documentation/misc-devices/mei/mei.txt             |   12 +-
4293  MAINTAINERS                                        |    1 +
4294  drivers/base/firmware_class.c                      |   17 +-
4295  drivers/char/nvram.c                               |   12 +-
4296  drivers/char/nwbutton.c                            |    5 +-
4297  drivers/char/ppdev.c                               |   87 +-
4298  drivers/char/raw.c                                 |    4 +-
4299  drivers/hv/channel.c                               |   36 +-
4300  drivers/hv/channel_mgmt.c                          |  268 ++++-
4301  drivers/hv/connection.c                            |    8 +-
4302  drivers/hv/hv.c                                    |   26 +-
4303  drivers/hv/hyperv_vmbus.h                          |    6 +-
4304  drivers/hv/ring_buffer.c                           |   31 +-
4305  drivers/hv/vmbus_drv.c                             |   25 +
4306  drivers/hwtracing/coresight/coresight-etb10.c      |   11 +-
4307  drivers/hwtracing/coresight/coresight-etm3x.c      |   21 +-
4308  drivers/hwtracing/coresight/coresight-etm4x.c      |   21 +-
4309  drivers/hwtracing/coresight/coresight-funnel.c     |   10 +-
4310  .../coresight/coresight-replicator-qcom.c          |   11 +-
4311  drivers/hwtracing/coresight/coresight-replicator.c |   16 +-
4312  drivers/hwtracing/coresight/coresight-tmc.c        |   15 +-
4313  drivers/hwtracing/coresight/coresight-tpiu.c       |   10 +-
4314  drivers/hwtracing/coresight/coresight.c            |   57 +-
4315  drivers/hwtracing/intel_th/Kconfig                 |    1 +
4316  drivers/hwtracing/intel_th/pci.c                   |   10 +
4317  drivers/hwtracing/stm/Kconfig                      |    5 +
4318  drivers/hwtracing/stm/core.c                       |   43 +-
4319  drivers/hwtracing/stm/policy.c                     |   18 +-
4320  drivers/hwtracing/stm/stm.h                        |    1 +
4321  drivers/misc/Kconfig                               |    4 +-
4322  drivers/misc/apds990x.c                            |    8 +-
4323  drivers/misc/arm-charlcd.c                         |   24 +-
4324  drivers/misc/bh1770glc.c                           |    8 +-
4325  drivers/misc/c2port/core.c                         |    8 +-
4326  drivers/misc/cxl/sysfs.c                           |    5 +-
4327  drivers/misc/eeprom/at24.c                         |    4 +-
4328  drivers/misc/eeprom/at25.c                         |    4 +-
4329  drivers/misc/eeprom/eeprom.c                       |    2 +-
4330  drivers/misc/eeprom/eeprom_93xx46.c                |   57 +-
4331  drivers/misc/genwqe/card_sysfs.c                   |    2 +-
4332  drivers/misc/lis3lv02d/lis3lv02d_i2c.c             |    8 +-
4333  drivers/misc/lkdtm.c                               |    2 +-
4334  drivers/misc/mei/Kconfig                           |    6 +-
4335  drivers/misc/mei/Makefile                          |    1 -
4336  drivers/misc/mei/amthif.c                          |  130 +--
4337  drivers/misc/mei/bus-fixup.c                       |   41 +-
4338  drivers/misc/mei/bus.c                             |   53 +-
4339  drivers/misc/mei/client.c                          |  185 ++--
4340  drivers/misc/mei/client.h                          |   27 +-
4341  drivers/misc/mei/debugfs.c                         |   65 +-
4342  drivers/misc/mei/hbm.c                             |   24 +-
4343  drivers/misc/mei/hw-me.c                           |   10 +-
4344  drivers/misc/mei/hw-txe.c                          |   10 +-
4345  drivers/misc/mei/hw.h                              |   32 +-
4346  drivers/misc/mei/init.c                            |   20 +-
4347  drivers/misc/mei/interrupt.c                       |   92 +-
4348  drivers/misc/mei/main.c                            |   80 +-
4349  drivers/misc/mei/mei-trace.c                       |    2 +
4350  drivers/misc/mei/mei-trace.h                       |   40 +-
4351  drivers/misc/mei/mei_dev.h                         |  118 +-
4352  drivers/misc/mei/pci-me.c                          |    4 +-
4353  drivers/misc/mei/pci-txe.c                         |    4 +-
4354  drivers/misc/mei/wd.c                              |  391 -------
4355  drivers/misc/mic/Kconfig                           |   44 +-
4356  drivers/misc/mic/Makefile                          |    1 +
4357  drivers/misc/mic/bus/Makefile                      |    1 +
4358  drivers/misc/mic/bus/cosm_bus.h                    |    2 +
4359  drivers/misc/mic/bus/vop_bus.c                     |  203 ++++
4360  drivers/misc/mic/bus/vop_bus.h                     |  140 +++
4361  drivers/misc/mic/card/Makefile                     |    1 -
4362  drivers/misc/mic/card/mic_device.c                 |   89 +-
4363  drivers/misc/mic/card/mic_device.h                 |    3 +
4364  drivers/misc/mic/card/mic_virtio.c                 |  634 -----------
4365  drivers/misc/mic/card/mic_virtio.h                 |   76 --
4366  drivers/misc/mic/card/mic_x100.c                   |    1 +
4367  drivers/misc/mic/cosm/cosm_main.c                  |   13 +-
4368  drivers/misc/mic/host/Makefile                     |    2 -
4369  drivers/misc/mic/host/mic_boot.c                   |  125 ++-
4370  drivers/misc/mic/host/mic_debugfs.c                |  190 ----
4371  drivers/misc/mic/host/mic_device.h                 |    9 +-
4372  drivers/misc/mic/host/mic_fops.c                   |  222 ----
4373  drivers/misc/mic/host/mic_fops.h                   |   32 -
4374  drivers/misc/mic/host/mic_main.c                   |   49 +-
4375  drivers/misc/mic/host/mic_virtio.c                 |  811 --------------
4376  drivers/misc/mic/host/mic_x100.c                   |   19 +-
4377  drivers/misc/mic/scif/scif_dma.c                   |   41 +-
4378  drivers/misc/mic/scif/scif_rma.c                   |    7 +-
4379  drivers/misc/mic/vop/Makefile                      |    9 +
4380  drivers/misc/mic/vop/vop_debugfs.c                 |  232 ++++
4381  drivers/misc/mic/vop/vop_main.c                    |  755 +++++++++++++
4382  .../misc/mic/{host/mic_virtio.h => vop/vop_main.h} |  129 ++-
4383  drivers/misc/mic/vop/vop_vringh.c                  | 1164 ++++++++++++++++++++
4384  drivers/misc/pch_phub.c                            |    6 +-
4385  drivers/misc/ti-st/st_core.c                       |    1 -
4386  drivers/misc/vmw_vmci/vmci_driver.c                |    2 +-
4387  drivers/nvmem/Kconfig                              |   20 +
4388  drivers/nvmem/Makefile                             |    4 +
4389  drivers/nvmem/lpc18xx_eeprom.c                     |  330 ++++++
4390  drivers/nvmem/mtk-efuse.c                          |   89 ++
4391  drivers/nvmem/rockchip-efuse.c                     |   90 +-
4392  drivers/nvmem/sunxi_sid.c                          |    9 +-
4393  drivers/platform/Kconfig                           |    3 +-
4394  drivers/platform/goldfish/Kconfig                  |   18 +
4395  drivers/platform/goldfish/Makefile                 |    2 +-
4396  drivers/platform/goldfish/goldfish_pipe.c          |  169 +--
4397  drivers/staging/goldfish/goldfish_audio.c          |    2 +-
4398  drivers/staging/goldfish/goldfish_nand.c           |   50 +-
4399  drivers/vme/bridges/vme_ca91cx42.c                 |   11 +-
4400  drivers/w1/masters/omap_hdq.c                      |    1 -
4401  drivers/watchdog/Kconfig                           |   15 +
4402  drivers/watchdog/Makefile                          |    1 +
4403  drivers/watchdog/mei_wdt.c                         |  724 ++++++++++++
4404  fs/compat_ioctl.c                                  |   22 -
4405  include/linux/coresight.h                          |    3 +
4406  include/linux/hyperv.h                             |   95 ++
4407  include/linux/vmw_vmci_defs.h                      |   43 +-
4408  lib/devres.c                                       |    2 +-
4409  scripts/ver_linux                                  |    2 +-
4410  tools/hv/Makefile                                  |    2 +
4411  127 files changed, 5657 insertions(+), 3500 deletions(-)
4412  create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt
4413  create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt
4414  create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt
4415  create mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt
4416  delete mode 100644 drivers/misc/mei/wd.c
4417  create mode 100644 drivers/misc/mic/bus/vop_bus.c
4418  create mode 100644 drivers/misc/mic/bus/vop_bus.h
4419  delete mode 100644 drivers/misc/mic/card/mic_virtio.c
4420  delete mode 100644 drivers/misc/mic/card/mic_virtio.h
4421  delete mode 100644 drivers/misc/mic/host/mic_fops.c
4422  delete mode 100644 drivers/misc/mic/host/mic_fops.h
4423  delete mode 100644 drivers/misc/mic/host/mic_virtio.c
4424  create mode 100644 drivers/misc/mic/vop/Makefile
4425  create mode 100644 drivers/misc/mic/vop/vop_debugfs.c
4426  create mode 100644 drivers/misc/mic/vop/vop_main.c
4427  rename drivers/misc/mic/{host/mic_virtio.h => vop/vop_main.h} (58%)
4428  create mode 100644 drivers/misc/mic/vop/vop_vringh.c
4429  create mode 100644 drivers/nvmem/lpc18xx_eeprom.c
4430  create mode 100644 drivers/nvmem/mtk-efuse.c
4431  create mode 100644 drivers/watchdog/mei_wdt.c
4432 Merging extcon/extcon-next (0331966df0a2 arm: boot: beaglex15: pass correct interrupt)
4433 $ git merge extcon/extcon-next
4434 Merge made by the 'recursive' strategy.
4435  arch/arm/boot/dts/am57xx-beagle-x15.dts |  3 +-
4436  drivers/extcon/extcon-arizona.c         |  4 +--
4437  drivers/extcon/extcon-gpio.c            |  2 +-
4438  drivers/extcon/extcon-max14577.c        |  3 ++
4439  drivers/extcon/extcon-max77693.c        | 12 +++++++-
4440  drivers/extcon/extcon-max77843.c        |  5 +++-
4441  drivers/extcon/extcon-max8997.c         |  3 ++
4442  drivers/extcon/extcon-palmas.c          | 50 +++++++++++++++++++++++++++++++++
4443  drivers/extcon/extcon-rt8973a.c         |  8 ++++--
4444  drivers/extcon/extcon-sm5502.c          |  8 ++++--
4445  include/linux/mfd/palmas.h              |  3 ++
4446  11 files changed, 90 insertions(+), 11 deletions(-)
4447 Merging cgroup/for-next (9a2ddda572a0 Documentation: cgroup: Fix 'cgroup-legacy' -> 'cgroup-v1')
4448 $ git merge cgroup/for-next
4449 Already up-to-date.
4450 Merging scsi/for-next (1440a6835981 Merge branch 'misc' into for-next)
4451 $ git merge scsi/for-next
4452 Auto-merging block/blk-core.c
4453 Merge made by the 'recursive' strategy.
4454  .../devicetree/bindings/scsi/hisilicon-sas.txt     |   21 +-
4455  block/blk-core.c                                   |    6 +-
4456  drivers/scsi/aacraid/aachba.c                      |   27 +-
4457  drivers/scsi/aacraid/aacraid.h                     |   14 +-
4458  drivers/scsi/aacraid/commctrl.c                    |   13 +-
4459  drivers/scsi/aacraid/comminit.c                    |    6 +-
4460  drivers/scsi/aacraid/commsup.c                     |   69 +-
4461  drivers/scsi/aacraid/dpcsup.c                      |    2 -
4462  drivers/scsi/aacraid/linit.c                       |  199 +-
4463  drivers/scsi/aacraid/src.c                         |   30 +-
4464  drivers/scsi/be2iscsi/be.h                         |   20 +-
4465  drivers/scsi/be2iscsi/be_cmds.c                    |  867 ++++----
4466  drivers/scsi/be2iscsi/be_cmds.h                    |  148 +-
4467  drivers/scsi/be2iscsi/be_iscsi.c                   |   62 +-
4468  drivers/scsi/be2iscsi/be_main.c                    |  297 +--
4469  drivers/scsi/be2iscsi/be_main.h                    |   25 +-
4470  drivers/scsi/be2iscsi/be_mgmt.c                    |  573 ++---
4471  drivers/scsi/be2iscsi/be_mgmt.h                    |    2 +
4472  drivers/scsi/bfa/bfa_ioc.c                         |    2 +-
4473  drivers/scsi/bnx2fc/bnx2fc_fcoe.c                  |    9 +
4474  drivers/scsi/bnx2fc/bnx2fc_io.c                    |    5 +-
4475  drivers/scsi/device_handler/scsi_dh_rdac.c         |    4 +-
4476  drivers/scsi/hisi_sas/Kconfig                      |    2 +-
4477  drivers/scsi/hisi_sas/Makefile                     |    2 +-
4478  drivers/scsi/hisi_sas/hisi_sas.h                   |   41 +-
4479  drivers/scsi/hisi_sas/hisi_sas_main.c              |   77 +-
4480  drivers/scsi/hisi_sas/hisi_sas_v1_hw.c             |   96 +-
4481  drivers/scsi/hisi_sas/hisi_sas_v2_hw.c             | 2205 ++++++++++++++++++++
4482  drivers/scsi/hosts.c                               |   22 +-
4483  drivers/scsi/megaraid/megaraid_sas.h               |  338 ++-
4484  drivers/scsi/megaraid/megaraid_sas_base.c          | 1044 +++++----
4485  drivers/scsi/megaraid/megaraid_sas_fp.c            |    2 +
4486  drivers/scsi/megaraid/megaraid_sas_fusion.c        | 1244 ++++++++---
4487  drivers/scsi/megaraid/megaraid_sas_fusion.h        |  136 +-
4488  drivers/scsi/qla2xxx/qla_attr.c                    |   22 +-
4489  drivers/scsi/qla2xxx/qla_bsg.c                     |  201 ++
4490  drivers/scsi/qla2xxx/qla_bsg.h                     |   34 +
4491  drivers/scsi/qla2xxx/qla_dbg.c                     |  146 +-
4492  drivers/scsi/qla2xxx/qla_def.h                     |   56 +-
4493  drivers/scsi/qla2xxx/qla_fw.h                      |   14 +-
4494  drivers/scsi/qla2xxx/qla_gbl.h                     |    2 +
4495  drivers/scsi/qla2xxx/qla_init.c                    |  119 +-
4496  drivers/scsi/qla2xxx/qla_inline.h                  |    4 +-
4497  drivers/scsi/qla2xxx/qla_isr.c                     |    4 -
4498  drivers/scsi/qla2xxx/qla_mbx.c                     |   27 +-
4499  drivers/scsi/qla2xxx/qla_os.c                      |   10 +
4500  drivers/scsi/qla2xxx/qla_sup.c                     |   70 +-
4501  drivers/scsi/qla2xxx/qla_version.h                 |    2 +-
4502  drivers/scsi/scsi_devinfo.c                        |    1 +
4503  drivers/scsi/scsi_scan.c                           |   12 +-
4504  drivers/scsi/scsi_transport_iscsi.c                |    2 +
4505  drivers/scsi/sd.c                                  |    4 +-
4506  drivers/scsi/storvsc_drv.c                         |   16 +-
4507  include/linux/blkdev.h                             |    9 +-
4508  include/scsi/iscsi_if.h                            |    2 +
4509  include/scsi/scsi_device.h                         |    1 +
4510  56 files changed, 6345 insertions(+), 2023 deletions(-)
4511  create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
4512 Merging target-updates/for-next (fab683eb12e7 scsi: qla2xxxx: avoid type mismatch in comparison)
4513 $ git merge target-updates/for-next
4514 Already up-to-date.
4515 Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2)
4516 $ git merge target-merge/for-next-merge
4517 Already up-to-date.
4518 Merging pinctrl/for-next (45d1df700a55 Merge branch 'devel' into for-next)
4519 $ git merge pinctrl/for-next
4520 Auto-merging drivers/pinctrl/tegra/pinctrl-tegra.c
4521 Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c
4522 Merge made by the 'recursive' strategy.
4523  .../bindings/gpio/microchip,pic32-gpio.txt         |   49 +
4524  .../bindings/pinctrl/microchip,pic32-pinctrl.txt   |   60 +
4525  .../bindings/pinctrl/st,stm32-pinctrl.txt          |  126 ++
4526  arch/arm/boot/dts/mt2701-pinfunc.h                 |  735 +++++++
4527  drivers/pinctrl/Kconfig                            |   50 +-
4528  drivers/pinctrl/Makefile                           |   14 +-
4529  drivers/pinctrl/freescale/pinctrl-imx.c            |   26 +
4530  drivers/pinctrl/mediatek/Kconfig                   |    6 +
4531  drivers/pinctrl/mediatek/Makefile                  |    1 +
4532  drivers/pinctrl/mediatek/pinctrl-mt2701.c          |  586 +++++
4533  drivers/pinctrl/mediatek/pinctrl-mt8127.c          |    8 +-
4534  drivers/pinctrl/mediatek/pinctrl-mt8135.c          |    8 +-
4535  drivers/pinctrl/mediatek/pinctrl-mt8173.c          |    8 +-
4536  drivers/pinctrl/mediatek/pinctrl-mtk-common.c      |   52 +
4537  drivers/pinctrl/mediatek/pinctrl-mtk-common.h      |   12 +-
4538  drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h      | 2323 ++++++++++++++++++++
4539  drivers/pinctrl/nomadik/pinctrl-abx500.c           |    5 +-
4540  drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c  |    7 +
4541  drivers/pinctrl/pinctrl-pic32.c                    | 2312 +++++++++++++++++++
4542  drivers/pinctrl/pinctrl-pic32.h                    |  141 ++
4543  drivers/pinctrl/pinctrl-st.c                       |    1 +
4544  drivers/pinctrl/pxa/pinctrl-pxa2xx.c               |    1 +
4545  drivers/pinctrl/qcom/pinctrl-spmi-mpp.c            |   30 +-
4546  drivers/pinctrl/stm32/Kconfig                      |   16 +
4547  drivers/pinctrl/stm32/Makefile                     |    5 +
4548  drivers/pinctrl/stm32/pinctrl-stm32.c              |  829 +++++++
4549  drivers/pinctrl/stm32/pinctrl-stm32.h              |   51 +
4550  drivers/pinctrl/stm32/pinctrl-stm32f429.c          | 1598 ++++++++++++++
4551  drivers/pinctrl/sunxi/Kconfig                      |   30 +-
4552  drivers/pinctrl/sunxi/Makefile                     |    2 +-
4553  drivers/pinctrl/tegra/Kconfig                      |   30 +
4554  drivers/pinctrl/tegra/Makefile                     |    7 +
4555  drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c   |    4 +-
4556  drivers/pinctrl/{ => tegra}/pinctrl-tegra.c        |    4 +-
4557  drivers/pinctrl/{ => tegra}/pinctrl-tegra.h        |    0
4558  drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c     |    0
4559  drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c     |    0
4560  drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c      |    0
4561  drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c     |    0
4562  drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c      |    0
4563  40 files changed, 9043 insertions(+), 94 deletions(-)
4564  create mode 100644 Documentation/devicetree/bindings/gpio/microchip,pic32-gpio.txt
4565  create mode 100644 Documentation/devicetree/bindings/pinctrl/microchip,pic32-pinctrl.txt
4566  create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-pinctrl.txt
4567  create mode 100644 arch/arm/boot/dts/mt2701-pinfunc.h
4568  create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt2701.c
4569  create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt2701.h
4570  create mode 100644 drivers/pinctrl/pinctrl-pic32.c
4571  create mode 100644 drivers/pinctrl/pinctrl-pic32.h
4572  create mode 100644 drivers/pinctrl/stm32/Kconfig
4573  create mode 100644 drivers/pinctrl/stm32/Makefile
4574  create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.c
4575  create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32.h
4576  create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f429.c
4577  create mode 100644 drivers/pinctrl/tegra/Kconfig
4578  create mode 100644 drivers/pinctrl/tegra/Makefile
4579  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra-xusb.c (99%)
4580  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.c (99%)
4581  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra.h (100%)
4582  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra114.c (100%)
4583  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra124.c (100%)
4584  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra20.c (100%)
4585  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra210.c (100%)
4586  rename drivers/pinctrl/{ => tegra}/pinctrl-tegra30.c (100%)
4587 Merging vhost/linux-next (481eaec37e91 tools/virtio: add ringtest utilities)
4588 $ git merge vhost/linux-next
4589 Already up-to-date.
4590 Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias)
4591 $ git merge remoteproc/for-next
4592 Auto-merging drivers/remoteproc/remoteproc_core.c
4593 Merge made by the 'recursive' strategy.
4594  drivers/remoteproc/remoteproc_core.c | 4 +++-
4595  drivers/remoteproc/wkup_m3_rproc.c   | 1 +
4596  2 files changed, 4 insertions(+), 1 deletion(-)
4597 Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
4598 $ git merge rpmsg/for-next
4599 Already up-to-date.
4600 Merging gpio/for-next (8d68bb842800 Merge branch 'devel' into for-next)
4601 $ git merge gpio/for-next
4602 Auto-merging MAINTAINERS
4603 Merge made by the 'recursive' strategy.
4604  .../devicetree/bindings/gpio/gpio-ts4800.txt       |  20 +
4605  MAINTAINERS                                        |  12 +
4606  arch/blackfin/kernel/bfin_gpio.c                   |   2 +-
4607  arch/powerpc/sysdev/ppc4xx_gpio.c                  |   2 +-
4608  arch/powerpc/sysdev/simple_gpio.c                  |   2 +-
4609  arch/unicore32/kernel/gpio.c                       |   2 +-
4610  drivers/gpio/Kconfig                               |  37 +-
4611  drivers/gpio/Makefile                              |   3 +
4612  drivers/gpio/gpio-104-dio-48e.c                    | 439 +++++++++++++++++++++
4613  drivers/gpio/gpio-104-idi-48.c                     |   3 +-
4614  drivers/gpio/gpio-altera.c                         |   5 +-
4615  drivers/gpio/gpio-davinci.c                        |   3 +-
4616  drivers/gpio/gpio-f7188x.c                         |  27 +-
4617  drivers/gpio/gpio-mpc8xxx.c                        | 259 +++++-------
4618  drivers/gpio/gpio-ts4800.c                         |  94 +++++
4619  drivers/gpio/gpio-ws16c48.c                        | 436 ++++++++++++++++++++
4620  drivers/soc/fsl/qe/gpio.c                          |   2 +-
4621  17 files changed, 1171 insertions(+), 177 deletions(-)
4622  create mode 100644 Documentation/devicetree/bindings/gpio/gpio-ts4800.txt
4623  create mode 100644 drivers/gpio/gpio-104-dio-48e.c
4624  create mode 100644 drivers/gpio/gpio-ts4800.c
4625  create mode 100644 drivers/gpio/gpio-ws16c48.c
4626 Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1)
4627 $ git merge dma-mapping/dma-mapping-next
4628 Already up-to-date.
4629 Merging pwm/for-next (ff01c944cfa9 pwm: Mark all devices as "might sleep")
4630 $ git merge pwm/for-next
4631 Already up-to-date.
4632 Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8)
4633 $ git merge dma-buf/for-next
4634 Already up-to-date.
4635 Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns)
4636 $ git merge userns/for-next
4637 Already up-to-date.
4638 Merging ktest/for-next (b953c0d234bc Linux 4.1)
4639 $ git merge ktest/for-next
4640 Already up-to-date.
4641 Merging clk/clk-next (7e0810c9485c clk: lpc32xx: add HCLK PLL output configuration)
4642 $ git merge clk/clk-next
4643 Auto-merging include/linux/device.h
4644 Auto-merging drivers/clk/rockchip/clk.c
4645 Auto-merging drivers/clk/rockchip/clk-rk3368.c
4646 Auto-merging drivers/clk/rockchip/clk-rk3036.c
4647 Merge made by the 'recursive' strategy.
4648  .../devicetree/bindings/clock/axi-clkgen.txt       |   5 +-
4649  .../bindings/clock/brcm,iproc-clocks.txt           |   6 +
4650  .../bindings/clock/rockchip,rk3036-cru.txt         |   2 +-
4651  Documentation/devicetree/bindings/clock/xgene.txt  |   2 +
4652  arch/arm/mach-s3c24xx/Kconfig                      |   1 +
4653  drivers/clk/Kconfig                                |  26 ++-
4654  drivers/clk/Makefile                               |   2 +-
4655  drivers/clk/bcm/clk-cygnus.c                       |  59 ++++++
4656  drivers/clk/bcm/clk-iproc-pll.c                    |  41 +++-
4657  drivers/clk/bcm/clk-iproc.h                        |  43 +++-
4658  drivers/clk/clk-axi-clkgen.c                       | 170 ++++------------
4659  drivers/clk/clk-composite.c                        |   2 -
4660  drivers/clk/clk-divider.c                          |  18 +-
4661  drivers/clk/clk-fixed-factor.c                     |  15 +-
4662  drivers/clk/clk-fixed-rate.c                       |  15 +-
4663  drivers/clk/clk-fractional-divider.c               |   2 -
4664  drivers/clk/clk-gate.c                             |   2 -
4665  drivers/clk/clk-gpio.c                             | 167 +++++----------
4666  drivers/clk/clk-multiplier.c                       |   2 -
4667  drivers/clk/clk-mux.c                              |   2 -
4668  drivers/clk/clk-palmas.c                           |  16 +-
4669  drivers/clk/clk-s2mps11.c                          | 108 +++-------
4670  drivers/clk/clk-scpi.c                             |   2 +-
4671  drivers/clk/clk-vt8500.c                           | 100 ++++++---
4672  drivers/clk/clk-xgene.c                            | 105 ++++++----
4673  drivers/clk/clk.c                                  | 226 +++++++++------------
4674  drivers/clk/imx/clk-busy.c                         |   4 +-
4675  drivers/clk/imx/clk-fixup-div.c                    |   5 +-
4676  drivers/clk/imx/clk-fixup-mux.c                    |   2 -
4677  drivers/clk/imx/clk-gate-exclusive.c               |   2 +-
4678  drivers/clk/mediatek/clk-gate.c                    |   8 +-
4679  drivers/clk/mediatek/clk-gate.h                    |   2 +-
4680  drivers/clk/mediatek/clk-mtk.c                     |   6 +-
4681  drivers/clk/meson/clkc.c                           |   2 +-
4682  drivers/clk/mvebu/common.c                         |   2 -
4683  drivers/clk/mvebu/dove-divider.c                   |   2 +-
4684  drivers/clk/mvebu/kirkwood.c                       |   2 -
4685  drivers/clk/mxs/clk-div.c                          |   2 +-
4686  drivers/clk/nxp/clk-lpc18xx-ccu.c                  |   4 +-
4687  drivers/clk/nxp/clk-lpc32xx.c                      |  10 +-
4688  drivers/clk/qcom/common.c                          |  17 +-
4689  drivers/clk/qcom/gcc-msm8916.c                     |  18 ++
4690  drivers/clk/rockchip/clk-rk3036.c                  |  26 +--
4691  drivers/clk/rockchip/clk-rk3368.c                  |  26 +--
4692  drivers/clk/rockchip/clk.c                         |   4 +-
4693  drivers/clk/samsung/Kconfig                        |   1 -
4694  drivers/clk/socfpga/clk-pll-a10.c                  |   2 +-
4695  drivers/clk/st/clkgen-fsyn.c                       |   8 +-
4696  drivers/clk/st/clkgen-mux.c                        |   9 +-
4697  drivers/clk/ti/composite.c                         |   2 -
4698  drivers/clk/ti/divider.c                           |   2 -
4699  drivers/clk/ti/gate.c                              |   2 -
4700  drivers/clk/ti/mux.c                               |   2 -
4701  drivers/clk/versatile/clk-icst.c                   |   3 +
4702  include/dt-bindings/clock/bcm-cygnus.h             |   6 +
4703  include/dt-bindings/clock/lpc32xx-clock.h          |   1 +
4704  include/dt-bindings/clock/qcom,gcc-msm8916.h       |   1 +
4705  include/linux/clk-provider.h                       |  28 ++-
4706  include/linux/device.h                             |  12 ++
4707  59 files changed, 688 insertions(+), 674 deletions(-)
4708 Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
4709 $ git merge random/dev
4710 Already up-to-date.
4711 Merging aio/master (fb2e69217129 aio: Fix compile error due to unexpected use of cmpxchg())
4712 $ git merge aio/master
4713 Auto-merging net/unix/af_unix.c
4714 Auto-merging net/sctp/socket.c
4715 Auto-merging net/core/stream.c
4716 Auto-merging net/atm/common.c
4717 Auto-merging mm/readahead.c
4718 Auto-merging mm/internal.h
4719 Auto-merging mm/filemap.c
4720 Auto-merging kernel/sysctl.c
4721 Auto-merging kernel/signal.c
4722 Auto-merging kernel/auditsc.c
4723 Auto-merging init/Kconfig
4724 Auto-merging include/linux/sched.h
4725 Auto-merging include/linux/fs.h
4726 Auto-merging fs/splice.c
4727 Auto-merging fs/read_write.c
4728 Auto-merging fs/pipe.c
4729 Auto-merging fs/namei.c
4730 Auto-merging fs/internal.h
4731 Auto-merging fs/attr.c
4732 Merge made by the 'recursive' strategy.
4733  drivers/gpu/drm/drm_lock.c     |   2 +-
4734  drivers/gpu/drm/ttm/ttm_lock.c |   6 +-
4735  fs/aio.c                       | 729 ++++++++++++++++++++++++++++++++++++++---
4736  fs/attr.c                      |   2 +-
4737  fs/binfmt_flat.c               |   2 +-
4738  fs/fuse/dev.c                  |   2 +-
4739  fs/internal.h                  |   6 +
4740  fs/namei.c                     |   2 +-
4741  fs/pipe.c                      |   4 +-
4742  fs/read_write.c                |   5 +-
4743  fs/splice.c                    |   8 +-
4744  include/linux/aio.h            |   9 +
4745  include/linux/fs.h             |   3 +
4746  include/linux/sched.h          |   6 +
4747  include/uapi/linux/aio_abi.h   |  15 +-
4748  init/Kconfig                   |  13 +
4749  kernel/auditsc.c               |   6 +-
4750  kernel/signal.c                |  20 ++
4751  kernel/sysctl.c                |   9 +
4752  mm/filemap.c                   |   6 +-
4753  mm/internal.h                  |   4 +-
4754  mm/readahead.c                 |  13 +-
4755  net/atm/common.c               |   4 +-
4756  net/ax25/af_ax25.c             |   2 +-
4757  net/caif/caif_socket.c         |   2 +-
4758  net/core/stream.c              |   2 +-
4759  net/decnet/af_decnet.c         |   2 +-
4760  net/irda/af_irda.c             |   4 +-
4761  net/netrom/af_netrom.c         |   2 +-
4762  net/rose/af_rose.c             |   2 +-
4763  net/sctp/socket.c              |   2 +-
4764  net/unix/af_unix.c             |   4 +-
4765  net/x25/af_x25.c               |   2 +-
4766  33 files changed, 819 insertions(+), 81 deletions(-)
4767 $ git reset --hard HEAD^
4768 HEAD is now at f5285635e017 Merge remote-tracking branch 'clk/clk-next'
4769 Merging next-20160111 version of aio
4770 $ git merge -m next-20160111/aio 6a81013efc4013555c5de34c01530b805f45c92c
4771 Auto-merging net/unix/af_unix.c
4772 Auto-merging net/sctp/socket.c
4773 Auto-merging net/core/stream.c
4774 Auto-merging net/atm/common.c
4775 Auto-merging mm/filemap.c
4776 Auto-merging kernel/sysctl.c
4777 Auto-merging kernel/signal.c
4778 Auto-merging kernel/auditsc.c
4779 Auto-merging init/Kconfig
4780 Auto-merging include/linux/sched.h
4781 Auto-merging include/linux/fs.h
4782 Auto-merging fs/splice.c
4783 Auto-merging fs/read_write.c
4784 Auto-merging fs/pipe.c
4785 Auto-merging fs/internal.h
4786 Auto-merging fs/attr.c
4787 Merge made by the 'recursive' strategy.
4788  drivers/gpu/drm/drm_lock.c     |   2 +-
4789  drivers/gpu/drm/ttm/ttm_lock.c |   6 +-
4790  fs/aio.c                       | 382 ++++++++++++++++++++++++++++++++++++++---
4791  fs/attr.c                      |   2 +-
4792  fs/binfmt_flat.c               |   2 +-
4793  fs/fuse/dev.c                  |   2 +-
4794  fs/internal.h                  |   6 +
4795  fs/pipe.c                      |   4 +-
4796  fs/read_write.c                |   5 +-
4797  fs/splice.c                    |   8 +-
4798  include/linux/aio.h            |   8 +
4799  include/linux/fs.h             |   2 +
4800  include/linux/sched.h          |   6 +
4801  include/uapi/linux/aio_abi.h   |   2 +-
4802  init/Kconfig                   |  13 ++
4803  kernel/auditsc.c               |   6 +-
4804  kernel/signal.c                |  20 +++
4805  kernel/sysctl.c                |   9 +
4806  mm/filemap.c                   |   6 +-
4807  net/atm/common.c               |   4 +-
4808  net/ax25/af_ax25.c             |   2 +-
4809  net/caif/caif_socket.c         |   2 +-
4810  net/core/stream.c              |   2 +-
4811  net/decnet/af_decnet.c         |   2 +-
4812  net/irda/af_irda.c             |   4 +-
4813  net/netrom/af_netrom.c         |   2 +-
4814  net/rose/af_rose.c             |   2 +-
4815  net/sctp/socket.c              |   2 +-
4816  net/unix/af_unix.c             |   4 +-
4817  net/x25/af_x25.c               |   2 +-
4818  30 files changed, 455 insertions(+), 64 deletions(-)
4819 Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
4820 $ git merge llvmlinux/for-next
4821 Merge made by the 'recursive' strategy.
4822 Merging kselftest/next (92e963f50fc7 Linux 4.5-rc1)
4823 $ git merge kselftest/next
4824 Already up-to-date.
4825 Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval')
4826 $ git merge y2038/y2038
4827 Merge made by the 'recursive' strategy.
4828  drivers/scsi/qla2xxx/qla_mr.c | 5 ++---
4829  fs/afs/main.c                 | 6 ++----
4830  2 files changed, 4 insertions(+), 7 deletions(-)
4831 Merging luto-misc/next (afd2ff9b7e1b Linux 4.4)
4832 $ git merge luto-misc/next
4833 Already up-to-date.
4834 Merging borntraeger/linux-next (36f90b0a2ddd Linux 4.5-rc2)
4835 $ git merge borntraeger/linux-next
4836 Already up-to-date.
4837 Merging livepatching/for-next (03f726f415f5 Merge branch 'for-4.5/upstream-fixes' into for-next)
4838 $ git merge livepatching/for-next
4839 Merge made by the 'recursive' strategy.
4840  arch/s390/include/asm/livepatch.h | 2 +-
4841  arch/x86/include/asm/livepatch.h  | 2 +-
4842  2 files changed, 2 insertions(+), 2 deletions(-)
4843 Merging coresight/next (37fe87dbde16 coresight: implementing 'cpu_id()' API)
4844 $ git merge coresight/next
4845 Auto-merging drivers/hwtracing/coresight/coresight-tmc.c
4846 Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c
4847 Merge made by the 'recursive' strategy.
4848  drivers/hwtracing/coresight/coresight-etm4x.c | 2 +-
4849  drivers/hwtracing/coresight/coresight-tmc.c   | 4 ++--
4850  drivers/hwtracing/coresight/of_coresight.c    | 2 +-
4851  3 files changed, 4 insertions(+), 4 deletions(-)
4852 Merging rtc/rtc-next (9d4be765c76d drivers: rtc: allow compilation of sun6i RTC for all sunxi SoCs)
4853 $ git merge rtc/rtc-next
4854 Auto-merging drivers/rtc/rtc-rx8025.c
4855 Merge made by the 'recursive' strategy.
4856  .../devicetree/bindings/rtc/epson,rx6110.txt       |  39 ++
4857  drivers/rtc/Kconfig                                |  27 +-
4858  drivers/rtc/Makefile                               |   1 +
4859  drivers/rtc/rtc-ds1305.c                           |   4 +-
4860  drivers/rtc/rtc-ds1307.c                           | 117 +++++-
4861  drivers/rtc/rtc-pcf2123.c                          | 214 +++++++----
4862  drivers/rtc/rtc-rx6110.c                           | 402 +++++++++++++++++++++
4863  drivers/rtc/rtc-rx8025.c                           |   1 -
4864  8 files changed, 719 insertions(+), 86 deletions(-)
4865  create mode 100644 Documentation/devicetree/bindings/rtc/epson,rx6110.txt
4866  create mode 100644 drivers/rtc/rtc-rx6110.c
4867 Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field)
4868 $ git merge hwspinlock/for-next
4869 Already up-to-date.
4870 Merging nvdimm/libnvdimm-for-next (36f90b0a2ddd Linux 4.5-rc2)
4871 $ git merge nvdimm/libnvdimm-for-next
4872 Already up-to-date.
4873 Merging akpm-current/current (234d02a19863 ipc/msg.c: use freezable blocking call)
4874 $ git merge --no-ff akpm-current/current
4875 Resolved 'fs/ocfs2/aops.c' using previous resolution.
4876 Auto-merging scripts/link-vmlinux.sh
4877 Auto-merging net/sctp/socket.c
4878 Auto-merging mm/memory_hotplug.c
4879 Auto-merging mm/memory.c
4880 Auto-merging mm/huge_memory.c
4881 Auto-merging mm/filemap.c
4882 Auto-merging lib/Kconfig.debug
4883 Auto-merging kernel/time/hrtimer.c
4884 Auto-merging kernel/signal.c
4885 Auto-merging kernel/rcu/Makefile
4886 Auto-merging kernel/profile.c
4887 Auto-merging kernel/memremap.c
4888 Auto-merging kernel/kexec_file.c
4889 Auto-merging kernel/kexec_core.c
4890 Auto-merging kernel/auditsc.c
4891 Auto-merging init/main.c
4892 Auto-merging init/Kconfig
4893 Removing include/trace/events/gfpflags.h
4894 Auto-merging include/linux/sched.h
4895 Auto-merging include/linux/mm.h
4896 Auto-merging fs/xfs/xfs_aops.c
4897 Auto-merging fs/ocfs2/quota_global.c
4898 Auto-merging fs/ocfs2/ocfs2_trace.h
4899 Auto-merging fs/ocfs2/aops.c
4900 CONFLICT (content): Merge conflict in fs/ocfs2/aops.c
4901 Auto-merging fs/ext4/dir.c
4902 Auto-merging drivers/xen/balloon.c
4903 Auto-merging drivers/usb/common/common.c
4904 Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h
4905 Auto-merging drivers/rapidio/rio.c
4906 Auto-merging drivers/net/wireless/marvell/mwifiex/debugfs.c
4907 Auto-merging drivers/media/platform/coda/coda-bit.c
4908 Auto-merging drivers/gpu/host1x/job.c
4909 Auto-merging drivers/firmware/efi/efivars.c
4910 Auto-merging arch/x86/mm/pageattr.c
4911 Auto-merging arch/x86/kernel/cpu/Makefile
4912 Auto-merging arch/x86/Kconfig
4913 Removing arch/s390/mm/extable.c
4914 Auto-merging arch/powerpc/Kconfig
4915 Auto-merging arch/mips/Kconfig
4916 Auto-merging arch/arm/Kconfig
4917 Removing arch/alpha/mm/extable.c
4918 Auto-merging Documentation/kernel-parameters.txt
4919 Auto-merging Documentation/cgroup-v2.txt
4920 Automatic merge failed; fix conflicts and then commit the result.
4921 $ git commit -v -a
4922 [master 74256136ec77] Merge branch 'akpm-current/current'
4923 $ git diff -M --stat --summary HEAD^..
4924  Documentation/blockdev/zram.txt                    |   10 +
4925  Documentation/cgroup-v2.txt                        |   19 +
4926  .../filesystems/ocfs2-online-filecheck.txt         |   94 +
4927  Documentation/kcov.txt                             |  111 +
4928  Documentation/kernel-parameters.txt                |   17 +-
4929  Documentation/memory-hotplug.txt                   |   23 +-
4930  Documentation/printk-formats.txt                   |   18 +
4931  Documentation/rapidio/mport_cdev.txt               |  104 +
4932  Documentation/rapidio/tsi721.txt                   |    9 +
4933  Documentation/vm/ksm.txt                           |   63 +
4934  Documentation/vm/page_owner.txt                    |    9 +-
4935  Makefile                                           |   11 +-
4936  arch/Kconfig                                       |    4 +
4937  arch/alpha/include/asm/uaccess.h                   |   10 +-
4938  arch/alpha/mm/Makefile                             |    2 +-
4939  arch/alpha/mm/extable.c                            |   92 -
4940  arch/arm/Kconfig                                   |    1 +
4941  arch/arm/include/asm/page.h                        |    2 +
4942  arch/arm/kernel/smp.c                              |    2 +
4943  arch/arm/mach-lpc32xx/phy3250.c                    |   13 +-
4944  arch/arm/mach-netx/fb.c                            |   14 +-
4945  arch/arm/mach-nspire/clcd.c                        |   13 +-
4946  arch/arm/mm/mmap.c                                 |    2 +-
4947  arch/arm64/include/asm/assembler.h                 |   15 +-
4948  arch/arm64/include/asm/futex.h                     |   12 +-
4949  arch/arm64/include/asm/uaccess.h                   |   30 +-
4950  arch/arm64/include/asm/word-at-a-time.h            |    7 +-
4951  arch/arm64/kernel/armv8_deprecated.c               |    7 +-
4952  arch/arm64/mm/extable.c                            |    2 +-
4953  arch/arm64/mm/mmap.c                               |    4 +-
4954  arch/avr32/Kconfig                                 |    1 +
4955  arch/blackfin/Kconfig                              |    1 +
4956  arch/cris/Kconfig                                  |    1 +
4957  arch/ia64/include/asm/uaccess.h                    |    8 +-
4958  arch/ia64/mm/extable.c                             |   97 +-
4959  arch/m32r/mm/init.c                                |   27 +-
4960  arch/mips/Kconfig                                  |    1 +
4961  arch/mips/mm/mmap.c                                |    4 +-
4962  arch/powerpc/Kconfig                               |    1 +
4963  arch/powerpc/kernel/process.c                      |    4 +-
4964  arch/powerpc/kernel/rtasd.c                        |    9 +-
4965  arch/powerpc/mm/mmap.c                             |    4 +-
4966  arch/powerpc/platforms/pseries/hotplug-cpu.c       |   10 +-
4967  arch/powerpc/sysdev/fsl_rio.c                      |   18 +-
4968  arch/s390/Kconfig                                  |    1 +
4969  arch/s390/include/asm/uaccess.h                    |    8 +-
4970  arch/s390/kernel/dumpstack.c                       |    6 +-
4971  arch/s390/kernel/time.c                            |    8 +-
4972  arch/s390/kernel/topology.c                        |    7 +-
4973  arch/s390/mm/Makefile                              |    2 +-
4974  arch/s390/mm/extable.c                             |   85 -
4975  arch/s390/mm/vmem.c                                |   10 +-
4976  arch/sh/Kconfig                                    |    1 +
4977  arch/sparc/Kconfig                                 |    1 +
4978  arch/sparc/include/asm/compat.h                    |    7 +
4979  arch/sparc/include/asm/syscall.h                   |    9 +-
4980  arch/sparc/kernel/sys_sparc_64.c                   |    2 +-
4981  arch/tile/Kconfig                                  |    1 +
4982  arch/tile/mm/init.c                                |   11 +-
4983  arch/x86/Kconfig                                   |    8 +-
4984  arch/x86/boot/Makefile                             |    6 +
4985  arch/x86/boot/compressed/Makefile                  |    2 +
4986  arch/x86/entry/vdso/Makefile                       |    2 +
4987  arch/x86/include/asm/compat.h                      |    3 +-
4988  arch/x86/include/asm/ftrace.h                      |    2 +-
4989  arch/x86/include/asm/uaccess.h                     |    5 +-
4990  arch/x86/kernel/Makefile                           |    5 +
4991  arch/x86/kernel/aperture_64.c                      |   12 +-
4992  arch/x86/kernel/apic/Makefile                      |    4 +
4993  arch/x86/kernel/apic/hw_nmi.c                      |    1 -
4994  arch/x86/kernel/cpu/Makefile                       |    4 +
4995  arch/x86/kernel/dumpstack.c                        |    5 +-
4996  arch/x86/kernel/machine_kexec_64.c                 |   46 +
4997  arch/x86/kernel/process_64.c                       |    2 +-
4998  arch/x86/lib/Makefile                              |    3 +
4999  arch/x86/mm/Makefile                               |    3 +
5000  arch/x86/mm/extable.c                              |  106 +-
5001  arch/x86/mm/init.c                                 |   36 +-
5002  arch/x86/mm/mmap.c                                 |    6 +-
5003  arch/x86/mm/pageattr.c                             |   14 +-
5004  arch/x86/realmode/rm/Makefile                      |    2 +
5005  block/genhd.c                                      |    2 +-
5006  block/partition-generic.c                          |   11 +
5007  drivers/ata/pata_hpt366.c                          |   13 +-
5008  drivers/base/memory.c                              |   34 +-
5009  drivers/base/property.c                            |   12 +-
5010  drivers/block/zram/zcomp.c                         |   24 +
5011  drivers/block/zram/zcomp.h                         |    2 +
5012  drivers/block/zram/zram_drv.c                      |    7 +-
5013  drivers/char/random.c                              |   22 +
5014  drivers/dma/iop-adma.c                             |    8 +-
5015  drivers/dma/mv_xor.c                               |    4 +-
5016  drivers/dma/qcom_bam_dma.c                         |   14 +-
5017  drivers/firewire/core-cdev.c                       |    4 +-
5018  drivers/firmware/efi/efivars.c                     |    2 +-
5019  drivers/firmware/efi/libstub/Makefile              |    2 +
5020  drivers/gpu/drm/amd/amdkfd/kfd_chardev.c           |    2 +-
5021  drivers/gpu/drm/amd/amdkfd/kfd_process.c           |    2 +-
5022  drivers/gpu/drm/drm_edid_load.c                    |   17 +-
5023  drivers/gpu/drm/drm_gem_cma_helper.c               |   13 +-
5024  drivers/gpu/drm/etnaviv/etnaviv_gpu.c              |    8 +-
5025  drivers/gpu/drm/omapdrm/omap_dmm_tiler.c           |   13 +-
5026  drivers/gpu/drm/omapdrm/omap_gem.c                 |    8 +-
5027  drivers/gpu/drm/sti/sti_cursor.c                   |   20 +-
5028  drivers/gpu/drm/sti/sti_gdp.c                      |    3 +-
5029  drivers/gpu/drm/sti/sti_hqvdp.c                    |    6 +-
5030  drivers/gpu/drm/tegra/gem.c                        |   11 +-
5031  drivers/gpu/drm/vc4/vc4_bo.c                       |    5 +-
5032  drivers/gpu/host1x/cdma.c                          |    8 +-
5033  drivers/gpu/host1x/job.c                           |   10 +-
5034  drivers/hid/uhid.c                                 |    2 +-
5035  drivers/ide/hpt366.c                               |    9 +-
5036  drivers/input/input-compat.h                       |   12 +-
5037  drivers/media/platform/coda/coda-bit.c             |   10 +-
5038  drivers/net/rionet.c                               |  277 +-
5039  drivers/net/wireless/marvell/mwifiex/debugfs.c     |   10 +-
5040  drivers/pinctrl/pinmux.c                           |   13 +-
5041  drivers/power/ab8500_btemp.c                       |   15 +-
5042  drivers/power/ab8500_charger.c                     |   16 +-
5043  drivers/power/ab8500_fg.c                          |   15 +-
5044  drivers/power/abx500_chargalg.c                    |   14 +-
5045  drivers/power/charger-manager.c                    |   27 +-
5046  drivers/rapidio/Kconfig                            |    8 +
5047  drivers/rapidio/devices/Makefile                   |    1 +
5048  drivers/rapidio/devices/rio_mport_cdev.c           | 2711 ++++++++++++++++++++
5049  drivers/rapidio/devices/tsi721.c                   | 1034 +++++---
5050  drivers/rapidio/devices/tsi721.h                   |   87 +-
5051  drivers/rapidio/devices/tsi721_dma.c               |  397 ++-
5052  drivers/rapidio/rio-driver.c                       |   12 +
5053  drivers/rapidio/rio-scan.c                         |  135 +-
5054  drivers/rapidio/rio.c                              |  433 +++-
5055  drivers/rapidio/rio.h                              |    5 +
5056  .../staging/lustre/lustre/llite/llite_internal.h   |    2 +-
5057  drivers/usb/common/common.c                        |   22 +-
5058  drivers/video/fbdev/acornfb.c                      |    4 +-
5059  drivers/video/fbdev/amba-clcd-versatile.c          |   14 +-
5060  drivers/video/fbdev/amba-clcd.c                    |    4 +-
5061  drivers/video/fbdev/atmel_lcdfb.c                  |    9 +-
5062  drivers/video/fbdev/ep93xx-fb.c                    |    8 +-
5063  drivers/video/fbdev/gbefb.c                        |    8 +-
5064  drivers/video/fbdev/imxfb.c                        |   12 +-
5065  drivers/video/fbdev/mx3fb.c                        |    9 +-
5066  drivers/video/fbdev/nuc900fb.c                     |    8 +-
5067  drivers/video/fbdev/omap/lcdc.c                    |   16 +-
5068  drivers/video/fbdev/pxa168fb.c                     |    8 +-
5069  drivers/video/fbdev/pxafb.c                        |    4 +-
5070  drivers/video/fbdev/s3c-fb.c                       |    7 +-
5071  drivers/video/fbdev/s3c2410fb.c                    |    8 +-
5072  drivers/video/fbdev/sa1100fb.c                     |    8 +-
5073  drivers/xen/Kconfig                                |   23 +-
5074  drivers/xen/balloon.c                              |   11 +-
5075  fs/autofs4/autofs_i.h                              |   72 +-
5076  fs/autofs4/dev-ioctl.c                             |   57 +-
5077  fs/autofs4/expire.c                                |   84 +-
5078  fs/autofs4/init.c                                  |   10 +-
5079  fs/autofs4/inode.c                                 |   52 +-
5080  fs/autofs4/root.c                                  |  163 +-
5081  fs/autofs4/symlink.c                               |   11 +-
5082  fs/autofs4/waitq.c                                 |   78 +-
5083  fs/binfmt_elf.c                                    |    2 +-
5084  fs/btrfs/tests/btrfs-tests.c                       |    3 +-
5085  fs/buffer.c                                        |   24 +-
5086  fs/cifs/cifs_debug.c                               |   56 +-
5087  fs/cifs/cifs_debug.h                               |    2 +-
5088  fs/cifs/cifsfs.c                                   |    6 +-
5089  fs/cifs/cifsglob.h                                 |    4 +-
5090  fs/ext4/dir.c                                      |    2 +-
5091  fs/ext4/fsync.c                                    |    5 +-
5092  fs/mpage.c                                         |    3 +-
5093  fs/ocfs2/Makefile                                  |    3 +-
5094  fs/ocfs2/alloc.c                                   |  105 +-
5095  fs/ocfs2/aops.c                                    | 1146 ++++-----
5096  fs/ocfs2/aops.h                                    |   19 +-
5097  fs/ocfs2/cluster/heartbeat.c                       |  191 +-
5098  fs/ocfs2/dlm/dlmcommon.h                           |   21 +-
5099  fs/ocfs2/dlm/dlmconvert.c                          |   30 +-
5100  fs/ocfs2/dlm/dlmdomain.c                           |   11 +-
5101  fs/ocfs2/dlm/dlmmaster.c                           |  124 +-
5102  fs/ocfs2/dlm/dlmrecovery.c                         |   33 +-
5103  fs/ocfs2/dlm/dlmthread.c                           |    7 +
5104  fs/ocfs2/file.c                                    |  165 +-
5105  fs/ocfs2/filecheck.c                               |  605 +++++
5106  fs/ocfs2/filecheck.h                               |   48 +
5107  fs/ocfs2/inode.c                                   |  203 +-
5108  fs/ocfs2/inode.h                                   |    9 +-
5109  fs/ocfs2/journal.c                                 |    8 +-
5110  fs/ocfs2/localalloc.c                              |    4 +-
5111  fs/ocfs2/mmap.c                                    |    4 +-
5112  fs/ocfs2/ocfs2.h                                   |    8 +
5113  fs/ocfs2/ocfs2_trace.h                             |   18 +-
5114  fs/ocfs2/quota_global.c                            |    2 +-
5115  fs/ocfs2/resize.c                                  |    2 +-
5116  fs/ocfs2/stackglue.c                               |    3 +-
5117  fs/ocfs2/stackglue.h                               |    2 +
5118  fs/ocfs2/super.c                                   |   49 +-
5119  fs/ocfs2/super.h                                   |    2 -
5120  fs/proc/page.c                                     |    8 +-
5121  fs/xfs/xfs_aops.c                                  |   11 +-
5122  include/asm-generic/atomic-long.h                  |    6 +-
5123  include/linux/auto_dev-ioctl.h                     |    6 -
5124  include/linux/auto_fs.h                            |   10 +-
5125  include/linux/buffer_head.h                        |   10 +-
5126  include/linux/compaction.h                         |   16 +
5127  include/linux/compat.h                             |   15 +
5128  include/linux/crc64_ecma.h                         |   56 +
5129  include/linux/dma-mapping.h                        |   25 +-
5130  include/linux/err.h                                |    4 +-
5131  include/linux/fault-inject.h                       |    5 +-
5132  include/linux/gfp.h                                |   45 +-
5133  include/linux/hardirq.h                            |    2 +
5134  include/linux/kcov.h                               |   27 +
5135  include/linux/kernel.h                             |    2 +
5136  include/linux/kexec.h                              |    4 +
5137  include/linux/list_bl.h                            |    4 +-
5138  include/linux/memcontrol.h                         |  147 +-
5139  include/linux/memory.h                             |    3 +
5140  include/linux/memory_hotplug.h                     |    7 +-
5141  include/linux/migrate.h                            |    6 +-
5142  include/linux/mm.h                                 |   41 +-
5143  include/linux/mmdebug.h                            |    3 +-
5144  include/linux/mmzone.h                             |   24 +-
5145  include/linux/oom.h                                |    2 +-
5146  include/linux/page-flags-layout.h                  |    2 +
5147  include/linux/page-flags.h                         |   32 +-
5148  include/linux/page_ext.h                           |    1 +
5149  include/linux/page_owner.h                         |   50 +-
5150  include/linux/pagemap.h                            |    3 +-
5151  include/linux/percpu.h                             |    3 -
5152  include/linux/poison.h                             |    4 +
5153  include/linux/printk.h                             |   12 +-
5154  include/linux/radix-tree.h                         |   27 +-
5155  include/linux/random.h                             |    1 +
5156  include/linux/rio.h                                |   97 +-
5157  include/linux/rio_drv.h                            |   15 +-
5158  include/linux/rio_mport_cdev.h                     |  271 ++
5159  include/linux/rio_regs.h                           |    3 +
5160  include/linux/sched.h                              |   15 +
5161  include/linux/sem.h                                |    1 +
5162  include/linux/slab.h                               |   11 +-
5163  include/linux/slab_def.h                           |    3 +
5164  include/linux/slub_def.h                           |    1 +
5165  include/linux/string.h                             |    9 +-
5166  include/linux/swap.h                               |    1 +
5167  include/linux/tick.h                               |    2 +-
5168  include/linux/trace_events.h                       |   10 -
5169  include/linux/tracepoint-defs.h                    |   14 +-
5170  include/linux/unaligned/access_ok.h                |   24 +-
5171  include/linux/vm_event_item.h                      |    2 +
5172  include/trace/events/btrfs.h                       |    2 +-
5173  include/trace/events/compaction.h                  |   57 +-
5174  include/trace/events/gfpflags.h                    |   43 -
5175  include/trace/events/huge_memory.h                 |   40 +-
5176  include/trace/events/kmem.h                        |    2 +-
5177  include/trace/events/mmflags.h                     |  165 ++
5178  include/trace/events/vmscan.h                      |    2 +-
5179  include/uapi/linux/Kbuild                          |    1 +
5180  include/uapi/linux/auto_fs.h                       |   21 +-
5181  include/uapi/linux/auto_fs4.h                      |   17 +-
5182  include/uapi/linux/byteorder/big_endian.h          |   24 +-
5183  include/uapi/linux/byteorder/little_endian.h       |   24 +-
5184  include/uapi/linux/kcov.h                          |   10 +
5185  include/uapi/linux/swab.h                          |   10 +-
5186  init/Kconfig                                       |   49 +
5187  init/main.c                                        |    5 +-
5188  ipc/msg.c                                          |    5 +-
5189  ipc/sem.c                                          |  124 +-
5190  ipc/shm.c                                          |   53 +-
5191  kernel/Makefile                                    |   12 +
5192  kernel/auditsc.c                                   |    4 +-
5193  kernel/exit.c                                      |    4 +-
5194  kernel/fork.c                                      |   13 +-
5195  kernel/hung_task.c                                 |   21 +-
5196  kernel/kallsyms.c                                  |   42 +-
5197  kernel/kcov.c                                      |  261 ++
5198  kernel/kexec.c                                     |    9 +-
5199  kernel/kexec_core.c                                |    6 +
5200  kernel/kexec_file.c                                |    8 +-
5201  kernel/locking/Makefile                            |    3 +
5202  kernel/memremap.c                                  |    4 +-
5203  kernel/printk/Makefile                             |    1 +
5204  kernel/printk/internal.h                           |   55 +
5205  kernel/printk/nmi.c                                |  222 ++
5206  kernel/printk/printk.c                             |   29 +-
5207  kernel/profile.c                                   |    4 +-
5208  kernel/ptrace.c                                    |    2 +-
5209  kernel/rcu/Makefile                                |    4 +
5210  kernel/sched/Makefile                              |    4 +
5211  kernel/seccomp.c                                   |    4 +-
5212  kernel/signal.c                                    |    4 +
5213  kernel/time/hrtimer.c                              |   10 +-
5214  kernel/time/tick-sched.c                           |   10 +-
5215  kernel/time/timer.c                                |   11 +
5216  lib/Kconfig                                        |    7 +
5217  lib/Kconfig.debug                                  |   21 +
5218  lib/Kconfig.ubsan                                  |    9 +-
5219  lib/Makefile                                       |   13 +
5220  lib/bug.c                                          |   11 +
5221  lib/crc64_ecma.c                                   |  341 +++
5222  lib/extable.c                                      |   50 +-
5223  lib/kstrtox.c                                      |   64 +
5224  lib/nmi_backtrace.c                                |   89 +-
5225  lib/radix-tree.c                                   |  182 +-
5226  lib/string.c                                       |   45 +-
5227  lib/test_printf.c                                  |   53 +
5228  lib/vsprintf.c                                     |  101 +-
5229  mm/Kconfig                                         |    7 +-
5230  mm/Kconfig.debug                                   |   53 +-
5231  mm/Makefile                                        |   20 +-
5232  mm/backing-dev.c                                   |   22 +-
5233  mm/compaction.c                                    |  324 ++-
5234  mm/debug-pagealloc.c                               |  127 +-
5235  mm/debug.c                                         |  165 +-
5236  mm/failslab.c                                      |   12 +-
5237  mm/filemap.c                                       |  169 +-
5238  mm/huge_memory.c                                   |  109 +-
5239  mm/internal.h                                      |   31 +-
5240  mm/kasan/Makefile                                  |    1 +
5241  mm/kmemcheck.c                                     |    3 +
5242  mm/ksm.c                                           |  733 +++++-
5243  mm/madvise.c                                       |   19 +-
5244  mm/memblock.c                                      |   11 +-
5245  mm/memcontrol.c                                    |  223 +-
5246  mm/memory-failure.c                                |    2 -
5247  mm/memory.c                                        |   26 +-
5248  mm/memory_hotplug.c                                |   41 +-
5249  mm/mempolicy.c                                     |    4 +-
5250  mm/migrate.c                                       |   23 +-
5251  mm/mprotect.c                                      |   24 +-
5252  mm/mremap.c                                        |    2 +
5253  mm/oom_kill.c                                      |  208 +-
5254  mm/page-writeback.c                                |   62 +-
5255  mm/page_alloc.c                                    |  426 ++-
5256  mm/page_owner.c                                    |  100 +-
5257  mm/page_poison.c                                   |  158 ++
5258  mm/rmap.c                                          |   16 +-
5259  mm/shmem.c                                         |   37 +-
5260  mm/slab.c                                          | 1043 ++++----
5261  mm/slab.h                                          |   95 +-
5262  mm/slab_common.c                                   |   11 +-
5263  mm/slob.c                                          |    4 +
5264  mm/slub.c                                          |  298 ++-
5265  mm/truncate.c                                      |    6 +-
5266  mm/util.c                                          |   30 +
5267  mm/vmalloc.c                                       |   25 +-
5268  mm/vmscan.c                                        |  234 +-
5269  mm/vmstat.c                                        |   17 +-
5270  mm/workingset.c                                    |  170 +-
5271  net/sctp/socket.c                                  |    2 +-
5272  net/xfrm/xfrm_user.c                               |    2 +-
5273  scripts/Makefile.lib                               |    6 +
5274  scripts/Makefile.ubsan                             |    4 +
5275  scripts/gdb/linux/proc.py                          |   41 +
5276  scripts/gdb/vmlinux-gdb.py                         |    1 +
5277  scripts/kallsyms.c                                 |   93 +-
5278  scripts/link-vmlinux.sh                            |    6 +-
5279  scripts/namespace.pl                               |    2 +
5280  scripts/sortextable.c                              |    2 +-
5281  sound/arm/pxa2xx-pcm-lib.c                         |   12 +-
5282  sound/drivers/pcsp/pcsp.c                          |    9 +-
5283  sound/soc/fsl/imx-pcm-fiq.c                        |   10 +-
5284  sound/soc/nuc900/nuc900-pcm.c                      |    6 +-
5285  sound/soc/omap/omap-pcm.c                          |   12 +-
5286  tools/perf/builtin-kmem.c                          |   49 +-
5287  tools/testing/radix-tree/.gitignore                |    2 +
5288  tools/testing/radix-tree/Makefile                  |   20 +
5289  tools/testing/radix-tree/find_next_bit.c           |   57 +
5290  tools/testing/radix-tree/linux.c                   |   60 +
5291  tools/testing/radix-tree/linux/bitops.h            |  150 ++
5292  tools/testing/radix-tree/linux/bitops/__ffs.h      |   43 +
5293  tools/testing/radix-tree/linux/bitops/ffs.h        |   41 +
5294  tools/testing/radix-tree/linux/bitops/ffz.h        |   12 +
5295  tools/testing/radix-tree/linux/bitops/find.h       |   13 +
5296  tools/testing/radix-tree/linux/bitops/fls.h        |   41 +
5297  tools/testing/radix-tree/linux/bitops/fls64.h      |   14 +
5298  tools/testing/radix-tree/linux/bitops/hweight.h    |   11 +
5299  tools/testing/radix-tree/linux/bitops/le.h         |   53 +
5300  tools/testing/radix-tree/linux/bitops/non-atomic.h |  111 +
5301  tools/testing/radix-tree/linux/bug.h               |    1 +
5302  tools/testing/radix-tree/linux/cpu.h               |   35 +
5303  tools/testing/radix-tree/linux/export.h            |    2 +
5304  tools/testing/radix-tree/linux/gfp.h               |    8 +
5305  tools/testing/radix-tree/linux/kernel.h            |   35 +
5306  tools/testing/radix-tree/linux/kmemleak.h          |    1 +
5307  tools/testing/radix-tree/linux/mempool.h           |   17 +
5308  tools/testing/radix-tree/linux/notifier.h          |    8 +
5309  tools/testing/radix-tree/linux/percpu.h            |    7 +
5310  tools/testing/radix-tree/linux/preempt.h           |    5 +
5311  tools/testing/radix-tree/linux/radix-tree.h        |    1 +
5312  tools/testing/radix-tree/linux/rcupdate.h          |    9 +
5313  tools/testing/radix-tree/linux/slab.h              |   28 +
5314  tools/testing/radix-tree/linux/types.h             |   28 +
5315  tools/testing/radix-tree/main.c                    |  272 ++
5316  tools/testing/radix-tree/rcupdate.c                |   86 +
5317  tools/testing/radix-tree/regression.h              |    8 +
5318  tools/testing/radix-tree/regression1.c             |  221 ++
5319  tools/testing/radix-tree/regression2.c             |  126 +
5320  tools/testing/radix-tree/regression3.c             |   86 +
5321  tools/testing/radix-tree/tag_check.c               |  332 +++
5322  tools/testing/radix-tree/test.c                    |  219 ++
5323  tools/testing/radix-tree/test.h                    |   40 +
5324  tools/vm/page-types.c                              |  125 +-
5325  401 files changed, 16605 insertions(+), 5074 deletions(-)
5326  create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt
5327  create mode 100644 Documentation/kcov.txt
5328  create mode 100644 Documentation/rapidio/mport_cdev.txt
5329  delete mode 100644 arch/alpha/mm/extable.c
5330  delete mode 100644 arch/s390/mm/extable.c
5331  create mode 100644 drivers/rapidio/devices/rio_mport_cdev.c
5332  create mode 100644 fs/ocfs2/filecheck.c
5333  create mode 100644 fs/ocfs2/filecheck.h
5334  create mode 100644 include/linux/crc64_ecma.h
5335  create mode 100644 include/linux/kcov.h
5336  create mode 100644 include/linux/rio_mport_cdev.h
5337  delete mode 100644 include/trace/events/gfpflags.h
5338  create mode 100644 include/trace/events/mmflags.h
5339  create mode 100644 include/uapi/linux/kcov.h
5340  create mode 100644 kernel/kcov.c
5341  create mode 100644 kernel/printk/internal.h
5342  create mode 100644 kernel/printk/nmi.c
5343  create mode 100644 lib/crc64_ecma.c
5344  create mode 100644 mm/page_poison.c
5345  create mode 100644 scripts/gdb/linux/proc.py
5346  create mode 100644 tools/testing/radix-tree/.gitignore
5347  create mode 100644 tools/testing/radix-tree/Makefile
5348  create mode 100644 tools/testing/radix-tree/find_next_bit.c
5349  create mode 100644 tools/testing/radix-tree/linux.c
5350  create mode 100644 tools/testing/radix-tree/linux/bitops.h
5351  create mode 100644 tools/testing/radix-tree/linux/bitops/__ffs.h
5352  create mode 100644 tools/testing/radix-tree/linux/bitops/ffs.h
5353  create mode 100644 tools/testing/radix-tree/linux/bitops/ffz.h
5354  create mode 100644 tools/testing/radix-tree/linux/bitops/find.h
5355  create mode 100644 tools/testing/radix-tree/linux/bitops/fls.h
5356  create mode 100644 tools/testing/radix-tree/linux/bitops/fls64.h
5357  create mode 100644 tools/testing/radix-tree/linux/bitops/hweight.h
5358  create mode 100644 tools/testing/radix-tree/linux/bitops/le.h
5359  create mode 100644 tools/testing/radix-tree/linux/bitops/non-atomic.h
5360  create mode 100644 tools/testing/radix-tree/linux/bug.h
5361  create mode 100644 tools/testing/radix-tree/linux/cpu.h
5362  create mode 100644 tools/testing/radix-tree/linux/export.h
5363  create mode 100644 tools/testing/radix-tree/linux/gfp.h
5364  create mode 100644 tools/testing/radix-tree/linux/kernel.h
5365  create mode 100644 tools/testing/radix-tree/linux/kmemleak.h
5366  create mode 100644 tools/testing/radix-tree/linux/mempool.h
5367  create mode 100644 tools/testing/radix-tree/linux/notifier.h
5368  create mode 100644 tools/testing/radix-tree/linux/percpu.h
5369  create mode 100644 tools/testing/radix-tree/linux/preempt.h
5370  create mode 100644 tools/testing/radix-tree/linux/radix-tree.h
5371  create mode 100644 tools/testing/radix-tree/linux/rcupdate.h
5372  create mode 100644 tools/testing/radix-tree/linux/slab.h
5373  create mode 100644 tools/testing/radix-tree/linux/types.h
5374  create mode 100644 tools/testing/radix-tree/main.c
5375  create mode 100644 tools/testing/radix-tree/rcupdate.c
5376  create mode 100644 tools/testing/radix-tree/regression.h
5377  create mode 100644 tools/testing/radix-tree/regression1.c
5378  create mode 100644 tools/testing/radix-tree/regression2.c
5379  create mode 100644 tools/testing/radix-tree/regression3.c
5380  create mode 100644 tools/testing/radix-tree/tag_check.c
5381  create mode 100644 tools/testing/radix-tree/test.c
5382  create mode 100644 tools/testing/radix-tree/test.h
5383 $ git clone -s -l -n -q . ../rebase-tmp
5384 $ cd ../rebase-tmp
5385 $ git checkout -b akpm remotes/origin/akpm/master
5386 Switched to a new branch 'akpm'
5387 $ git rebase --onto master remotes/origin/akpm/master-base
5388 First, rewinding head to replay your work on top of it...
5389 Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression
5390 $ cd ../next
5391 $ git fetch -f ../rebase-tmp akpm:akpm/master
5392 From ../rebase-tmp
5393  + 5888beab66ff...2c1975dd89fc akpm       -> akpm/master  (forced update)
5394 $ rm -rf ../rebase-tmp
5395 Merging akpm/master (2c1975dd89fc drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression)
5396 $ git merge --no-ff akpm/master
5397 Merge made by the 'recursive' strategy.
5398  drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +--
5399  1 file changed, 1 insertion(+), 2 deletions(-)