Brantley West (1):
      allow a percent value for the offset parameter

Ian Chakeres (1):
      Added information about minimal output to documentation

Jens Axboe (25):
      Merge branch 'android-26-shm' of https://github.com/omor1/fio
      Merge branch 'alignment' of https://github.com/omor1/fio
      Fix typo in man page / HOWTO for block size defaults
      Merge branch 'alignment' of https://github.com/sitsofe/fio
      Merge branch 'android_cgroup' of https://github.com/omor1/fio
      Merge branch 'bugfix' of https://github.com/YukiKita/fio
      Revert "Fixed json_print_value so that ending double quote of JSON string value will not disappear"
      log: make log_buf() return how much it wrote
      log: make the logging functions handle > 1024 bytes correctly
      log: ensure we don't truncate the final '\0' in the log
      log: unify the logging handlers
      lib/output_buffer: harden buf_output_free() and kill buf_output_clear()
      Merge branch 'size_perc' of https://github.com/sitsofe/fio
      Merge branch 'master' of https://github.com/cbwest3/fio
      Merge branch 'more-minimal-info-in-docs' of https://github.com/ianchakeres/fio
      stat: correct json 'io_bytes' output
      fileset: fix double addition of file offset
      Fix up some style
      diskutil: ensure we have enough room to not write past end
      blktrace: ensure that dev loop doesn't truncate name
      Add strndup() function, if we don't have it
      configure: remember to initialize 'strndup' to "no"
      oslib/strndup: cleanup and remember to include for aux programs
      sync: add support for write life time hint
      Fio 2.21

Omri Mor (5):
      flist.h: replace offsetof macros by stddef.h include
      Android: add support for cgroups
      configure: fix _Static_assert check
      os/os-android.h: fix alignment problems in shared memory functions     Fixes: #356 ("Android: SIGBUS due to unaligned access")
      os/os-android.h: fix compilation for Android O

Sitsofe Wheeler (3):
      fio: fix some struct alignment issues
      server: bump protocol version
      filesetup: fix size percentage calculations when using offset

Stephen Bates (2):
      pattern: Add support for files in buffer_pattern argument.
      man: Update buffer_pattern entry in man pages

Tomohiro Kusumi (23):
      configure: Use single square brackets (POSIX)
      configure: Add print_config() for "<config>... <yes|no>" outputs
      Move {is,load}_blktrace() to a new header blktrace.h
      Drop struct thread_data dependency from os headers
      Drop circular dependency in log.c and lib/output_buffer.c
      Include sg headers in os/os-linux.h
      Move Linux/ppc64 specific cpu_online() to os/os-linux.h
      verify: add missing free(ptr);
      verify: mention some default option values
      manpage: update URL links to HOWTO/README
      use true/false for bool type
      use correct syscall name in log_err()
      fix wrong malloc size for ignore_error buffer
      don't leave ignore_error_nr[etype] with 4 on blank input or error
      use enum error_type_bit for ignore_error index
      use ARRAY_SIZE() for ignore_error_nr[etype]
      HOWTO: mention some details of ignore_error= option
      sg: add missing free(msg); in ->errdetails() handler
      sg: drop unneeded strdup from ->errdetails() handler
      sg: drop redundant void* cast
      sg: don't use void* for pointer arithmetic (gcc)
      splice: don't use void* for pointer arithmetic (gcc)
      binject: don't use void* for pointer arithmetic (gcc)

YukiKita (1):
      Fixed json_print_value so that ending double quote of JSON string value will not disappear