Merge branch 'output-all' of https://github.com/kerolasa/lelux-utiliteetit

* 'output-all' of https://github.com/kerolasa/lelux-utiliteetit:
  zramctl: add --output-all option
  swapon: add --output-all option
  rfkill: add --output-all option
  partx: add --output-all option
  lsns: add --output-all option
  lsmem: add --output-all option
  lslogins: add --output-all option
  lslocks: add --output-all option
  lscpu: add --output-all option
  losetup: add --output-all option
  findmnt: add --output-all option

diff --cc sys-utils/lscpu.c
index fd6d63bbf34d0676b4d2b1bdc198f1c910b254f0,f260fe7cafe6a81b62a53df08effc1793b7ce8f6..619a7df1d70cebc153c96fd50b021e9b6a69d24a
--- 1/sys-utils/lscpu.c
--- 2/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@@ -1933,8 -1931,10 +1933,11 @@@ int main(int argc, char *argv[]
        int c, i;
        int columns[ARRAY_SIZE(coldescs)], ncolumns = 0;
        int cpu_modifier_specified = 0;
 +      size_t setsize;
  
+       enum {
+               OPT_OUTPUT_ALL = CHAR_MAX + 1,
+       };
        static const struct option longopts[] = {
                { "all",        no_argument,       NULL, 'a' },
                { "online",     no_argument,       NULL, 'b' },

diff --cc sys-utils/zramctl.c
Simple merge