Merge branch 'master' into gfio

Conflicts:
	fio.c
	fio.h

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

diff --cc HOWTO
Simple merge

diff --cc fio.h
index 8246e38856a22321fae6bcab9410ed401f64cabd,6da22f039c8b1216762ec7ae349fb66b0d5bf229..95d9d77c555b6cc044e9cb485003b25535e8c3e3
--- 1/fio.h
--- 2/fio.h
+++ b/fio.h
@@@ -314,7 -527,8 +314,7 @@@ extern int shm_id
  extern int groupid;
  extern int terse_output;
  extern int temp_stall_ts;
- extern unsigned long page_mask, page_size;
 -extern unsigned long long mlock_size;
+ extern uintptr_t page_mask, page_size;
  extern int read_only;
  extern int eta_print;
  extern unsigned long done_secs;

diff --cc iolog.c
Simple merge

diff --cc libfio.c
index acdb0ea468a8d3855ecc4affcc395dd086218ee3,668df455b95d40daf8a14347113b7aaea7741717..36876ddf24dc66c25f9b778fc4141acb122e433f
--- 1/libfio.c
--- 2/libfio.c
+++ b/libfio.c
@@@ -41,9 -36,6 +41,9 @@@ FLIST_HEAD(disk_list)
  
  unsigned long arch_flags = 0;
  
- unsigned long page_mask;
- unsigned long page_size;
++uintptr_t page_mask;
++uintptr_t page_size;
 +
  static const char *fio_os_strings[os_nr] = {
        "Invalid",
        "Linux",

diff --cc stat.c
Simple merge