From: Karel Zak <kzak@redhat.com>
Date: Wed, 2 Jun 2021 10:33:07 +0000 (+0200)
Subject: Merge branch 'next'
X-Git-Tag: v2.38-rc1~486
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac55a4130fcdab12ee6a49f8a8ebd6a17c1890df;p=thirdparty%2Futil-linux.git

Merge branch 'next'

* next: (26 commits)
  build-sys: add script to compare config.h from meson and autotools
  meson: add missing header files check
  docs: update TODO
  tests: update lscpu outputs
  lscpu: read MHZ from /sys/.../cpufreq/scaling_cur_freq
  lscpu: use locale-independent strtod() when read from kernel
  lib/c_strtod; add locale independent strtod()
  tests: update lscpu output
  lscpu: use MHZ as number to be locale sensitive
  lscpu: add SCALMHZ% and "CPU scaling MHz:"
  sulogin: fix whitespace error
  sulogin: ignore none-existing console devices
  lsns: fix old error message
  lsns: fix copy & past in man page
  lsns: fill UID and USER columns for interpolated namespaces
  fixup! lsns: interpolate missing namespaces for converting forests to a tree
  lsns: interpolate missing namespaces for converting forests to a tree
  lsns: reorganize members specifying other namespaces in lsns_namespace
  lsns: make namespace having no process printable
  libblkid: support zone reset for wipefs
  ...
---

ac55a4130fcdab12ee6a49f8a8ebd6a17c1890df
diff --cc sys-utils/lscpu.c
index b5cde27230,90bcde5efa..24f59465d9
--- a/sys-utils/lscpu.c
+++ b/sys-utils/lscpu.c
@@@ -149,7 -150,8 +150,8 @@@ static struct lscpu_coldesc coldescs_cp
  	[COL_CPU_ADDRESS]      = { "ADDRESS", N_("physical address of a CPU") },
  	[COL_CPU_CONFIGURED]   = { "CONFIGURED", N_("shows if the hypervisor has allocated the CPU") },
  	[COL_CPU_ONLINE]       = { "ONLINE", N_("shows if Linux currently makes use of the CPU"), SCOLS_FL_RIGHT },
 -	[COL_CPU_MHZ]	       = { "MHZ", N_("shows the currently MHz of the CPU"), SCOLS_FL_RIGHT },
 +	[COL_CPU_MHZ]          = { "MHZ", N_("shows the currently MHz of the CPU"), SCOLS_FL_RIGHT },
+ 	[COL_CPU_SCALMHZ]      = { "SCALMHZ%", N_("shows scaling percentage of the CPU frequency"), SCOLS_FL_RIGHT },
  	[COL_CPU_MAXMHZ]       = { "MAXMHZ", N_("shows the maximum MHz of the CPU"), SCOLS_FL_RIGHT },
  	[COL_CPU_MINMHZ]       = { "MINMHZ", N_("shows the minimum MHz of the CPU"), SCOLS_FL_RIGHT }
  };