From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 13 Mar 2018 00:13:10 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/bvanassche/fio
X-Git-Tag: fio-3.6~42
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=c4bf91427a4fd1fbdb662667307189eabacf45b5

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

* 'master' of https://github.com/bvanassche/fio:
  parse: Fix two compiler warnings
  stat: Fix a compiler warning in __show_run_stats()
  Rename struct rb_node into struct fio_rb_node
  configure: Disable lex on NetBSD
---

c4bf91427a4fd1fbdb662667307189eabacf45b5