Merge remote-tracking branch 'sami/to-craig' into sami-merge

Conflicts:
	pgrep.c
	w.c

diff --cc configure.ac
Simple merge

diff --cc pgrep.c
index 6c6d2618598a4ccf97ca32af4a043dab4e4e5aa7,9473a1eab0c10ebc9b6f733fb41a0feea97db14b..b1d4ace44f60e63a75caff159bd949108ed5e1fc
--- 1/pgrep.c
--- 2/pgrep.c
+++ b/pgrep.c
@@@ -792,15 -774,12 +792,15 @@@ int main (int argc, char **argv
        if (i_am_pkill) {
                int i;
                for (i = 0; i < num; i++) {
 -                      if (kill (procs[i].num, opt_signal) != -1)
 -                              continue;
 +                      if (kill (procs[i].num, opt_signal) != -1) {
 +                              if (opt_echo)
 +                                      printf(_("%s killed (pid %lu)\n"), procs[i].str, procs[i].num);
 +                              continue;
 +                      }
                        if (errno==ESRCH)
-                                /* gone now, which is OK */
-                               continue;
-                       xwarn(_("killing pid %d failed"), procs[i].num);
+                                // gone now, which is OK
+                               continue;
+                       xwarn(_("killing pid %ld failed"), procs[i].num);
                }
        } else {
                if (opt_count) {

diff --cc pmap.c
Simple merge

diff --cc ps/output.c
Simple merge

diff --cc vmstat.c
Simple merge

diff --cc w.c
Simple merge