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, 14 insertions, 12 deletions

diff --git a/ipc/sem.c b/ipc/sem.c
index 92842113c6a9..d1a6edd17eba 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -2170,17 +2170,19 @@ static int sysvipc_sem_proc_show(struct seq_file *s, void *it)
 
         sem_otime = get_semotime(sma);
 
-        return seq_printf(s,
-                          "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
-                          sma->sem_perm.key,
-                          sma->sem_perm.id,
-                          sma->sem_perm.mode,
-                          sma->sem_nsems,
-                          from_kuid_munged(user_ns, sma->sem_perm.uid),
-                          from_kgid_munged(user_ns, sma->sem_perm.gid),
-                          from_kuid_munged(user_ns, sma->sem_perm.cuid),
-                          from_kgid_munged(user_ns, sma->sem_perm.cgid),
-                          sem_otime,
-                          sma->sem_ctime);
+        seq_printf(s,
+                   "%10d %10d  %4o %10u %5u %5u %5u %5u %10lu %10lu\n",
+                   sma->sem_perm.key,
+                   sma->sem_perm.id,
+                   sma->sem_perm.mode,
+                   sma->sem_nsems,
+                   from_kuid_munged(user_ns, sma->sem_perm.uid),
+                   from_kgid_munged(user_ns, sma->sem_perm.gid),
+                   from_kuid_munged(user_ns, sma->sem_perm.cuid),
+                   from_kgid_munged(user_ns, sma->sem_perm.cgid),
+                   sem_otime,
+                   sma->sem_ctime);
+
+        return 0;
 }
 #endif