Jens Axboe (27):
      Merge branch 'timespec_add_msec_overflow' of https://github.com/sitsofe/fio
      Merge branch 'stat_base_overflow' of https://github.com/football1222/fio
      Merge branch 'fixes' of https://github.com/sitsofe/fio
      Merge branch 'doc_runtime' of https://github.com/sitsofe/fio
      engines/windowsaio: kill useless forward declarations
      Merge branch 'direct_layout_fix' of https://github.com/sitsofe/fio
      Merge branch 'asmfix' of https://github.com/oohal/fio
      lib/axmap: a few fixes/cleanups
      Merge branch 'verify_warn' of https://github.com/sitsofe/fio
      t/axmap: we don't need smalloc/sfree wrappers
      Merge branch 'shifted_logging' of https://github.com/sitsofe/fio
      filesetup: revert O_DIRECT for layout mess
      Merge branch 'gluster_printf' of https://github.com/sitsofe/fio
      Merge branch 'travis_32bit' of https://github.com/sitsofe/fio
      Merge branch 'windows_io_hint' of https://github.com/sitsofe/fio
      Merge branch 'verify_trigger' of https://github.com/sitsofe/fio
      Merge branch 'solaris-clock-setaffinity' of https://github.com/szaydel/fio
      io_u: fix trimming of mixed block size randommap
      time: ensure that offload mode switches parent out of ramp
      time: use bool for ramp time
      init: fixup_options() cleanup
      Add support for doing total latency percentiles
      stat: some bool conversions
      Merge branch 'doc-patches' of https://github.com/vincentkfu/fio
      init: typo in help output
      Remove old exp/README.md file
      Fio 3.1

Oliver O'Halloran (1):
      arch/ppc: Fix get_cpu_clock asm clobber list

Richard Liu (1):
      stat: increase the size of base to avoid overflow

Sam Zaydel (1):
      Fix clock setaffinity failed error which occurs on Solaris and Solaris derivatives such as Illumos.

Sitsofe Wheeler (18):
      verify: make overwriting verified blocks warning more specific
      verify: warn when verify pass won't be run
      rbd: fixup format specifier
      fio2gnuplot: minor man page heading fix
      configure: fail rbd configure check on wrong rados_create2 signature
      travis: install additional development libraries
      doc: remove '--runtime' command line option
      fio: implement 64 bit network/big endian byte swapping macros
      configure: clean up libverbs configure test
      README: update/add mintty issue links
      time: fix overflow in timespec_add_msec
      backend: verify-trigger fixes
      filesetup: align layout buffer
      filesetup: add direct=1 failure warning to layout
      stat: fix shifted windowed logging when using multiple directions
      travis: add 32 bit build, minor updates and cleanups
      glusterfs: silence printf specifier warnings
      windowsaio: obey sequential/random I/O hinting

Tomohiro Kusumi (17):
      cleanup NetBSD/OpenBSD header
      HOWTO: add OpenBSD to direct I/O unsupported platform
      add ifdef __sun__ for Solaris specific code
      filesetup: add non O_DIRECT direct I/O support for initial layout setup
      change fio_set_odirect() prototype not to use int fd
      change os_trim() prototype not to use int fd
      skeleton: add option example
      fix broken external ioengine option
      cleanup ioengine_load() (for the next commit)
      fix load_ioengine() not to support no "external:" prefix
      add __load_ioengine() to separate ioengine loading from td context
      fix regression by 8c43ba62('filesetup: align layout buffer')
      revert/rework 81647a9a('fix load_ioengine() not to support no "external:" prefix')
      lib/memalign: don't malloc size twice
      fix strncpy(3) copy length
      add "invalid block size" to "first direct IO errored." message
      add fio_set_directio() error message for platforms without direct I/O

Vincent Fu (3):
      doc: latency log unit is nsec
      doc: provide more detail regarding the --status-interval option
      doc: provide some documentation for the json output format