Merge branch 'master' into next

diff --cc afs.c
index 531cada83dc4724c92ea2c329e8a3e3b48602030,ccda7cdaaa4e211b696d4e898f08c7c2520ab3ef..1350db3423c3a184cb645e09cae9a2ebb060358b
--- 1/afs.c
--- 2/afs.c
+++ b/afs.c
@@@ -1019,15 -1089,14 +1020,14 @@@ static void create_tables_callback(int 
        }
        ret = open_afs_tables();
  out:
-       if (ret >= 0)
-               buf = make_message("successfully created afs table(s)\n");
-       else
-               buf = make_message("%s\n", para_strerror(-ret));
-       pass_buffer_as_shm(buf, strlen(buf), &fd);
-       free(buf);
+       if (ret < 0)
+               para_printf(&pb, "%s\n", para_strerror(-ret));
+       if (pb.buf)
+               pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+       free(pb.buf);
  }
  
 -int com_init(int fd, int argc, char * const * const argv)
 +int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
  {
        int i, j, ret;
        uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;

diff --cc aft.c
Simple merge

diff --cc attribute.c
Simple merge

diff --cc blob.c
Simple merge