From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 16 Jan 2020 22:44:16 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/bvanassche/fio
X-Git-Tag: fio-3.18~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2d8ca3fe2b3f3abc6d0ab50b7ad371b5dd7307e5;p=fio.git

Merge branch 'master' of https://github.com/bvanassche/fio

* 'master' of https://github.com/bvanassche/fio:
  t/read-to-pipe-async: Complain if pthread_detach() fails
  t/read-to-pipe-async: Do not divide by zero
  t/memlock: Verify 'threads' argument
  server: Make it explicit that the setsockopt() return value is ignored
  blktrace: Fix memory leaks in error paths
  blktrace: Check value of 'merge_buf' pointer before using it
  blktrace: Pass a positive error code to td_verror()
---

2d8ca3fe2b3f3abc6d0ab50b7ad371b5dd7307e5