Merge branch 'akpm' (patches from Andrew)

Merge second patchbomb from Andrew Morton:

 - the rest of MM

 - various misc bits

 - add ability to run /sbin/reboot at reboot time

 - printk/vsprintf changes

 - fiddle with seq_printf() return value

* akpm: (114 commits)
  parisc: remove use of seq_printf return value
  lru_cache: remove use of seq_printf return value
  tracing: remove use of seq_printf return value
  cgroup: remove use of seq_printf return value
  proc: remove use of seq_printf return value
  s390: remove use of seq_printf return value
  cris fasttimer: remove use of seq_printf return value
  cris: remove use of seq_printf return value
  openrisc: remove use of seq_printf return value
  ARM: plat-pxa: remove use of seq_printf return value
  nios2: cpuinfo: remove use of seq_printf return value
  microblaze: mb: remove use of seq_printf return value
  ipc: remove use of seq_printf return value
  rtc: remove use of seq_printf return value
  power: wakeup: remove use of seq_printf return value
  x86: mtrr: if: remove use of seq_printf return value
  linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
  MAINTAINERS: CREDITS: remove Stefano Brivio from B43
  .mailmap: add Ricardo Ribalda
  CREDITS: add Ricardo Ribalda Delgado
  ...

1 files changed, 18 insertions, 16 deletions

diff --git a/ipc/msg.c b/ipc/msg.c
index a7261d5cbc89..2b6fdbb9e0e9 100644
--- a/ipc/msg.c
+++ b/ipc/msg.c
@@ -1015,22 +1015,24 @@ static int sysvipc_msg_proc_show(struct seq_file *s, void *it)
         struct user_namespace *user_ns = seq_user_ns(s);
         struct msg_queue *msq = it;
 
-        return seq_printf(s,
-                        "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
-                        msq->q_perm.key,
-                        msq->q_perm.id,
-                        msq->q_perm.mode,
-                        msq->q_cbytes,
-                        msq->q_qnum,
-                        msq->q_lspid,
-                        msq->q_lrpid,
-                        from_kuid_munged(user_ns, msq->q_perm.uid),
-                        from_kgid_munged(user_ns, msq->q_perm.gid),
-                        from_kuid_munged(user_ns, msq->q_perm.cuid),
-                        from_kgid_munged(user_ns, msq->q_perm.cgid),
-                        msq->q_stime,
-                        msq->q_rtime,
-                        msq->q_ctime);
+        seq_printf(s,
+                   "%10d %10d  %4o  %10lu %10lu %5u %5u %5u %5u %5u %5u %10lu %10lu %10lu\n",
+                   msq->q_perm.key,
+                   msq->q_perm.id,
+                   msq->q_perm.mode,
+                   msq->q_cbytes,
+                   msq->q_qnum,
+                   msq->q_lspid,
+                   msq->q_lrpid,
+                   from_kuid_munged(user_ns, msq->q_perm.uid),
+                   from_kgid_munged(user_ns, msq->q_perm.gid),
+                   from_kuid_munged(user_ns, msq->q_perm.cuid),
+                   from_kgid_munged(user_ns, msq->q_perm.cgid),
+                   msq->q_stime,
+                   msq->q_rtime,
+                   msq->q_ctime);
+
+        return 0;
 }
 #endif