Merge branch 'master' into client-server

Conflicts:
	init.c

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --cc init.c
index 6066fc59ca2bc7f159e1862bec8a4e93b6824608,4eb0df2def2e529ca5a3165e506d0775f8a10ab0..142a1637b43bd108a1d34e16a3ac6349a2dfbc54
--- 1/init.c
--- 2/init.c
+++ b/init.c
@@@ -1239,11 -1175,9 +1241,11 @@@ int parse_cmd_line(int argc, char *argv
                        smalloc_pool_size = atoi(optarg);
                        break;
                case 't':
-                       def_thread.o.timeout = atoi(optarg);
 +                      fio_client_add_cmd_option(cur_client, argv[optind-1]);
+                       def_timeout = atoi(optarg);
                        break;
                case 'l':
 +                      fio_client_add_cmd_option(cur_client, argv[optind-1]);
                        write_lat_log = 1;
                        break;
                case 'b':