From: Karel Zak <kzak@redhat.com>
Date: Thu, 10 May 2018 10:15:32 +0000 (+0200)
Subject: Merge branch 'output-all' of https://github.com/kerolasa/lelux-utiliteetit
X-Git-Tag: v2.33-rc1~274
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9fdebcf540147fe3108971fc9c80d505867f711;p=thirdparty%2Futil-linux.git

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
---

c9fdebcf540147fe3108971fc9c80d505867f711
diff --cc sys-utils/lscpu.c
index fd6d63bbf3,f260fe7caf..619a7df1d7
--- a/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' },