Merge branch 'master' into gfio

Conflicts:
	init.c

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

diff --cc HOWTO
Simple merge

diff --cc Makefile
Simple merge

diff --cc configure
index 71faf9184a9e9fb57a386f79ebd55868facf2403,d1f277d057ea1e0ed8226f80d63bfb18ee5097cd..5d576e104fc863eabf9da37f31158f34c9f0a51b
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -1068,8 -1035,10 +1086,11 @@@ f
  if test "$tcp_nodelay" = "yes" ; then
    output_sym "CONFIG_TCP_NODELAY"
  fi
+ if test "$rlimit_memlock" = "yes" ; then
+   output_sym "CONFIG_RLIMIT_MEMLOCK"
+ fi
  
  echo "LIBS+=$LIBS" >> $config_host_mak
 +echo "CFLAGS+=$CFLAGS" >> $config_host_mak
  echo "CC=$cc" >> $config_host_mak
  echo "EXTFLAGS=$EXTFLAGS $CFLAGS" >> $config_host_mak

diff --cc debug.h
Simple merge

diff --cc engines/net.c
Simple merge

diff --cc eta.c
index a724fe63936bc64caa0719871c9ff90cfb522c49,f90d428197656f362fcdf199865a65f06dbebbec..531b876280b2176d3784d6d50073d2d47797e146
--- 1/eta.c
--- 2/eta.c
+++ b/eta.c
@@@ -439,12 -440,17 +440,17 @@@ void display_thread_status(struct jobs_
                eta_to_str(eta_str, je->eta_sec);
        }
  
+       if (eta_new_line_pending) {
+               eta_new_line_pending = 0;
+               p += sprintf(p, "\n");
+       }
+ 
        p += sprintf(p, "Jobs: %d (f=%d)", je->nr_running, je->files_open);
 -      if (je->m_rate || je->t_rate) {
 +      if (je->m_rate[0] || je->m_rate[1] || je->t_rate[0] || je->t_rate[1]) {
                char *tr, *mr;
  
 -              mr = num2str(je->m_rate, 4, 0, je->is_pow2);
 -              tr = num2str(je->t_rate, 4, 0, je->is_pow2);
 +              mr = num2str(je->m_rate[0] + je->m_rate[1], 4, 0, je->is_pow2);
 +              tr = num2str(je->t_rate[0] + je->t_rate[1], 4, 0, je->is_pow2);
                p += sprintf(p, ", CR=%s/%s KB/s", tr, mr);
                free(tr);
                free(mr);

diff --cc filesetup.c
Simple merge

diff --cc fio.h
Simple merge

diff --cc init.c
Simple merge

diff --cc memory.c
index e969221f36f86a8a1c74b502152a97e75f81c219,ee5f895d2b0b0f88e6bd50a2a2a50149c45591fd..f1cd2d770f4cbe3597ecbc5e236b355e930fc49a
--- 1/memory.c
--- 2/memory.c
+++ b/memory.c
@@@ -171,12 -173,13 +171,13 @@@ static int alloc_mem_mmap(struct thread
  
  static void free_mem_mmap(struct thread_data *td, size_t total_mem)
  {
-       dprint(FD_MEM, "munmap %u %p\n", total_mem, td->orig_buffer);
+       dprint(FD_MEM, "munmap %llu %p\n", (unsigned long long) total_mem,
+                                               td->orig_buffer);
        munmap(td->orig_buffer, td->orig_buffer_size);
 -      if (td->mmapfile) {
 +      if (td->o.mmapfile) {
                close(td->mmapfd);
 -              unlink(td->mmapfile);
 -              free(td->mmapfile);
 +              unlink(td->o.mmapfile);
 +              free(td->o.mmapfile);
        }
  }
  

diff --cc server.c
Simple merge